summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-01-31 19:32:23 +0100
committerVladimír Čunát <vcunat@gmail.com>2015-01-31 19:34:57 +0100
commitdbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch)
tree18c61fd667b95bf3a3322e5f40161d2028b3e42c
parent5dab625862a5690a35c122f3749eee31879a2415 (diff)
parentb50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff)
downloadnixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar
nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.gz
nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.bz2
nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.lz
nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.xz
nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.zst
nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.zip
Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
-rw-r--r--.gitignore6
-rw-r--r--README.md2
-rw-r--r--default.nix2
-rw-r--r--doc/language-support.xml2
-rw-r--r--doc/manual.xml1
-rw-r--r--doc/packageconfig.xml85
-rw-r--r--lib/licenses.nix5
-rw-r--r--lib/maintainers.nix7
-rw-r--r--nixos/doc/manual/manual.xml1
-rw-r--r--nixos/doc/manual/release-notes/rl-1412.xml6
-rw-r--r--nixos/modules/installer/tools/nixos-rebuild.sh4
-rw-r--r--nixos/modules/misc/ids.nix2
-rw-r--r--[-rwxr-xr-x]nixos/modules/module-list.nix5
-rw-r--r--nixos/modules/programs/environment.nix4
-rw-r--r--nixos/modules/rename.nix7
-rw-r--r--nixos/modules/security/grsecurity.nix18
-rw-r--r--nixos/modules/services/amqp/rabbitmq.nix32
-rw-r--r--nixos/modules/services/databases/openldap.nix44
-rw-r--r--nixos/modules/services/hardware/freefall.nix62
-rw-r--r--nixos/modules/services/hardware/tlp.nix93
-rw-r--r--nixos/modules/services/misc/apache-kafka.nix156
-rw-r--r--nixos/modules/services/misc/gitlab.nix19
-rw-r--r--nixos/modules/services/misc/gitolite.nix1
-rw-r--r--nixos/modules/services/misc/redmine.nix3
-rw-r--r--nixos/modules/services/monitoring/riemann-dash.nix2
-rw-r--r--nixos/modules/services/networking/firewall.nix2
-rw-r--r--nixos/modules/services/networking/ntpd.nix3
-rw-r--r--nixos/modules/services/networking/openntpd.nix24
-rw-r--r--nixos/modules/services/networking/tlsdated.nix110
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix1
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/owncloud.nix577
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix4
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde4.nix8
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix143
-rw-r--r--nixos/modules/services/x11/desktop-managers/kodi.nix31
-rw-r--r--nixos/modules/services/x11/display-managers/kdm.nix3
-rw-r--r--nixos/modules/system/boot/loader/grub/grub.nix2
-rw-r--r--nixos/modules/system/boot/loader/gummiboot/gummiboot.nix2
-rw-r--r--nixos/modules/system/boot/loader/loader.nix15
-rw-r--r--nixos/modules/system/boot/modprobe.nix15
-rw-r--r--nixos/modules/tasks/filesystems.nix7
-rw-r--r--nixos/modules/virtualisation/containers.nix10
-rw-r--r--nixos/modules/virtualisation/nixos-container.pl4
-rw-r--r--nixos/release.nix2
-rw-r--r--nixos/tests/chromium.nix1
-rw-r--r--pkgs/applications/audio/clementine/default.nix12
-rw-r--r--pkgs/applications/audio/distrho/default.nix10
-rw-r--r--pkgs/applications/audio/drumkv1/default.nix4
-rw-r--r--pkgs/applications/audio/game-music-emu/default.nix21
-rw-r--r--pkgs/applications/audio/guitarix/default.nix4
-rw-r--r--pkgs/applications/audio/keyfinder-cli/default.nix32
-rw-r--r--pkgs/applications/audio/keyfinder/default.nix42
-rw-r--r--[-rwxr-xr-x]pkgs/applications/audio/mpc/default.nix0
-rw-r--r--[-rwxr-xr-x]pkgs/applications/audio/ncmpc/default.nix0
-rw-r--r--pkgs/applications/audio/samplv1/default.nix4
-rw-r--r--pkgs/applications/audio/snd/default.nix4
-rw-r--r--pkgs/applications/audio/sooperlooper/default.nix34
-rw-r--r--pkgs/applications/audio/spotify/default.nix56
-rw-r--r--pkgs/applications/audio/synthv1/default.nix4
-rw-r--r--[-rwxr-xr-x]pkgs/applications/audio/vimpc/default.nix0
-rw-r--r--pkgs/applications/editors/emacs-modes/flycheck/default.nix32
-rw-r--r--pkgs/applications/editors/emacs-modes/haskell/git.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/let-alist/default.nix27
-rw-r--r--pkgs/applications/editors/monodevelop/builder.sh28
-rw-r--r--pkgs/applications/editors/monodevelop/default.nix59
-rw-r--r--pkgs/applications/editors/monodevelop/prefix.patch44
-rw-r--r--pkgs/applications/editors/monodoc/builder.sh20
-rw-r--r--pkgs/applications/editors/monodoc/default.nix15
-rw-r--r--pkgs/applications/editors/tiled/default.nix (renamed from pkgs/applications/editors/tiled-qt/default.nix)6
-rw-r--r--pkgs/applications/gis/qgis/default.nix20
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix4
-rw-r--r--pkgs/applications/graphics/PythonMagick/default.nix14
-rw-r--r--pkgs/applications/graphics/digikam/default.nix8
-rw-r--r--pkgs/applications/graphics/f-spot/builder.sh27
-rw-r--r--pkgs/applications/graphics/f-spot/default.nix32
-rw-r--r--pkgs/applications/graphics/f-spot/dllmap.patch28
-rw-r--r--pkgs/applications/graphics/feh/default.nix6
-rw-r--r--pkgs/applications/graphics/leocad/default.nix28
-rw-r--r--pkgs/applications/graphics/sxiv/default.nix4
-rw-r--r--pkgs/applications/kde-apps-14.12/default.nix265
-rw-r--r--pkgs/applications/kde-apps-14.12/dependencies.nix1676
-rwxr-xr-xpkgs/applications/kde-apps-14.12/dependencies.sh12
-rw-r--r--pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch12
-rw-r--r--pkgs/applications/kde-apps-14.12/manifest.nix1258
-rwxr-xr-xpkgs/applications/kde-apps-14.12/manifest.sh15
-rw-r--r--pkgs/applications/kde-apps-14.12/renames.nix23
-rw-r--r--pkgs/applications/kde-apps-14.12/setup-hook.sh1
-rw-r--r--pkgs/applications/misc/blender/default.nix5
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
-rw-r--r--pkgs/applications/misc/cherrytree/default.nix36
-rw-r--r--pkgs/applications/misc/cherrytree/subprocess.patch15
-rw-r--r--pkgs/applications/misc/cool-old-term/default.nix53
-rw-r--r--pkgs/applications/misc/cool-retro-term/default.nix47
-rw-r--r--pkgs/applications/misc/cura/default.nix4
-rw-r--r--pkgs/applications/misc/curaengine/default.nix6
-rw-r--r--pkgs/applications/misc/gpa/default.nix20
-rw-r--r--pkgs/applications/misc/grass/default.nix1
-rw-r--r--pkgs/applications/misc/ikiwiki/default.nix6
-rw-r--r--pkgs/applications/misc/pstree/default.nix2
-rw-r--r--pkgs/applications/misc/pwsafe/default.nix80
-rw-r--r--pkgs/applications/misc/terminal-notifier/default.nix26
-rw-r--r--pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch57
-rw-r--r--pkgs/applications/misc/xca/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/browser.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix6
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/plugins.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/source/sources.nix24
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/sources.nix354
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix12
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix8
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix4
-rw-r--r--pkgs/applications/networking/google-drive-ocamlfuse/default.nix18
-rw-r--r--pkgs/applications/networking/instant-messengers/qtox/default.nix28
-rw-r--r--pkgs/applications/networking/instant-messengers/toxic/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/utox/default.nix26
-rw-r--r--pkgs/applications/networking/irc/irssi/default.nix4
-rw-r--r--pkgs/applications/networking/irc/quassel/default.nix19
-rw-r--r--pkgs/applications/networking/irc/weechat/default.nix6
-rw-r--r--pkgs/applications/networking/mailreaders/sup/.bundix/cache4
-rw-r--r--pkgs/applications/networking/mailreaders/sup/Gemfile8
-rw-r--r--pkgs/applications/networking/mailreaders/sup/Gemfile.lock34
-rw-r--r--pkgs/applications/networking/mailreaders/sup/default.nix86
-rw-r--r--pkgs/applications/networking/mailreaders/sup/gemset.nix107
-rw-r--r--pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff25
-rw-r--r--pkgs/applications/networking/remote/freerdp/unstable.nix8
-rw-r--r--pkgs/applications/networking/syncthing/default.nix4
-rw-r--r--pkgs/applications/networking/vnstat/default.nix5
-rw-r--r--pkgs/applications/office/mendeley/default.nix66
-rw-r--r--pkgs/applications/office/zotero/default.nix78
-rw-r--r--pkgs/applications/science/astronomy/gravit/default.nix4
-rw-r--r--pkgs/applications/science/astronomy/stellarium/default.nix8
-rw-r--r--pkgs/applications/science/logic/why3/default.nix2
-rw-r--r--pkgs/applications/science/logic/z3/default.nix17
-rw-r--r--pkgs/applications/science/math/pssp/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix6
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix8
-rw-r--r--pkgs/applications/version-management/git-and-tools/hub/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/tig/default.nix9
-rw-r--r--pkgs/applications/version-management/gitlab-shell/default.nix8
-rw-r--r--pkgs/applications/version-management/gitlab/Gemfile258
-rw-r--r--pkgs/applications/version-management/gitlab/Gemfile.lock7
-rw-r--r--pkgs/applications/version-management/gitlab/Gemfile.nix1508
-rw-r--r--pkgs/applications/version-management/gitlab/README5
-rw-r--r--pkgs/applications/version-management/gitlab/bootstrap.nix45
-rw-r--r--pkgs/applications/version-management/gitlab/default.nix111
-rw-r--r--pkgs/applications/version-management/gitlab/gemset.nix2398
-rwxr-xr-xpkgs/applications/version-management/gitlab/generate_nix_requirements.rb56
-rw-r--r--pkgs/applications/version-management/gitolite/default.nix4
-rw-r--r--pkgs/applications/version-management/meld/default.nix44
-rw-r--r--pkgs/applications/version-management/rcs/default.nix4
-rw-r--r--pkgs/applications/version-management/redmine/bootstrap.nix2
-rw-r--r--pkgs/applications/version-management/redmine/default.nix4
-rw-r--r--pkgs/applications/video/kodi/plugins.nix108
-rw-r--r--pkgs/applications/video/kodi/wrapper.nix53
-rw-r--r--pkgs/applications/video/mjpg-streamer/default.nix34
-rw-r--r--pkgs/applications/video/mpv/default.nix4
-rw-r--r--pkgs/applications/video/simplescreenrecorder/default.nix4
-rw-r--r--pkgs/applications/video/smtube/default.nix4
-rw-r--r--pkgs/applications/virtualization/docker/default.nix4
-rw-r--r--pkgs/applications/window-managers/i3/default.nix2
-rw-r--r--pkgs/applications/window-managers/i3/lock.nix16
-rw-r--r--pkgs/build-support/autonix/default.nix174
-rwxr-xr-xpkgs/build-support/autonix/manifest.sh38
-rw-r--r--pkgs/build-support/cc-wrapper/default.nix3
-rw-r--r--[-rwxr-xr-x]pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in0
-rw-r--r--pkgs/build-support/fetchurl/mirrors.nix10
-rw-r--r--pkgs/build-support/fetchzip/default.nix31
-rwxr-xr-xpkgs/build-support/fetchzip/nix-prefetch-zip31
-rw-r--r--pkgs/build-support/gcc-wrapper/setup-hook-stdinc.sh44
-rw-r--r--pkgs/build-support/templaterpm/default.nix24
-rwxr-xr-xpkgs/build-support/templaterpm/nix-template-rpm.py274
-rw-r--r--pkgs/data/documentation/man-pages/default.nix4
-rw-r--r--pkgs/data/documentation/zeal/default.nix50
-rw-r--r--pkgs/data/fonts/unifont/default.nix39
-rw-r--r--pkgs/desktops/plasma-5.1/default.nix143
-rw-r--r--pkgs/desktops/plasma-5.1/dependencies.nix220
-rwxr-xr-xpkgs/desktops/plasma-5.1/dependencies.sh22
-rw-r--r--pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch13
-rw-r--r--pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch130
-rw-r--r--pkgs/desktops/plasma-5.1/manifest.nix166
-rwxr-xr-xpkgs/desktops/plasma-5.1/manifest.sh15
-rw-r--r--pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch24
-rw-r--r--pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch18
-rw-r--r--pkgs/desktops/plasma-5.1/renames.nix24
-rw-r--r--pkgs/desktops/plasma-5.1/setup-hook.sh1
-rw-r--r--pkgs/desktops/plasma-5.1/startkde/default.nix33
-rw-r--r--pkgs/desktops/plasma-5.1/startkde/kdeglobals11
-rw-r--r--pkgs/desktops/plasma-5.1/startkde/startkde.in382
-rw-r--r--pkgs/desktops/plasma-5.1/startkde/startupconfigkeys5
-rw-r--r--pkgs/desktops/plasma-5.2/default.nix163
-rw-r--r--pkgs/desktops/plasma-5.2/dependencies.nix284
-rwxr-xr-xpkgs/desktops/plasma-5.2/dependencies.sh22
-rw-r--r--pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch13
-rw-r--r--pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch130
-rw-r--r--pkgs/desktops/plasma-5.2/manifest.nix214
-rwxr-xr-xpkgs/desktops/plasma-5.2/manifest.sh15
-rw-r--r--pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch24
-rw-r--r--pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch18
-rw-r--r--pkgs/desktops/plasma-5.2/renames.nix23
-rw-r--r--pkgs/desktops/plasma-5.2/setup-hook.sh1
-rw-r--r--pkgs/desktops/plasma-5.2/startkde/default.nix33
-rw-r--r--pkgs/desktops/plasma-5.2/startkde/kdeglobals11
-rw-r--r--pkgs/desktops/plasma-5.2/startkde/startkde.in382
-rw-r--r--pkgs/desktops/plasma-5.2/startkde/startupconfigkeys5
-rw-r--r--pkgs/development/compilers/cryptol/1.8.x.nix119
-rw-r--r--pkgs/development/compilers/cryptol/2.0.x.nix31
-rw-r--r--pkgs/development/compilers/cryptol/fix-gitrev.patch44
-rw-r--r--pkgs/development/compilers/elm/0001-remove-custom-build-step.patch25
-rw-r--r--pkgs/development/compilers/elm/elm-compiler.nix4
-rw-r--r--pkgs/development/compilers/elm/elm-make.nix4
-rw-r--r--pkgs/development/compilers/elm/elm-package.nix4
-rw-r--r--pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json6
-rw-r--r--pkgs/development/compilers/elm/elm-reactor.nix54
-rw-r--r--pkgs/development/compilers/fsharp/default.nix4
-rw-r--r--pkgs/development/compilers/ghc/7.10.1.nix6
-rw-r--r--pkgs/development/compilers/go/1.4.nix14
-rw-r--r--pkgs/development/compilers/icedtea/sources.nix18
-rw-r--r--pkgs/development/compilers/julia/0.2.nix (renamed from pkgs/development/compilers/julia/0.2.1.nix)0
-rw-r--r--pkgs/development/compilers/julia/0.3.nix (renamed from pkgs/development/compilers/julia/0.3.5.nix)3
-rw-r--r--pkgs/development/compilers/mono/default.nix5
-rw-r--r--pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch14
-rw-r--r--pkgs/development/compilers/openjdk/openjdk8.nix142
-rw-r--r--pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch21
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk7-linux.nix6
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix6
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk8-linux.nix6
-rw-r--r--pkgs/development/compilers/rustc/1.0.0-alpha.nix (renamed from pkgs/development/compilers/rustc/0.12.nix)42
-rw-r--r--pkgs/development/compilers/rustc/grsec.patch16
-rw-r--r--pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch8
-rw-r--r--pkgs/development/compilers/rustc/hardcode_paths.patch47
-rw-r--r--pkgs/development/compilers/rustc/head.nix18
-rw-r--r--pkgs/development/compilers/yap/default.nix4
-rw-r--r--pkgs/development/coq-modules/containers/default.nix24
-rw-r--r--pkgs/development/coq-modules/contribs/all.nix163
-rw-r--r--pkgs/development/coq-modules/contribs/default.nix208
-rw-r--r--pkgs/development/coq-modules/contribs/mk-contrib.nix30
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix315
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix22
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix11
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix10
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix11
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix11
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix46
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix47
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix10
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2872
-rw-r--r--pkgs/development/haskell-modules/lib.nix12
-rw-r--r--pkgs/development/interpreters/groovy/default.nix4
-rw-r--r--pkgs/development/interpreters/mujs/default.nix6
-rw-r--r--pkgs/development/interpreters/php/5.4.nix4
-rw-r--r--pkgs/development/interpreters/pypy/2.4/default.nix2
-rw-r--r--pkgs/development/interpreters/python/2.6/default.nix1
-rw-r--r--pkgs/development/interpreters/python/2.7/default.nix1
-rw-r--r--pkgs/development/interpreters/python/3.2/default.nix1
-rw-r--r--pkgs/development/interpreters/python/3.3/default.nix2
-rw-r--r--pkgs/development/interpreters/python/3.4/default.nix2
-rw-r--r--pkgs/development/interpreters/racket/default.nix87
-rw-r--r--pkgs/development/interpreters/ruby/bundix/Gemfile4
-rw-r--r--pkgs/development/interpreters/ruby/bundix/Gemfile.lock19
-rw-r--r--pkgs/development/interpreters/ruby/bundix/default.nix9
-rw-r--r--pkgs/development/interpreters/ruby/bundix/gemset.nix22
-rw-r--r--pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix142
-rw-r--r--pkgs/development/interpreters/ruby/bundler-env/default.nix312
-rw-r--r--pkgs/development/interpreters/ruby/bundler-env/mkrf_conf_xapian.rb14
-rw-r--r--pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb238
-rw-r--r--pkgs/development/interpreters/ruby/bundler-env/package-1.8.rb29
-rw-r--r--pkgs/development/interpreters/ruby/bundler-env/xapian-Rakefile38
-rw-r--r--pkgs/development/interpreters/ruby/bundler-head.nix18
-rw-r--r--pkgs/development/interpreters/ruby/bundler.nix13
-rw-r--r--pkgs/development/interpreters/ruby/fix-gem-nix-versions.patch35
-rw-r--r--pkgs/development/interpreters/ruby/gem.nix181
-rw-r--r--pkgs/development/interpreters/ruby/generated.nix2615
-rw-r--r--pkgs/development/interpreters/ruby/libs.nix45
-rw-r--r--pkgs/development/interpreters/ruby/load-ruby-env.nix69
-rw-r--r--pkgs/development/interpreters/ruby/overrides.nix5
-rw-r--r--pkgs/development/interpreters/ruby/ruby-1.8.7.nix15
-rw-r--r--pkgs/development/interpreters/ruby/ruby-1.9.3.nix15
-rw-r--r--pkgs/development/interpreters/ruby/ruby-2.0.0.nix15
-rw-r--r--pkgs/development/interpreters/ruby/ruby-2.1.0.nix16
-rw-r--r--pkgs/development/interpreters/ruby/ruby-2.1.1.nix15
-rw-r--r--pkgs/development/interpreters/ruby/ruby-2.1.2.nix15
-rw-r--r--pkgs/development/interpreters/ruby/ruby-2.1.3.nix15
-rw-r--r--pkgs/development/interpreters/ruby/ruby-2.2.0.nix15
-rw-r--r--pkgs/development/interpreters/ruby/rubygems.nix8
-rw-r--r--pkgs/development/libraries/accountsservice/default.nix4
-rw-r--r--pkgs/development/libraries/adns/default.nix4
-rw-r--r--pkgs/development/libraries/appstream/default.nix36
-rw-r--r--pkgs/development/libraries/cloog-ppl/default.nix2
-rw-r--r--pkgs/development/libraries/ffmpeg/2.x.nix4
-rw-r--r--pkgs/development/libraries/filter_audio/default.nix24
-rw-r--r--pkgs/development/libraries/freeimage/default.nix5
-rw-r--r--pkgs/development/libraries/glib-networking/default.nix4
-rw-r--r--pkgs/development/libraries/glm/0954.nix1
-rw-r--r--pkgs/development/libraries/gnome-sharp/Makefile.in.patch11
-rw-r--r--pkgs/development/libraries/gnome-sharp/default.nix22
-rw-r--r--pkgs/development/libraries/gpgme/default.nix2
-rw-r--r--pkgs/development/libraries/gstreamer/core/default.nix10
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix2
-rw-r--r--pkgs/development/libraries/gtk-sharp-1/builder.sh11
-rw-r--r--pkgs/development/libraries/gtk-sharp-1/default.nix37
-rw-r--r--pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch65
-rw-r--r--pkgs/development/libraries/gtk-sharp-1/glib-include.patch24
-rw-r--r--pkgs/development/libraries/gtksourceview-sharp/builder.sh11
-rw-r--r--pkgs/development/libraries/gtksourceview-sharp/default.nix19
-rw-r--r--pkgs/development/libraries/gtksourceview-sharp/prefix.patch46
-rw-r--r--pkgs/development/libraries/haskell/base-prelude/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/conduit/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/either/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh2
-rw-r--r--pkgs/development/libraries/haskell/jwt/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/lifted-async/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/lifted-base/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/logsink/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/monad-control/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/resourcet/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/shake/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/shelly/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/web-routes-happstack/default.nix15
-rw-r--r--pkgs/development/libraries/jansson/default.nix4
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/default.nix185
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix484
-rwxr-xr-xpkgs/development/libraries/kde-frameworks-5.5/dependencies.sh22
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch55
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch12
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch30
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/manifest.nix364
-rwxr-xr-xpkgs/development/libraries/kde-frameworks-5.5/manifest.sh15
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/renames.nix66
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/default.nix190
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix500
-rwxr-xr-xpkgs/development/libraries/kde-frameworks-5.6/dependencies.sh22
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch55
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch12
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch30
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/manifest.nix382
-rwxr-xr-xpkgs/development/libraries/kde-frameworks-5.6/manifest.sh15
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/renames.nix68
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh1
-rw-r--r--pkgs/development/libraries/libbladeRF/default.nix39
-rw-r--r--pkgs/development/libraries/libdbusmenu-qt/qt5.nix23
-rw-r--r--pkgs/development/libraries/libgsystem/default.nix6
-rw-r--r--pkgs/development/libraries/libkeyfinder/default.nix39
-rw-r--r--pkgs/development/libraries/libmilter/default.nix1
-rw-r--r--pkgs/development/libraries/libpgf/default.nix27
-rw-r--r--pkgs/development/libraries/libressl/default.nix2
-rw-r--r--pkgs/development/libraries/libspatialite/default.nix13
-rw-r--r--pkgs/development/libraries/libtoxcore/default.nix6
-rw-r--r--pkgs/development/libraries/mesa/default.nix5
-rw-r--r--pkgs/development/libraries/nspr/default.nix4
-rw-r--r--pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix (renamed from pkgs/development/libraries/phonon-backend-gstreamer/default.nix)0
-rw-r--r--pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix31
-rw-r--r--pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix (renamed from pkgs/development/libraries/phonon-backend-vlc/default.nix)0
-rw-r--r--pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix38
-rw-r--r--pkgs/development/libraries/phonon/qt4/default.nix (renamed from pkgs/development/libraries/phonon/default.nix)0
-rw-r--r--pkgs/development/libraries/phonon/qt5/default.nix30
-rw-r--r--pkgs/development/libraries/poppler/default.nix13
-rw-r--r--pkgs/development/libraries/proj/default.nix22
-rw-r--r--pkgs/development/libraries/qmltermwidget/default.nix33
-rw-r--r--pkgs/development/libraries/qscintilla/default.nix6
-rw-r--r--[-rwxr-xr-x]pkgs/development/libraries/tinyxml/2.6.2-entity.patch0
-rw-r--r--pkgs/development/libraries/v8/3.16.14.nix70
-rw-r--r--pkgs/development/libraries/webkitgtk/default.nix4
-rw-r--r--pkgs/development/libraries/xapian/bindings/1.0.x.nix1
-rw-r--r--pkgs/development/libraries/xapian/bindings/default.nix1
-rw-r--r--pkgs/development/libraries/xapian/default.nix6
-rw-r--r--pkgs/development/mobile/titaniumenv/build-app.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/default.nix3
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/default.nix6
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix77
-rw-r--r--pkgs/development/mobile/xcodeenv/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/cmdliner/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/cpdf/default.nix35
-rw-r--r--pkgs/development/ocaml-modules/ezjsonm/default.nix26
-rw-r--r--pkgs/development/ocaml-modules/gapi-ocaml/default.nix24
-rw-r--r--pkgs/development/ocaml-modules/hex/default.nix23
-rw-r--r--pkgs/development/ocaml-modules/jsonm/default.nix30
-rw-r--r--pkgs/development/ocaml-modules/lambda-term/1.6.nix42
-rw-r--r--pkgs/development/ocaml-modules/lambda-term/default.nix12
-rw-r--r--pkgs/development/ocaml-modules/ocamlfuse/default.nix29
-rw-r--r--pkgs/development/ocaml-modules/ocurl/default.nix19
-rw-r--r--pkgs/development/python-modules/gevent_sslwrap.patch2
-rw-r--r--pkgs/development/python-modules/graph-tool/2.x.x.nix28
-rw-r--r--pkgs/development/python-modules/pyacoustid-py3.patch32
-rw-r--r--pkgs/development/python-modules/pygobject/3.nix3
-rw-r--r--pkgs/development/python-modules/pygtksourceview/codegendir.patch25
-rw-r--r--pkgs/development/python-modules/pygtksourceview/default.nix16
-rw-r--r--pkgs/development/r-modules/cran-packages.nix1870
-rw-r--r--pkgs/development/r-modules/default.nix34
-rw-r--r--pkgs/development/tools/build-managers/apache-maven/default.nix9
-rw-r--r--pkgs/development/tools/build-managers/boot/builder.sh13
-rw-r--r--pkgs/development/tools/build-managers/boot/default.nix27
-rw-r--r--pkgs/development/tools/build-managers/cargo/snapshot.nix10
-rw-r--r--pkgs/development/tools/build-managers/dub/default.nix35
-rw-r--r--pkgs/development/tools/build-managers/icmake/default.nix6
-rw-r--r--pkgs/development/tools/egg2nix/default.nix4
-rw-r--r--pkgs/development/tools/grabserial/default.nix22
-rw-r--r--pkgs/development/tools/haskell/ihaskell/wrapper.nix24
-rw-r--r--pkgs/development/tools/misc/arcanist/default.nix14
-rw-r--r--pkgs/development/tools/misc/astyle/default.nix4
-rw-r--r--pkgs/development/tools/misc/ccache/default.nix11
-rw-r--r--pkgs/development/tools/misc/fswatch/default.nix11
-rw-r--r--pkgs/development/tools/misc/gdb/default.nix6
-rw-r--r--pkgs/development/tools/node-webkit/nw11.nix57
-rw-r--r--pkgs/development/tools/node-webkit/nw9.nix (renamed from pkgs/development/tools/node-webkit/default.nix)0
-rw-r--r--pkgs/development/tools/ocaml/camlidl/default.nix15
-rw-r--r--pkgs/development/tools/ocaml/merlin/default.nix14
-rw-r--r--pkgs/development/tools/ocaml/ocp-index/default.nix36
-rw-r--r--pkgs/development/tools/ocaml/utop/default.nix7
-rw-r--r--pkgs/development/tools/parsing/ragel/default.nix2
-rw-r--r--pkgs/development/tools/rust/racer/default.nix18
-rw-r--r--pkgs/development/tools/vagrant/default.nix13
-rw-r--r--pkgs/development/web/nodejs/build-node-package.nix123
-rw-r--r--pkgs/games/dwarf-fortress/default.nix8
-rw-r--r--pkgs/games/dwarf-therapist/default.nix18
-rw-r--r--[-rwxr-xr-x]pkgs/games/planetaryannihilation/default.nix0
-rw-r--r--pkgs/games/tibia/default.nix6
-rw-r--r--pkgs/misc/drivers/hplip/default.nix24
-rw-r--r--pkgs/misc/drivers/hplip/hplip.state2
-rw-r--r--pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix39
-rw-r--r--pkgs/misc/frescobaldi/default.nix4
-rw-r--r--pkgs/misc/misc.nix2
-rw-r--r--pkgs/misc/themes/orion/default.nix24
-rw-r--r--pkgs/os-specific/linux/dmtcp/default.nix22
-rw-r--r--pkgs/os-specific/linux/firmware/zd1211/default.nix4
-rw-r--r--pkgs/os-specific/linux/freefall/default.nix42
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing.nix8
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix8
-rw-r--r--pkgs/os-specific/linux/lxc/default.nix4
-rw-r--r--pkgs/os-specific/linux/sdparm/default.nix11
-rw-r--r--pkgs/os-specific/linux/sysdig/default.nix4
-rw-r--r--pkgs/os-specific/linux/xf86-input-wacom/default.nix4
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix4
-rw-r--r--pkgs/os-specific/linux/zfs/git.nix4
-rw-r--r--pkgs/servers/amqp/rabbitmq-server/default.nix4
-rwxr-xr-xpkgs/servers/apache-kafka/default.nix48
-rw-r--r--pkgs/servers/consul/Gemfile6
-rw-r--r--pkgs/servers/consul/Gemfile.lock22
-rw-r--r--pkgs/servers/consul/default.nix19
-rw-r--r--pkgs/servers/consul/gemset.nix59
-rw-r--r--pkgs/servers/http/nginx/default.nix12
-rw-r--r--pkgs/servers/mail/mailman/default.nix8
-rw-r--r--pkgs/servers/monitoring/riemann-dash/Gemfile3
-rw-r--r--pkgs/servers/monitoring/riemann-dash/Gemfile.lock27
-rw-r--r--pkgs/servers/monitoring/riemann-dash/default.nix8
-rw-r--r--pkgs/servers/monitoring/riemann-dash/gemset.nix80
-rw-r--r--pkgs/servers/monitoring/riemann/default.nix4
-rw-r--r--pkgs/servers/mpd/default.nix7
-rw-r--r--pkgs/servers/nosql/cassandra/default.nix11
-rw-r--r--pkgs/servers/nosql/influxdb/backup.nix31
-rw-r--r--pkgs/servers/nosql/influxdb/deps.nix35
-rw-r--r--pkgs/servers/nosql/redis/default.nix4
-rw-r--r--pkgs/servers/owncloud/default.nix28
-rw-r--r--[-rwxr-xr-x]pkgs/servers/zookeeper/default.nix0
-rw-r--r--pkgs/shells/mksh/default.nix48
-rw-r--r--pkgs/stdenv/generic/default.nix78
-rw-r--r--pkgs/tools/X11/xdg-utils/0001-xdg-open-recognize-KDE_SESSION_VERSION.patch25
-rw-r--r--pkgs/tools/X11/xdg-utils/default.nix2
-rw-r--r--pkgs/tools/audio/beets/default.nix19
-rw-r--r--pkgs/tools/audio/beets/mediafile-codec-fix.patch25
-rw-r--r--pkgs/tools/audio/beets/test-bucket-fix-year.patch23
-rw-r--r--pkgs/tools/audio/dir2opus/default.nix33
-rw-r--r--pkgs/tools/audio/mpdcron/Gemfile2
-rw-r--r--pkgs/tools/audio/mpdcron/Gemfile.lock12
-rw-r--r--pkgs/tools/audio/mpdcron/default.nix15
-rw-r--r--pkgs/tools/audio/mpdcron/gemset.nix19
-rw-r--r--pkgs/tools/bootloaders/refind/default.nix115
-rw-r--r--pkgs/tools/compression/lz4/default.nix8
-rw-r--r--pkgs/tools/compression/pigz/default.nix4
-rw-r--r--pkgs/tools/filesystems/avfs/default.nix25
-rw-r--r--pkgs/tools/filesystems/exfat-utils/default.nix34
-rw-r--r--pkgs/tools/filesystems/fuse-exfat/default.nix14
-rw-r--r--pkgs/tools/graphics/gifsicle/default.nix6
-rw-r--r--pkgs/tools/graphics/nip2/default.nix24
-rw-r--r--pkgs/tools/graphics/pgf/default.nix32
-rw-r--r--pkgs/tools/graphics/pngcrush/default.nix4
-rw-r--r--pkgs/tools/graphics/vips/default.nix27
-rw-r--r--pkgs/tools/misc/ccze/default.nix26
-rw-r--r--pkgs/tools/misc/clex/default.nix30
-rw-r--r--pkgs/tools/misc/debootstrap/default.nix8
-rw-r--r--pkgs/tools/misc/ent/default.nix27
-rw-r--r--pkgs/tools/misc/ethtool/default.nix4
-rw-r--r--pkgs/tools/misc/fortune/default.nix4
-rw-r--r--pkgs/tools/misc/gparted/default.nix16
-rw-r--r--pkgs/tools/misc/heimdall/default.nix16
-rw-r--r--pkgs/tools/misc/moreutils/default.nix4
-rw-r--r--pkgs/tools/misc/ostree/default.nix6
-rw-r--r--pkgs/tools/misc/parallel/default.nix4
-rw-r--r--pkgs/tools/misc/rcm/default.nix17
-rw-r--r--pkgs/tools/misc/rcm/fix-rcmlib-path.patch68
-rw-r--r--pkgs/tools/misc/rkflashtool/default.nix2
-rw-r--r--pkgs/tools/misc/rmlint/default.nix33
-rw-r--r--pkgs/tools/misc/rmlint/fix-scons.patch22
-rw-r--r--pkgs/tools/misc/rrdtool/default.nix19
-rw-r--r--pkgs/tools/misc/tlp/default.nix65
-rw-r--r--pkgs/tools/misc/vorbisgain/default.nix15
-rw-r--r--pkgs/tools/misc/xflux/default.nix39
-rw-r--r--pkgs/tools/misc/youtube-dl/default.nix4
-rw-r--r--pkgs/tools/networking/asynk/default.nix36
-rw-r--r--pkgs/tools/networking/cjdns/default.nix10
-rw-r--r--pkgs/tools/networking/isync/default.nix4
-rw-r--r--[-rwxr-xr-x]pkgs/tools/networking/mailutils/default.nix0
-rw-r--r--pkgs/tools/networking/megatools/default.nix9
-rw-r--r--pkgs/tools/networking/openssh/default.nix2
-rw-r--r--pkgs/tools/networking/socat/default.nix6
-rw-r--r--pkgs/tools/networking/socat/enable-ecdhe.patch19
-rw-r--r--pkgs/tools/networking/sstp/default.nix32
-rw-r--r--pkgs/tools/networking/tlsdate/default.nix41
-rw-r--r--pkgs/tools/networking/traceroute/default.nix4
-rw-r--r--pkgs/tools/networking/unbound/default.nix9
-rw-r--r--pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch66
-rw-r--r--pkgs/tools/networking/vtun/default.nix24
-rw-r--r--pkgs/tools/package-management/gem-nix/default.nix23
-rw-r--r--pkgs/tools/package-management/nix/unstable.nix6
-rw-r--r--pkgs/tools/package-management/nixui/default.nix53
-rw-r--r--pkgs/tools/package-management/nixui/node-default.nix24
-rw-r--r--pkgs/tools/package-management/nixui/node.nix617
-rw-r--r--pkgs/tools/security/afl/default.nix4
-rw-r--r--pkgs/tools/security/eid-mw/default.nix2
-rw-r--r--pkgs/tools/security/eid-viewer/default.nix6
-rw-r--r--pkgs/tools/security/kpcli/default.nix2
-rw-r--r--pkgs/tools/security/tor/torbrowser.nix6
-rw-r--r--pkgs/tools/system/ipmitool/default.nix4
-rw-r--r--pkgs/tools/system/stress-ng/default.nix4
-rw-r--r--pkgs/tools/text/gawk/default.nix10
-rw-r--r--pkgs/tools/text/gist/Gemfile2
-rw-r--r--pkgs/tools/text/gist/Gemfile.lock10
-rw-r--r--pkgs/tools/text/gist/default.nix35
-rw-r--r--pkgs/tools/text/gist/gemset.nix9
-rw-r--r--pkgs/tools/video/swftools/default.nix21
-rw-r--r--pkgs/tools/video/swftools/swftools.patch17
-rw-r--r--pkgs/top-level/all-packages.nix437
-rw-r--r--pkgs/top-level/haskell-defaults.nix1
-rw-r--r--pkgs/top-level/haskell-packages.nix8
-rw-r--r--pkgs/top-level/node-packages-generated.nix36063
-rw-r--r--pkgs/top-level/node-packages.json46
-rw-r--r--pkgs/top-level/node-packages.nix77
-rw-r--r--pkgs/top-level/perl-packages.nix22
-rw-r--r--pkgs/top-level/python-packages.json2
-rw-r--r--pkgs/top-level/python-packages.nix301
-rw-r--r--pkgs/top-level/release-python.nix1
564 files changed, 41760 insertions, 27700 deletions
diff --git a/.gitignore b/.gitignore
index 16aaf68b70b..337672a92dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,8 @@ result-*
 /doc/manual.pdf
 .version-suffix
 
-.DS_Store
\ No newline at end of file
+.DS_Store
+
+/pkgs/applications/kde-apps-*/tmp/
+/pkgs/development/libraries/kde-frameworks-*/tmp/
+/pkgs/desktops/plasma-*/tmp/
\ No newline at end of file
diff --git a/README.md b/README.md
index 948fbc4fb93..a2ed0877e9a 100644
--- a/README.md
+++ b/README.md
@@ -14,5 +14,5 @@ manager.
 
 Communication:
 
-* [Mailing list](https://lists.science.uu.nl/mailman/listinfo/nix-dev)
+* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev)
 * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
diff --git a/default.nix b/default.nix
index 84bb1af84e9..bdbe13b3ea2 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 if ! builtins ? nixVersion || builtins.compareVersions "1.8" builtins.nixVersion == 1 then
 
-  abort "This version of Nixpkgs requires Nix >= 1.8, please upgrade!"
+  abort "This version of Nixpkgs requires Nix >= 1.8, please upgrade! See https://nixos.org/wiki/How_to_update_when_nix_is_too_old_to_evaluate_nixpkgs"
 
 else
 
diff --git a/doc/language-support.xml b/doc/language-support.xml
index 4446e9ee382..7d016ae6fb9 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -618,7 +618,7 @@ sed -i '/ = data_files/d' setup.py</programlisting>
   <screen>
     $ nix-env -i gem-nix
     $ gem-nix --no-user-install --nix-file=pkgs/development/interpreters/ruby/generated.nix yajl-ruby
-    $ nix-build -A rubyLibs.yajl-ruby
+    $ nix-build -A rubyPackages.yajl-ruby
   </screen>
 </section>
 
diff --git a/doc/manual.xml b/doc/manual.xml
index 01373b4f5b1..1b713b0c30c 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -12,6 +12,7 @@
   <xi:include href="introduction.xml" />
   <xi:include href="quick-start.xml" />
   <xi:include href="stdenv.xml" />
+  <xi:include href="packageconfig.xml" />
   <xi:include href="meta.xml" />
   <xi:include href="language-support.xml" />
   <xi:include href="package-notes.xml" />
diff --git a/doc/packageconfig.xml b/doc/packageconfig.xml
new file mode 100644
index 00000000000..12a843029a9
--- /dev/null
+++ b/doc/packageconfig.xml
@@ -0,0 +1,85 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-packageconfig">
+
+<title>nixpkgs global configuration</title>
+
+    <para>
+        Nix packages can be configured to allow or deny certain
+        options.
+    </para>
+
+    <para>
+        To apply the configuration edit <filename>~/.nixpkgs/config.nix</filename>
+        and set it like
+        <programlisting>
+            {
+                allowUnfree = true;
+            }
+        </programlisting>
+        and will allow the Nix package manager to install unfree licensed packages.
+
+        The configuration as listed also applies to NixOS under <option>nixpkgs.config</option> set.
+    </para>
+
+    <itemizedlist>
+        <listitem>
+            <para>
+                Allow installing of packages that are distributed under unfree license by setting
+                <programlisting>
+                  allowUnfree = true;
+                </programlisting>
+                or deny them by setting it to <literal>false</literal>.
+            </para>
+            <para>
+                Same can be achieved by setting the environment variable:
+                <programlisting>
+                    export NIXPKGS_ALLOW_UNFREE=1
+                </programlisting>
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                Whenever unfree packages are not allowed, single packages can
+                still be allowed by a predicate function that accepts package
+                as an argument and should return a boolean:
+                <programlisting>
+                  allowUnfreePredicate = (pkg: ...);
+                </programlisting>
+
+                Example to allow flash player only:
+                <programlisting>
+                  allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name);
+                </programlisting>
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                Whenever unfree packages are not allowed, packages can still be
+                whitelisted by their license:
+                <programlisting>
+                  whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];
+                </programlisting>
+            </para>
+        </listitem>
+
+        <listitem>
+            <para>
+                In addition to whitelisting licenses which are denied by the
+                <literal>allowUnfree</literal> setting, you can also explicitely
+                deny installation of packages which have a certain license:
+                <programlisting>
+                  blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];
+                </programlisting>
+            </para>
+        </listitem>
+    </itemizedlist>
+
+    <para>
+        A complete list of licenses can be found in the file
+        <filename>lib/licenses.nix</filename> of the nix package tree.
+    </para>
+
+</chapter>
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 5959a3d5036..9b3acf8653b 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -130,6 +130,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Eclipse Public License 1.0";
   };
 
+  fdl12 = spdx {
+    spdxId = "GFDL-1.2";
+    fullName = "GNU Free Documentation License v1.2";
+  };
+
   free = {
     fullName = "Unspecified free software license";
   };
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fff8a372e29..8a0bd6c1d5b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -43,6 +43,7 @@
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
+  cocreature = "Moritz Kiefer <moritz.kiefer@purelyfunctional.org>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
   copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
@@ -105,6 +106,7 @@
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
   magnetophon = "Bart Brouns <bart@magnetophon.nl>";
+  malyn = "Michael Alyn Miller <malyn@strangeGizmo.com>";
   manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
@@ -121,22 +123,26 @@
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
+  np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   olcai = "Erik Timan <dev@timan.info>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";
+  paholg = "Paho Lurie-Gregg <paho@paholg.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
+  pjones = "Peter Jones <pjones@devalot.com>";
   pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>";
   plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>";
   prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
   pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
   puffnfresh = "Brian McKenna <brian@brianmckenna.org>";
   qknight = "Joachim Schiele <js@lastlog.de>";
+  ragge = "Ragnar Dahlen <r.dahlen@gmail.com>";
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
   redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
   refnil = "Martin Lavoie <broemartino@gmail.com>";
@@ -179,6 +185,7 @@
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
   vizanto = "Danny Wilson <danny@prime.vc>";
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
+  vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index a3ad76209ac..f6aedfd6b66 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -32,6 +32,7 @@
   <xi:include href="configuration/configuration.xml" />
   <xi:include href="administration/running.xml" />
   <!-- <xi:include href="userconfiguration.xml" /> -->
+  <xi:include href="development/development.xml" />
   <xi:include href="release-notes/release-notes.xml" />
 
   <appendix xml:id="ch-options">
diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml
index 7249317a0c7..36ae48af759 100644
--- a/nixos/doc/manual/release-notes/rl-1412.xml
+++ b/nixos/doc/manual/release-notes/rl-1412.xml
@@ -112,9 +112,9 @@ xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s
 documentation</link> for details. If you wish to continue to use
 httpd 2.2, add the following line to your NixOS configuration:
 
-rogramlisting>
-rvices.httpd.package = pkgs.apacheHttpd_2_2;
-programlisting>
+<programlisting>
+services.httpd.package = pkgs.apacheHttpd_2_2;
+</programlisting>
 
 </para></listitem>
 
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 93f258f54e3..8157f8fc7da 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -148,9 +148,9 @@ if [ -n "$buildNix" ]; then
             if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
                 machine="$(uname -m)"
                 if [ "$machine" = x86_64 ]; then
-                    nixStorePath=/nix/store/d34q3q2zj9nriq4ifhn3dnnngqvinjb3-nix-1.7
+                    nixStorePath=/nix/store/ffig6yaggbh12dh9y5pnf1grf5lqyipz-nix-1.8
                 elif [[ "$machine" =~ i.86 ]]; then
-                    nixStorePath=/nix/store/qlah0darpcn6sf3lr2226rl04l1gn4xz-nix-1.7
+                    nixStorePath=/nix/store/lglhfp4mimfa5wzjjf1kqz6f5wlsj2mn-nix-1.8
                 else
                     echo "$0: unsupported platform"
                     exit 1
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 7bfbefb348f..7415af8ab6a 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -176,7 +176,7 @@
       tox-bootstrapd = 166;
       cadvisor = 167;
       nylon = 168;
-
+      apache-kafka = 169;
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
       nixbld = 30000; # start of range of uids
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2a2a7b00416..b949fef6bab 100755..100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -144,11 +144,13 @@
   ./services/hardware/acpid.nix
   ./services/hardware/amd-hybrid-graphics.nix
   ./services/hardware/bluetooth.nix
+  ./services/hardware/freefall.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/pommed.nix
   ./services/hardware/sane.nix
   ./services/hardware/tcsd.nix
+  ./services/hardware/tlp.nix
   ./services/hardware/thinkfan.nix
   ./services/hardware/udev.nix
   ./services/hardware/udisks2.nix
@@ -168,6 +170,7 @@
   ./services/mail/opensmtpd.nix
   ./services/mail/postfix.nix
   ./services/mail/spamassassin.nix
+  ./services/misc/apache-kafka.nix
   #./services/misc/autofs.nix
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/cgminer.nix
@@ -290,6 +293,7 @@
   ./services/networking/tcpcrypt.nix
   ./services/networking/teamspeak3.nix
   ./services/networking/tftpd.nix
+  ./services/networking/tlsdated.nix
   ./services/networking/tox-bootstrapd.nix
   ./services/networking/unbound.nix
   ./services/networking/unifi.nix
@@ -369,6 +373,7 @@
   ./system/boot/kernel.nix
   ./system/boot/kexec.nix
   ./system/boot/loader/efi.nix
+  ./system/boot/loader/loader.nix
   ./system/boot/loader/generations-dir/generations-dir.nix
   ./system/boot/loader/grub/grub.nix
   ./system/boot/loader/grub/ipxe.nix
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index a5ec387df64..4d93d2d35b4 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -46,12 +46,14 @@ in
         PERL5LIB = [ "/lib/perl5/site_perl" ];
         KDEDIRS = [ "" ];
         STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
-        QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
+        QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" "/lib/qt5/plugins" ];
+        QML2_IMPORT_PATH = [ "/lib/qml" ];
         QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
         GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ];
         XDG_DATA_DIRS = [ "/share" ];
         MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ];
+        LIBEXEC_PATH = [ "/lib/libexec" ];
       };
 
     environment.extraInit =
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 20fd76855d9..1efc278aeb2 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -33,7 +33,8 @@ let
   zipModules = list:
     zipAttrsWith (n: v:
       if tail v != [] then
-        if n == "_type" then (head v)
+        if all (o: isAttrs o && o ? _type) v then mkMerge v
+        else if n == "_type" then head v
         else if n == "warnings" then concatLists v
         else if n == "description" || n == "apply" then
           abort "Cannot rename an option to multiple options."
@@ -115,8 +116,8 @@ in zipModules ([]
 ++ obsolete [ "nix" "proxy" ] [ "networking" "proxy" "default" ]
 
 # KDE
-++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ]
-# ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] # !!! doesn't work!
+++ deprecated [ "kde" "extraPackages" ] [ "environment" "systemPackages" ]
+++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ]
 
 # Multiple efi bootloaders now
 ++ obsolete [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ]
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 5c8c4993951..d0c7fa6ec28 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -156,6 +156,24 @@ in
           '';
         };
 
+        denyUSB = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            If true, then set <literal>GRKERNSEC_DENYUSB y</literal>.
+
+            This enables a sysctl with name
+            <literal>kernel.grsecurity.deny_new_usb</literal>. Setting
+            its value to <literal>1</literal> will prevent any new USB
+            devices from being recognized by the OS.  Any attempted
+            USB device insertion will be logged.
+
+            This option is intended to be used against custom USB
+            devices designed to exploit vulnerabilities in various USB
+            device drivers.
+          '';
+        };
+
         restrictProc = mkOption {
           type = types.bool;
           default = false;
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 77487ec1ab9..780d5daded9 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -31,6 +31,15 @@ in {
           <literal>guest</literal> by default, so you should delete
           this user if you intend to allow external access.
         '';
+        type = types.str;
+      };
+
+      port = mkOption {
+        default = 5672;
+        description = ''
+          Port on which RabbitMQ will listen for AMQP connections.
+        '';
+        type = types.int;
       };
 
       dataDir = mkOption {
@@ -77,6 +86,7 @@ in {
     users.extraUsers.rabbitmq = {
       description = "RabbitMQ server user";
       home = "${cfg.dataDir}";
+      createHome = true;
       group = "rabbitmq";
       uid = config.ids.uids.rabbitmq;
     };
@@ -87,14 +97,16 @@ in {
       description = "RabbitMQ Server";
 
       wantedBy = [ "multi-user.target" ];
-      after = [ "network-interfaces.target" ];
+      after = [ "network.target" ];
 
-      path = [ pkgs.rabbitmq_server ];
+      path = [ pkgs.rabbitmq_server pkgs.procps ];
 
       environment = {
         RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia";
         RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
+        RABBITMQ_NODE_PORT = toString cfg.port;
         RABBITMQ_SERVER_START_ARGS = "-rabbit error_logger tty -rabbit sasl_error_logger false";
+        RABBITMQ_PID_FILE = "${cfg.dataDir}/pid";
         SYS_PREFIX = "";
         RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" ''
           [ ${concatStringsSep "," cfg.plugins} ].
@@ -103,26 +115,22 @@ in {
 
       serviceConfig = {
         ExecStart = "${pkgs.rabbitmq_server}/sbin/rabbitmq-server";
+        ExecStop = "${pkgs.rabbitmq_server}/sbin/rabbitmqctl stop";
         User = "rabbitmq";
         Group = "rabbitmq";
-        PermissionsStartOnly = true;
+        WorkingDirectory = cfg.dataDir;
       };
 
+      postStart = ''
+        rabbitmqctl wait ${cfg.dataDir}/pid
+      '';
+
       preStart = ''
-        mkdir -p ${cfg.dataDir} && chmod 0700 ${cfg.dataDir}
-        if [ "$(id -u)" = 0 ]; then chown rabbitmq:rabbitmq ${cfg.dataDir}; fi
-        
         ${optionalString (cfg.cookie != "") ''
             echo -n ${cfg.cookie} > ${cfg.dataDir}/.erlang.cookie
             chmod 400 ${cfg.dataDir}/.erlang.cookie
-            chown rabbitmq:rabbitmq ${cfg.dataDir}/.erlang.cookie
         ''}
-
-        mkdir -p /var/log/rabbitmq && chmod 0700 /var/log/rabbitmq
-        chown rabbitmq:rabbitmq /var/log/rabbitmq
       '';
-
-      postStart = mkBefore "until rabbitmqctl status; do sleep 1; done";
     };
 
   };
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index eae4c114fc1..29bdb201752 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -20,23 +20,49 @@ in
     services.openldap = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "
           Whether to enable the ldap server.
         ";
+        example = literalExample ''
+          openldap.enable = true;
+          openldap.extraConfig = '''
+            include ''${pkgs.openldap}/etc/openldap/schema/core.schema
+            include ''${pkgs.openldap}/etc/openldap/schema/cosine.schema
+            include ''${pkgs.openldap}/etc/openldap/schema/inetorgperson.schema
+            include ''${pkgs.openldap}/etc/openldap/schema/nis.schema
+
+            database bdb 
+            suffix dc=example,dc=org 
+            rootdn cn=admin,dc=example,dc=org 
+            # NOTE: change after first start
+            rootpw secret
+            directory /var/db/openldap
+          ''';
+        '';
       };
 
       user = mkOption {
+        type = types.string;
         default = "openldap";
         description = "User account under which slapd runs.";
       };
 
       group = mkOption {
+        type = types.string;
         default = "openldap";
         description = "Group account under which slapd runs.";
       };
 
+      dataDir = mkOption {
+        type = types.string;
+        default = "/var/db/openldap";
+        description = "The database directory.";
+      };
+
       extraConfig = mkOption {
+        type = types.lines;
         default = "";
         description = "
           sldapd.conf configuration
@@ -60,22 +86,22 @@ in
       preStart = ''
         mkdir -p /var/run/slapd
         chown -R ${cfg.user}:${cfg.group} /var/run/slapd
-        mkdir -p /var/db/openldap
-        chown -R ${cfg.user}:${cfg.group} /var/db/openldap
+        mkdir -p ${cfg.dataDir}
+        chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
       '';
-      serviceConfig.ExecStart = "${openldap}/libexec/slapd -u openldap -g openldap -d 0 -f ${configFile}";
+      serviceConfig.ExecStart = "${openldap}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -f ${configFile}";
     };
 
-    users.extraUsers = optionalAttrs (cfg.user == "openldap") (singleton
-      { name = "openldap";
+    users.extraUsers.openldap =
+      { name = cfg.user;
         group = cfg.group;
         uid = config.ids.uids.openldap;
-      });
+      };
 
-    users.extraGroups = optionalAttrs (cfg.group == "openldap") (singleton
-      { name = "openldap";
+    users.extraGroups.openldap =
+      { name = cfg.group;
         gid = config.ids.gids.openldap;
-     });
+      };
 
   };
 }
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix
new file mode 100644
index 00000000000..6e6960bac49
--- /dev/null
+++ b/nixos/modules/services/hardware/freefall.nix
@@ -0,0 +1,62 @@
+{ config, lib, pkgs, utils, ... }:
+
+with lib;
+
+{
+
+  ###### interface
+
+  options = with types; {
+
+    services.freefall = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to protect HP/Dell laptop hard drives (not SSDs) in free fall.
+        '';
+        type = bool;
+      };
+
+      devices = mkOption {
+        default = [ "/dev/sda" ];
+        description = ''
+          Device paths to all internal spinning hard drives.
+        '';
+        type = listOf string;
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = let
+
+    cfg = config.services.freefall;
+
+    mkService = dev:
+      assert dev != "";
+      let dev' = utils.escapeSystemdPath dev; in
+      nameValuePair "freefall-${dev'}"
+        { description = "Free-fall protection for ${dev}";
+        after = [ "${dev'}.device" ];
+        wantedBy = [ "${dev'}.device" ];
+        path = [ pkgs.freefall ];
+        serviceConfig = {
+          ExecStart = "${pkgs.freefall}/bin/freefall ${dev}";
+          Restart = "on-failure";
+          Type = "forking";
+        };
+      };
+
+  in mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.freefall ];
+
+    systemd.services = listToAttrs (map mkService cfg.devices);
+
+  };
+
+}
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
new file mode 100644
index 00000000000..f221c82e2ed
--- /dev/null
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+cfg = config.services.tlp;
+
+tlp = pkgs.tlp.override { kmod = config.system.sbin.modprobe; };
+
+confFile = pkgs.writeText "tlp" (builtins.readFile "${tlp}/etc/default/tlp" + cfg.extraConfig);
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.tlp = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the TLP daemon.";
+      };
+
+      extraConfig = mkOption {
+        type = types.str;
+        default = "";
+        description = "Additional configuration variables for TLP";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services = {
+      tlp = {
+        description = "TLP system startup/shutdown";
+
+        after = [ "multi-user.target" ];
+        wantedBy = [ "multi-user.target" ];
+        before = [ "shutdown.target" ];
+
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${tlp}/bin/tlp init start";
+          ExecStop = "${tlp}/bin/tlp init stop";
+        };
+      };
+
+      tlp-sleep = {
+        description = "TLP suspend/resume";
+
+        wantedBy = [ "sleep.target" ];
+        before = [ "sleep.target" ];
+
+        unitConfig = {
+          StopWhenUnneeded = true;
+        };
+
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${tlp}/bin/tlp suspend";
+          ExecStop = "${tlp}/bin/tlp resume";
+        };
+      };
+    };
+
+    services.udev.packages = [ tlp ];
+
+    environment.etc = [{ source = confFile;
+                         target = "default/tlp";
+                       }
+                      ] ++ optional tlp.enableRDW {
+                        source = "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm";
+                        target = "NetworkManager/dispatcher.d/99tlp-rdw-nm";
+                      };
+
+    environment.systemPackages = [ tlp ];
+
+  };
+
+}
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
new file mode 100644
index 00000000000..168615153fe
--- /dev/null
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -0,0 +1,156 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.apache-kafka;
+
+  serverProperties =
+    if cfg.serverProperties != null then
+      cfg.serverProperties
+    else
+      ''
+        # Generated by nixos
+        broker.id=${toString cfg.brokerId}
+        port=${toString cfg.port}
+        host.name=${cfg.hostname}
+        log.dirs=${concatStringsSep "," cfg.logDirs}
+        zookeeper.connect=${cfg.zookeeper}
+        ${toString cfg.extraProperties}
+      '';
+
+  configDir = pkgs.buildEnv {
+    name = "apache-kafka-conf";
+    paths = [
+      (pkgs.writeTextDir "server.properties" serverProperties)
+      (pkgs.writeTextDir "log4j.properties" cfg.log4jProperties)
+    ];
+  };
+
+in {
+
+  options.services.apache-kafka = {
+    enable = mkOption {
+      description = "Whether to enable Apache Kafka.";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    brokerId = mkOption {
+      description = "Broker ID.";
+      default = 0;
+      type = types.int;
+    };
+
+    port = mkOption {
+      description = "Port number the broker should listen on.";
+      default = 9092;
+      type = types.int;
+    };
+
+    hostname = mkOption {
+      description = "Hostname the broker should bind to.";
+      default = "localhost";
+      type = types.string;
+    };
+
+    logDirs = mkOption {
+      description = "Log file directories";
+      default = [ "/tmp/kafka-logs" ];
+      type = types.listOf types.path;
+    };
+    
+    zookeeper = mkOption {
+      description = "Zookeeper connection string";
+      default = "localhost:2181";
+      type = types.string;
+    };
+ 
+    extraProperties = mkOption {
+      description = "Extra properties for server.properties.";
+      type = types.nullOr types.lines;
+      default = null;
+    };
+
+    serverProperties = mkOption {
+      description = ''
+        Complete server.properties content. Other server.properties config
+        options will be ignored if this option is used.
+      '';
+      type = types.nullOr types.lines;
+      default = null;
+    };
+
+    log4jProperties = mkOption {
+      description = "Kafka log4j property configuration.";
+      default = ''
+        log4j.rootLogger=INFO, stdout 
+        
+        log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+        log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+        log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
+      '';
+      type = types.lines;
+    };
+
+    jvmOptions = mkOption {
+      description = "Extra command line options for the JVM running Kafka.";
+      default = [
+        "-server"
+        "-Xmx1G"
+        "-Xms1G"
+        "-XX:+UseCompressedOops"
+        "-XX:+UseParNewGC"
+        "-XX:+UseConcMarkSweepGC"
+        "-XX:+CMSClassUnloadingEnabled"
+        "-XX:+CMSScavengeBeforeRemark"
+        "-XX:+DisableExplicitGC"
+        "-Djava.awt.headless=true"
+        "-Djava.net.preferIPv4Stack=true"
+      ];
+      type = types.listOf types.string;
+      example = [
+        "-Djava.net.preferIPv4Stack=true"
+        "-Dcom.sun.management.jmxremote"
+        "-Dcom.sun.management.jmxremote.local.only=true"
+      ];
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [pkgs.apacheKafka];
+
+    users.extraUsers = singleton {
+      name = "apache-kafka";
+      uid = config.ids.uids.apache-kafka;
+      description = "Apache Kafka daemon user";
+      home = head cfg.logDirs;
+    };
+
+    systemd.services.apache-kafka = {
+      description = "Apache Kafka Daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.jre}/bin/java \
+            -cp "${pkgs.apacheKafka}/libs/*:${configDir}" \
+            ${toString cfg.jvmOptions} \
+            kafka.Kafka \
+            ${configDir}/server.properties
+        '';
+        User = "apache-kafka";
+        PermissionsStartOnly = true;
+      };
+      preStart = ''
+        mkdir -m 0700 -p ${concatStringsSep " " cfg.logDirs}
+        if [ "$(id -u)" = 0 ]; then
+           chown apache-kafka ${concatStringsSep " " cfg.logDirs};
+        fi
+      '';
+    };
+
+  };
+}
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index efa139c8dfd..ddb0bd671dd 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -7,8 +7,10 @@ with lib;
 let
   cfg = config.services.gitlab;
 
-  ruby = pkgs.ruby;
-  rubyLibs = pkgs.rubyLibs;
+  ruby = pkgs.gitlab.ruby;
+  bundler = pkgs.bundler;
+
+  gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}";
 
   databaseYml = ''
     production:
@@ -38,13 +40,14 @@ let
 
   gitlab-runner = pkgs.stdenv.mkDerivation rec {
     name = "gitlab-runner";
-    buildInputs = [ pkgs.gitlab pkgs.rubyLibs.bundler pkgs.makeWrapper ];
+    buildInputs = [ pkgs.gitlab pkgs.bundler pkgs.makeWrapper ];
     phases = "installPhase fixupPhase";
     buildPhase = "";
     installPhase = ''
       mkdir -p $out/bin
-      makeWrapper ${rubyLibs.bundler}/bin/bundle $out/bin/gitlab-runner\
+      makeWrapper ${bundler}/bin/bundle $out/bin/gitlab-runner\
           --set RAKEOPT '"-f ${pkgs.gitlab}/share/gitlab/Rakefile"'\
+          --set GEM_HOME '${gemHome}'\
           --set UNICORN_PATH "${cfg.stateDir}/"\
           --set GITLAB_PATH "${pkgs.gitlab}/share/gitlab/"\
           --set GITLAB_APPLICATION_LOG_PATH "${cfg.stateDir}/log/application.log"\
@@ -172,6 +175,7 @@ in {
       after = [ "network.target" "redis.service" ];
       wantedBy = [ "multi-user.target" ];
       environment.HOME = "${cfg.stateDir}/home";
+      environment.GEM_HOME = gemHome;
       environment.UNICORN_PATH = "${cfg.stateDir}/";
       environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/";
       environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log";
@@ -201,7 +205,7 @@ in {
         Group = "gitlab";
         TimeoutSec = "300";
         WorkingDirectory = "${pkgs.gitlab}/share/gitlab";
-        ExecStart="${rubyLibs.bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.stateDir}/tmp/sidekiq.pid\"";
+        ExecStart="${bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.stateDir}/tmp/sidekiq.pid\"";
       };
     };
 
@@ -209,6 +213,7 @@ in {
       after = [ "network.target" "postgresql.service" "redis.service" ];
       wantedBy = [ "multi-user.target" ];
       environment.HOME = "${cfg.stateDir}/home";
+      environment.GEM_HOME = gemHome;
       environment.UNICORN_PATH = "${cfg.stateDir}/";
       environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/";
       environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log";
@@ -263,7 +268,7 @@ in {
 
             # force=yes disables the manual-interaction yes/no prompt
             # which breaks without an stdin.
-            force=yes ${rubyLibs.bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile gitlab:setup RAILS_ENV=production
+            force=yes ${bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile gitlab:setup RAILS_ENV=production
           fi
         fi
 
@@ -285,7 +290,7 @@ in {
         Group = "gitlab";
         TimeoutSec = "300";
         WorkingDirectory = "${pkgs.gitlab}/share/gitlab";
-        ExecStart="${rubyLibs.bundler}/bin/bundle exec \"unicorn -c ${cfg.stateDir}/config/unicorn.rb -E production\"";
+        ExecStart="${bundler}/bin/bundle exec \"unicorn -c ${cfg.stateDir}/config/unicorn.rb -E production\"";
       };
 
     };
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 66e19d13d72..16335c8aca7 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -36,6 +36,7 @@ in
           Initial administrative public key for Gitolite. This should
           be an SSH Public Key. Note that this key will only be used
           once, upon the first initialization of the Gitolite user.
+          The key string cannot have any line breaks in it.
         '';
       };
 
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index d7e64590f50..059cc18733b 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -8,7 +8,6 @@ let
   cfg = config.services.redmine;
 
   ruby = pkgs.ruby;
-  rubyLibs = pkgs.rubyLibs;
 
   databaseYml = ''
     production:
@@ -155,7 +154,7 @@ in {
       environment.HOME = "${pkgs.redmine}/share/redmine";
       environment.REDMINE_LANG = "en";
       environment.GEM_HOME = "${pkgs.redmine}/share/redmine/vendor/bundle/ruby/1.9.1";
-      environment.GEM_PATH = "${rubyLibs.bundler}/lib/ruby/gems/1.9";
+      environment.GEM_PATH = "${bundler}/${bundler.ruby.gemPath}";
       path = with pkgs; [
         imagemagickBig
         subversion
diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix
index 148dc046805..523f74cb72b 100644
--- a/nixos/modules/services/monitoring/riemann-dash.nix
+++ b/nixos/modules/services/monitoring/riemann-dash.nix
@@ -15,7 +15,7 @@ let
 
   launcher = writeScriptBin "riemann-dash" ''
     #!/bin/sh
-    exec ${rubyLibs.riemann_dash}/bin/riemann-dash ${conf}
+    exec ${pkgs.riemann-dash}/bin/riemann-dash ${conf}
   '';
 
 in {
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 1f17661c9f0..b05a640e11f 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -356,7 +356,7 @@ in
         ''
           If pings are allowed, this allows setting rate limits
           on them. If non-null, this option should be in the form
-          of flags like "-limit 1/minute -limit-burst 5"
+          of flags like "--limit 1/minute --limit-burst 5"
         '';
     };
 
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index 1988c7140d3..a9183577d0a 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -82,7 +82,8 @@ in
           '';
 
         serviceConfig = {
-          ExecStart = "@${ntp}/bin/ntpd ntpd -g -n ${ntpFlags}";
+          ExecStart = "@${ntp}/bin/ntpd ntpd -g ${ntpFlags}";
+          Type = "forking";
         };
       };
 
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
index 2f9031481d1..d1c32db49c4 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -12,6 +12,7 @@ let
 
   cfgFile = pkgs.writeText "openntpd.conf" ''
     ${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)}
+    ${cfg.extraConfig}
   '';
 in
 {
@@ -25,6 +26,27 @@ in
       type = types.listOf types.str;
       inherit (options.services.ntp.servers) description;
     };
+
+    extraConfig = mkOption {
+      type = with types; lines;
+      default = "";
+      example = ''
+        listen on 127.0.0.1 
+        listen on ::1 
+      '';
+      description = ''
+        Additional text appended to <filename>openntpd.conf</filename>.
+      '';
+    };
+
+    extraOptions = mkOption {
+      type = with types; string;
+      default = "";
+      example = "-s";
+      description = ''
+        Extra options used when launching openntpd.
+      '';
+    };
   };
 
   ###### implementation
@@ -42,7 +64,7 @@ in
     systemd.services.openntpd = {
       description = "OpenNTP Server";
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${package}/sbin/ntpd -d -f ${cfgFile}";
+      serviceConfig.ExecStart = "${package}/sbin/ntpd -d -f ${cfgFile} ${cfg.extraOptions}";
     };
   };
 }
diff --git a/nixos/modules/services/networking/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix
new file mode 100644
index 00000000000..f2d0c9f35c9
--- /dev/null
+++ b/nixos/modules/services/networking/tlsdated.nix
@@ -0,0 +1,110 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  inherit (pkgs) coreutils tlsdate;
+
+  cfg = config.services.tlsdated;
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.tlsdated = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable tlsdated daemon.
+        '';
+      };
+
+      extraOptions = mkOption {
+        type = types.string;
+        description = ''
+          Additional command line arguments to pass to tlsdated.
+        '';
+      };
+
+      sources = mkOption {
+        type = types.listOf (types.submodule {
+          options = {
+            host = mkOption {
+              type = types.string;
+              description = ''
+                Remote hostname.
+              '';
+            };
+            port = mkOption {
+              type = types.int;
+              description = ''
+                Remote port.
+              '';
+            };
+            proxy = mkOption {
+              type = types.nullOr types.string;
+              default = null;
+              description = ''
+                The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed:
+
+                 http://127.0.0.1:8118
+                 socks4a://127.0.0.1:9050
+                 socks5://127.0.0.1:9050
+
+                The proxy support should not leak DNS requests and is suitable for use with Tor.
+              '';
+            };
+          };
+        });
+        default = [
+          {
+            host = "www.ptb.de";
+            port = 443;
+            proxy = null;
+          }
+        ];
+        description = ''
+          You can list one or more sources to fetch time from.
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    # Make tools such as tlsdate available in the system path
+    environment.systemPackages = [ tlsdate ];
+
+    systemd.services.tlsdated = {
+      description = "tlsdated daemon";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        # XXX because pkgs.tlsdate is compiled to run as nobody:nogroup, we
+        # hard-code base-path to /tmp and use PrivateTmp.
+        ExecStart = "${tlsdate}/bin/tlsdated -f ${pkgs.writeText "tlsdated.confg" ''
+          base-path /tmp
+
+          ${concatMapStrings (src: ''
+          source
+              host    ${src.host}
+              port    ${toString src.port}
+              proxy   ${if src.proxy == null then "none" else src.proxy}
+          end
+          '') cfg.sources}
+        ''} ${cfg.extraOptions}";
+        PrivateTmp = "yes";
+      };
+    };
+
+  };
+
+}
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index d5a57eddd5e..6a830827fd7 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -682,6 +682,7 @@ in
         serviceConfig.Type = "forking";
         serviceConfig.PIDFile = "${mainCfg.stateDir}/httpd.pid";
         serviceConfig.Restart = "always";
+        serviceConfig.RestartSec = "5s";
       };
 
   };
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
new file mode 100644
index 00000000000..3bea3c3ee1d
--- /dev/null
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -0,0 +1,577 @@
+{ config, lib, pkgs, serverInfo, php, ... }:
+
+with lib;
+
+let
+
+  httpd = serverInfo.serverConfig.package;
+
+  version24 = !versionOlder httpd.version "2.4";
+
+  allGranted = if version24 then ''
+    Require all granted
+  '' else ''
+    Order allow,deny
+    Allow from all
+  '';
+
+  owncloudConfig = pkgs.writeText "config.php"
+    ''
+      <?php
+
+      /* Only enable this for local development and not in productive environments */
+      /* This will disable the minifier and outputs some additional debug informations */
+      define("DEBUG", false);
+
+      $CONFIG = array(
+      /* Flag to indicate ownCloud is successfully installed (true = installed) */
+      "installed" => true,
+
+      /* Type of database, can be sqlite, mysql or pgsql */
+      "dbtype" => "${config.dbType}",
+
+      /* Name of the ownCloud database */
+      "dbname" => "${config.dbName}",
+
+      /* User to access the ownCloud database */
+      "dbuser" => "${config.dbUser}",
+
+      /* Password to access the ownCloud database */
+      "dbpassword" => "${config.dbPassword}",
+
+      /* Host running the ownCloud database. To specify a port use "HOSTNAME:####"; to specify a unix sockets use "localhost:/path/to/socket". */
+      "dbhost" => "${config.dbServer}",
+
+      /* Prefix for the ownCloud tables in the database */
+      "dbtableprefix" => "",
+
+      /* Force use of HTTPS connection (true = use HTTPS) */
+      "forcessl" => ${config.forceSSL},
+
+      /* Blacklist a specific file and disallow the upload of files with this name - WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING. */
+      "blacklisted_files" => array('.htaccess'),
+
+      /* The automatic hostname detection of ownCloud can fail in certain reverse proxy and CLI/cron situations. This option allows to manually override the automatic detection. You can also add a port. For example "www.example.com:88" */
+      "overwritehost" => "${config.overwriteHost}",
+
+      /* The automatic protocol detection of ownCloud can fail in certain reverse proxy and CLI/cron situations. This option allows to manually override the protocol detection. For example "https" */
+      "overwriteprotocol" => "${config.overwriteProtocol}",
+
+      /* The automatic webroot detection of ownCloud can fail in certain reverse proxy and CLI/cron situations. This option allows to manually override the automatic detection. For example "/domain.tld/ownCloud". The value "/" can be used to remove the root. */
+      "overwritewebroot" => "${config.overwriteWebRoot}",
+
+      /* The automatic detection of ownCloud can fail in certain reverse proxy and CLI/cron situations. This option allows to define a manually override condition as regular expression for the remote ip address. For example "^10\.0\.0\.[1-3]$" */
+      "overwritecondaddr" => "",
+
+      /* A proxy to use to connect to the internet. For example "myproxy.org:88" */
+      "proxy" => "",
+
+      /* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
+      "proxyuserpwd" => "",
+
+      /* List of trusted domains, to prevent host header poisoning ownCloud is only using these Host headers */
+      'trusted_domains' => array('${config.trustedDomain}'),
+
+      /* Theme to use for ownCloud */
+      "theme" => "",
+
+      /* Optional ownCloud default language - overrides automatic language detection on public pages like login or shared items. This has no effect on the user's language preference configured under "personal -> language" once they have logged in */
+      "default_language" => "${config.defaultLang}",
+
+      /* Path to the parent directory of the 3rdparty directory */
+      "3rdpartyroot" => "",
+
+      /* URL to the parent directory of the 3rdparty directory, as seen by the browser */
+      "3rdpartyurl" => "",
+
+      /* Default app to open on login.
+       * This can be a comma-separated list of app ids.
+       * If the first app is not enabled for the current user,
+       * it will try with the second one and so on. If no enabled app could be found,
+       * the "files" app will be displayed instead. */
+      "defaultapp" => "${config.defaultApp}",
+
+      /* Enable the help menu item in the settings */
+      "knowledgebaseenabled" => true,
+
+      /* Enable installing apps from the appstore */
+      "appstoreenabled" => ${config.appStoreEnable},
+
+      /* URL of the appstore to use, server should understand OCS */
+      "appstoreurl" => "https://api.owncloud.com/v1",
+
+      /* Domain name used by ownCloud for the sender mail address, e.g. no-reply@example.com */
+      "mail_domain" => "${config.mailFromDomain}",
+
+      /* FROM address used by ownCloud for the sender mail address, e.g. owncloud@example.com
+         This setting overwrites the built in 'sharing-noreply' and 'lostpassword-noreply'
+         FROM addresses, that ownCloud uses
+      */
+      "mail_from_address" => "${config.mailFrom}",
+
+      /* Enable SMTP class debugging */
+      "mail_smtpdebug" => false,
+
+      /* Mode to use for sending mail, can be sendmail, smtp, qmail or php, see PHPMailer docs */
+      "mail_smtpmode" => "${config.SMTPMode}",
+
+      /* Host to use for sending mail, depends on mail_smtpmode if this is used */
+      "mail_smtphost" => "${config.SMTPHost}",
+
+      /* Port to use for sending mail, depends on mail_smtpmode if this is used */
+      "mail_smtpport" => ${config.SMTPPort},
+
+      /* SMTP server timeout in seconds for sending mail, depends on mail_smtpmode if this is used */
+      "mail_smtptimeout" => ${config.SMTPTimeout},
+
+      /* SMTP connection prefix or sending mail, depends on mail_smtpmode if this is used.
+         Can be "", ssl or tls */
+      "mail_smtpsecure" => "${config.SMTPSecure}",
+
+      /* authentication needed to send mail, depends on mail_smtpmode if this is used
+       * (false = disable authentication)
+       */
+      "mail_smtpauth" => ${config.SMTPAuth},
+
+      /* authentication type needed to send mail, depends on mail_smtpmode if this is used
+       * Can be LOGIN (default), PLAIN or NTLM */
+      "mail_smtpauthtype" => "${config.SMTPAuthType}",
+
+      /* Username to use for sendmail mail, depends on mail_smtpauth if this is used */
+      "mail_smtpname" => "${config.SMTPUser}",
+
+      /* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
+      "mail_smtppassword" => "${config.SMTPPass}",
+
+      /* memcached servers (Only used when xCache, APC and APCu are absent.) */
+      "memcached_servers" => array(
+          // hostname, port and optional weight. Also see:
+          // http://www.php.net/manual/en/memcached.addservers.php
+          // http://www.php.net/manual/en/memcached.addserver.php
+          //array('localhost', 11211),
+          //array('other.host.local', 11211),
+      ),
+
+      /* How long should ownCloud keep deleted files in the trash bin, default value:  30 days */
+      'trashbin_retention_obligation' => 30,
+
+      /* Disable/Enable auto expire for the trash bin, by default auto expire is enabled */
+      'trashbin_auto_expire' => true,
+
+      /* allow user to change his display name, if it is supported by the back-end */
+      'allow_user_to_change_display_name' => true,
+
+      /* Check 3rdparty apps for malicious code fragments */
+      "appcodechecker" => true,
+
+      /* Check if ownCloud is up to date */
+      "updatechecker" => true,
+
+      /* Are we connected to the internet or are we running in a closed network? */
+      "has_internet_connection" => true,
+
+      /* Check if the ownCloud WebDAV server is working correctly. Can be disabled if not needed in special situations*/
+      "check_for_working_webdav" => true,
+
+      /* Check if .htaccess protection of data is working correctly. Can be disabled if not needed in special situations*/
+      "check_for_working_htaccess" => true,
+
+      /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
+      "log_type" => "owncloud",
+
+      /* File for the owncloud logger to log to, (default is ownloud.log in the data dir) */
+      "logfile" => "${config.dataDir}/owncloud.log",
+
+      /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
+      "loglevel" => "2",
+
+      /* date format to be used while writing to the owncloud logfile */
+      'logdateformat' => 'F d, Y H:i:s',
+
+      /* timezone used while writing to the owncloud logfile (default: UTC) */
+      'logtimezone' => '${serverInfo.fullConfig.time.timeZone}',
+
+      /* Append all database queries and parameters to the log file.
+       (watch out, this option can increase the size of your log file)*/
+      "log_query" => false,
+
+      /* Whether ownCloud should log the last successfull cron exec */
+      "cron_log" => true,
+
+      /*
+       * Configure the size in bytes log rotation should happen, 0 or false disables the rotation.
+       * This rotates the current owncloud logfile to a new name, this way the total log usage
+       * will stay limited and older entries are available for a while longer. The
+       * total disk usage is twice the configured size.
+       * WARNING: When you use this, the log entries will eventually be lost.
+       */
+      'log_rotate_size' => "104857600", // 104857600, // 100 MiB
+
+      /* Lifetime of the remember login cookie, default is 15 days */
+      "remember_login_cookie_lifetime" => 1296000,
+
+      /* Life time of a session after inactivity */
+      "session_lifetime" => 86400,
+
+      /*
+       * Enable/disable session keep alive when a user is logged in in the Web UI.
+       * This is achieved by sending a "heartbeat" to the server to prevent
+       * the session timing out.
+       */
+      "session_keepalive" => true,
+
+      /* Custom CSP policy, changing this will overwrite the standard policy */
+      "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *",
+
+      /* Enable/disable X-Frame-Restriction */
+      /* HIGH SECURITY RISK IF DISABLED*/
+      "xframe_restriction" => true,
+
+      /* The directory where the user data is stored, default to data in the owncloud
+       * directory. The sqlite database is also stored here, when sqlite is used.
+       */
+      "datadirectory" => "${config.dataDir}/storage",
+
+      /* The directory where the skeleton files are located. These files will be copied to the data
+       * directory of new users. Leave empty to not copy any skeleton files.
+       */
+      // "skeletondirectory" => "",
+
+      /* Enable maintenance mode to disable ownCloud
+         If you want to prevent users to login to ownCloud before you start doing some maintenance work,
+         you need to set the value of the maintenance parameter to true.
+         Please keep in mind that users who are already logged-in are kicked out of ownCloud instantly.
+      */
+      "maintenance" => false,
+
+      "apps_paths" => array(
+
+      /* Set an array of path for your apps directories
+       key 'path' is for the fs path and the key 'url' is for the http path to your
+       applications paths. 'writable' indicates whether the user can install apps in this folder.
+       You must have at least 1 app folder writable or you must set the parameter 'appstoreenabled' to false
+      */
+          array(
+              'path'=> '${config.dataDir}/apps',
+              'url' => '/apps',
+              'writable' => true,
+          ),
+      ),
+      'user_backends'=>array(
+          /*
+          array(
+              'class'=>'OC_User_IMAP',
+              'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
+          )
+          */
+      ),
+      //links to custom clients
+      'customclient_desktop' => ''', //http://owncloud.org/sync-clients/
+      'customclient_android' => ''', //https://play.google.com/store/apps/details?id=com.owncloud.android
+      'customclient_ios' => ''', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
+
+      // PREVIEW
+      'enable_previews' => true,
+      /* the max width of a generated preview, if value is null, there is no limit */
+      'preview_max_x' => null,
+      /* the max height of a generated preview, if value is null, there is no limit */
+      'preview_max_y' => null,
+      /* the max factor to scale a preview, default is set to 10 */
+      'preview_max_scale_factor' => 10,
+      /* custom path for libreoffice / openoffice binary */
+      'preview_libreoffice_path' => '${config.libreofficePath}',
+      /* cl parameters for libreoffice / openoffice */
+      'preview_office_cl_parameters' => ''',
+
+      /* whether avatars should be enabled */
+      'enable_avatars' => true,
+
+      // Extra SSL options to be used for configuration
+      'openssl' => array(
+          'config' => '/etc/ssl/openssl.cnf',
+      ),
+
+      // default cipher used for file encryption, currently we support AES-128-CFB and AES-256-CFB
+      'cipher' => 'AES-256-CFB',
+
+      /* whether usage of the instance should be restricted to admin users only */
+      'singleuser' => false,
+
+      /* all css and js files will be served by the web server statically in one js file and ons css file*/
+      'asset-pipeline.enabled' => false,
+
+      /* where mount.json file should be stored, defaults to data/mount.json */
+      'mount_file' => ''',
+
+      /*
+       * Location of the cache folder, defaults to "data/$user/cache" where "$user" is the current user.
+       *
+       * When specified, the format will change to "$cache_path/$user" where "$cache_path" is the configured
+       * cache directory and "$user" is the user.
+       *
+       */
+      'cache_path' => ''',
+
+      /* EXPERIMENTAL: option whether to include external storage in quota calculation, defaults to false */
+      'quota_include_external_storage' => false,
+
+      /*
+       * specifies how often the filesystem is checked for changes made outside owncloud
+       * 0 -> never check the filesystem for outside changes, provides a performance increase when it's certain that no changes are made directly to the filesystem
+       * 1 -> check each file or folder at most once per request, recomended for general use if outside changes might happen
+       * 2 -> check every time the filesystem is used, causes a performance hit when using external storages, not recomended for regular use
+       */
+      'filesystem_check_changes' => 1,
+
+      /* If true, prevent owncloud from changing the cache due to changes in the filesystem for all storage */
+      'filesystem_cache_readonly' => false,
+
+      /**
+       * define default folder for shared files and folders
+       */
+      'share_folder' => '/',
+
+      'version' => '${pkgs.owncloud.version}',
+
+      'openssl' => '${pkgs.openssl}/bin/openssl'
+
+      );
+
+    '';
+
+in
+
+rec {
+
+  extraConfig =
+    ''
+      ServerName ${config.siteName}
+      ServerAdmin ${config.adminAddr}
+      DocumentRoot ${documentRoot}
+
+      RewriteEngine On
+      RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
+      RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
+
+      <Directory ${pkgs.owncloud}>
+        ${builtins.readFile "${pkgs.owncloud}/.htaccess"}
+      </Directory>
+    '';
+
+  globalEnvVars = [
+    { name = "OC_CONFIG_PATH"; value = "${config.dataDir}/config/"; }
+  ];
+
+  documentRoot = pkgs.owncloud;
+
+  enablePHP = true;
+
+  options = {
+
+    id = mkOption {
+      default = "main";
+      description = ''
+        A unique identifier necessary to keep multiple owncloud server
+        instances on the same machine apart.  This is used to
+        disambiguate the administrative scripts, which get names like
+        mediawiki-$id-change-password.
+      '';
+    };
+
+    adminUser = mkOption {
+      default = "owncloud";
+      description = "The admin user name for accessing owncloud.";
+    };
+
+    adminPassword = mkOption {
+      description = "The admin password for accessing owncloud.
+        Warning: this is stored in cleartext in the Nix store!";
+    };
+
+    dbType = mkOption {
+      default = "pgsql";
+      description = "Type of database, in NixOS, for now, only pgsql.";
+    };
+
+    dbName = mkOption {
+      default = "owncloud";
+      description = "Name of the database that holds the owncloud data.";
+    };
+
+    dbServer = mkOption {
+      default = "localhost:5432";
+      description = ''
+        The location of the database server.
+      '';
+    };
+
+    dbUser = mkOption {
+      default = "owncloud";
+      description = "The user name for accessing the database.";
+    };
+
+    dbPassword = mkOption {
+      example = "foobar";
+      description = ''
+        The password of the database user.  Warning: this is stored in
+        cleartext in the Nix store!
+      '';
+    };
+
+    forceSSL = mkOption {
+      default = "false";
+      description = "Force use of HTTPS connection.";
+    };
+
+    adminAddr = mkOption {
+      default = serverInfo.serverConfig.adminAddr;
+      example = "admin@example.com";
+      description = ''
+        Emergency contact e-mail address.  Defaults to the Apache
+        admin address.
+      '';
+    };
+
+    siteName = mkOption {
+      default = "owncloud";
+      example = "Foobar owncloud";
+      description = "Name of the owncloud";
+    };
+
+    trustedDomain = mkOption {
+      default = "";
+      description = "Trusted domain";
+    };
+
+    defaultLang = mkOption {
+      default = "";
+      description = "Default language";
+    };
+
+    defaultApp = mkOption {
+      default = "";
+      description = "Default application";
+    };
+
+    appStoreEnable = mkOption {
+      default = "true";
+      description = "Enable app store";
+    };
+
+    mailFrom = mkOption {
+      default = "no-reply";
+      description = "Mail from";
+    };
+
+    mailFromDomain = mkOption {
+      default = "example.xyz";
+      description = "Mail from domain";
+    };
+
+    SMTPMode = mkOption {
+      default = "smtp";
+      description = "Which mode to use for sending mail: sendmail, smtp, qmail or php.";
+    };
+
+    SMTPHost = mkOption {
+      default = "";
+      description = "SMTP host";
+    };
+
+    SMTPPort = mkOption {
+      default = "25";
+      description = "SMTP port";
+    };
+
+    SMTPTimeout = mkOption {
+      default = "10";
+      description = "SMTP mode";
+    };
+
+    SMTPSecure = mkOption {
+      default = "ssl";
+      description = "SMTP secure";
+    };
+
+    SMTPAuth = mkOption {
+      default = "true";
+      description = "SMTP auth";
+    };
+
+    SMTPAuthType = mkOption {
+      default = "LOGIN";
+      description = "SMTP auth type";
+    };
+
+    SMTPUser = mkOption {
+      default = "";
+      description = "SMTP user";
+    };
+
+    SMTPPass = mkOption {
+      default = "";
+      description = "SMTP pass";
+    };
+
+    dataDir = mkOption {
+      default = "/var/lib/owncloud";
+      description = "Data dir";
+    };
+
+    libreofficePath = mkOption {
+      default = "/usr/bin/libreoffice";
+      description = "Path for LibreOffice/OpenOffice binary.";
+    };
+
+    overwriteHost = mkOption {
+      default = "";
+      description = "The automatic hostname detection of ownCloud can fail in
+        certain reverse proxy and CLI/cron situations. This option allows to
+        manually override the automatic detection. You can also add a port.";
+    };
+
+    overwriteProtocol = mkOption {
+      default = "";
+      description = "The automatic protocol detection of ownCloud can fail in
+        certain reverse proxy and CLI/cron situations. This option allows to
+        manually override the protocol detection.";
+    };
+
+    overwriteWebRoot = mkOption {
+      default = "";
+      description = "The automatic webroot detection of ownCloud can fail in
+        certain reverse proxy and CLI/cron situations. This option allows to
+        manually override the automatic detection.";
+    };
+
+  };
+
+  startupScript = pkgs.writeScript "owncloud_startup.sh" ''
+
+    if [ ! -d ${config.dataDir}/config ]; then
+      mkdir -p ${config.dataDir}/config
+      cp ${owncloudConfig} ${config.dataDir}/config/config.php
+      mkdir -p ${config.dataDir}/storage
+      mkdir -p ${config.dataDir}/apps
+      cp -r ${pkgs.owncloud}/apps/* ${config.dataDir}/apps/
+      chmod -R ug+rw ${config.dataDir}
+      chmod -R o-rwx ${config.dataDir}
+      chown -R wwwrun:wwwrun ${config.dataDir}
+
+      ${pkgs.postgresql}/bin/createuser -s -r postgres
+      ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
+      ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}" || true
+      ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true
+
+      QUERY="CREATE TABLE appconfig (appid VARCHAR( 255 ) NOT NULL ,configkey VARCHAR( 255 ) NOT NULL ,configvalue VARCHAR( 255 ) NOT NULL); GRANT ALL ON appconfig TO ${config.dbUser}; ALTER TABLE appconfig OWNER TO ${config.dbUser};"
+      ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
+    fi
+
+    ${php}/bin/php ${pkgs.owncloud}/occ upgrade || true
+
+    chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true
+
+    QUERY="INSERT INTO groups (gid) values('admin'); INSERT INTO users (uid,password) values('${config.adminUser}','`echo -n "${config.adminPassword}" | ${pkgs.openssl}/bin/openssl dgst -sha1 | ${pkgs.gawk}/bin/awk '{print $2}'`'); INSERT INTO group_user (gid,uid) values('admin','${config.adminUser}');"
+    ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
+  '';
+}
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index bffbb56e681..9165658a7be 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -18,8 +18,8 @@ in
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
   imports = [
-    ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix
-    ./e19.nix ./gnome3.nix ./xbmc.nix
+    ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix
+    ./e19.nix ./gnome3.nix ./xbmc.nix ./kodi.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 16c99862e9e..21b6243ba18 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -70,14 +70,6 @@ in
         description = "Custom kde-workspace, used for NixOS rebranding.";
       };
     };
-
-    environment.kdePackages = mkOption {
-      default = [];
-      example = literalExample "[ pkgs.kde4.kdesdk ]";
-      type = types.listOf types.package;
-      description = "This option is obsolete.  Please use <option>environment.systemPackages</option> instead.";
-    };
-
   };
 
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
new file mode 100644
index 00000000000..6d6479da2a1
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -0,0 +1,143 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.kde5;
+  xorg = pkgs.xorg;
+
+  phononBackends = {
+    gstreamer = [
+      pkgs.phonon_backend_gstreamer
+      pkgs.gst_all.gstPluginsBase
+      pkgs.gst_all.gstPluginsGood
+      pkgs.gst_all.gstPluginsUgly
+      pkgs.gst_all.gstPluginsBad
+      pkgs.gst_all.gstFfmpeg # for mp3 playback
+      pkgs.phonon_qt5_backend_gstreamer
+      pkgs.gst_all_1.gst-plugins-base
+      pkgs.gst_all_1.gst-plugins-good
+      pkgs.gst_all_1.gst-plugins-ugly
+      pkgs.gst_all_1.gst-plugins-bad
+      pkgs.gst_all_1.gst-libav # for mp3 playback
+    ];
+
+    vlc = [
+      pkgs.phonon_qt5_backend_vlc
+      pkgs.phonon_backend_vlc
+    ];
+  };
+
+  phononBackendPackages = flip concatMap cfg.phononBackends
+    (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
+
+  kf5 = pkgs.kf5_stable;
+
+  plasma5 = pkgs.plasma5_stable;
+
+  kdeApps = pkgs.kdeApps_stable;
+
+in
+
+{
+  options = {
+
+    services.xserver.desktopManager.kde5 = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable the Plasma 5 (KDE 5) desktop environment.";
+      };
+
+      phononBackends = mkOption {
+        type = types.listOf types.str;
+        default = ["gstreamer"];
+        example = ["gstreamer" "vlc"];
+        description = ''
+          Phonon backends to use in KDE. Only the VLC and gstreamer backends are
+          available. The VLC backend is preferred by upstream.
+        '';
+      };
+
+    };
+
+  };
+
+
+  config = mkIf (xcfg.enable && cfg.enable) {
+
+    warnings = optional config.services.xserver.desktopManager.kde4.enable
+      "KDE 4 should not be enabled at the same time as KDE 5";
+
+    services.xserver.desktopManager.session = singleton {
+      name = "kde5";
+      bgSupport = true;
+      start = ''exec ${plasma5.startkde}/bin/startkde;'';
+    };
+
+    security.setuidOwners = singleton {
+      program = "kcheckpass";
+      source = "${plasma5.plasma-workspace}/lib/libexec/kcheckpass";
+      owner = "root";
+      group = "root";
+      setuid = true;
+    };
+
+    environment.systemPackages = with plasma5; with kf5;
+      (builtins.attrValues
+        (removeAttrs plasma5
+          [ "deepOverride" "override" "overrideDerivation"
+            "recurseForDerivations" "scope"
+          ]))
+      ++
+      (builtins.attrValues
+        (removeAttrs kf5
+          [ "deepOverride" "extra-cmake-modules" "mkDerivation" "override"
+            "overrideDerivation" "recurseForDerivations" "scope"
+          ]))
+      ++
+      [
+        pkgs.qt4 # qtconfig is the only way to set Qt 4 theme
+
+        kdeApps.kde-baseapps
+        kdeApps.kde-base-artwork
+        kdeApps.kde-workspace
+        kdeApps.kde-runtime
+        kdeApps.kmix
+        kdeApps.konsole
+        kdeApps.oxygen-icons
+
+        pkgs.hicolor_icon_theme
+
+        pkgs.orion # GTK theme, nearly identical to Breeze
+      ]
+      ++ (optional config.networking.networkmanager.enable plasma-nm)
+      ++ phononBackendPackages;
+
+    environment.pathsToLink = [ "/share" ];
+
+    environment.etc = singleton {
+      source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+      target = "X11/xkb";
+    };
+
+    environment.profileRelativeEnvVars =
+      mkIf (lib.elem "gstreamer" cfg.phononBackends)
+      {
+        GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
+        GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
+      };
+
+    fonts.fonts = [ plasma5.oxygen-fonts ];
+
+    # Enable helpful DBus services.
+    services.udisks2.enable = true;
+    services.upower.enable = config.powerManagement.enable;
+
+    security.pam.services.kde = { allowNullPassword = true; };
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
new file mode 100644
index 00000000000..1e30308a513
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.desktopManager.kodi;
+in
+
+{
+  options = {
+    services.xserver.desktopManager.kodi = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the kodi multimedia center.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.desktopManager.session = [{
+      name = "kodi";
+      start = ''
+        ${pkgs.kodi}/bin/kodi --lircdev /var/run/lirc/lircd --standalone &
+        waitPID=$!
+      '';
+    }];
+
+    environment.systemPackages = [ pkgs.kodi ];
+  };
+}
\ No newline at end of file
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index 7ec489ae3e7..42eaacfe84a 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -151,6 +151,9 @@ in
         description = "KDM user";
       };
 
+    environment.systemPackages =
+      [ pkgs.kde4.kde_wallpapers ]; # contains kdm's default background
+
   };
 
 }
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 3ea00e40c3b..b16a725aba8 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -196,7 +196,7 @@ in
       };
 
       timeout = mkOption {
-        default = 5;
+        default = if (config.boot.loader.timeout != null) then config.boot.loader.timeout else -1;
         type = types.int;
         description = ''
           Timeout (in seconds) until GRUB boots the default menu item.
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index 003f72b37f9..6c201eb8212 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -31,7 +31,7 @@ in {
     };
 
     timeout = mkOption {
-      default = null;
+      default = if config.boot.loader.timeout == null then 10000 else config.boot.loader.timeout;
 
       example = 4;
 
diff --git a/nixos/modules/system/boot/loader/loader.nix b/nixos/modules/system/boot/loader/loader.nix
new file mode 100644
index 00000000000..28cceafea7c
--- /dev/null
+++ b/nixos/modules/system/boot/loader/loader.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+    options = {
+        boot.loader.timeout =  mkOption {
+            default = 5;
+            type = types.nullOr types.int;
+            description = ''
+              Timeout (in seconds) until loader boots the default menu item. Use null if the loader menu should be displayed indefinitely.
+            '';
+        };
+    };
+}
\ No newline at end of file
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index eaf8cf1ecd6..a1feaad6132 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -10,10 +10,18 @@ with lib;
 
     system.sbin.modprobe = mkOption {
       internal = true;
-      default = pkgs.writeTextFile {
+      default = pkgs.stdenv.mkDerivation {
         name = "modprobe";
-        destination = "/sbin/modprobe";
-        executable = true;
+        buildCommand = ''
+          mkdir -p $out/bin
+          for i in ${pkgs.kmod}/sbin/*; do
+            name=$(basename $i)
+            echo "$text" > $out/bin/$name
+            echo 'exec '$i' "$@"' >> $out/bin/$name
+            chmod +x $out/bin/$name
+          done
+          ln -s bin $out/sbin
+        '';
         text =
           ''
             #! ${pkgs.stdenv.shell}
@@ -26,7 +34,6 @@ with lib;
                 MODULE_DIR=/run/booted-system/kernel-modules/lib/modules/
             fi
 
-            exec ${pkgs.kmod}/sbin/modprobe "$@"
           '';
       };
       description = ''
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 64a20034f3c..c6f2f072352 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -142,7 +142,10 @@ in
       ++ config.system.fsPackages;
 
     environment.etc.fstab.text =
-      ''
+      let
+        fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" ];
+        skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
+      in ''
         # This is a generated file.  Do not edit!
 
         # Filesystems.
@@ -154,7 +157,7 @@ in
             + " " + fs.fsType
             + " " + fs.options
             + " 0"
-            + " " + (if fs.fsType == "none" || fs.device == "none" || fs.fsType == "btrfs" || fs.fsType == "tmpfs" || fs.noCheck then "0" else
+            + " " + (if skipCheck fs then "0" else
                      if fs.mountPoint == "/" then "1" else "2")
             + "\n"
         )}
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 075ec0ea227..c461cf8c00c 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -54,6 +54,14 @@ in
       '';
     };
 
+    boot.enableContainers = mkOption {
+      type = types.bool;
+      default = !config.boot.isContainer;
+      description = ''
+        Whether to enable support for nixos containers.
+      '';
+    };
+
     containers = mkOption {
       type = types.attrsOf (types.submodule (
         { config, options, name, ... }:
@@ -164,7 +172,7 @@ in
   };
 
 
-  config = mkIf (!config.boot.isContainer) {
+  config = mkIf (config.boot.enableContainers) {
 
     systemd.services."container@" =
       { description = "Container '%i'";
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index 9ae5331786c..94edfb37948 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -104,6 +104,10 @@ if ($action eq "create") {
 
     die "$0: container ‘$containerName’ already exists\n" if -e $confFile;
 
+    # Due to interface name length restrictions, container names must
+    # be restricted too.
+    die "$0: container name ‘$containerName’ is too long\n" if length $containerName > 11;
+
     # Get an unused IP address.
     my %usedIPs;
     foreach my $confFile2 (glob "/etc/containers/*.conf") {
diff --git a/nixos/release.nix b/nixos/release.nix
index c2760965d20..ca12a03f835 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -252,7 +252,7 @@ in rec {
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fleet = scrubDrv (import tests/fleet.nix { system = "x86_64-linux"; });
-  tests.gitlab = callTest tests/gitlab.nix {};
+  #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
   tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test);
   tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test);
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index d571a435816..efae0ec4045 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -10,6 +10,7 @@ import ./make-test.nix (
   name = "chromium";
 
   machine.imports = [ ./common/x11.nix ];
+  machine.virtualisation.memorySize = 1024;
 
   startupHTML = pkgs.writeText "chromium-startup.html" ''
     <!DOCTYPE html>
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 604c35f46ce..857aa2edaf5 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
+, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst_ffmpeg
 , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
 , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
-, sparsehash, config }:
+, sparsehash, config, makeWrapper }:
 
 let withSpotify = config.clementine.spotify or false;
 in
@@ -22,6 +23,9 @@ stdenv.mkDerivation {
     gettext
     glew
     gst_plugins_base
+    gst_plugins_good
+    gst_plugins_ugly
+    gst_ffmpeg
     gstreamer
     gvfs
     libcdio
@@ -29,6 +33,7 @@ stdenv.mkDerivation {
     liblastfm
     libmtp
     libplist
+    makeWrapper
     pkgconfig
     protobuf
     qca2
@@ -42,6 +47,11 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    wrapProgram $out/bin/clementine \
+      --set GST_PLUGIN_SYSTEM_PATH "$GST_PLUGIN_SYSTEM_PATH"
+  '';
+
   meta = with stdenv.lib; {
     homepage = "http://www.clementine-player.org";
     description = "A multiplatform music player";
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index aa3a76c3af1..ec428c7bb1f 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -2,15 +2,15 @@
 , libxslt, lv2, pkgconfig, premake3, xlibs }:
 
 let
-  rev = "99efbf0b";
+  rev = "3bfddf7f";
 in
 stdenv.mkDerivation rec {
   name = "distrho-${rev}";
 
   src = fetchgit {
-    url = "https://github.com/falkTX/DISTRHO.git";
+    url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
     inherit rev;
-    sha256 = "ed26a6edca19ebb8260b3dc042f69c32162e1d91179fb9d22da42ec7131936f9";
+    sha256 = "55dc52921bb757c3213da5ef6cab40909f39be3e3b41ba4c6cd66ad90bfb2e6c";
   };
 
   patchPhase = ''
@@ -50,5 +50,9 @@ stdenv.mkDerivation rec {
     '';
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
+
+    # The old repo was removed and split into multiple repos. More
+    # work is required to get everything to build and work.
+    broken = true;
   };
 }
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index a5dd037c774..e27b95c81e5 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "1cih4f22922ndk8yrcf955fvzkd8mh7qz1xcdyn3xybs7ackgarq";
+    sha256 = "1y3imsh059y9sihr92f3drwmcby4x3krmhly111ahwkydb94kphw";
   };
 
   buildInputs = [ jack2 libsndfile lv2 qt4 ];
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
new file mode 100644
index 00000000000..60d9c0e7b12
--- /dev/null
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "0.6.0";
+  name = "game-music-emu-${version}";
+
+  src = fetchurl {
+    url = "https://game-music-emu.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "11s9l938nxbrk7qb2k1ppfgizcz00cakbxgv0gajc6hyqv882vjh";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    homepage = https://code.google.com/p/game-music-emu/;
+    description = "A collection of video game music file emulators";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.all;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 8ffc760a88f..af23dd1dd41 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.32.1";
+  version = "0.32.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1sl7ca1lj0wchh3xq7qw3zqrbyyh4r8cwljb9i3yplpsn90d1i3k";
+    sha256 = "0mh4ma48hc8kq3xw25y1zjcrwgsdb0scd36vzw50a1qmmnh74rgp";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
new file mode 100644
index 00000000000..a6e843d0db8
--- /dev/null
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, libav, libkeyfinder }:
+
+stdenv.mkDerivation rec {
+  version = "20150125";
+  name = "keyfinder-cli-${version}";
+
+  src = fetchFromGitHub {
+    repo = "keyfinder-cli";
+    owner = "EvanPurkhiser";
+    rev = "3a6f598b3661fdba73ada81cd200a6e56c23ddca";
+    sha256 = "05k4g9zdzi4q81p8lax9b2j4bcg1bpp04sdbza5i5pfz2fng2cf7";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Musical key detection for digital audio (command-line tool)";
+    longDescription = ''
+      This small utility is the automation-oriented DJ's best friend. By making
+      use of Ibrahim Sha'ath's high quality libKeyFinder library, it can be
+      used to estimate the musical key of many different audio formats.
+    '';
+    homepage = https://github.com/EvanPurkhiser/keyfinder-cli;
+    license = with licenses; gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ libav libkeyfinder ];
+
+  makeFlagsArray = "PREFIX=$(out)";
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
new file mode 100644
index 00000000000..08e9a9f3545
--- /dev/null
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }:
+
+stdenv.mkDerivation rec {
+  version = "1.25-17-gf670607";
+  name = "keyfinder-${version}";
+
+  src = fetchFromGitHub {
+    repo = "is_KeyFinder";
+    owner = "ibsh";
+    rev = "f6706074435ac14c5238ee3f0dd22ac22d72af9c";
+    sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Musical key detection for digital audio (graphical UI)";
+    longDescription = ''
+      KeyFinder is an open source key detection tool, for DJs interested in
+      harmonic and tonal mixing. Designed primarily for electronic and dance
+      music, it is highly configurable and can be applied to many genres. It
+      supports a huge range of codecs thanks to LibAV, and writes to metadata
+      tags using TagLib. It's intended to be very focused: no library
+      management, no track suggestions, no media player. Just a fast,
+      efficient workflow tool.
+    '';
+    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
+    license = with licenses; gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  # TODO: upgrade libav when "Audio sample format conversion failed" is fixed
+  buildInputs = [ libav_0_8 libkeyfinder qt5 taglib ];
+
+  configurePhase = ''
+    substituteInPlace is_KeyFinder.pro \
+       --replace "keyfinder.0" "keyfinder" \
+       --replace '$$[QT_INSTALL_PREFIX]' "$out"
+    qmake
+  '';
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 9224e21185b..9224e21185b 100755..100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index b5f84f536d0..b5f84f536d0 100755..100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index c89f23f8a28..28473ca365b 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "155qq7gxyqn7sh8bbyhjk40lxl157lb2h539j4gqgv5jphz8g6wy";
+    sha256 = "0fbkdb2dqw7v6n8j1h6pjz2019ylli9rmz8awywv2ycm8blr5pf0";
   };
 
   buildInputs = [ jack2 libsndfile lv2 qt4 ];
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 17596e24a3b..8f2e9e787b3 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-15.1";
+  name = "snd-15.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "01xrgxmkibadm3zva2n7qv00dz8yy9wlkpwv7vancqfb8x44x1ji";
+    sha256 = "0v2r7a6363aai726cywi7ai0qlwdc20bqdprs5fmyz8sbmksbqzr";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
new file mode 100644
index 00000000000..b40e2187175
--- /dev/null
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, liblo, libxml2, jack2, libsndfile, wxGTK, libsigcxx
+,libsamplerate, rubberband, pkgconfig, ncurses
+}:
+
+stdenv.mkDerivation rec {
+  name = "sooperlooper-${version}";
+  version = "1.7.3";
+  src = fetchurl {
+    url = "http://essej.net/sooperlooper/${name}.tar.gz";
+    sha256 = "0n2gdxw1fx8nxxnpzf4sj0kp6k6zi1yq59cbz6qqzcnsnpnvszbs";
+  };
+
+  buildInputs = [
+   liblo libxml2 jack2 libsndfile wxGTK libsigcxx
+   libsamplerate rubberband pkgconfig ncurses
+  ];
+
+  meta = {
+    description = "A live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more";
+    longDescription = ''
+      It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory.
+      The application is a standalone JACK client with an engine controllable via OSC and MIDI.
+      It also includes a GUI which communicates with the engine via OSC (even over a network) for user-friendly control on a desktop.
+      However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc)
+      and the engine can be run standalone on a computer without a monitor.
+    '';
+
+    version = "${version}";
+    homepage = "http://essej.net/sooperlooper/index.html";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 9d3e61395e7..2a56e109540 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype
 , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
-, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer, udev, fontconfig
+, libgcrypt, chromium, udev, fontconfig
 , dbus, expat }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -10,20 +10,6 @@ let
     then "0.9.4.183.g644e24e.428"
     else "0.9.11.27.g2b1a638.81";
 
-  qt4webkit =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        name = "libqtwebkit4_2.3.2_i386.deb";
-        url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_i386.deb;
-        sha256 = "0q4abhczx91ma57fjss0gn8j6nkfbfsbsh6kxhykzj88dih2s8rn";
-      }
-    else
-      fetchurl {
-        name = "libqtwebkit4_2.3.2_amd64.deb";
-        url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_amd64.deb;
-        sha256 = "0sac88avfivwkfhmd6fik7ili8fdznqas6741dbspf9mfnawbwch";
-      };
-
   deps = [
     alsaLib
     atk
@@ -36,15 +22,12 @@ let
     GConf
     gdk_pixbuf
     glib
-    gst_plugins_base
-    gstreamer
     gtk
     libgcrypt
     libpng
     nss
     pango
     qt4
-    sqlite
     stdenv.cc.cc
     xlibs.libX11
     xlibs.libXcomposite
@@ -56,7 +39,6 @@ let
     xlibs.libXrender
     xlibs.libXrender
     xlibs.libXScrnSaver
-    #xlibs.libXss
   ];
 
 in
@@ -83,37 +65,37 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      mkdir -p $out
+      libdir=$out/lib/spotify
+      mkdir -p $libdir
       dpkg-deb -x $src $out
       mv $out/opt/spotify/* $out/
       rm -rf $out/usr $out/opt
 
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
-      mkdir $out/lib
 
-      ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d
-      ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
-      ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
+      ln -s ${nss}/lib/libnss3.so $libdir/libnss3.so.1d
+      ln -s ${nss}/lib/libnssutil3.so $libdir/libnssutil3.so.1d
+      ln -s ${nss}/lib/libsmime3.so $libdir/libsmime3.so.1d
 
       ${if stdenv.system == "x86_64-linux" then ''
-      ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.1.0.0
-      ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0
-      ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so
-      ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so
+      ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
+      ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
+      ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
+      ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
       '' else ''
-      ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
-      ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
-      ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
-      ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
+      ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.0.9.8
+      ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.0.9.8
+      ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so.0d
+      ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so.0d
       ''}
 
       # Work around Spotify trying to open libudev.so.0 (which we don't have)
-      ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0
+      ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.0
 
       mkdir -p $out/bin
 
-      rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.cc.cc}/lib64"
+      rpath="$out/spotify-client/Data:$libdir:$out/spotify-client:${stdenv.cc.cc}/lib64"
 
       ln -s $out/spotify-client/spotify $out/bin/spotify
 
@@ -125,12 +107,8 @@ stdenv.mkDerivation {
         --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath $rpath $out/spotify-client/Data/SpotifyHelper
 
-      dpkg-deb -x ${qt4webkit} ./
-      mkdir -p $out/lib/
-      cp -v usr/lib/*/* $out/lib/
-
       preload=$out/libexec/spotify/libpreload.so
-      librarypath="${stdenv.lib.makeLibraryPath deps}:$out/lib"
+      librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
       mkdir -p $out/libexec/spotify
       gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
 
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index fd9d5e69f48..83ce2fd66fa 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "16wcxrcjwp0qp2xgahhzvcs2k31sr6c9jsxyhivj4famj7a39pfw";
+    sha256 = "07570mi7rjwkkvfzdw1jcbhpkpxpjp69xj7wfzng92rk2gz7yi8m";
   };
 
   buildInputs = [ qt4 jack2 lv2 ];
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index 71a07f18e08..71a07f18e08 100755..100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/flycheck/default.nix b/pkgs/applications/editors/emacs-modes/flycheck/default.nix
new file mode 100644
index 00000000000..98eab4d477c
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/flycheck/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, emacs, let-alist, dash, texinfo }:
+
+stdenv.mkDerivation {
+  name = "flycheck-0.22-64-g90dbc2d";
+
+  src = fetchFromGitHub {
+    owner = "flycheck";
+    repo = "flycheck";
+    rev = "90dbc2d";
+    sha256 = "08bg4jps6hjldbcrvqarrwdv4xzirm5pns5s0331wm0sc47yvbli";
+  };
+
+  buildInputs = [ emacs texinfo ];
+
+  buildPhase = ''
+    emacs -L ${let-alist}/share/emacs/site-lisp -L ${dash}/share/emacs/site-lisp --batch -f batch-byte-compile flycheck.el
+    makeinfo --force --no-split -o doc/flycheck.info doc/flycheck.texi
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp $out/share/info
+    mv flycheck.el flycheck.elc $out/share/emacs/site-lisp/
+    mv "doc/"*.info $out/share/info/
+  '';
+
+  meta = {
+    homepage = "https://github.com/magit/git-modes";
+    description = "Emacs modes for various Git-related files";
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ simons ];
+  };
+}
diff --git a/pkgs/applications/editors/emacs-modes/haskell/git.nix b/pkgs/applications/editors/emacs-modes/haskell/git.nix
index 72f49592b51..20de1cae4d3 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/git.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/git.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo }:
 
 let
-  version = "13.10-299-g74b5a3c";      # git describe --tags
+  version = "13.10-361-gfa09425";      # git describe --tags
 in
 stdenv.mkDerivation {
   name = "haskell-mode-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "haskell";
     repo = "haskell-mode";
     rev = "v${version}";
-    sha256 = "1qjrc1c4jsgbbhnhssvadg00qffn80a8slrxc9g1hnzp632kv8wl";
+    sha256 = "1bq4gddzwjy2w1hbsmwxcamcy87amz7ksy1vmpwg0qij88fk4av9";
   };
 
   buildInputs = [ emacs texinfo ];
diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
new file mode 100644
index 00000000000..863e9f95d95
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "let-alist-1.0.3";
+
+  src = fetchurl {
+    url = "http://elpa.gnu.org/packages/let-alist-1.0.3.el";
+    sha256 = "12n1cmjc7hzyy0jmsdxqz1hqzg4ri4nvvi0p9mw1d6v44xzfm0mx";
+  };
+
+  buildInputs = [ emacs ];
+
+  unpackPhase = "cp -v ${src} let-alist.el";
+  buildPhase = "emacs --batch -f batch-byte-compile let-alist.el";
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp
+    mv -v *.el *.elc $out/share/emacs/site-lisp/
+  '';
+
+  meta = {
+    homepage = "http://elpa.gnu.org/packages/let-alist.html";
+    description = "Easily let-bind values of an assoc-list by their names";
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ simons ];
+  };
+}
diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh
deleted file mode 100644
index c069edb3a6d..00000000000
--- a/pkgs/applications/editors/monodevelop/builder.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-export MONO_GAC_PREFIX=$monodoc:$gtksharp
-
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    moz=$(ls $mozilla/lib/*/libgtkembedmoz.so)
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
-            --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \
-            --suffix MONO_GAC_PREFIX ':' "$monodoc" \
-            --set MOZILLA_FIVE_HOME "$(dirname $moz)"
-    done
-}
-
-genericBuild
-
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index aad6325fa44..737576a1da0 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,26 +1,47 @@
-{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
-, gtkmozembedsharp, monodoc
-, perl, perlXMLParser, pkgconfig
-, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
-, mozilla, makeWrapper
+{stdenv, fetchgit
+, autoconf, automake, pkgconfig, shared_mime_info, intltool
+, glib, mono, gtk-sharp, gnome-sharp
 }:
 
-stdenv.mkDerivation {
-  name = "monodevelop-0.6-pre2315";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://tarballs.nixos.org/monodevelop-0.6-pre2315.tar.bz2;
-    md5 = "8c33df5629b0676b7ab552854c1de6fd";
+stdenv.mkDerivation rec {
+  version = "5.1.4.0";
+  revision = "7d45bbe2ee22625f125d0c52548524f02d005cca";
+  name = "monodevelop-${version}";
+  src = fetchgit {
+    url = https://github.com/mono/monodevelop.git;
+    rev = revision;
+    sha256 = "0qy12zdvb0jiic3pq1w9mcsz2wwxrn0m92abd184q06yg5m48g1b";
   };
 
-  patches = [./prefix.patch];
-  
   buildInputs = [
-    file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
-    glib gtk GConf gnome_vfs libbonobo libglade libgnome
-    gtkmozembedsharp monodoc
+    autoconf automake pkgconfig shared_mime_info intltool
+    mono gtk-sharp gnome-sharp
   ];
-  
-  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper;
+
+  preConfigure = "patchShebangs ./configure";
+  preBuild = ''
+    cat > ./main/buildinfo <<EOF
+    Release ID: ${version}
+    Git revision: ${revision}
+    Build date: 1970-01-01 00:00:01
+    EOF
+  '';
+
+  postInstall = ''
+    for prog in monodevelop mdtool; do
+    patch -p 0 $out/bin/$prog <<EOF
+    2a3,5
+    > export MONO_GAC_PREFIX=${gtk-sharp}:\$MONO_GAC_PREFIX
+    > export PATH=${mono}/bin:\$PATH
+    > export LD_LIBRARY_PATH=${glib}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH
+    > 
+    EOF
+    done
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/applications/editors/monodevelop/prefix.patch b/pkgs/applications/editors/monodevelop/prefix.patch
deleted file mode 100644
index 5ab0b4042dd..00000000000
--- a/pkgs/applications/editors/monodevelop/prefix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -rc MonoDevelop-orig/Makefile.in MonoDevelop/Makefile.in
-*** MonoDevelop-orig/Makefile.in	2005-03-09 17:43:58.000000000 +0100
---- MonoDevelop/Makefile.in	2005-03-09 18:10:20.000000000 +0100
-***************
-*** 298,304 ****
-  # (mkdir ../../build/bin/ hack)
-  SUBDIRS = Core build po Extras
-  bin_SCRIPTS = monodevelop
-! gnome_data = @gnome_prefix@/share
-  desktopdir = $(gnome_data)/applications
-  desktop_DATA = monodevelop.desktop
-  pixmapdir = $(gnome_data)/pixmaps
---- 298,304 ----
-  # (mkdir ../../build/bin/ hack)
-  SUBDIRS = Core build po Extras
-  bin_SCRIPTS = monodevelop
-! gnome_data = @prefix@/share
-  desktopdir = $(gnome_data)/applications
-  desktop_DATA = monodevelop.desktop
-  pixmapdir = $(gnome_data)/pixmaps
-***************
-*** 809,818 ****
-  all:
-  
-  install-data-hook:
-! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  uninstall-hook:
-! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  run: runmd
-  
---- 809,818 ----
-  all:
-  
-  install-data-hook:
-! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  uninstall-hook:
-! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  run: runmd
-  
-Only in MonoDevelop: Makefile.in~
diff --git a/pkgs/applications/editors/monodoc/builder.sh b/pkgs/applications/editors/monodoc/builder.sh
deleted file mode 100644
index bcea7a7a89a..00000000000
--- a/pkgs/applications/editors/monodoc/builder.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
-            --suffix MONO_GAC_PREFIX ':' "$out"
-    done
-}
-
-genericBuild
-
-
diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix
deleted file mode 100644
index 0e8421646a8..00000000000
--- a/pkgs/applications/editors/monodoc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}:
-
-stdenv.mkDerivation {
-  name = "monodoc-1.0.6";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/monodoc-1.0.6.tar.gz;
-    md5 = "f2fc27e8e4717d90dc7efa2450625693";
-  };
-
-  buildInputs = [mono gtksharp pkgconfig];
-
-  inherit gtksharp makeWrapper;
-}
diff --git a/pkgs/applications/editors/tiled-qt/default.nix b/pkgs/applications/editors/tiled/default.nix
index 05020df01a0..92cd5071306 100644
--- a/pkgs/applications/editors/tiled-qt/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt }:
 
 stdenv.mkDerivation rec {
-  name = "tiled-qt-0.9.1";
+  name = "tiled-0.11.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tiled/${name}.tar.gz";
-    sha256 = "09xm6ry56zsqbfl9fvlvc5kq9ikzdskm283r059q6rlc7crzhs38";
+    url = "https://github.com/bjorn/tiled/archive/v0.11.0.tar.gz";
+    sha256 = "03a15vbzjfwc8dpifbjvd0gnr208mzmdkgs2nlc8zq6z0a4h4jqd";
   };
 
   buildInputs = [ qt ];
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 231533e580e..8e36ec9b168 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
-  pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }:
+  pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.4.0";
+  name = "qgis-2.6.1";
 
-  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
-    fcgi libspatialindex libspatialite ];
+  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
+    fcgi libspatialindex libspatialite postgresql ] ++
+    (with pythonPackages; [ numpy psycopg2 ]);
 
-  nativeBuildInputs = [ cmake python ];
+  nativeBuildInputs = [ cmake makeWrapper ];
 
   # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
   #enableParallelBuilding = true;
@@ -20,11 +21,14 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "711b7d81ddff45b083a21f05c8aa5093a6a38a0ee42dfcc873234fcef1fcdd76";
-    
-
+    sha256 = "1avw9mnhrcxsdalqr2yhyif1cacl4dsgcpfc31axkv7vj401djnl";
   };
 
+  postInstall = ''
+    wrapProgram $out/bin/qgis \
+      --prefix PYTHONPATH : $PYTHONPATH
+  '';
+
   meta = {
     description = "User friendly Open Source Geographic Information System";
     homepage = http://www.qgis.org;
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 8ae4bc2dd1b..939b59b8d1c 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -30,10 +30,10 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ImageMagick-${version}";
+  name = "imagemagick-${version}";
 
   src = fetchurl {
-    url = "mirror://imagemagick/releases/${name}.tar.xz";
+    url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz";
     sha256 = "1dmrl5x63msdnxsf4cmhz5v4ard2z3jrgp2zhqlb27399j81qcqj";
   };
 
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index 3e01dc7b2db..17bf7d54670 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -1,11 +1,17 @@
 {stdenv, fetchurl, python, boost, pkgconfig, imagemagick}:
 
-stdenv.mkDerivation {
-  name = "PythonMagick-0.7";
+let
+
+  version = "0.9.11";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "pythonmagick-${version}";
 
   src = fetchurl {
-    url = http://www.imagemagick.org/download/python/PythonMagick-0.7.tar.gz;
-    sha256 = "1553kyzdcysii2qhbpbgs0icmfpm6s2lp3zchgs73cxfnfym8lz1";
+    url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.gz";
+    sha256 = "01z01mlqkk0lvrh2jsmf84qjw29sq4rpj0653x7nqy7mrszwwp2v";
   };
 
   buildInputs = [python boost pkgconfig imagemagick];
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index b067358ea06..2551a985312 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
 lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble, mysql }:
+shared_desktop_ontologies, marble, mysql, libpgf }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-4.4.0";
+  name = "digikam-4.6.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "1sflh3i989f9xi4qym3rzcrx7ahrjf1n9si8c5q05dgm039a4s2w";
+    sha256 = "0id3anikki8c3rzqzapdbg00h577qwybknvkbz1kdq0348bs6ixh";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];
 
   buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
     jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
-    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
+    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql libpgf ];
 
   # Make digikam find some FindXXXX.cmake
   KDEDIRS="${marble}:${qjson}";
diff --git a/pkgs/applications/graphics/f-spot/builder.sh b/pkgs/applications/graphics/f-spot/builder.sh
deleted file mode 100644
index 252c4f91e0c..00000000000
--- a/pkgs/applications/graphics/f-spot/builder.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --prefix PATH ':' "$(dirname $(type -p mono))" \
-            --prefix LD_LIBRARY_PATH ':' "$sqlite/lib" \
-            --prefix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
-            --prefix MONO_GAC_PREFIX ':' "$gtksharp"
-    done
-    
-    # !!! hack
-    export ALL_INPUTS="$out $pkgs"
-
-    find $out -name "*.dll.config" -o -name "*.exe.config" | while read configFile; do
-        echo "modifying config file $configFile"
-        $monoDLLFixer "$configFile"
-    done
-}
-
-genericBuild
diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix
deleted file mode 100644
index 291f0adce58..00000000000
--- a/pkgs/applications/graphics/f-spot/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
-, libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
-, monoDLLFixer
-, makeWrapper
-}:
-
-stdenv.mkDerivation {
-  name = "f-spot-0.0.10";
-
-  builder = ./builder.sh;
-  
-  inherit makeWrapper;
-
-  src = fetchurl {
-    url = http://tarballs.nixos.org/f-spot-0.0.10.tar.bz2;
-    sha256 = "1hgls6hzvxsnk09j9y6hq10qxsc92i864mdg3gk2cimbkbr0mh8b";
-  };
-
-  patches = [./dllmap.patch];
-
-  buildInputs = [
-    perl perlXMLParser pkgconfig mono libexif
-    libgnome libgnomeui gtksharp libjpeg sqlite
-    lcms libgphoto2
-  ];
-
-  inherit monoDLLFixer gtksharp sqlite libgnomeui;
-
-  meta = {
-    homepage = http://f-spot.org;
-  };
-}
diff --git a/pkgs/applications/graphics/f-spot/dllmap.patch b/pkgs/applications/graphics/f-spot/dllmap.patch
deleted file mode 100644
index 956c75c0d23..00000000000
--- a/pkgs/applications/graphics/f-spot/dllmap.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rc f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config
-*** f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-02-27 19:25:09.000000000 +0100
---- f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-03-11 12:13:12.000000000 +0100
-***************
-*** 1,3 ****
-  <configuration>
-!   <dllmap dll="libgphoto2.so" target="/usr/lib/libgphoto2.so.2"/>
-  </configuration>
---- 1,3 ----
-  <configuration>
-!   <dllmap dll="libgphoto2.so" target="libgphoto2.so.2"/>
-  </configuration>
-diff -rc f-spot-0.0.10-orig/src/f-spot.exe.config.in f-spot-0.0.10/src/f-spot.exe.config.in
-*** f-spot-0.0.10-orig/src/f-spot.exe.config.in	2005-02-27 18:03:02.000000000 +0100
---- f-spot-0.0.10/src/f-spot.exe.config.in	2005-03-11 12:48:03.000000000 +0100
-***************
-*** 9,13 ****
-    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
-    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
-    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
-!   <dllmap dll="libexif.dll" target="libexif.so.@EXIF_SOVERSION@"/>
-  </configuration>
---- 9,13 ----
-    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
-    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
-    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
-!   <dllmap dll="libexif.dll" target="libexif.so"/>
-  </configuration>
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index e40a5fd0630..bd77446b1ec 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng
-, libXinerama, curl }:
+, libXinerama, curl, libexif }:
 
 stdenv.mkDerivation rec {
   name = "feh-2.12";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0ckhidmsms2l5jycp0qf71jzmb3bpbhjq3bcgfpvfvszah7pmq30";
   };
 
-  buildInputs = [makeWrapper x11 imlib2 libjpeg libpng libXinerama curl];
+  buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ];
 
   preBuild = ''
-    makeFlags="PREFIX=$out"
+    makeFlags="PREFIX=$out exif=1"
   '';
 
   postInstall = ''
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
new file mode 100644
index 00000000000..eaaf047c9bb
--- /dev/null
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -0,0 +1,28 @@
+/*
+To use aditional parts libraries
+set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
+*/
+
+{ stdenv, fetchsvn, qt4, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "leocad-${version}";
+  version = "0.81";
+
+  src = fetchsvn {
+    url = "http://svn.leocad.org/tags/${name}";
+    sha256 = "1190gb437ls51hhfiwa79fq131026kywpy3j3k4fkdgfr8a9v3q8";
+  };
+
+  buildInputs = [ qt4 zlib ];
+
+  prefixKey="INSTALL_PREFIX=";
+  configureScript = "qmake leocad.pro";
+
+  meta = with stdenv.lib; {
+    description = "CAD program for creating virtual LEGO models";
+    homepage = http://www.leocad.org/;
+    license = licenses.gpl2;
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index a82dafb516e..d3caed5abe8 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://github.com/muennich/sxiv.git";
-    rev = "6216bf6c2d42be63025d29550831d9f4447f4066";
-    sha256 = "e25e19cf073cc2621656e50d2c31cc59cc0fc200716f96c765374568a26977f1";
+    rev = "92e3b57816e999b46f8d0778984719227631e9a7";
+    sha256 = "0jbswh0k1xq5hgrv1pyvk7lpwbbj66p7gjsdm8zh6ah324apjr2b";
   };
 
   postUnpack = ''
diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix
new file mode 100644
index 00000000000..fb5a46fbc63
--- /dev/null
+++ b/pkgs/applications/kde-apps-14.12/default.nix
@@ -0,0 +1,265 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ autonix, kde4, kf55, pkgs, qt4, stdenv, debug ? false }:
+
+with stdenv.lib; with autonix;
+
+let
+
+  kf5 = kf55.override { inherit debug; };
+
+  mirror = "mirror://kde";
+
+  renames =
+    (builtins.removeAttrs
+      (import ./renames.nix {})
+      ["Backend" "CTest"])
+    // {
+      "KDE4" = "kdelibs";
+      "Kexiv2" = "libkexiv2";
+      "Kdcraw" = "libkdcraw";
+      "Kipi" = "libkipi";
+      "LibKMahjongg" = "libkmahjongg";
+      "LibKonq" = "kde-baseapps";
+    };
+
+  scope =
+    # packages in this collection
+    (mapAttrs (dep: name: kdeApps."${name}") renames) //
+    # packages from KDE Frameworks 5
+    kf5.scope //
+    # packages from nixpkgs
+    (with pkgs;
+      {
+        ACL = acl;
+        Akonadi = kde4.akonadi;
+        Alsa = alsaLib;
+        Automoc4 = automoc4;
+        Avahi = avahi;
+        BISON = bison;
+        Baloo = kde4.baloo;
+        Boost = boost156;
+        Canberra = libcanberra;
+        Cdparanoia = cdparanoia;
+        CUPS = cups;
+        DBusMenuQt = libdbusmenu_qt;
+        DjVuLibre = djvulibre;
+        ENCHANT = enchant;
+        EPub = ebook_tools;
+        Eigen2 = eigen2;
+        Eigen3 = eigen;
+        Exiv2 = exiv2;
+        FAM = fam;
+        FFmpeg = ffmpeg;
+        Flac = flac;
+        FLEX = flex;
+        Freetype = freetype;
+        GMP = gmp;
+        Gettext = gettext;
+        Gpgme = gpgme;
+        Gphoto2 = libgphoto2;
+        Grantlee = grantlee;
+        GSL = gsl;
+        HUNSPELL = hunspell;
+        HUpnp = herqq;
+        Jasper = jasper;
+        KActivities = kde4.kactivities;
+        LCMS2 = lcms2;
+        Ldap = openldap;
+        LibAttica = attica;
+        LibGcrypt = libgcrypt;
+        LibSSH = libssh;
+        LibSpectre = libspectre;
+        LibVNCServer = libvncserver;
+        Libical = libical;
+        MusicBrainz3 = libmusicbrainz;
+        NetworkManager = networkmanager;
+        OggVorbis = libvorbis;
+        OpenAL = openal;
+        OpenEXR = openexr;
+        Poppler = poppler.poppler_qt4;
+        Prison = prison;
+        PulseAudio = pulseaudio;
+        PythonLibrary = python;
+        Qalculate = libqalculate;
+        QCA2 = qca2;
+        QImageBlitz = qimageblitz;
+        QJSON = qjson;
+        Qt4 = qt4;
+        Samba = samba;
+        Sasl2 = cyrus_sasl;
+        SharedDesktopOntologies = shared_desktop_ontologies;
+        SndFile = libsndfile;
+        Speechd = speechd;
+        TIFF = libtiff;
+        Taglib = taglib;
+        TelepathyQt4 = telepathy_qt;
+        TunePimp = libtunepimp;
+        UDev = udev;
+        USB = libusb;
+        Xscreensaver = xscreensaver;
+        Xsltproc = libxslt;
+      }
+    );
+
+  preResolve = super:
+    fold (f: x: f x) super
+      [
+        (userEnvPkg "SharedMimeInfo")
+        (userEnvPkg "SharedDesktopOntologies")
+        (blacklist ["artikulate"]) # build failure, wrong boost?
+        (blacklist ["kde-dev-scripts" "kde-dev-utils"]) # docbook errors
+        (blacklist ["kdewebdev"]) # unknown build failure
+      ];
+
+  postResolve = super:
+    super // {
+
+      ark = with pkgs; super.ark // {
+        buildInputs = (super.ark.buildInputs or []) ++ [ makeWrapper ];
+        postInstall = ''
+          wrapProgram $out/bin/ark --prefix PATH : "${unzipNLS}/bin"
+        '';
+      };
+
+      ffmpegthumbs = with pkgs; super.ffmpegthumbs // {
+        nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
+      };
+
+      kalzium = with pkgs; super.kalzium // {
+        nativeBuildInputs = super.kalzium.nativeBuildInputs ++ [pkgconfig];
+      };
+
+      kde-runtime = with pkgs; super.kde-runtime // {
+        buildInputs =
+          super.kde-runtime.buildInputs ++ [libcanberra];
+        nativeBuildInputs =
+          super.kde-runtime.nativeBuildInputs ++ [pkgconfig];
+        NIX_CFLAGS_COMPILE =
+          (super.kde-runtime.NIX_CFLAGS_COMPILE or "")
+          + " -I${ilmbase}/include/OpenEXR";
+      };
+
+      kde-workspace = with pkgs; super.kde-workspace // {
+        buildInputs = with xlibs;
+          super.kde-workspace.buildInputs
+          ++
+          [
+            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms
+            xcbutilrenderutil
+          ];
+        nativeBuildInputs =
+          super.kde-workspace.nativeBuildInputs
+          ++ [ pkgconfig ];
+      };
+
+      kdelibs = with pkgs; super.kdelibs // {
+        buildInputs =
+          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz ];
+
+        nativeBuildInputs =
+          super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];
+
+        NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+        propagatedBuildInputs =
+          super.kdelibs.propagatedBuildInputs ++ [ qt4 soprano phonon strigi ];
+
+        propagatedNativeBuildInputs =
+          super.kdelibs.propagatedNativeBuildInputs
+          ++ [ automoc4 cmake perl shared_mime_info ];
+
+        patches = [ ./kdelibs/polkit-install.patch ];
+
+        cmakeFlags = [
+          "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+          "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+          "-DHUPNP_ENABLED=ON"
+          "-DWITH_SOLID_UDISKS2=ON"
+        ];
+      };
+
+      kdepim = with pkgs; super.kdepim // {
+        buildInputs =
+          super.kdepim.buildInputs ++ [ gpgme libassuan ];
+        nativeBuildInputs =
+          super.kdepim.nativeBuildInputs ++ [ pkgconfig ];
+      };
+
+      kdepimlibs = with pkgs; super.kdepimlibs // {
+        nativeBuildInputs =
+          super.kdepimlibs.nativeBuildInputs ++ [ pkgconfig ];
+      };
+
+      kdesdk-thumbnailers = with pkgs; super.kdesdk-thumbnailers // {
+        nativeBuildInputs =
+          super.kdesdk-thumbnailers.nativeBuildInputs
+          ++ [gettext];
+      };
+
+      kgpg = with pkgs; super.kgpg // {
+        buildInputs = super.kgpg.buildInputs ++ [boost];
+      };
+
+      kmix = with pkgs; super.kmix // {
+        nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
+        cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
+      };
+
+      kmousetool = with pkgs; super.kmousetool // {
+        buildInputs = with xlibs;
+          super.kmousetool.buildInputs
+          ++ [libXtst libXt];
+      };
+
+      kremotecontrol = with pkgs; super.kremotecontrol // {
+        buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst];
+      };
+
+      krfb = with pkgs; super.krfb // {
+        buildInputs =
+          super.krfb.buildInputs
+          ++ [xlibs.libXtst kde4.telepathy.common_internals];
+      };
+
+      libkdcraw = with pkgs; super.libkdcraw // {
+        buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
+        nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];
+      };
+
+      libkexiv2 = with pkgs; super.libkexiv2 // {
+        buildInputs = super.libkexiv2.buildInputs ++ [exiv2 scope.KDE4];
+      };
+
+      libkface = with pkgs; super.libkface // {
+        buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
+      };
+
+      libkipi = with pkgs; super.libkipi // {
+        buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
+      };
+
+      libksane = with pkgs; super.libksane // {
+        buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
+      };
+
+    };
+
+  kdeApps = generateCollection ./. {
+    inherit (kf5) mkDerivation;
+    inherit mirror preResolve postResolve renames scope;
+  };
+
+in kdeApps
diff --git a/pkgs/applications/kde-apps-14.12/dependencies.nix b/pkgs/applications/kde-apps-14.12/dependencies.nix
new file mode 100644
index 00000000000..a32fc688828
--- /dev/null
+++ b/pkgs/applications/kde-apps-14.12/dependencies.nix
@@ -0,0 +1,1676 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+  amor = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  analitza = {
+    buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5OpenGL" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ark = {
+    buildInputs = [ "BZip2" "KDE4" "LibArchive" "LibKonq" "LibLZMA" "QJSON" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  artikulate = {
+    buildInputs = [ "KDE4" "KDeclarative" "QtGStreamer" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  audiocd-kio = {
+    buildInputs = [ "Cdparanoia" "Flac" "KDE4" "Libkcddb" "Libkcompactdisc" "OggVorbis" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  blinken = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  bomber = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  bovo = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  cantor = {
+    buildInputs = [ "Analitza" "KDE4" "LibSpectre" "LuaJIT" "PythonLibs" "Qalculate" "R" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  cervisia = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  dolphin-plugins = {
+    buildInputs = [ "KDE4" "LibKonq" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  dragon = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ffmpegthumbs = {
+    buildInputs = [ "FFmpeg" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  filelight = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  granatier = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  gwenview = {
+    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KIO" "Kdcraw" "Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  jovie = {
+    buildInputs = [ "KDE4" "Qt4" "Speechd" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  juk = {
+    buildInputs = [ "KDE4" "Taglib" "TunePimp" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kaccessible = {
+    buildInputs = [ "KDE4" "Qt4" "Speechd" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kajongg = {
+    buildInputs = [ "KDE4" "Twisted" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kalgebra = {
+    buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5WebKitWidgets" "Readline" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kalzium = {
+    buildInputs = [ "KDE4" "KDEWIN32" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kamera = {
+    buildInputs = [ "Gphoto2" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kanagram = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kapman = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kapptemplate = {
+    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Widgets" ];
+    nativeBuildInputs = [ "RBKCONFIG_COMPILER4" "RBUIC4" "XSLTPROC_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kate = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5ItemModels" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5OPTIONAL_COMPONENTS" "KF5Parts" "KF5Plasma" "KF5Service" "KF5TextEditor" "KF5ThreadWeaver" "KF5Wallet" "KF5WindowSystem" "KF5XmlGui" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "SIP" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  katomic = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kblackbox = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kblocks = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbounce = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbreakout = {
+    buildInputs = [ "KDE4" "KDEGames" "KDeclarative" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbruch = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcachegrind = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcalc = {
+    buildInputs = [ "GMP" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcharselect = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcolorchooser = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcron = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-base-artwork = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-baseapps = {
+    buildInputs = [ "Baloo" "BalooWidgets" "GLIB2" "KActivities" "KDE4" "KFileMetaData" "LibTidy" "X11" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-dev-scripts = {
+    buildInputs = [ "ECM" "KDE4" "KF5DocTools" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-dev-utils = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ar = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-bg = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-bs = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ca = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ca_valencia = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-cs = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-da = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-de = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-el = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-en_gb = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-es = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-et = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-eu = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-fa = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-fi = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-fr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ga = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-gl = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-he = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-hi = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-hr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-hu = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ia = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-id = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-is = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-it = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ja = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-kk = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-km = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ko = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-lt = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-lv = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-mr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-nb = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-nds = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-nl = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-nn = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-pa = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-pl = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-pt = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-pt_br = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ro = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ru = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-sk = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-sl = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-sr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-sv = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-tr = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-ug = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-uk = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-wa = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-zh_cn = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-l10n-zh_tw = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-runtime = {
+    buildInputs = [ "Alsa" "BZip2" "Exiv2" "GLIB2" "Gpgme" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "LibAttica" "LibGcrypt" "LibLZMA" "LibSSH" "NepomukCore" "NetworkManager" "OpenEXR" "PulseAudio" "QCA2" "QGpgme" "QNtrack" "SLP" "Samba" "SharedMimeInfo" "Soprano" ];
+    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "WINDRES_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kde-wallpapers = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-workspace = {
+    buildInputs = [ "Akonadi" "Boost" "DBusMenuQt" "Fontconfig" "Freetype" "GLIB2" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "NepomukCore" "OpenGL" "OpenGLES" "PCIUTILS" "PNG" "Prison" "PythonLibrary" "QImageBlitz" "QJSON" "Qalculate" "Qt4" "RAW1394" "Sensors" "Soprano" "Strigi" "UDev" "USB" "Wayland" "X11" "X11_XCB" "XCB" "Xmms" "ZLIB" "libgps" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeartwork = {
+    buildInputs = [ "Eigen3" "KDE4" "KDE4Workspace" "Kexiv2" "OpenGL" "Xscreensaver" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeedu-data = {
+    buildInputs = [ "ECM" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdegraphics-mobipocket = {
+    buildInputs = [ "KDE4" "Strigi" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdegraphics-strigi-analyzer = {
+    buildInputs = [ "KDE4" "OpenEXR" "Strigi" "TIFF" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdegraphics-thumbnailers = {
+    buildInputs = [ "KDE4" "Kdcraw" "Kexiv2" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdelibs = {
+    buildInputs = [ "ACL" "AGG" "ASPELL" "Automoc4" "Avahi" "BZip2" "Blitz" "BlueZ" "Carbon" "DBusMenuQt" "DNSSD" "DocBookXML" "DocBookXSL" "ENCHANT" "Eigen2" "FAM" "FFmpeg" "Flac" "Flex" "GIF" "GObject" "GSSAPI" "GStreamer" "Grantlee" "HSPELL" "HUNSPELL" "HUpnp" "IOKit" "JPEG" "Jasper" "KDE4" "KDE4Internal" "LCMS" "LibArt" "LibAttica" "LibXml2" "Libintl" "OpenEXR" "OpenSSL" "PCRE" "PNG" "QCA2" "QImageBlitz" "Qt4" "SharedDesktopOntologies" "SharedMimeInfo" "Soprano" "Sqlite" "Strigi" "UDev" "USB" "Xine" "Xmms" "ZLIB" ];
+    nativeBuildInputs = [ "BISON" "FLEX" "LibXslt" "Perl" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kdenetwork-filesharing = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdenetwork-strigi-analyzers = {
+    buildInputs = [ "Boost" "KDE4" "Strigi" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdepim = {
+    buildInputs = [ "Akonadi" "Baloo" "Boost" "Git" "Grantlee" "KDE4" "KdepimLibs" "LibKGAPI2" "Prison" "QGpgme" "QJSON" "Sasl2" "Xsltproc" "ZLIB" ];
+    nativeBuildInputs = [ "DBLATEX_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdepim-runtime = {
+    buildInputs = [ "AccountsQt" "Akonadi" "Boost" "KDE4" "KdepimLibs" "LibKFbAPI" "LibKGAPI2" "Libkolab" "Libkolabxml" "QJSON" "Qt4" "Sasl2" "SharedMimeInfo" "SignOnQt" "Xsltproc" ];
+    nativeBuildInputs = [ "_testrunner" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kdepimlibs = {
+    buildInputs = [ "Akonadi" "Boost" "Gpgme" "KDE4" "Ldap" "LibXml2" "Libical" "Prison" "QJSON" "Sasl2" "SharedMimeInfo" "Xsltproc" ];
+    nativeBuildInputs = [ "LibXslt" "PERL_EXECUTABLE" "_testrunner" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kdesdk-kioslaves = {
+    buildInputs = [ "KDE4" "SVN" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesdk-strigi-analyzers = {
+    buildInputs = [ "KDE4" "Strigi" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesdk-thumbnailers = {
+    buildInputs = [ "GettextPO" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdewebdev = {
+    buildInputs = [ "KDE4" "KdepimLibs" "LibTidy" "RUBY" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdf = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdiamond = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kfloppy = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kfourinline = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kgamma = {
+    buildInputs = [ "KDE4" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kgeography = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kget = {
+    buildInputs = [ "Boost" "KDE4" "KDE4Workspace" "KTorrent" "LibMms" "NepomukCore" "NepomukWidgets" "QCA2" "QGpgme" "SharedDesktopOntologies" "Soprano" "Sqlite" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kgoldrunner = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kgpg = {
+    buildInputs = [ "Gpgme" "KDE4" "KdepimLibs" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khangman = {
+    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kig = {
+    buildInputs = [ "BoostPython" "ECM" "KF5Archive" "KF5ConfigWidgets" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5IconThemes" "KF5ItemModels" "KF5KDELibs4Support" "KF5Parts" "KF5TextEditor" "KF5XmlGui" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kigo = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  killbots = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kiriki = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kiten = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjumpingcube = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  klettres = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  klickety = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  klines = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmag = {
+    buildInputs = [ "KDE4" "QAccessibilityClient" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmahjongg = {
+    buildInputs = [ "KDE4" "KDEGames" "LibKMahjongg" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmines = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmix = {
+    buildInputs = [ "Alsa" "Canberra" "ECM" "GLIB2" "KDE4" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5XmlGui" "Phonon" "PulseAudio" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmousetool = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmouth = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmplot = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knavalbattle = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knetwalk = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kolf = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kollision = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kolourpaint = {
+    buildInputs = [ "KDE4" "QImageBlitz" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kompare = {
+    buildInputs = [ "KDE4" "LibKompareDiff2" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  konquest = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  konsole = {
+    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Konq" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kopete = {
+    buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kpat = {
+    buildInputs = [ "KDE4" "KDEGames" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kppp = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kqtquickcharts = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  krdc = {
+    buildInputs = [ "KDE4" "LibNXCL" "LibVNCServer" "TelepathyQt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kremotecontrol = {
+    buildInputs = [ "KDE4" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kreversi = {
+    buildInputs = [ "KDE4" "KDEGames" "KDeclarative" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  krfb = {
+    buildInputs = [ "KDE4" "KTp" "LibVNCServer" "TelepathyQt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kruler = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksaneplugin = {
+    buildInputs = [ "KDE4" "KSane" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kscd = {
+    buildInputs = [ "Alsa" "KDE4" "MusicBrainz3" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kshisen = {
+    buildInputs = [ "KDE4" "KDEGames" "LibKMahjongg" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksirk = {
+    buildInputs = [ "KDE4" "KDEGames" "QCA2" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksnakeduel = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksnapshot = {
+    buildInputs = [ "KDE4" "Kipi" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kspaceduel = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksquares = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kstars = {
+    buildInputs = [ "AstrometryNet" "CFitsio" "Eigen3" "INDI" "KDE4" "OpenGL" "PyKDE4" "QJSON" "WCSLIB" "Xplanet" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksudoku = {
+    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksystemlog = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kteatime = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktimer = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktouch = {
+    buildInputs = [ "KDE4" "KDeclarative" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktuberling = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kturtle = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktux = {
+    buildInputs = [ "KDE4" "KDE4Workspace" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kubrick = {
+    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kuser = {
+    buildInputs = [ "KDE4" "KdepimLibs" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwalletmanager = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwordquiz = {
+    buildInputs = [ "KDE4" "LibKdeEdu" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkcddb = {
+    buildInputs = [ "KDE4" "MusicBrainz5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkcompactdisc = {
+    buildInputs = [ "Alsa" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkdcraw = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkdeedu = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkdegames = {
+    buildInputs = [ "KDE4" "KDeclarative" "OpenAL" "SndFile" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkeduvocdocument = {
+    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkexiv2 = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkface = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkipi = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkmahjongg = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkomparediff2 = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libksane = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  lokalize = {
+    buildInputs = [ "HUNSPELL" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  lskat = {
+    buildInputs = [ "KDE4" "KDEGames" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  marble = {
+    buildInputs = [ "KDE4" "Phonon" "Protobuf" "PyQt4" "PythonLibrary" "QextSerialPort" "Qt4" "Qt5Concurrent" "Qt5Core" "Qt5Designer" "Qt5Network" "Qt5PrintSupport" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" "QtLocation" "SIP" "SharedMimeInfo" "ZLIB" "libgps" "liblocation" "libshp" "libwlocate" "quazip" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  mplayerthumbs = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  okteta = {
+    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "QCA2" "Qt5" "Qt5Test" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  okular = {
+    buildInputs = [ "ActiveApp" "CHM" "DjVuLibre" "EPub" "Freetype" "JPEG" "KActivities" "KDE4" "Kexiv2" "LibKScreen" "LibSpectre" "Poppler" "QCA2" "QImageBlitz" "QMobipocket" "TIFF" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  oxygen-icons = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  pairs = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  palapeli = {
+    buildInputs = [ "KDE4" "KDEGames" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "QVORONOI_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  parley = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  picmi = {
+    buildInputs = [ "KDE4" "KDEGames" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  poxml = {
+    buildInputs = [ "Gettext" "GettextPO" "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  print-manager = {
+    buildInputs = [ "CUPS" "KDE4" "KDE4Internal" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  rocs = {
+    buildInputs = [ "Boost" "Grantlee" "KDE4" "Qt4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  step = {
+    buildInputs = [ "Eigen2" "GSL" "KDE4" "Qalculate" "Qt4" ];
+    nativeBuildInputs = [ "PythonInterp" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  superkaramba = {
+    buildInputs = [ "KDE4" "PythonLibs" "QImageBlitz" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  svgpart = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  sweeper = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  umbrello = {
+    buildInputs = [ "KDE4" "LibXml2" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  zeroconf-ioslave = {
+    buildInputs = [ "KDE4" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+}
diff --git a/pkgs/applications/kde-apps-14.12/dependencies.sh b/pkgs/applications/kde-apps-14.12/dependencies.sh
new file mode 100755
index 00000000000..e00c7770ab8
--- /dev/null
+++ b/pkgs/applications/kde-apps-14.12/dependencies.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch
new file mode 100644
index 00000000000..d2ecac663ec
--- /dev/null
+++ b/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
+ 
+-    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
++    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
+         "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/applications/kde-apps-14.12/manifest.nix b/pkgs/applications/kde-apps-14.12/manifest.nix
new file mode 100644
index 00000000000..6751af8858e
--- /dev/null
+++ b/pkgs/applications/kde-apps-14.12/manifest.nix
@@ -0,0 +1,1258 @@
+# This file is generated automatically. DO NOT EDIT!
+{ mirror }:
+[
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/pairs-14.12.1.tar.xz";
+    sha256 = "13byliibd6fwa8bsgka8hc64jkprmgsnqh9sks36w7ic22f32qhx";
+    name = "pairs-14.12.1.tar.xz";
+    store = "/nix/store/fsaycjsmkm1g92j3syc2a8nwdgfgs99g-pairs-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kgamma-14.12.1.tar.xz";
+    sha256 = "1ad2c1l2lbc2pdybavnnj834ww82rbm91k0wjgz25xc3l3gkrg9i";
+    name = "kgamma-14.12.1.tar.xz";
+    store = "/nix/store/4ggxl3vnlngg1p6irixa42as7gyp3c8k-kgamma-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ktux-14.12.1.tar.xz";
+    sha256 = "00x5jm26w1a214chdg1fkzki1z3h1dbw5qagal4lkcb98fi5sbcq";
+    name = "ktux-14.12.1.tar.xz";
+    store = "/nix/store/n68cvnv9h371cx7q5jqfqs2bdj1rqvyi-ktux-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/analitza-14.12.1.tar.xz";
+    sha256 = "0jgmjda5n5935v37jgaichk5hif67mzlyvxqmr19wwmbiqfbazx8";
+    name = "analitza-14.12.1.tar.xz";
+    store = "/nix/store/n8ayxw5rwzlyc015ff1lzwnd2wa3ss4x-analitza-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kubrick-14.12.1.tar.xz";
+    sha256 = "0c2ixhd3763pzy92z1ck638wggmq3h4jvnax5ralfhhvn9r2f5bj";
+    name = "kubrick-14.12.1.tar.xz";
+    store = "/nix/store/hz00x8miy3gw4gm2ylw0v90d8xnxxqml-kubrick-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ksirk-14.12.1.tar.xz";
+    sha256 = "1sdd117xhn9jclqiczh1cr8apy0akwncmbj82gwm7i1qx31i55fx";
+    name = "ksirk-14.12.1.tar.xz";
+    store = "/nix/store/fv5vdi5m80l7hzkhkidyk5rd1srghl8x-ksirk-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/katomic-14.12.1.tar.xz";
+    sha256 = "1mjzm4v80cva7kfakjpjkd4sw4fdcyin5f2srck7fl0pnqdpnhqz";
+    name = "katomic-14.12.1.tar.xz";
+    store = "/nix/store/9wa79ygill8gb5n281cybrmj4zv627h9-katomic-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/jovie-14.12.1.tar.xz";
+    sha256 = "1xkmybfgn6mbrp6lx8ri0dzmz1nsvg9cxlxan4n5bzwd3zjpycjd";
+    name = "jovie-14.12.1.tar.xz";
+    store = "/nix/store/w4b045lmp2viqrvifkm11n282l5khwbd-jovie-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdeartwork-14.12.1.tar.xz";
+    sha256 = "0jrdyy787wnqx31nrgmf7amhy5ix9w7anfnqrdn4w8yydpvghhqw";
+    name = "kdeartwork-14.12.1.tar.xz";
+    store = "/nix/store/ky4vpsb0mm22raiq0r6jfxjsdr5c0vmv-kdeartwork-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kapman-14.12.1.tar.xz";
+    sha256 = "0bkpcjdcax6b3dp236ybaakpxz5b1vkrmmxpczvg6hf2cqwmlsv5";
+    name = "kapman-14.12.1.tar.xz";
+    store = "/nix/store/l5xwmjgcw6rbmmhy2m5z55hxcf9d12hv-kapman-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkomparediff2-14.12.1.tar.xz";
+    sha256 = "0fjqsa83sqd7gcpm818yirnm077g6q616rh9676dzwv0cmc334zx";
+    name = "libkomparediff2-14.12.1.tar.xz";
+    store = "/nix/store/aixz1c1q6rnpqxm805xdirlqg47kw1kr-libkomparediff2-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-wallpapers-14.12.1.tar.xz";
+    sha256 = "1q28rb8a4rw6v5wvwri3aslc8xwbn0324b07lnkvn58alpmdga8v";
+    name = "kde-wallpapers-14.12.1.tar.xz";
+    store = "/nix/store/kx7kv61rc3ddz7gmm5k5cwp9zh3k70nk-kde-wallpapers-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ark-14.12.1.tar.xz";
+    sha256 = "1fimg9f4l373l31kr59fvvsavssvn3ljdrxrgnl6a66v1gwgjsdp";
+    name = "ark-14.12.1.tar.xz";
+    store = "/nix/store/c21hgh72czi1nqr3lci8lynvsd3qkvzh-ark-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdesdk-thumbnailers-14.12.1.tar.xz";
+    sha256 = "1p3abcnidk07jgr9qn03zfnhqci27683gz25wy271v6gl7b0wp6c";
+    name = "kdesdk-thumbnailers-14.12.1.tar.xz";
+    store = "/nix/store/b867ygwgvr9g8j54s3gya7c2wpr9gwf8-kdesdk-thumbnailers-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-wa-14.12.1.tar.xz";
+    sha256 = "0aq5n0n0saqkllkwpf9a5scjpsv4bxzx89z2a048kh76i8h9zr5p";
+    name = "kde-l10n-wa-14.12.1.tar.xz";
+    store = "/nix/store/hp6x10injwcygbd5zqvkkg2k85n62drw-kde-l10n-wa-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-it-14.12.1.tar.xz";
+    sha256 = "13z9gmaziyvw112phzxc7893lz6wh8q92gb3fj3hmdmzj0vfqv4r";
+    name = "kde-l10n-it-14.12.1.tar.xz";
+    store = "/nix/store/j8x84jy2x4fw72a2mj7zgzkbd2v430np-kde-l10n-it-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-km-14.12.1.tar.xz";
+    sha256 = "0fdns3fifr4ypz5mi798xc18miwlb7lqz22f18gnrza22vnzwi09";
+    name = "kde-l10n-km-14.12.1.tar.xz";
+    store = "/nix/store/yccjbanz6ijsf5rdd0n53cwygbv5jm4m-kde-l10n-km-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt-14.12.1.tar.xz";
+    sha256 = "13pzz23zf9nnl3a65nrpmwlpnkvr490vfs7yfvvr5w0nrqfwzhp6";
+    name = "kde-l10n-pt-14.12.1.tar.xz";
+    store = "/nix/store/mzfjypmyhmp3s7mnxk0mwf57s3l440c2-kde-l10n-pt-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ru-14.12.1.tar.xz";
+    sha256 = "1a5ygssdwkm9iqakl1w4pza70g1gwh7mzi6jzhbd4jsn740ykw0r";
+    name = "kde-l10n-ru-14.12.1.tar.xz";
+    store = "/nix/store/pjdp04f6m3ghqr23lyzxw7w0fgg5i6ll-kde-l10n-ru-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-de-14.12.1.tar.xz";
+    sha256 = "1iavp7xr2qv8i97sl1kpl9kasi21br91l3mdah382ayhaz5khnlb";
+    name = "kde-l10n-de-14.12.1.tar.xz";
+    store = "/nix/store/4j1r5xz2fslwv0di0dn9x8n49hrxizg4-kde-l10n-de-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-uk-14.12.1.tar.xz";
+    sha256 = "1228lpwggkwz9rwnmrmrw4f72hcbng40g1q1bfhjzw078s7j6nxr";
+    name = "kde-l10n-uk-14.12.1.tar.xz";
+    store = "/nix/store/dz1zi3jrw92cgci5zc8nia3xzq1zykdf-kde-l10n-uk-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ja-14.12.1.tar.xz";
+    sha256 = "191whr3i7qkqj2wjzjqgagb1vs391x9sp688w56ynjjmh58vrvq1";
+    name = "kde-l10n-ja-14.12.1.tar.xz";
+    store = "/nix/store/ylf7xmqdh9yrz37yaq4f8nddap1gfanc-kde-l10n-ja-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-kk-14.12.1.tar.xz";
+    sha256 = "01ivq7g550i9ik18xnibn7xl5mmm237wrsksjm0xni18s89wwz8b";
+    name = "kde-l10n-kk-14.12.1.tar.xz";
+    store = "/nix/store/b6n06i5p82k6fq4p4rpl7bf0cyklazxb-kde-l10n-kk-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pl-14.12.1.tar.xz";
+    sha256 = "0ni41lp6l4l3pa1xf6kkim2k5qcvapm2g65nh5hryiwx9dpgkimv";
+    name = "kde-l10n-pl-14.12.1.tar.xz";
+    store = "/nix/store/ysarksjh5lcm2yhbphrsqhyzmlp6qclr-kde-l10n-pl-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sv-14.12.1.tar.xz";
+    sha256 = "1r84629cv7c0lkfxii0q133cl710rgiqp5iylb3w32h7c1ji4x19";
+    name = "kde-l10n-sv-14.12.1.tar.xz";
+    store = "/nix/store/zpq7ayj7ihr1xw4ihcnckqvnagl28lk0-kde-l10n-sv-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca-14.12.1.tar.xz";
+    sha256 = "1xprgp7l1h7wkfjh6v3yya9xw3r60vhsyk3ly38vcwxy5b6fjigd";
+    name = "kde-l10n-ca-14.12.1.tar.xz";
+    store = "/nix/store/g5pcas9cz1yq6qz9883l2djfpb77li8a-kde-l10n-ca-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-da-14.12.1.tar.xz";
+    sha256 = "0b38wgm8f23l9ya9h67m6zm785fmqi7737xfphjmrjh2i13gxpbl";
+    name = "kde-l10n-da-14.12.1.tar.xz";
+    store = "/nix/store/v6hb004qp3i0p4vp1yslnmz4clb66p8d-kde-l10n-da-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-he-14.12.1.tar.xz";
+    sha256 = "0ynvsrczdraf55gaiwbv9nzwy548zkkbdh475frqfmalzh9b7jww";
+    name = "kde-l10n-he-14.12.1.tar.xz";
+    store = "/nix/store/33f2k043b8gi64mr4wwrs6pwp5b9bq7h-kde-l10n-he-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lv-14.12.1.tar.xz";
+    sha256 = "0x3rlallirrzgn8gfyssyvaj3zaji672n6hfacp2djpfzbfwqq6l";
+    name = "kde-l10n-lv-14.12.1.tar.xz";
+    store = "/nix/store/7hlk5vyd3pl9rdp22ybsj868w6s7sfz0-kde-l10n-lv-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hu-14.12.1.tar.xz";
+    sha256 = "061kyzz24f6bink3sm4p7q959977ril3m86lm8fa1ddnccw7ya46";
+    name = "kde-l10n-hu-14.12.1.tar.xz";
+    store = "/nix/store/b2v25j4hlsl7lqb77wk7sj1j5z9q7ldm-kde-l10n-hu-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sr-14.12.1.tar.xz";
+    sha256 = "16kcpilb4mp4cfgklc4dr6y389hlmzvwx8wp0y3i2w1r18nwd8m8";
+    name = "kde-l10n-sr-14.12.1.tar.xz";
+    store = "/nix/store/8a3pmbwm8k7g951yi5d3mv57y9vxn84z-kde-l10n-sr-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-is-14.12.1.tar.xz";
+    sha256 = "14r5wrkr39cipx40hqqcx12cvv0vql829689yiy97ypcg4bqndma";
+    name = "kde-l10n-is-14.12.1.tar.xz";
+    store = "/nix/store/l4fy9j1aix7fyisan5f2pa4273misph2-kde-l10n-is-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-mr-14.12.1.tar.xz";
+    sha256 = "1nvaxd38c4f9kkhkrv4bb1aczi1iv1bp16kmm47s1y6kzb93zq9h";
+    name = "kde-l10n-mr-14.12.1.tar.xz";
+    store = "/nix/store/vk6fz8gixl7wv6w20h4inn984839lkkk-kde-l10n-mr-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-gl-14.12.1.tar.xz";
+    sha256 = "1xjh19c7rjd5k3v3c7g0ljz1kz5vv3zhji4rm84j30z12cks3nhh";
+    name = "kde-l10n-gl-14.12.1.tar.xz";
+    store = "/nix/store/0f4agkrcrb1cn6sdgdpj1bwln6f2ra5i-kde-l10n-gl-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-cs-14.12.1.tar.xz";
+    sha256 = "1qg9y5173374fpf6yk4v8mlsqdjzp8inirp08qx0lh33jd6rpddb";
+    name = "kde-l10n-cs-14.12.1.tar.xz";
+    store = "/nix/store/3nk8pxfypvnwbcszm33fn3j7f0kmgdji-kde-l10n-cs-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-en_GB-14.12.1.tar.xz";
+    sha256 = "04b7amh2247ksr414m3x7bc4p22xm6kxncsax9ggapx613flb2zc";
+    name = "kde-l10n-en_GB-14.12.1.tar.xz";
+    store = "/nix/store/i5vsmw062i49ki35qqyi0ix6x5fl4jvg-kde-l10n-en_GB-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sk-14.12.1.tar.xz";
+    sha256 = "0ic2y081699mv16hpkb3ivdvd4ph51wz3md5bz65pfz404gn7krf";
+    name = "kde-l10n-sk-14.12.1.tar.xz";
+    store = "/nix/store/p2jc4kci6k5kn1ihy9yv5inp4p4g01n9-kde-l10n-sk-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ga-14.12.1.tar.xz";
+    sha256 = "0794p0dqa1nnkwwc2ipslzhaakcx3r4b6s03hf7m14r58wmvws28";
+    name = "kde-l10n-ga-14.12.1.tar.xz";
+    store = "/nix/store/4kbdmqqmv1slh4z56rifg8sw0a9980m4-kde-l10n-ga-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sl-14.12.1.tar.xz";
+    sha256 = "0nv2yrk99dkvb49ww6l6za0czy89p1nsilm56f4mdgbvrgzwk9zp";
+    name = "kde-l10n-sl-14.12.1.tar.xz";
+    store = "/nix/store/hdyxfm2wnigh8wb3ay8y8v7psjrbijy7-kde-l10n-sl-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nb-14.12.1.tar.xz";
+    sha256 = "0zj66ydg5pwlx3hwwdxz6i8m330wz0w2l2p4fvf4kjvy49cafrmd";
+    name = "kde-l10n-nb-14.12.1.tar.xz";
+    store = "/nix/store/ln3d7jpln9kl947fhgknbhg0rh6lnxds-kde-l10n-nb-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ko-14.12.1.tar.xz";
+    sha256 = "08q0d0q2cm2bmdwwmyavzb07wlbnf5lpl071gjm146kzk0y1kmpg";
+    name = "kde-l10n-ko-14.12.1.tar.xz";
+    store = "/nix/store/vw8kpmpiyrrqch5wb4164yv0jhkdkpkk-kde-l10n-ko-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ro-14.12.1.tar.xz";
+    sha256 = "0xprq9jw94i38aaq1drkv1qpgf3rf75745zlagzb430jr1a285lb";
+    name = "kde-l10n-ro-14.12.1.tar.xz";
+    store = "/nix/store/87kmgghdnkmzvdbk611qmv2nav8m2f0p-kde-l10n-ro-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ug-14.12.1.tar.xz";
+    sha256 = "1am6yr3qq4l2wgpphxhqfj8ydndvjxmc3cl4gz6zlkddaw4pv5kr";
+    name = "kde-l10n-ug-14.12.1.tar.xz";
+    store = "/nix/store/h8wfla9jsbhfjvjfnca6yjwpcc90nb5m-kde-l10n-ug-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hr-14.12.1.tar.xz";
+    sha256 = "0hjhzf77mckh9xqqxn54w47lsn3fwl2p4rfk22ijlliglrylpajv";
+    name = "kde-l10n-hr-14.12.1.tar.xz";
+    store = "/nix/store/mja592hds8ajqsx96wb1zxph1n0pxqb0-kde-l10n-hr-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pa-14.12.1.tar.xz";
+    sha256 = "0sr6pygs0lk1ar2zn6966ngaf9vjfy207i1bgg6gr3559v5wkx8x";
+    name = "kde-l10n-pa-14.12.1.tar.xz";
+    store = "/nix/store/9vay8airc00fg0d91lpp84l21akqxn27-kde-l10n-pa-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-id-14.12.1.tar.xz";
+    sha256 = "018yvdp7l9qjaj7niyjas87dhna1xr0mikpdycw5dbwchpizlr53";
+    name = "kde-l10n-id-14.12.1.tar.xz";
+    store = "/nix/store/sx4w67x5xq87ragvsysg4jwcpvrk674p-kde-l10n-id-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bs-14.12.1.tar.xz";
+    sha256 = "0ybh9wyhym05rlc3s0kl9lh07y96nyl3p4lifj13lcqi975mgnp9";
+    name = "kde-l10n-bs-14.12.1.tar.xz";
+    store = "/nix/store/l9cx18xxg7ly9nrsfi1lj9vxzg19h9sq-kde-l10n-bs-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt_BR-14.12.1.tar.xz";
+    sha256 = "1wbgns7pq0jxjffgvr6hgfg3san1k2c7wppsvn2cpjiph0v4azz9";
+    name = "kde-l10n-pt_BR-14.12.1.tar.xz";
+    store = "/nix/store/59bsq0cq07hc9apbfdmaa66jg5n8wlwg-kde-l10n-pt_BR-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bg-14.12.1.tar.xz";
+    sha256 = "0m404hxz8dskbdsni021703vdn4lvwpf88hwrdrfnhcv06jazjiq";
+    name = "kde-l10n-bg-14.12.1.tar.xz";
+    store = "/nix/store/9xiaf2c0lbxy65vrx6hdh884ky6h2s79-kde-l10n-bg-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nds-14.12.1.tar.xz";
+    sha256 = "09r79l4ngcsnya6kqj5hj69xq00bf4ndxgkkplwiq137zqamqcfl";
+    name = "kde-l10n-nds-14.12.1.tar.xz";
+    store = "/nix/store/m8ahg0qxpv2hskl9dl7dgch10adxfia5-kde-l10n-nds-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_TW-14.12.1.tar.xz";
+    sha256 = "1azwmzg47pk4b23hpnpic3c8phnfz4iy3n6lv50sz98b9whkmf0s";
+    name = "kde-l10n-zh_TW-14.12.1.tar.xz";
+    store = "/nix/store/mq5v891rzj692h61aak71g71iy963ayw-kde-l10n-zh_TW-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nn-14.12.1.tar.xz";
+    sha256 = "1xp44glwk6nnnavw0lrl7ssl5miqfd7b093chfz35g2g92nyaa3g";
+    name = "kde-l10n-nn-14.12.1.tar.xz";
+    store = "/nix/store/gprdva58d383n4ka677pdbpaz8l05w8i-kde-l10n-nn-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ia-14.12.1.tar.xz";
+    sha256 = "1kjjg4z4y0fh4kyzy9vzxlw47xkiirh207d7x0b94nksxzbqwg67";
+    name = "kde-l10n-ia-14.12.1.tar.xz";
+    store = "/nix/store/jhv6zy04igavcq0dxsg9kk3vfh2063m9-kde-l10n-ia-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-tr-14.12.1.tar.xz";
+    sha256 = "1kdxps75gv2vlf98f958llkk161z2y908bg1fdq4rgdh1n3bylkh";
+    name = "kde-l10n-tr-14.12.1.tar.xz";
+    store = "/nix/store/hy0v61dnnmpbj84a4imvgxqx3y0fd5qg-kde-l10n-tr-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ar-14.12.1.tar.xz";
+    sha256 = "121dblyh53fb3qirg7s9givqcn0xswdj2hrnqc8s2x2qas74v6a9";
+    name = "kde-l10n-ar-14.12.1.tar.xz";
+    store = "/nix/store/jmjbgfmqvcqd1sxdj0a7c73a9yqyzvpz-kde-l10n-ar-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_CN-14.12.1.tar.xz";
+    sha256 = "0cyi0g55xln8smnlnhl0vfpi0jrihnfp3vrv6j2gz30zzfgkw9dp";
+    name = "kde-l10n-zh_CN-14.12.1.tar.xz";
+    store = "/nix/store/b9dqgb7nsfgyzhr4vw7fnl287spyjigg-kde-l10n-zh_CN-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-es-14.12.1.tar.xz";
+    sha256 = "11i4xmsigmi9mqbc5x9l96vsrfh6709fbbfpqa6b28a5jif9anmr";
+    name = "kde-l10n-es-14.12.1.tar.xz";
+    store = "/nix/store/0ycvh7sgyhjqffzq5ff5mjnv0y4f8pxy-kde-l10n-es-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-et-14.12.1.tar.xz";
+    sha256 = "0c8vhbi1bi29krh1sway8z0536cn507i1lp8jffb4mk953mm5y9n";
+    name = "kde-l10n-et-14.12.1.tar.xz";
+    store = "/nix/store/9rbki0767k1hirpx7530lqcw74bfy2b1-kde-l10n-et-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fr-14.12.1.tar.xz";
+    sha256 = "1s2glywjbrr2q6ssmalblschrgny4rk3q3aws2ffrrlkanx0qyva";
+    name = "kde-l10n-fr-14.12.1.tar.xz";
+    store = "/nix/store/pq8r37pcg05p9rc5prcy9r2f5mby7m0z-kde-l10n-fr-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fa-14.12.1.tar.xz";
+    sha256 = "0pj3klcdlash8wgvz75nw009jz63rblv038yhrh1qsidjw4vsl85";
+    name = "kde-l10n-fa-14.12.1.tar.xz";
+    store = "/nix/store/k0amn3lcd7xcssqh8fs46swa9jmksv9x-kde-l10n-fa-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lt-14.12.1.tar.xz";
+    sha256 = "0k4m1ixlnmmgbznhgvbmfss0c1fynd492sylcvbsrnqcawq3fqdz";
+    name = "kde-l10n-lt-14.12.1.tar.xz";
+    store = "/nix/store/cqbsi6sr0mcl3pnzlk0w52disg2xgm1i-kde-l10n-lt-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nl-14.12.1.tar.xz";
+    sha256 = "0m0hwib0v5j2bmgkgwjzhbhqnyk8gcm46969rr2qf51snrvynlax";
+    name = "kde-l10n-nl-14.12.1.tar.xz";
+    store = "/nix/store/8pw7v2ccr5vgl6ic7dnlm5xcqgkbvxyr-kde-l10n-nl-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-eu-14.12.1.tar.xz";
+    sha256 = "0wcax8gnnk6rwpfl6ph8z5i013rmh08pr159nxpakdsvbcn5ma5v";
+    name = "kde-l10n-eu-14.12.1.tar.xz";
+    store = "/nix/store/vplfymrx36jk65b0xjmzh2g4l9ky7dfm-kde-l10n-eu-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca@valencia-14.12.1.tar.xz";
+    sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq";
+    name = "kde-l10n-ca_valencia-14.12.1.tar.xz";
+    store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-el-14.12.1.tar.xz";
+    sha256 = "022kr5cvlz8hxj3s74my680ghp23lj8amykzgr5z9i996q2hs6ps";
+    name = "kde-l10n-el-14.12.1.tar.xz";
+    store = "/nix/store/p9a3lyi934i4pc5p8433firhkcs0ybn3-kde-l10n-el-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fi-14.12.1.tar.xz";
+    sha256 = "1sxs5z3dkx7hb8l7ilrhzvl2ip02fsb24iqgh0gadqwdfj46gwjn";
+    name = "kde-l10n-fi-14.12.1.tar.xz";
+    store = "/nix/store/9f3cb3yksriwphrnkmn1knrq0108ka4p-kde-l10n-fi-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hi-14.12.1.tar.xz";
+    sha256 = "0a5ilahwh6wpxg4mb3wqg079qfvcxg7zqblwyx6mdwh4d2ly5y1f";
+    name = "kde-l10n-hi-14.12.1.tar.xz";
+    store = "/nix/store/pfswxr29nz9qylmb7n83cnap95khz248-kde-l10n-hi-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/granatier-14.12.1.tar.xz";
+    sha256 = "0lifihkssp0g30kv3iigbpr9ghdwwykmzfiv4qwsxaxadil9qqlm";
+    name = "granatier-14.12.1.tar.xz";
+    store = "/nix/store/ychwcs2gn4mgmhza315nmf2z35c0ibb7-granatier-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kamera-14.12.1.tar.xz";
+    sha256 = "1avmsy622rnyyvsx9zwspqx9g4mb5wzc74mvcjrivi3c3mcz2ng6";
+    name = "kamera-14.12.1.tar.xz";
+    store = "/nix/store/c1n1s1hbj8q4smgxnd4kka9qidh0rvvw-kamera-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kfloppy-14.12.1.tar.xz";
+    sha256 = "1ky8n0zk07d3cnap8f3zw5qck2kw4l0dql0fnbk3s58r982af2fd";
+    name = "kfloppy-14.12.1.tar.xz";
+    store = "/nix/store/bl5csvnm20xxaqz5p7d3ymnkbd0df1p1-kfloppy-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdepimlibs-4.14.4.tar.xz";
+    sha256 = "04c53ms91r8bpxgn305zzvagi30jli7217kvgdy4z4il6wnvns8r";
+    name = "kdepimlibs-4.14.4.tar.xz";
+    store = "/nix/store/v157pqk6clf9yn21cdbvxxvh0sn892rd-kdepimlibs-4.14.4.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkipi-14.12.1.tar.xz";
+    sha256 = "01bpjh40p5cwli018sgyn6jgis1l83icikabcw6vxkp8vsn3q6yg";
+    name = "libkipi-14.12.1.tar.xz";
+    store = "/nix/store/7amx4gdg85lw28amb0v3nd92hk71lphs-libkipi-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/khangman-14.12.1.tar.xz";
+    sha256 = "1574cdbq5lyq4hl84xwia5z15az4zzh6zvasxvaa5bz94cjkpyns";
+    name = "khangman-14.12.1.tar.xz";
+    store = "/nix/store/jyx0msd02v7iikj7czv3y8ckw79rahpa-khangman-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/konsole-14.12.1.tar.xz";
+    sha256 = "0i7mccspglppz0sx2zqfn0861h6ibxkwrcscivqk7yxpq44nb58j";
+    name = "konsole-14.12.1.tar.xz";
+    store = "/nix/store/0wy6dhhq6gn6h58vi324yiqa2f5ni5py-konsole-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/killbots-14.12.1.tar.xz";
+    sha256 = "0i006gjysfbf9wn0qgbv47fvx8z4v49ikcaqg9y83pl72shnsa1j";
+    name = "killbots-14.12.1.tar.xz";
+    store = "/nix/store/yg7gb0aidvcxh4i1z0ja8nvs23vhdf22-killbots-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kturtle-14.12.1.tar.xz";
+    sha256 = "0sn74w413xx5y3kh0fqf7f47pklz4v22nnv6x11kpkcyx1xmghh9";
+    name = "kturtle-14.12.1.tar.xz";
+    store = "/nix/store/s16w00cgm430r315d2v2a041hivc5a1q-kturtle-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kajongg-14.12.1.tar.xz";
+    sha256 = "0690jlsnj3s2l51nmx3an75q0m6xv0rssdmshrmbxgp2cqx5b455";
+    name = "kajongg-14.12.1.tar.xz";
+    store = "/nix/store/j2qlvd878dlxkaps9v61dw9k1n6nmh4p-kajongg-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/bomber-14.12.1.tar.xz";
+    sha256 = "0g4cb3jwva9saddf9m2j4k3y1gybh2bv8dxzfb1xqy5cv20qlrfc";
+    name = "bomber-14.12.1.tar.xz";
+    store = "/nix/store/8v0k2n5pkvv6wg3q957zqclasmsw2a7c-bomber-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kruler-14.12.1.tar.xz";
+    sha256 = "0rag54kg5jzgj32fnf4xmawb0hnk52rhjf7i2y5f3156x3iraxxx";
+    name = "kruler-14.12.1.tar.xz";
+    store = "/nix/store/c61iqdbq71kb6wvnzfq7436hni8anrrn-kruler-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kmag-14.12.1.tar.xz";
+    sha256 = "1wlz3n3z9qcsqvs7rz3a76bh6rkrq0g9p797axcsfp7wzjfilj5c";
+    name = "kmag-14.12.1.tar.xz";
+    store = "/nix/store/r2c1gika9sw2m5i1mmj3b47n7g19715k-kmag-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kwalletmanager-14.12.1.tar.xz";
+    sha256 = "16pd2iym8v9xxdmazn2i7vq61c9m805h9a7awy8wha8bfdinazvi";
+    name = "kwalletmanager-14.12.1.tar.xz";
+    store = "/nix/store/rqrykz2vvj59w1563dgcjpi8fmkwdnm5-kwalletmanager-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/krfb-14.12.1.tar.xz";
+    sha256 = "15kxapi1mwjpbj995k8rxla0h1wwvhd406pbwkpak3a9szljsv72";
+    name = "krfb-14.12.1.tar.xz";
+    store = "/nix/store/x147kkpbjm9mmdbapxs040cvb8fci9ab-krfb-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkcddb-14.12.1.tar.xz";
+    sha256 = "1vb8rmb1j0nh2dh8ch19v1qpdxhc4c0am7k11lld45kamg3az0gd";
+    name = "libkcddb-14.12.1.tar.xz";
+    store = "/nix/store/ar6s1pn0lfgs1iw6q5akr0l5dcrd1x2a-libkcddb-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/klettres-14.12.1.tar.xz";
+    sha256 = "1bj5s3js6v3641s2kgrl6a5bgr25g9lgbvsfzqrp0pil2nx1g6h1";
+    name = "klettres-14.12.1.tar.xz";
+    store = "/nix/store/dbf3r79p85w5v6jihmqndcb631kqpb7m-klettres-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/klines-14.12.1.tar.xz";
+    sha256 = "1hxjqpc1z47dj1ryp116hdzkla4h1awnlmyzq7yjhki2viw32n3f";
+    name = "klines-14.12.1.tar.xz";
+    store = "/nix/store/xwj5di67f0swj1w0c2235vrbany8ffgn-klines-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ksystemlog-14.12.1.tar.xz";
+    sha256 = "15a92f873vybp3m9icjshbqs8nl6xm4cl9ca3cghmdlcqrn7f92x";
+    name = "ksystemlog-14.12.1.tar.xz";
+    store = "/nix/store/aj1drn165rirvr5wjmqfnzsfknnb32gj-ksystemlog-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/klickety-14.12.1.tar.xz";
+    sha256 = "071y9khz57mrw12dvwxhs03jn56j06hw38hcf8d4r4wksbwr3j87";
+    name = "klickety-14.12.1.tar.xz";
+    store = "/nix/store/y8p216blw2zrld7mj5c1ji9nwqhrbqsf-klickety-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/lokalize-14.12.1.tar.xz";
+    sha256 = "1ala2pfqh0a0kqxiyfpp11rcn805g6gcn0m9qjbmdqhl9wviij9h";
+    name = "lokalize-14.12.1.tar.xz";
+    store = "/nix/store/5c1isv8y9s4k7153i5y41jdps6zsp8gl-lokalize-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-thumbnailers-14.12.1.tar.xz";
+    sha256 = "198m7iw621azbcp4abv3izq5p29yz9s2apr6ivxpp1iqzpz2x70g";
+    name = "kdegraphics-thumbnailers-14.12.1.tar.xz";
+    store = "/nix/store/d315k9787k4c5ww7zp0341cybnwwsy2j-kdegraphics-thumbnailers-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-base-artwork-14.12.1.tar.xz";
+    sha256 = "0zd298ii8a3lnfh6lxgw6nmf91kx3days1nqk5arilkbrf7b4952";
+    name = "kde-base-artwork-14.12.1.tar.xz";
+    store = "/nix/store/6v8hm7rgdvfkvakv1jfq3g7jk3zq7x3z-kde-base-artwork-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/artikulate-14.12.1.tar.xz";
+    sha256 = "021hyprapc6fjhls55yn69sndm13krfriwj1vmq5mvqxzr0aid2k";
+    name = "artikulate-14.12.1.tar.xz";
+    store = "/nix/store/xaibvsd6g0xnwpnayb0jxhah9hmb3xin-artikulate-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kaccessible-14.12.1.tar.xz";
+    sha256 = "0gp49jxkscdqd35xqmzhr17smiwyxgx8xbr7hkvbm10dzn9kx6x7";
+    name = "kaccessible-14.12.1.tar.xz";
+    store = "/nix/store/s6j8nymsygqkh4vfgkgqwcg6xigda53d-kaccessible-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/konquest-14.12.1.tar.xz";
+    sha256 = "006an4bpfsnzcpm086xjyryd1xlzw0yz2knbzkvsdf3jr9kpmnrr";
+    name = "konquest-14.12.1.tar.xz";
+    store = "/nix/store/wxk5v878fibdxxd9m9f6phyc99a56psc-konquest-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/superkaramba-14.12.1.tar.xz";
+    sha256 = "10dlnn4knlvkz38c98613x9px85a8dhlfwpp4231r3v5va03xszj";
+    name = "superkaramba-14.12.1.tar.xz";
+    store = "/nix/store/p3yhp4gg9pfbmnlb6jqk6xhaz2yllx9w-superkaramba-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdesdk-kioslaves-14.12.1.tar.xz";
+    sha256 = "06f8xxzldsqmch9acmfd95lr48rm94d6qll62bj5zi0bs5qjygbw";
+    name = "kdesdk-kioslaves-14.12.1.tar.xz";
+    store = "/nix/store/ga54jhkjav5i83vmir8j6l51d3gv1cs1-kdesdk-kioslaves-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/cantor-14.12.1.tar.xz";
+    sha256 = "100yscp21w7amqmwzh4zsk7kmyn5pf3swlkwipz857wi3wajkm75";
+    name = "cantor-14.12.1.tar.xz";
+    store = "/nix/store/xhdgix591fkzqdzw0pch0vv8wk2kkhz5-cantor-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-mobipocket-14.12.1.tar.xz";
+    sha256 = "0qa0bpfvgbq3x3wlgi1cp3v8xn1wayyjrc07ffdr63w1gfi10mg1";
+    name = "kdegraphics-mobipocket-14.12.1.tar.xz";
+    store = "/nix/store/pvk5701kz79m2bn13n45ffwy0zjng838-kdegraphics-mobipocket-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-runtime-14.12.1.tar.xz";
+    sha256 = "0cy2dhxw2cvbgqrknb3iy97rip2dcd7nrq3pj649mpq9a3r3cg17";
+    name = "kde-runtime-14.12.1.tar.xz";
+    store = "/nix/store/yd2zzjmb762dkjbkhjxdsnbg38k53f65-kde-runtime-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kiriki-14.12.1.tar.xz";
+    sha256 = "00j95hcyrnw2li2abkwqsd0dp8ph4wlqzy0d3gzfnkal19j2x2m2";
+    name = "kiriki-14.12.1.tar.xz";
+    store = "/nix/store/hxk0628k5s042wcxwd1v7vy951bsjqxp-kiriki-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kwordquiz-14.12.1.tar.xz";
+    sha256 = "1c03ab89lnnin81lvq3mbcw2d10k3rjlk2fpplcbbnsryq35bivi";
+    name = "kwordquiz-14.12.1.tar.xz";
+    store = "/nix/store/6a5bi2hpxmry12zq6qkwk2hzlv5h7qkz-kwordquiz-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kate-14.12.1.tar.xz";
+    sha256 = "0c3diy846drf5nihvhzhpsp8pl2kviyn6ian61myy2147smkany5";
+    name = "kate-14.12.1.tar.xz";
+    store = "/nix/store/ykssldwmik1x7njph3rmzh9d14n7f0mi-kate-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/parley-14.12.1.tar.xz";
+    sha256 = "0awzpa9bl1j9gzy3596dhpsg3pqbmmdh87n52z7cjyk8sw0ikk19";
+    name = "parley-14.12.1.tar.xz";
+    store = "/nix/store/3k84f0vl6l7l65hmbbdlfp2zg348kcmi-parley-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkdegames-14.12.1.tar.xz";
+    sha256 = "0af15lbsjc7w5p3s3nxsb08cvyg7dncjmpw7z1vhgqykzmwpyp56";
+    name = "libkdegames-14.12.1.tar.xz";
+    store = "/nix/store/clfp83sn2pg1jr82j79szwkx0aysl9a3-libkdegames-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkcompactdisc-14.12.1.tar.xz";
+    sha256 = "10zpv05wmqs1lrby95d5bgvwiqcmkd3ndrdsr6cpayg2lw9nq86d";
+    name = "libkcompactdisc-14.12.1.tar.xz";
+    store = "/nix/store/ghjddljclnsn3z0rflrrxanbkzxn46m5-libkcompactdisc-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kmplot-14.12.1.tar.xz";
+    sha256 = "0p0iv3m2648vyr1imzwdfs73rc2q39nl8r7w31z5dhm65rq2zi27";
+    name = "kmplot-14.12.1.tar.xz";
+    store = "/nix/store/k78l2m24w71dbczia8bnwi3fhpqghj6b-kmplot-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kuser-14.12.1.tar.xz";
+    sha256 = "1zgik2i9z0n58m3fm8g0kgjm9aqa6v1f3331r8nrjir9vd9vr8g7";
+    name = "kuser-14.12.1.tar.xz";
+    store = "/nix/store/lpdpdbbbgfyib95cq1m1db5fdym6wjxz-kuser-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kspaceduel-14.12.1.tar.xz";
+    sha256 = "1zihp0nc6gs4xymyykldjw22zrxm8qznjaya4z1fw07hwndijvia";
+    name = "kspaceduel-14.12.1.tar.xz";
+    store = "/nix/store/p1lzq3dbil7klabykd2995j65qwqfldd-kspaceduel-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/gwenview-14.12.1.tar.xz";
+    sha256 = "04g3qkz1g27ph6ha1zrbqpr827vhx9n2nigr0dy95a61qw1m0jww";
+    name = "gwenview-14.12.1.tar.xz";
+    store = "/nix/store/agnpfa5vjjfq79j3x2nf3nfwvvxjl28i-gwenview-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/oxygen-icons-14.12.1.tar.xz";
+    sha256 = "1z27id29s98h20dg27wr28w2qpb25ii1xsrgjk6r33nhj2y39jmg";
+    name = "oxygen-icons-14.12.1.tar.xz";
+    store = "/nix/store/wfnbykydc5zl9d678mpw7hpc1nscynmg-oxygen-icons-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kppp-14.12.1.tar.xz";
+    sha256 = "0lvcanlskjgra2wn3k1j5jx9vy5k0g381ycg79fazkczsr8is5wf";
+    name = "kppp-14.12.1.tar.xz";
+    store = "/nix/store/q4fxwbxh1rl3icjzhcyij7wwbchc0xzn-kppp-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kmouth-14.12.1.tar.xz";
+    sha256 = "0a3fhlgy8z84n83v59safl71v29px9783dndlqgh1dk8lmki7dmd";
+    name = "kmouth-14.12.1.tar.xz";
+    store = "/nix/store/9ny33z3srhnwz8p9fd7i6klmm9y9j08k-kmouth-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kig-14.12.1.tar.xz";
+    sha256 = "0qs89kpms9ch2r9xj4scvjscn7b7bh5k1nxaln1z654mgp1rl4f8";
+    name = "kig-14.12.1.tar.xz";
+    store = "/nix/store/iwj5hwmm9p278b7yi510fh38710w96rr-kig-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkexiv2-14.12.1.tar.xz";
+    sha256 = "0qpfccasra3ffq5iz7dpxpzcyk13ywjdaz32n1wfsylfv158w9sg";
+    name = "libkexiv2-14.12.1.tar.xz";
+    store = "/nix/store/z8w5hn03zzpbpg7mjdmykylcbvhcd2ac-libkexiv2-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kcron-14.12.1.tar.xz";
+    sha256 = "0czcxajsdx7xal9cvy9cd4drhvaivx68mhymj5k3n90cka7qda2x";
+    name = "kcron-14.12.1.tar.xz";
+    store = "/nix/store/ixgf55ccq4gyyazhnbrrrg1qhpgh048s-kcron-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ksnapshot-14.12.1.tar.xz";
+    sha256 = "02g48b3i7xglrgp1nxvpbsrq7kqg81s4mf6k9rhfn312n45g1arg";
+    name = "ksnapshot-14.12.1.tar.xz";
+    store = "/nix/store/vjc105v5nsibh4pfvrvsjck78f2645lx-ksnapshot-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/marble-14.12.1.tar.xz";
+    sha256 = "13plghz8d5a8gdkq3nr7m0bvp2p0smqnj987bmsi1cldvliwiijl";
+    name = "marble-14.12.1.tar.xz";
+    store = "/nix/store/543lrxwg6zz77yz58ihn3dvf9rhy3xzg-marble-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kpat-14.12.1.tar.xz";
+    sha256 = "02bh34553r7k0vf7sb5nsr6zgmh1xfgyjfyfc22yvknpmz2zz8wb";
+    name = "kpat-14.12.1.tar.xz";
+    store = "/nix/store/2ssmxyy2vhlipyrh6cs5qgms20cicmhy-kpat-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/poxml-14.12.1.tar.xz";
+    sha256 = "1r0iqqszmqmjnkq41xv87sc601fm8s94ga9pn37alni7f7qddfrs";
+    name = "poxml-14.12.1.tar.xz";
+    store = "/nix/store/n8504ljfha2rq1r0lrpz0gyyh59rpjln-poxml-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/umbrello-14.12.1.tar.xz";
+    sha256 = "0kr60kdfg2pl049n4rkksfs6160jijxdwymx60gj44h8w2dxrx6c";
+    name = "umbrello-14.12.1.tar.xz";
+    store = "/nix/store/m7ia6872rxwbpx88zidqanf1wqni1az6-umbrello-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/krdc-14.12.1.tar.xz";
+    sha256 = "0jqq60spxb64m9y37q2wd7w1z3h0c0hcjvd6wi694v0zhblg5622";
+    name = "krdc-14.12.1.tar.xz";
+    store = "/nix/store/qlj342akja4fh4yp2fib4v4bm3kn2bmg-krdc-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ktimer-14.12.1.tar.xz";
+    sha256 = "1p4y1kx3w6rqwjnhpjx17246w8gp7l8q2212x7khs8karnfyvxh2";
+    name = "ktimer-14.12.1.tar.xz";
+    store = "/nix/store/39r333hqffzycjszw3wbash4p8cs4vrc-ktimer-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kremotecontrol-14.12.1.tar.xz";
+    sha256 = "0rvf73bj6l7cgbjcpn2bgy00zpdw4sj5zcchgl42xldl75zzr6mc";
+    name = "kremotecontrol-14.12.1.tar.xz";
+    store = "/nix/store/p9al8bnc7cy61ccnbmw5vzbvg36rq3yl-kremotecontrol-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-dev-utils-14.12.1.tar.xz";
+    sha256 = "1wpiarm8h4y5yjrdrxkmndps06h08vql70n63aai8crdvgwixdqy";
+    name = "kde-dev-utils-14.12.1.tar.xz";
+    store = "/nix/store/qsdvwqqp7pwbh2vdi5p3w56snysf94f8-kde-dev-utils-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/knavalbattle-14.12.1.tar.xz";
+    sha256 = "1jd4b2kmlknh1xz055xysasfs90810m8sg4iwyzqv2j5kj8i4x4l";
+    name = "knavalbattle-14.12.1.tar.xz";
+    store = "/nix/store/6ic12j8bm99jckl82p347717mrhl5v6r-knavalbattle-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libksane-14.12.1.tar.xz";
+    sha256 = "0a4hp2d0h26nkggmkiswywlw0aj5wkk8c6s9wy2h7m7qcmyq4gk0";
+    name = "libksane-14.12.1.tar.xz";
+    store = "/nix/store/72jv9b0id1ql2pbz8vdcm77n7s7br3vk-libksane-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkdcraw-14.12.1.tar.xz";
+    sha256 = "0svalln7g862d6f5k76vdggqc1h1x9gagm6v56yzr9dypz81y40m";
+    name = "libkdcraw-14.12.1.tar.xz";
+    store = "/nix/store/j4y0bpk9zir6270cmxmfxn10bphgbdw8-libkdcraw-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/blinken-14.12.1.tar.xz";
+    sha256 = "1fvgq57qhx305qxmhzm628p283dyk9nnp33q5vgcxxfw726mi5pq";
+    name = "blinken-14.12.1.tar.xz";
+    store = "/nix/store/xl2fn6zcfr99ir7l10y8dd79ns4msgyp-blinken-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/step-14.12.1.tar.xz";
+    sha256 = "15wlgig9b932ck1hwdld0q8nh74rh820wj4nc6ifys83wv43jnzh";
+    name = "step-14.12.1.tar.xz";
+    store = "/nix/store/1v6hadh7m1i58hc62c6z2qs2ycsi02rw-step-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+    sha256 = "03lajpwia7fmlnr9l0g44knwghz8b2i70i659nkvypw6qd89cccr";
+    name = "kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+    store = "/nix/store/0invqcgsx7scwmihagccpgdfq3aa52w8-kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-baseapps-14.12.1.tar.xz";
+    sha256 = "0l31842mmriirkcqsdmj7s31yjwr5im8di7z7dfjgjqy0j1q1jzc";
+    name = "kde-baseapps-14.12.1.tar.xz";
+    store = "/nix/store/rjsmd2babmjdbwvr5n5gv1f9wcag4iln-kde-baseapps-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-dev-scripts-14.12.1.tar.xz";
+    sha256 = "0g3i26vm3n2jc69mpwy94b60ff9c6fsr4yrl1h4f3408f4g4sjj4";
+    name = "kde-dev-scripts-14.12.1.tar.xz";
+    store = "/nix/store/h2hcdrv66b95ajbj5wrz1aspq4fr85pd-kde-dev-scripts-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kollision-14.12.1.tar.xz";
+    sha256 = "1l2c34l95kj4f8y156yirc35vfb2yblnkkjq1bfkmiavsb6vzhd5";
+    name = "kollision-14.12.1.tar.xz";
+    store = "/nix/store/8kf7fxqm2avmamkdidsglx7rvl30cj1n-kollision-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kgoldrunner-14.12.1.tar.xz";
+    sha256 = "0sgr2034mr5gmmg81qp9sqjw2sn2cgdw8bl9dq2iid43czih5zbw";
+    name = "kgoldrunner-14.12.1.tar.xz";
+    store = "/nix/store/82jk65vx3xpg2ydn3fzg6v2w07xgihhc-kgoldrunner-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kolf-14.12.1.tar.xz";
+    sha256 = "0arxis9q9qzbv35qq52pl4j5xzqhdwypjhxwdiqammqksdnln8lw";
+    name = "kolf-14.12.1.tar.xz";
+    store = "/nix/store/y7m9zzkm4wz23myj568sdjpn86f6m4iy-kolf-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/okular-14.12.1.tar.xz";
+    sha256 = "1my3d91lm6wz8gh9g7pw4rrdxkc22vr9v02b22qqvxb2z8mdq5cb";
+    name = "okular-14.12.1.tar.xz";
+    store = "/nix/store/8ipl9g3hgm04x1xpvyy8ahlbvjq6birx-okular-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkmahjongg-14.12.1.tar.xz";
+    sha256 = "00s4akfgr33n1bg2bds1fxccnig9hybm95qq95ii6ky4jyjc6b78";
+    name = "libkmahjongg-14.12.1.tar.xz";
+    store = "/nix/store/jl34m0f1m497dpwnmmw2svy9ig9x7x5q-libkmahjongg-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kbreakout-14.12.1.tar.xz";
+    sha256 = "1cvqjch9ymjii7xmlg1clscbv6245m5bnf77dxz6nkzsrcy4khbx";
+    name = "kbreakout-14.12.1.tar.xz";
+    store = "/nix/store/ab28gj1xwh9calkkf87xqnh84x8cjq08-kbreakout-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kgpg-14.12.1.tar.xz";
+    sha256 = "0cfhmlp200dbhdkckf7xvfbfsz985zw7vp6vin4w378dzyw55lmb";
+    name = "kgpg-14.12.1.tar.xz";
+    store = "/nix/store/8bfm6nbnd3clpdy108yab44vv7552c1i-kgpg-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kscd-14.12.1.tar.xz";
+    sha256 = "0ag9i649ah627b5xsacvz1q05pijfrbwrg34bpcc61px9zsgk18l";
+    name = "kscd-14.12.1.tar.xz";
+    store = "/nix/store/lfsycaw8n7kjsbnkga24cfqmpr0rpff8-kscd-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kcalc-14.12.1.tar.xz";
+    sha256 = "0qsfllwhn1gd675k5fxbfcfflnn86cbh3nzn70bc2lmxmwrlzbj2";
+    name = "kcalc-14.12.1.tar.xz";
+    store = "/nix/store/5avv44x780sz0v874cl781k7camn6xcj-kcalc-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kfourinline-14.12.1.tar.xz";
+    sha256 = "0mhykajapvbcrasadyjjjz7sps3vmmw1hhijfjbswkb62ikmwc6k";
+    name = "kfourinline-14.12.1.tar.xz";
+    store = "/nix/store/qbgn1hkh15gv93wbrfg2bh14zsfgxfva-kfourinline-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/picmi-14.12.1.tar.xz";
+    sha256 = "0nrg4qza4h99k59w92v3qy68xlkdslqrlqi62fg94i88rl9l6ypq";
+    name = "picmi-14.12.1.tar.xz";
+    store = "/nix/store/s1m8hz32vjf2v38p2rkznrx4mgn6rzr3-picmi-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdewebdev-14.12.1.tar.xz";
+    sha256 = "0iv2r5vxkk8bg8p2zpq2dqnq0vvwhmjls0gdg30gyc4w04a7jcqr";
+    name = "kdewebdev-14.12.1.tar.xz";
+    store = "/nix/store/9mqr7imp19hgjl7bn5sbp2d3xmgrr3p1-kdewebdev-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kmines-14.12.1.tar.xz";
+    sha256 = "13f070kh0rfs5pmw3lnlwxwvx2ph2q8n1vm9lvr6kw1ablngiacm";
+    name = "kmines-14.12.1.tar.xz";
+    store = "/nix/store/nx62f1snc9d786yi1vsh0vzixkgrv9gr-kmines-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/filelight-14.12.1.tar.xz";
+    sha256 = "1dzcgric6rxhxhi84lgbsmkfk6s6b96px8019njnp744jys2ikv8";
+    name = "filelight-14.12.1.tar.xz";
+    store = "/nix/store/syf2l3yk3wga82cyak82janjsjhgvbd5-filelight-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/amor-14.12.1.tar.xz";
+    sha256 = "0p0fgp3j6x1f83kxdvmkcy4ladhg206m261fbpa92zyxp2ylnl0a";
+    name = "amor-14.12.1.tar.xz";
+    store = "/nix/store/5nkk3cqvi177qd3mq0n687r5swcrixfd-amor-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdiamond-14.12.1.tar.xz";
+    sha256 = "12frpi62f4w86ygxa68dvx1nj8n7w7lsgizfdyc6lix6l5vfzn7x";
+    name = "kdiamond-14.12.1.tar.xz";
+    store = "/nix/store/6pbb85yp6xhd3x5w0a5ql6ms10yj1pj3-kdiamond-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kteatime-14.12.1.tar.xz";
+    sha256 = "0my0fjiblkkfy2148axc7gp1nsx5lr2y8zn6d2labai2f6dy1bpf";
+    name = "kteatime-14.12.1.tar.xz";
+    store = "/nix/store/89l402jmb83ji7xvkz82kz024l012yaz-kteatime-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/juk-14.12.1.tar.xz";
+    sha256 = "0wzjrk5w5y0f6bc98pr7xni1j8krdyjsk3agcwkhb4d4c0aa5gka";
+    name = "juk-14.12.1.tar.xz";
+    store = "/nix/store/gjxwckkx3mikzkpxs7vzk830nj42fj6q-juk-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/mplayerthumbs-14.12.1.tar.xz";
+    sha256 = "0z9iw1syv61y4fb4dlr9n8w78ri7wpznys5bd5sn0hxbkwnavs6b";
+    name = "mplayerthumbs-14.12.1.tar.xz";
+    store = "/nix/store/kdk1frzcpvc11ln0vamc6m0m7h1xfnj5-mplayerthumbs-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kget-14.12.1.tar.xz";
+    sha256 = "1jr15bcc09pypihva7pjsq6rlj0kqqhqvprxdggmwa7fnyyjxrg4";
+    name = "kget-14.12.1.tar.xz";
+    store = "/nix/store/v34rq3l61yyxsml99xp18adg85ki53r1-kget-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkface-14.12.1.tar.xz";
+    sha256 = "198z0n286qnngrln24s1dfghkddz5zy7qr8af0jkywxdj3j2ks3a";
+    name = "libkface-14.12.1.tar.xz";
+    store = "/nix/store/8l4frnslphg2rbpmaikwi0j7w4hfw56r-libkface-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kcolorchooser-14.12.1.tar.xz";
+    sha256 = "1yw1cxg2caddncnhqyck1fh7g43svgcb8pb15wp5rz7qqs0p65mf";
+    name = "kcolorchooser-14.12.1.tar.xz";
+    store = "/nix/store/ygwdm76ijc39y3blkfl7s6g21328dk1p-kcolorchooser-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/dragon-14.12.1.tar.xz";
+    sha256 = "0wqmjb7zl883mcmx4x8ss0x64r79wrphfxkyva6sifcy596y2wxh";
+    name = "dragon-14.12.1.tar.xz";
+    store = "/nix/store/2iwy70md4cqg461x92sbxwbfzmj4y1xz-dragon-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kjumpingcube-14.12.1.tar.xz";
+    sha256 = "1h7nypr5b8b5az7c2gszihlhq9k2dn92cabjmif9rlkrvl6nahcy";
+    name = "kjumpingcube-14.12.1.tar.xz";
+    store = "/nix/store/5n1arbyl0fjp5b5xdlgyha4nwpxbczyz-kjumpingcube-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kapptemplate-14.12.1.tar.xz";
+    sha256 = "00df6ckfaglnnxizzqmci10h8hiqjv0fgi8xb3x4d3aszb049k1y";
+    name = "kapptemplate-14.12.1.tar.xz";
+    store = "/nix/store/fxh9hhx7z5bv151xrxw26h91pz09lw9z-kapptemplate-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ksquares-14.12.1.tar.xz";
+    sha256 = "0b1av02srxfd9ji51f2pcb5phmlqdz2lzik1n97yzn6f0xh19h9y";
+    name = "ksquares-14.12.1.tar.xz";
+    store = "/nix/store/16zwzi9y1215imff1phggjza00j9y4br-ksquares-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/bovo-14.12.1.tar.xz";
+    sha256 = "08in3ppksxp7zdgrv5lvjxzlvc6srfjcicagqbj2r8nrfmngjlim";
+    name = "bovo-14.12.1.tar.xz";
+    store = "/nix/store/gfficdhz1w80xmvn9842jx1fwpd81lqi-bovo-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ksaneplugin-14.12.1.tar.xz";
+    sha256 = "00bsd58kfvhp36rbwsmbk3yqjx8gca3r42q5z3fvd0jpf7y8xxip";
+    name = "ksaneplugin-14.12.1.tar.xz";
+    store = "/nix/store/pafvmq1gg81mjpwyf388k311qwf7pgcj-ksaneplugin-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/rocs-14.12.1.tar.xz";
+    sha256 = "033irmbjs6d8q7zdvz7vzx61d0gmgxb96cypwlwjmww1czgy9zcg";
+    name = "rocs-14.12.1.tar.xz";
+    store = "/nix/store/n25f8hphjdbwbk9z488i4bjmfai5vzsx-rocs-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kompare-14.12.1.tar.xz";
+    sha256 = "1js49gfffbv6nplr907dkcq3j6xi6h1276n0fbkpd7y31cca6mi7";
+    name = "kompare-14.12.1.tar.xz";
+    store = "/nix/store/ikirdy65sp1w2w38p28nkzic0zhw5iyp-kompare-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kalzium-14.12.1.tar.xz";
+    sha256 = "180qq9h046hax0jl13iy9mzbzhn66y41p8cj5447qgrnjbdk5qa8";
+    name = "kalzium-14.12.1.tar.xz";
+    store = "/nix/store/4zh8mah5lsisbnv07nas6wqv6xvsqzy4-kalzium-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ksudoku-14.12.1.tar.xz";
+    sha256 = "1majccia02g7icqh8pad3m91nj94j228s66v25szlwacg2zc86zr";
+    name = "ksudoku-14.12.1.tar.xz";
+    store = "/nix/store/1pbw74v9j5r9x36b2r7yq5k8n9fbcvwz-ksudoku-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/cervisia-14.12.1.tar.xz";
+    sha256 = "1xgvk1qar2mg5awkwsc0wzyzmskgv9r6bgbczyy0fjjd9xh0mp75";
+    name = "cervisia-14.12.1.tar.xz";
+    store = "/nix/store/2ifpmknn9aw760hsz4j7cf7kc6x704hl-cervisia-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kcharselect-14.12.1.tar.xz";
+    sha256 = "0rb4dr7ygiks45c73nwab9wg9zdn1xgq93yhkpp23bkfq9ca7z4f";
+    name = "kcharselect-14.12.1.tar.xz";
+    store = "/nix/store/3qpkmwxn855x58k5za6r67rniyzkj006-kcharselect-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kbruch-14.12.1.tar.xz";
+    sha256 = "180gbax6lrn5qr1l7x1c3i0i2kh1by4j80bif66jxwra505by50z";
+    name = "kbruch-14.12.1.tar.xz";
+    store = "/nix/store/mvjdshn07gw1jn31y7igfzrzdmkpw98d-kbruch-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/knetwalk-14.12.1.tar.xz";
+    sha256 = "00b2zkiv3i99k6ri3xljas2fc2ihri84cmckgwrzvpxbdha8wpj8";
+    name = "knetwalk-14.12.1.tar.xz";
+    store = "/nix/store/y0pg73qfkvfdrk3r7xz7yfgzl2s24vg5-knetwalk-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/palapeli-14.12.1.tar.xz";
+    sha256 = "1zdbhn7dfrzb18k3rjgm934gjib5kazkgblsl15jxlzw2yfy458i";
+    name = "palapeli-14.12.1.tar.xz";
+    store = "/nix/store/7vjjf69hw3kkwxmnlxfcg44wh7yy1s5i-palapeli-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/okteta-14.12.1.tar.xz";
+    sha256 = "1mw32cjj2kw36frki26nycwi48p1s0wi2v9h85v9dwgk6235i7d8";
+    name = "okteta-14.12.1.tar.xz";
+    store = "/nix/store/mk87jrnhqgcarmc658k4f2fpm1181i3g-okteta-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ksnakeduel-14.12.1.tar.xz";
+    sha256 = "14ryx9ydwi23lhf5xr5mn77ixzkirwdg43mrh2cc0rnq440mzalv";
+    name = "ksnakeduel-14.12.1.tar.xz";
+    store = "/nix/store/1mbdk8jijasnkhrzavpv89mzbfrz9b6n-ksnakeduel-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdelibs-4.14.4.tar.xz";
+    sha256 = "0h255hhl46r7ax9hm9sr7qddljwzfky2ssh695ml3svfwg52mihl";
+    name = "kdelibs-4.14.4.tar.xz";
+    store = "/nix/store/nky571v70dk45hy9jfvii63amga1qx55-kdelibs-4.14.4.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdesdk-strigi-analyzers-14.12.1.tar.xz";
+    sha256 = "1bsf1dgb2039jjzqy6pr66yw08kxbn5xpna0bfmrbiw4pprlmbi4";
+    name = "kdesdk-strigi-analyzers-14.12.1.tar.xz";
+    store = "/nix/store/6sfiw6s55wnsnsyh0sas9s3f8fbpwnw4-kdesdk-strigi-analyzers-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/svgpart-14.12.1.tar.xz";
+    sha256 = "18r6n6wh8yg5wmd5wyc8sf6k994ghfknanlp7l1pcqwqa6wfv6rx";
+    name = "svgpart-14.12.1.tar.xz";
+    store = "/nix/store/hcxrbw696pca5z4p95ws7373x55bi9lj-svgpart-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-filesharing-14.12.1.tar.xz";
+    sha256 = "0id8qmr432ygkfmcq3mfr3zv0w58393w0z5pd86k8nnkz43nh208";
+    name = "kdenetwork-filesharing-14.12.1.tar.xz";
+    store = "/nix/store/dazj5495njhw8bdyizpx0af9r20bvj5a-kdenetwork-filesharing-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ffmpegthumbs-14.12.1.tar.xz";
+    sha256 = "1q6ayhxrsq3y5yvrawsvr88pzl7vcz5ms6dq0sgd4mad83kwl5yj";
+    name = "ffmpegthumbs-14.12.1.tar.xz";
+    store = "/nix/store/11nyk47q1i4qh92kdzw3l6gi5nqhja5b-ffmpegthumbs-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kmix-14.12.1.tar.xz";
+    sha256 = "1zk1c1m1zihb4wih2330a95gd1skakwsx0vccxp8np3nsh71z3fa";
+    name = "kmix-14.12.1.tar.xz";
+    store = "/nix/store/5y3gdnaa0a8nhpd5a2abp3ixcdnmg9im-kmix-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/audiocd-kio-14.12.1.tar.xz";
+    sha256 = "1wi3mwx9v7lh71ciar29c1bprwh2lgq46yq3kx5gq7wz20cx54hh";
+    name = "audiocd-kio-14.12.1.tar.xz";
+    store = "/nix/store/6h2dlw28xi87axxdglbkjz2jyjl78ijv-audiocd-kio-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/lskat-14.12.1.tar.xz";
+    sha256 = "19q5qzfh1dczkdz612hw21849h438dhl21ghbfm5hi5m04vmn8rc";
+    name = "lskat-14.12.1.tar.xz";
+    store = "/nix/store/awrjks0ihywpqygz8aqwrxn53yd8sljb-lskat-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kmahjongg-14.12.1.tar.xz";
+    sha256 = "1pbq9f6zb96v98sz94kz979z5scpqzvc5fp4nxs2dg1rx1la8qxl";
+    name = "kmahjongg-14.12.1.tar.xz";
+    store = "/nix/store/kk2rlvdl5hm4b0ms3i5pvs1r6lh5ipbh-kmahjongg-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kde-workspace-4.11.15.tar.xz";
+    sha256 = "1y7df6mar72lzy1dan7v5wwgf2w669b0hkrdb6ai1s3whmqr611a";
+    name = "kde-workspace-4.11.15.tar.xz";
+    store = "/nix/store/pmn8vgwjdszsl46pra65vn5i7pxfj7g4-kde-workspace-4.11.15.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkdeedu-14.12.1.tar.xz";
+    sha256 = "03jic27ghfz2gpbn2nb69qiiip4vgy3y4as8qx328cl39l5vh8d4";
+    name = "libkdeedu-14.12.1.tar.xz";
+    store = "/nix/store/1l6fwf3bb28myf3k3hsiv27gk8ar6gz1-libkdeedu-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ktouch-14.12.1.tar.xz";
+    sha256 = "07z1nkyc4hxjd39pczkv1z6dxdjn3334wnv778mdrf98lm77vjxd";
+    name = "ktouch-14.12.1.tar.xz";
+    store = "/nix/store/wvgsj2m324xic0rjr6kyi7pfwqnfpmzq-ktouch-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kblocks-14.12.1.tar.xz";
+    sha256 = "0qk5g5karl29g4hbpl7lfgahv71as3mj6j604cpd2wiwma05qa2s";
+    name = "kblocks-14.12.1.tar.xz";
+    store = "/nix/store/wgjmvym6jg44xr5mzgw3pb77w1ya8s2h-kblocks-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kqtquickcharts-14.12.1.tar.xz";
+    sha256 = "026am7l64m721vv3l79z6v3avxq94z1vrzx1ifwf8p001inf4ydy";
+    name = "kqtquickcharts-14.12.1.tar.xz";
+    store = "/nix/store/5ppmqjmqizw31x1yjnzmicybln433l9a-kqtquickcharts-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/sweeper-14.12.1.tar.xz";
+    sha256 = "0c3kqnjwi5q24k7b05dr5mygd3ps0r1s9cbs49r9zikswz7gky1d";
+    name = "sweeper-14.12.1.tar.xz";
+    store = "/nix/store/1nwklpfvdggaxadjc3396j8qgwdl619h-sweeper-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kopete-14.12.1.tar.xz";
+    sha256 = "1pkgzlq7scz0pvmn2dis128rh2hdfxhbg6imn4mwrizmlpaycb98";
+    name = "kopete-14.12.1.tar.xz";
+    store = "/nix/store/gcj1qvbh1m7hbbyfdsl1nypc07nzy0yn-kopete-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kbounce-14.12.1.tar.xz";
+    sha256 = "1x726x5x6cpdnig0wmam7zzigj33afwswdmxxgspnpimkybwpy0f";
+    name = "kbounce-14.12.1.tar.xz";
+    store = "/nix/store/w5dhnrmkm982i7kw1j9j5rf09z22cka9-kbounce-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kanagram-14.12.1.tar.xz";
+    sha256 = "07lz09armwr4j594pn30d617ngxcn8n3yxikm79ck5020gx4wvgx";
+    name = "kanagram-14.12.1.tar.xz";
+    store = "/nix/store/cxxfxxpmnk70i9cx0cgx7k6jdg32s73f-kanagram-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/zeroconf-ioslave-14.12.1.tar.xz";
+    sha256 = "12ri1dbbzc9dwx2n843979yvh93a9yrzpprk9jdmjr1hkna8rgmy";
+    name = "zeroconf-ioslave-14.12.1.tar.xz";
+    store = "/nix/store/5jhzsqxdfzh1zw1d103np2rm34jdj945-zeroconf-ioslave-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/libkeduvocdocument-14.12.1.tar.xz";
+    sha256 = "0nqjcddjmapgadlkv97banjk5fh7p355hfxcbspksyndsgplz1hv";
+    name = "libkeduvocdocument-14.12.1.tar.xz";
+    store = "/nix/store/zcxv7zv41p63pij7d37wdp4hcll77ldc-libkeduvocdocument-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kmousetool-14.12.1.tar.xz";
+    sha256 = "0k38qj2hv9k846fba4sxdg1biplbdn5hfmfhx5qmc6g6h8xrs2dr";
+    name = "kmousetool-14.12.1.tar.xz";
+    store = "/nix/store/dv7j6rb4688zzlp36l45f2h0vzykvybj-kmousetool-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kolourpaint-14.12.1.tar.xz";
+    sha256 = "15vkd7i35myfi9m11p52g8x7dlkvf06fa400r9vbw321fza2gyjc";
+    name = "kolourpaint-14.12.1.tar.xz";
+    store = "/nix/store/dqi11m0gnkyrfppdlibvgv2gbycpjqm6-kolourpaint-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kgeography-14.12.1.tar.xz";
+    sha256 = "04g2sw2r1i8kc85n9igk15kmk3hc8gdci52lxk4ca04bxcif7061";
+    name = "kgeography-14.12.1.tar.xz";
+    store = "/nix/store/zl0qg5scvgmzsq6c7l4s2rs4dh6v243h-kgeography-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/dolphin-plugins-14.12.1.tar.xz";
+    sha256 = "0sjfm5ry54h56vbbch11js50a70pvwbkinyxxgyvs6g260ngpkx2";
+    name = "dolphin-plugins-14.12.1.tar.xz";
+    store = "/nix/store/1cknwl7y4djaq1cwjj3g38k8w8gi6zwc-dolphin-plugins-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kreversi-14.12.1.tar.xz";
+    sha256 = "1011262n5zh6hji7xxgq3k2hkgh0hqhpvk9krw22plda4nww2xwc";
+    name = "kreversi-14.12.1.tar.xz";
+    store = "/nix/store/rbc1h7c1v7bdzgwxqw5xs2x19rn4z9q4-kreversi-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdepim-runtime-4.14.4.tar.xz";
+    sha256 = "08axhahiqv77cr6ssvh1cadqjvv1064w5l94wxadnyq3vz8kl6kz";
+    name = "kdepim-runtime-4.14.4.tar.xz";
+    store = "/nix/store/rwsx6c3s4nc7vkcfk0c39jbp7f5f0rvp-kdepim-runtime-4.14.4.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdf-14.12.1.tar.xz";
+    sha256 = "1cvd7ydk277crv1wiw7sn72mv9lf5pqk56gylfmzr63mr7dyj5iz";
+    name = "kdf-14.12.1.tar.xz";
+    store = "/nix/store/5caacq7s0yh79mqykwj5wydj3b5gyl83-kdf-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kiten-14.12.1.tar.xz";
+    sha256 = "0518zbvgn3w00b7lxfivrgrp8xrpb09rf9cf9zdxdl2z37gxmvmv";
+    name = "kiten-14.12.1.tar.xz";
+    store = "/nix/store/8dl8yv38wpv199jjgw3kdl8rajxnnc77-kiten-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+    sha256 = "1xdb3hm7iad2wvbwqaa5bbqzgg6xdbbv68xfjajpx8k9cn20kh9r";
+    name = "kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+    store = "/nix/store/1widcjdd8hzy1dnabg9px06yjc0k7ncf-kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kcachegrind-14.12.1.tar.xz";
+    sha256 = "01fa9b73ymym5qyd5lirb4cf6c37x02a1a9ls2qgzswflm557d49";
+    name = "kcachegrind-14.12.1.tar.xz";
+    store = "/nix/store/k4y83g821js66c35bc6x2r8m1924vd4f-kcachegrind-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kstars-14.12.1.tar.xz";
+    sha256 = "08px9765vl6hpmy39wyhlbm4d3y5wh82w33g2fppx4d9bxmpz166";
+    name = "kstars-14.12.1.tar.xz";
+    store = "/nix/store/plbszpr250pr7x41578a4b5n329wgl4l-kstars-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdepim-4.14.4.tar.xz";
+    sha256 = "0jpbc84xv07j2qynkn4mhmwlldbmjg6v7dqc1028kfk7sbcahhf2";
+    name = "kdepim-4.14.4.tar.xz";
+    store = "/nix/store/shap58rcwhg13766v7zm28nxr6rn09gw-kdepim-4.14.4.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/ktuberling-14.12.1.tar.xz";
+    sha256 = "1ghymw6ljvkd9wi4j0f1n8gjkhxfkqvmb8n36lasrfr27v57z68v";
+    name = "ktuberling-14.12.1.tar.xz";
+    store = "/nix/store/c4m2nwfbjwqgc9ydq6macg4zkmrsd7v6-ktuberling-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kblackbox-14.12.1.tar.xz";
+    sha256 = "0cxyzlsvhw9rg3b9c558zbqr3ijbzyx5as9g92ald8w7qjja5jnv";
+    name = "kblackbox-14.12.1.tar.xz";
+    store = "/nix/store/rnz72ryzp7mcxk83l71rw7br3k6hamr9-kblackbox-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kalgebra-14.12.1.tar.xz";
+    sha256 = "0pn4scp7y7ih60jaq39kanwgsc2aslb41v9xw8322kk8q4gyc8g4";
+    name = "kalgebra-14.12.1.tar.xz";
+    store = "/nix/store/c3gmynlqgyhdx3nghhwgk8i85qqysjsj-kalgebra-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kdeedu-data-14.12.1.tar.xz";
+    sha256 = "0hyqwkva7bgi43fgad4caz8q4pcb9kx5czpc3d8nksk5q28a1llg";
+    name = "kdeedu-data-14.12.1.tar.xz";
+    store = "/nix/store/53ksfs7gxzr33sgdbfxk4ydjzzl2c7y3-kdeedu-data-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kigo-14.12.1.tar.xz";
+    sha256 = "100rrip6w08ld2xgwdm2dryk8qa92dssdz0a0iykgklddq6dvxr1";
+    name = "kigo-14.12.1.tar.xz";
+    store = "/nix/store/ggvs29ryi85ig0r9z3jq259kvyq1k1h0-kigo-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/print-manager-14.12.1.tar.xz";
+    sha256 = "1ad9a23cfivyzfgajg1bn10n2glp2ks8yqkl5f0xk5alyldzbir6";
+    name = "print-manager-14.12.1.tar.xz";
+    store = "/nix/store/p445xkdbm1dqqb3p2x10rag6xccidp9c-print-manager-14.12.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/applications/14.12.1/src/kshisen-14.12.1.tar.xz";
+    sha256 = "1b0csn1ngpcwcl8iwv02hy1gb6hk13453khzgya6ckixk5szcdy7";
+    name = "kshisen-14.12.1.tar.xz";
+    store = "/nix/store/1hx5ws8bbzh0lnmjp0x8ln1s7rv3x62a-kshisen-14.12.1.tar.xz";
+  }
+]
diff --git a/pkgs/applications/kde-apps-14.12/manifest.sh b/pkgs/applications/kde-apps-14.12/manifest.sh
new file mode 100755
index 00000000000..487e505ccd0
--- /dev/null
+++ b/pkgs/applications/kde-apps-14.12/manifest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]; then
+
+  # The extra slash at the end of the URL is necessary to stop wget
+  # from recursing over the whole server! (No, it's not a bug.)
+  $(nix-build ../../.. -A autonix.manifest) \
+      http://download.kde.org/stable/applications/14.12.1/ \
+      -A '*.tar.xz'
+
+else
+
+  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
+
+fi
diff --git a/pkgs/applications/kde-apps-14.12/renames.nix b/pkgs/applications/kde-apps-14.12/renames.nix
new file mode 100644
index 00000000000..011cb77337b
--- /dev/null
+++ b/pkgs/applications/kde-apps-14.12/renames.nix
@@ -0,0 +1,23 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+"Analitza5" = "analitza";
+"Backend" = "kde-workspace";
+"CTest" = "sweeper";
+"ECM" = "extra-cmake-modules";
+"Gpgmepp" = "kdepimlibs";
+"JDns" = "kopete";
+"KDE4Workspace" = "kde-workspace";
+"KDEGames" = "libkdegames";
+"KDeclarative" = "kdelibs";
+"KSane" = "libksane";
+"KdepimLibs" = "kdepimlibs";
+"LibKEduVocDocument" = "libkeduvocdocument";
+"LibKdeEdu" = "libkdeedu";
+"LibKompareDiff2" = "libkomparediff2";
+"Libkcddb" = "libkcddb";
+"Libkcompactdisc" = "libkcompactdisc";
+"Okular" = "okular";
+"QJDns" = "kopete";
+"QMobipocket" = "kdegraphics-mobipocket";
+}
diff --git a/pkgs/applications/kde-apps-14.12/setup-hook.sh b/pkgs/applications/kde-apps-14.12/setup-hook.sh
new file mode 100644
index 00000000000..a8d9b7e0e36
--- /dev/null
+++ b/pkgs/applications/kde-apps-14.12/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 654ce0d139e..982c0d618d5 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -10,11 +10,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.73";
+  name = "blender-2.73a";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "140fcxjb73gim430v08021ls3civ3yghld63ljkgxi5vaww1cq95";
+    sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc";
   };
 
   buildInputs =
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     [ "-DWITH_MOD_OCEANSIM=ON"
       "-DWITH_CODEC_FFMPEG=ON"
       "-DWITH_CODEC_SNDFILE=ON"
-      "-DWITH_FFTW3=ON"
       "-DWITH_INSTALL_PORTABLE=OFF"
       "-DWITH_FFTW3=ON"
       "-DWITH_SDL=ON"
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index c541e55595b..cbcd16c4e91 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.16.0";
+  name = "calibre-2.18.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1a9s99r92wk09lsbx8kn2kyg1wr7j84j8vjf65zaf5siwxnwy291";
+    sha256 = "05n7kfih4mbhnvpzi5i821jl0na66si2ygz8cql931p2qcfhnixx";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
new file mode 100644
index 00000000000..0950817c788
--- /dev/null
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "cherrytree-0.35.6";
+
+  src = fetchurl {
+    url = "http://www.giuspen.com/software/${name}.tar.xz";
+    sha256 = "1nfrnnwaxb07jf5c3id8zimr3q3rbhvzjlmpb99d41d7hqrd2bxj";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.sqlite3 ];
+
+  buildInputs = with pythonPackages; [ python gettext wrapPython pygtk dbus pygtksourceview ];
+
+  pythonPath = with pythonPackages; [ pygtk dbus pygtksourceview ];
+
+  patches = [ ./subprocess.patch ];
+
+  installPhase = ''
+    python setup.py install --prefix="$out"
+
+    for file in "$out"/bin/*; do
+        wrapProgram "$file" \
+            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+    done
+  '';
+
+  doCheck = false;
+
+  meta = {
+    description = "A hierarchical note taking application, featuring rich text and syntax highlighting, storing data in a single xml or sqlite file";
+    homepage = http://www.giuspen.com/cherrytree;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/misc/cherrytree/subprocess.patch b/pkgs/applications/misc/cherrytree/subprocess.patch
new file mode 100644
index 00000000000..cff357a5693
--- /dev/null
+++ b/pkgs/applications/misc/cherrytree/subprocess.patch
@@ -0,0 +1,15 @@
+diff -Naur cherrytree-0.35.6-orig/setup.py cherrytree-0.35.6/setup.py
+--- cherrytree-0.35.6-orig/setup.py     2014-05-30 23:25:11.000000000 +0200
++++ cherrytree-0.35.6/setup.py  2015-01-29 07:35:32.785904009 +0100
+@@ -205,4 +205,9 @@
+           },
+        distclass=CherryTreeDist
+     )
+-    subprocess.call("update-desktop-database")
++    try:
++        subprocess.check_call(['update-desktop-database'])
++    except subprocess.CalledProcessError:
++        pass # handle errors in the called executable
++    except OSError:
++        pass # executable not found
+
diff --git a/pkgs/applications/misc/cool-old-term/default.nix b/pkgs/applications/misc/cool-old-term/default.nix
deleted file mode 100644
index c56393a1be8..00000000000
--- a/pkgs/applications/misc/cool-old-term/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchFromGitHub, qt5 }:
-
-stdenv.mkDerivation rec {
-  version = "0.9";
-  name = "cool-old-term-${version}";
-
-  src = fetchFromGitHub {
-    owner = "Swordifish90";
-    repo = "cool-old-term";
-    rev = "2494bc05228290545df8c59c05624a4b903e9068";
-    sha256 = "8462f3eded7b2219acc143258544b0dfac32d81e10cac61ff14276d426704c93";
-  };
-
-  buildInputs = [ qt5 ];
-
-  buildPhase = ''
-    pushd ./konsole-qml-plugin
-    qmake konsole-qml-plugin.pro PREFIX=$out
-    make
-    popd
-  '';
-
-  installPhase = ''
-    pushd ./konsole-qml-plugin
-    make install
-    popd
-
-    install -d $out/bin $out/lib/cool-old-term $out/share/cool-old-term
-    cp -a ./imports $out/lib/cool-old-term/
-    cp -a ./app     $out/share/cool-old-term/
-
-    cat > $out/bin/cool-old-term <<EOF
-    #!${stdenv.shell}
-    ${qt5}/bin/qmlscene -I $out/lib/cool-old-term/imports $out/share/cool-old-term/app/main.qml
-    EOF
-    chmod a+x $out/bin/cool-old-term
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Terminal emulator which mimics the old cathode display";
-    longDescription = ''
-      cool-old-term is a terminal emulator which tries to mimic the look and
-      feel of the old cathode tube screens. It has been designed to be
-      eye-candy, customizable, and reasonably lightweight.
-    '';
-    homepage = "https://github.com/Swordifish90/cool-old-term";
-    licenses = with stdenv.lib.licenses; [ gpl2 gpl3 ];
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ skeidel ];
-  };
-}
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
new file mode 100644
index 00000000000..d955e5b7677
--- /dev/null
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchgit, makeWrapper, qt5, qmltermwidget }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.0";
+  name = "cool-retro-term-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/Swordfish90/cool-retro-term.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "042ikarg6n0c09niwrm987pkzi8xjxxdrg2nqvk9pj7lgmmkkfn1";
+    fetchSubmodules = false;
+  };
+
+  patchPhase = ''
+    sed -i -e '/qmltermwidget/d' cool-retro-term.pro 
+  '';
+
+  buildInputs = [ makeWrapper qt5 qmltermwidget ];
+
+  configurePhase = "qmake PREFIX=$out";
+
+  installPhase = "make -j $NIX_BUILD_CORES INSTALL_ROOT=$out install";
+
+  preFixup = ''
+    mv $out/usr/share $out/share
+    mv $out/usr/bin $out/bin
+    rmdir $out/usr
+
+    wrapProgram $out/bin/cool-retro-term \
+      --prefix QML2_IMPORT_PATH : "${qmltermwidget}/lib/qml/"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Terminal emulator which mimics the old cathode display";
+    longDescription = ''
+      cool-retro-term is a terminal emulator which tries to mimic the look and
+      feel of the old cathode tube screens. It has been designed to be
+      eye-candy, customizable, and reasonably lightweight.
+    '';
+    homepage = "https://github.com/Swordifish90/cool-retro-term";
+    licenses = with stdenv.lib.licenses; [ gpl2 gpl3 ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ skeidel ];
+  };
+}
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 581081975e5..f64593517af 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,14 +1,14 @@
 { stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }:
 let
   py = python27Packages;
-  version = "14.09";
+  version = "14.12.1";
 in
 stdenv.mkDerivation rec {
   name = "cura-${version}";
 
   src = fetchurl {
     url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
-    sha256 = "1nr26hfqa6chim5qch92wpk0s28wfvznvcf3kkzgf23hw707f40v";
+    sha256 = "1sybsa84qznlzcgn18p70gh1v60npwfca5yn80h35msxrnh8gbp5";
   };
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index bb818e9236c..b8779eca0dc 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl }:
 let
-  version = "14.03";
+  version = "14.12.1";
 in
 stdenv.mkDerivation {
   name = "curaengine-${version}";
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
-    sha256 = "0f37jk6w3zd9x29c1rydqmfdzybx9nbmwdi3y3nzynq1vq7zmxcc";
+    sha256 = "1cfns71mjndy2dlmccmjx8ldd0p5v88sqg0jg6ak5c864cvgbjdr";
   };
 
   installPhase = ''
     mkdir -p $out/bin
-    cp CuraEngine $out/bin/
+    cp build/CuraEngine $out/bin/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
new file mode 100644
index 00000000000..3e737544d18
--- /dev/null
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, gpgme, libgpgerror, libassuan }:
+
+stdenv.mkDerivation rec {
+  
+  name = "gpa-0.9.7";
+
+  src = fetchurl {
+    url = "mirror://gnupg/gpa/${name}.tar.bz2";
+    sha256 = "1r8pnvfw66b2m9lhajlarbxx9172c1gzripdij01bawgbrhwp33y";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk gpgme libgpgerror libassuan ];
+
+  meta = with stdenv.lib; {
+    description = "Graphical user interface for the GnuPG";
+    homepage = https://www.gnupg.org/related_software/gpa/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix
index 6abf6da4a69..291ce723aab 100644
--- a/pkgs/applications/misc/grass/default.nix
+++ b/pkgs/applications/misc/grass/default.nix
@@ -177,6 +177,7 @@ a.composableDerivation.composableDerivation {} (fix: {
     description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization";
     homepage = http://grass.itc.it/index.php;
     license = [ "GPL" ];
+    broken = true;
   };
 
 })
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 691fecc77fd..a076a2bb7cf 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20141016";
+  version = "3.20150107";
 
   lib = stdenv.lib;
 in
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "1amvrb6djil7g0yabsngfs0f1n7qcvj2hddipjkgfjbmghd6jqiw";
+    url = "https://github.com/joeyh/ikiwiki/archive/debian/${version}.tar.gz";
+    sha256 = "12kiqjxrh93gysdp7bhglnks2md9davl8jgzqlj0m8xs5rf1972n";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index ec96ed76ce4..e11e920fdd4 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   unpackPhase = "unpackFile \$src; sourceRoot=.";
 
-  buildPhase = "pwd; gcc -o pstree pstree.c";
+  buildPhase = "pwd; $CC -o pstree pstree.c";
   installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin";
 
   meta = {
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
new file mode 100644
index 00000000000..a1538c69932
--- /dev/null
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -0,0 +1,80 @@
+{ stdenv, fetchurl, wxGTK, libuuid, xercesc, zip , libXt, libXtst
+, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, ykpers
+}:
+
+stdenv.mkDerivation rec {
+  name = "pwsafe-${version}";
+  version = "0.95";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/passwordsafe/pwsafe-${version}BETA-src.tgz";
+    sha256 = "f0b081bc358fee97fce20f352e360960d2813989023b837102b90ba6ed787d46";
+  };
+
+  makefile = "Makefile.linux";
+  makeFlags = "YBPERS_LIBPATH=${ykpers}/lib";
+
+  buildFlags = "unicoderelease";
+  buildInputs = [ wxGTK libuuid gettext perl zip
+                  xercesc libXt libXtst libXi xextproto
+                  pkgconfig libyubikey ykpers ];
+
+  postPatch = ''
+    # Fix perl scripts used during the build.
+    for f in `find . -type f -name '*.pl'`; do
+      patchShebangs $f
+    done
+
+    # Fix hard coded paths.
+    for f in `grep -Rl /usr/share/ src`; do
+      substituteInPlace $f --replace /usr/share/ $out/share/
+    done
+
+    for f in `grep -Rl /usr/bin/ .`; do
+      substituteInPlace $f --replace /usr/bin/ ""
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin \
+             $out/share/applications \
+             $out/share/pwsafe/xml \
+             $out/share/icons/hicolor/48x48/apps \
+             $out/share/doc/passwordsafe/help \
+             $out/share/man/man1 \
+             $out/share/locale
+
+    (cd help && make -f Makefile.linux)
+    cp help/help.zip $out/share/doc/passwordsafe/help
+
+    (cd src/ui/wxWidgets/I18N && make mos)
+    cp -dr src/ui/wxWidgets/I18N/mos/* $out/share/locale/
+    # */
+
+    cp README.txt docs/ReleaseNotes.txt docs/ChangeLog.txt \
+      LICENSE install/copyright $out/share/doc/passwordsafe
+
+    cp src/ui/wxWidgets/GCCUnicodeRelease/pwsafe $out/bin/
+    cp install/graphics/pwsafe.png $out/share/icons/hicolor/48x48/apps
+    cp docs/pwsafe.1 $out/share/man/man1
+    cp xml/* $out/share/pwsafe/xml
+    #  */
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Password Safe is a password database utility";
+
+    longDescription = ''
+      Password Safe is a password database utility. Like many other
+      such products, commercial and otherwise, it stores your
+      passwords in an encrypted file, allowing you to remember only
+      one password (the "safe combination"), instead of all the
+      username/password combinations that you use.
+    '';
+
+    homepage = http://passwordsafe.sourceforge.net/;
+    maintainers = with maintainers; [ pjones ];
+    platforms = platforms.linux;
+    license = licenses.artistic2;
+  };
+}
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
new file mode 100644
index 00000000000..94655614023
--- /dev/null
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "terminal-notifier-${version}";
+
+  version = "1.5.0";
+
+  src = fetchzip {
+    url = "https://github.com/alloy/terminal-notifier/releases/download/${version}/terminal-notifier-${version}.zip";
+    sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p";
+  };
+
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p $out/Applications
+    mkdir -p $out/bin
+    cp -r terminal-notifier.app $out/Applications
+    ln -s $out/Applications/terminal-notifier.app/Contents/MacOS/terminal-notifier $out/bin/terminal-notifier
+  '';
+
+  meta = with lib; {
+    maintainers = with maintainers; [ cstrahan ];
+    platforms   = with platforms; darwin;
+  };
+}
diff --git a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch b/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch
new file mode 100644
index 00000000000..9bfe3831c4a
--- /dev/null
+++ b/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch
@@ -0,0 +1,57 @@
+From abd9d530776e8bb6d8f05312fc3ae3044796139c Mon Sep 17 00:00:00 2001
+From: Oliver Winker <oliver@oli1170.net>
+Date: Tue, 12 Aug 2014 19:08:05 +0200
+Subject: [PATCH] Fix for openssl 1.0.1i
+
+Fixes following application error
+---
+Errors
+error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error
+---
+
+Due to openssl 1.0.1i change:
+---
+commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291
+Author: Emilia Kasper <emilia@openssl.org>
+Date:   Wed Jul 2 19:02:33 2014 +0200
+
+    Fix OID handling:
+
+    - Upon parsing, reject OIDs with invalid base-128 encoding.
+    - Always NUL-terminate the destination buffer in OBJ_obj2txt printing function.
+
+    CVE-2014-3508
+
+    Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
+    Reviewed-by: Kurt Roeckx <kurt@openssl.org>
+    Reviewed-by: Tim Hudson <tjh@openssl.org>
+---
+---
+ lib/x509v3ext.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
+index cf74c32..d94cbda 100644
+--- a/lib/x509v3ext.cpp
++++ b/lib/x509v3ext.cpp
+@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n)
+ x509v3ext::x509v3ext(const x509v3ext &n)
+ {
+ 	ext = NULL;
++	if (!n.isValid())
++		return;
+ 	set(n.ext);
+ }
+ 
+@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
+ 
+ bool x509v3ext::isValid() const
+ {
+-	return ext->value->length > 0 &&
++	return ext && ext->value && ext->value->length > 0 &&
+ 		OBJ_obj2nid(ext->object) != NID_undef;
+ }
+ 
+-- 
+2.0.1
+
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index be99439c617..d5fa5e5ec56 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8";
   };
 
+  patches = [ ./0001-Fix-for-openssl-1.0.1i.patch ];
+
   configurePhase = ''
     export PATH=$PATH:${which}/bin
     export QTDIR=${qt4}
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index f88d7df4030..6dcc1dbf860 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -9,7 +9,7 @@ mkChromiumDerivation (base: rec {
 
   installPhase = ''
     mkdir -p "$libExecPath"
-    cp -v "$buildPath/"*.pak "$libExecPath/"
+    cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
     cp -v "$buildPath/icudtl.dat" "$libExecPath/"
     cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
     cp -v "$buildPath/libpdf.so" "$buildPath/libffmpegsumo.so" "$libExecPath/"
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 5b662f4b29b..9c8e7d08382 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -143,6 +143,12 @@ let
       sed -i -e '/module_path *=.*libexif.so/ {
         s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")|
       }' chrome/utility/media_galleries/image_metadata_extractor.cc
+
+      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev}/lib/\1!' \
+        device/udev_linux/udev?_loader.cc
+
+      sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
+        gpu/config/gpu_info_collector_linux.cc
     '';
 
     gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 8e397d81919..c41b2e2c4e7 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -66,7 +66,7 @@ let
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${chromium.browser.version}";
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper ] ++ chromium.plugins.enabledPlugins;
 
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 30fa4c39a4e..b4766cee434 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -21,9 +21,10 @@ let
       chan = if source.channel == "dev"    then "chrome-unstable"
         else if source.channel == "stable" then "chrome"
         else "chrome-${source.channel}";
+      cext = if versionOlder source.version "41.0.0.0" then "lzma" else "xz";
     in ''
       mkdir -p plugins
-      ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
+      ar p "$src" data.tar.${cext} | tar xJ -C plugins --strip-components=4 \
         ./opt/google/${chan}/PepperFlash \
         ./opt/google/${chan}/libwidevinecdm.so \
         ./opt/google/${chan}/libwidevinecdmadapter.so
@@ -93,6 +94,7 @@ let
           else head (tail v);
       in fold (l: r: zipAttrsWith (_: f) [ l r ]) {};
     in {
+      inherit enabledPlugins;
       settings = mergeAttrsets (map getNix enabledPlugins);
     };
   };
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 5437f8e283a..5f40e63125d 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "41.0.2224.3";
-    sha256 = "04lgklidxx4bryqhnm7kjqbfr12ns8ic9g4yxk3dig71081sas5f";
-    sha256bin32 = "17fgh57yckk318r7r6qkc934dpq35qa6ps4x5fwscl070rzjf81k";
-    sha256bin64 = "1qsvjm38cxx3inrw0hs4q9f4i9arqfj9cs57xh64wflrnh2z52zf";
+    version = "41.0.2272.16";
+    sha256 = "14l3l5gcjqszqjb3zmwxsyfci495fi315sznvm2n2ark24mf03yq";
+    sha256bin32 = "0xqhzlmbyh5w678j7iwssd81z1bpggpzxni1y79xn5lhc26c50jd";
+    sha256bin64 = "0c9j75xqv4jx57asiaadarz714h1adscvb4h5ng7mbmr268qp6f2";
   };
   beta = {
-    version = "40.0.2214.10";
-    sha256 = "0wxkxgj6z18l2qkm0k16r8bpv9rdxk1g1ias03zzvlbj1bw3brdn";
-    sha256bin32 = "0wr2vg97d3qrryb5sz31sd3ycb1l17irrs79vfa04ip85jqv89zn";
-    sha256bin64 = "0bclgy386vdmfdf59hwkypcs8wwmlpgl3npp089hmcdvv7dmars8";
+    version = "41.0.2272.16";
+    sha256 = "14l3l5gcjqszqjb3zmwxsyfci495fi315sznvm2n2ark24mf03yq";
+    sha256bin32 = "0xqhzlmbyh5w678j7iwssd81z1bpggpzxni1y79xn5lhc26c50jd";
+    sha256bin64 = "0c9j75xqv4jx57asiaadarz714h1adscvb4h5ng7mbmr268qp6f2";
   };
   stable = {
-    version = "39.0.2171.65";
-    sha256 = "0lglcjvyhgmdm0sd76wv509pgwcfl86rlp9rj83z9giadwqlcmxi";
-    sha256bin32 = "1iqzi462vw8da5f8ysk76q68xhiw5ndqc3hhc6djipsc6h240bji";
-    sha256bin64 = "1gxh3sxpnl0167la9ncnz7l85gzi4ax6g5pqni1nma5g5cqqm177";
+    version = "40.0.2214.91";
+    sha256 = "0ja1wvjn0g8xs20j87s3gl9h70yzx8rfa3k126wnl9gay6gxlbzp";
+    sha256bin32 = "0mfg66s7fqx6v8n0hilsw40i5ximasbqhrmw4fpnpa0x0i77bphj";
+    sha256bin64 = "14lqm8m937b9sl5k7sc939aar76ij9790c807yahk6q36mfyd269";
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index db69301044a..f99ff763cb8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,183 +4,183 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "35.0";
+  version = "35.0.1";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "171c24f002bceacbe7a29ca807f3e13cab20cb09"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "4b9936b23e3a14603a87fbc3ca3ffdf6cac51ab3"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "2ec4b773acddb8b7ca6edd77c87d7f6018eebe6a"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "3ff150a7956464802550de974901d77f8fdeaa2c"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "c87ab9f8d6ff800b8d4524fbb31f5eda93f04d0b"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "4424f5a5ee97ef17786242c0ed8fbd235892792c"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "626055151dbd2b6324b9a78f0d52f908d851ef27"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "46eb6f9a7d79ab0935e53f8adcbb39ef9eb23958"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "5bdb6329d9b87e844f54c76e6a1d3a01bb549a47"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "c3d9a75ed9624f55b28be6537e66d3d008f2f8e0"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "afdef9abc432e29db0105359436feb799cf4b4d8"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "6bc04d5d929b6e8c507080d7d9c6a38cdbd8cdfc"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "08c01dbc10d092dd1bed279b61a718494f306934"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "7cd459c801cb13a632bf8dbe0e935924731378be"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "1086d708700b1e78943aff8b5525fefdc57f6b4b"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "61ef1b7d3e7f10024a688940177906094504375e"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "63c097425c56a2aebd6519013bd39719e22b8869"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "d2f27d7c96ff11b03f44f7d1aee9b2f0b042946e"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "cf9368ef310017d68c06eb1cbb14e83656adb94f"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "c45797b2747cf9688250c3b9816b31333c76218c"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "a664464f41b2bc8cdcb6f9cbf2945da66743f923"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "4b17670ee1204fe6fc99ac60466b630a67fb377d"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "004c18d0270d0964b69b9d574ee0085f95f79d5f"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "974c674138cdfd4983ee89e11d9b8ea905318e07"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "3c76d0e794a9f90313438a77cc71c4917e6d0963"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "de062d16baa844bef4d46278b922e55c24446013"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "1fc3fd7ff88fa47be3e63c6d18fb7ea0f96ea182"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "034e54f38b3905afa9265adcd7028ecaeef0b0ea"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "da6c2109d0749e3fb02d39608bfc097e0d4b7e94"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "564dfbadd8a4da4d27a5980be2c037c38f798be3"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "4e601b99d70c68884efa386cd7d9e73d27f58fcc"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "6d8b101a0cf704501f737867ec139481457d4925"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "bf228d3a5a62fbdb1169029722fa0e3b5ed88b32"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "cdd695b5e0983c6602d9a351b3b132c4063c0b4b"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "117fc06f022e5508a0d15be0e1a7a3db4745c8d6"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "85d4ab75a06eefb41bcd16c9eb870f704cc41d69"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "8518aa683ae83d230067a72ed541e3d190933548"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "ed174cf13bd4ea448e4c86e1c05632728da2138e"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "3d78f1b8b814da0f9b64e06275a46675e52baee7"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "4ceca57c924cbd80dbd6578c0fbcfdc0dbedad36"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "b96227ce0f152eb901ca9cdfa579634d943e8ee1"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "d8ebb59b19d1bab937b53cd7af14a07537688218"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "80b63f903b0182f939436e8ec7a54b0c7bcfddad"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "1e5d88aa9fade0f39be239d4fc88a63be7fba1fb"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "f16c3e3d6904ee327002788e2374bf126c40d5b5"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "f4a411e5ab5ad73b524ef92c5ed465f25d9411e3"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "dd9ba1358f4359ce0e686c9f04f2603398cc70e7"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "e7c5a2688c9ec3cca5005caa25fa7d8d97044a3a"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "7bf4fc268ef16dbac4bf1697aeb127b00f024b23"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "de4b641021139e2a3a14db6ae9ccd0202d36380e"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "afc1ee57a9eb78d53fdf9416fdde4ed519482810"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "e91d0e394bf54562297dbfcf79cd2998d3824292"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "c7c1f11f1767116b1a3f0ed7a72cbfe5ec72f4ad"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "e02cf16977b0ad6b76e1f50b8dce6634e7688740"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "8e5462e20a5f7916bb2db78d438573f7d0da9706"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "7337351eb8bd38f010c805ce1e00d74b9379d8c1"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "ea958109c28d185d250a199d935285edb7099e8c"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "fa5fd96f8ebe24ec343c2bd834dce571153c0e73"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "66b24e265d01d1775dab8edc4e6b3e2f2566ba22"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "e8be6ebbd667459206c8f66bd069ded86784d8ab"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "824ce366ab30abd33e9a7c2f5d57cfde4d60c00d"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "12b4a0bfb18f893a0eecdec56a4eda02372396ce"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "218082c202a7699a162901d9093f519811a5f378"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "93d3acad0e144b884d3a1a30ac6336fca4e17e77"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "c74d417d4f26061008a9cbd7c7f121fb1e656cfc"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "e0da9d2c6cdd1b5c3b26bef6b3401e4fa6452e4b"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "830599b504839b9995414982ba655331619609ec"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "4a5c334689e844358e22aba8389849594b6a1891"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "1e9a7b2e57802850c1efb3046b4913499fad07d2"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ae86e5252bd7b2a4422bc8c6f777ade07242176e"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "4c94ec105da0f91a2b87ba8013eb7b832c2fee12"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "dab8398e904f8392c01313314bbaf76bd0decd8f"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "7d3c9ebcb0ee1aec567d0676c78038a35faf746f"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "4b4c20766fe95c6dd69c8e29a2ffcea007940b74"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "eb960637873424213035846cee85dc5cd3bcffaa"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "c467354f5c4197880c42205c5385cfd62a115413"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "a25db0f49e9ca9b8238a321480cc6913195ab000"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "8241b15c08fa66e05da25a5d0ad5ffbc50cc6388"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "9c6e3df8063a8c4ee859dc0e58ac6f36c2f26659"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "ec00dfcaf552aa94322b2bcdec1ec8bfc6b5fb6a"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "5165b5ebfa7af89fa61d994ecf5d77087d455828"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3c52f08951f65d45a5623bc3f88cf7c8e10140c1"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "2b8e12856d5ac25ae101fd717713c46f02836567"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "0e3848584959c4123d40da34d6ed25b749cebd15"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "9a290473f24f9f2347ab64a5851a1f14aed713f7"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "95a66e9f36b6984a341cd801297db84f4ed0c0f3"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "bf1ba19941a5f51c32ac4ac58886165ac258d47e"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "710cc727bad72b0f7e85ba84171983b5729e3ea7"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "914e85645210db9f3887751ca8dd68011dc35afc"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1253e742d911defc9d4cc6334f9eefdc33ac594b"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "a3775040046ec7170fecc0a76f97a1c1ebf77097"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "ae66b28ea0ba09d4f6fa43efd13db774a3e196c7"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "6a36025b57fc9ffcf136d377d4b8b0da0ad70561"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "f2e31c725ee85e70be0aa04fe10463c0e93ab403"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "640db9133bd8dad4c0317f1ca47570aedbac6f05"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "ab4782eb61e9aab81b899b355416a7cac1434fc5"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "3306c8a43d605d43a459915cbe537fd96d38fc1f"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "49b7be7d6237cde197daa9dc6eed39f27eb8afda"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "f8c201f166bd7a11b118bd16a9056e386c8a6fb1"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "e4e970289b0370e1c7fac171e0c704f089a7daef"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "5f5e99bdd7d0581bdbf866ea4e11a7ceab11633e"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "a1c7adaf6986d96119f4ee5941b8e37eb7a5eb99"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "cc54a5fd8b361bb64e74cb25c886b3f7acec564b"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "72159be6e48f786ae3c3393ddac54f38d26a5b78"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "e4ec61472d4abe31cbced6077edd091a5905f0da"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "1f8297062d8898a288e11dfb8acfdaaa47add0ee"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "78c3a4d2caf84ccf89cf8da4fc3ef183bc9cf70a"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "ab9ac9e5f0e29e5380c09256f10eb69767ced505"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "bb8f2a6ecba549fac49337a057e9a4db4129b79d"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "fe5c477631d72f8ccee29177431d3dea0be9f180"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "2c2d06266a4d98ec20bf2f5e52b9c3c0bb609c76"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "8dfed7ad4f1783e6760221373358f231f4f0da0f"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "757b62b448f83e9d69c66d1615da966107c931a3"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "713c610d63083ea8021f01d321b930b0c847f780"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "366089fb3c938ea35a5dffe7f7ca760054f567b0"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "efdd56a4cc63066096446ad360549447647348de"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "3c2e550f836f0cefcfb5c38411b1ac2f3a637bcf"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "36a2ec196849c1f469e74b3053c3f12396b01504"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "be2e5712afc9d4cc4c7f1934e596f7c1957544c2"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "e73b9d865474ffa5acbeb231d4e685937be1975f"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "4fbc2a641867d394f28a4742b5c5133731f546d5"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "87631ece4d7b74baedd781d1f6b2a57b2eeda412"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "68f83785a6df96389cf76870d98090c786fdfc31"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "8e2d292250b23dd76e5661fe52de979d0c5d9205"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "f0d738d05df36c876882f8c301331869d83f7294"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "eea2560db78a13f0c04aad6825d328b8bc55eb08"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "c6034e46de8466295d0e359274b6a55d55d0184a"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "10ec7c2904189566a938325ea815723e0bb0b2cb"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "0df41d06162817cd34b1bb53515c90cfad3de511"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "3c12b50d07447911fc0f509ad00e385124bf7ec3"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "0ce146883573be7eb5daed17699230da82ada4cf"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "c01aa06a17bd8d621ed6aded5e74e71370e9e4c8"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "2164863aa00224f593290194767f3996811e638a"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "567697d04976120296727b8a3ea4c26b747a4588"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "9d157740a17808968351dc8adec6aa537cec0a44"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "d4bd135c4e13f82a8a2809e3e1d8e09cf7f80f42"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "3dbf64a4e9ed9900f2ac9581f89f0df723129a14"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "e3d930beb3fb127d9528b4ff296fbbeeebb14bb8"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "a579c6c9a0564add3bda66a003318fe2947f69cc"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "030cfc69fa37be23b88b70d4ac80e459efb5a059"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "47d39cfef7f363504a626ac82f913e41742be0e8"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "bc5d110d4ce4953d213bea29e1052b7ca1718410"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "8944e82080ac7371dba99e3e602b7ad03e589655"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "6c224dc91d8fd60056a6c72dc54de8c68a279b6d"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "baee23301b0d140248030b1fd68fc04e5c10f939"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "828160c350a4dd71f88b0d1f17c8692e6d4b14d1"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "5ef8b1e005286bbf3e2e1f7eefa4addf8f3767d0"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "30bcc039ccd95b1a0c488b1b805ae0a767856b16"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "8352a59403334665bc88604e6a40581a3eb7aac0"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "3e0939fe78cd88350748690598b786dd4e335855"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "09f0bb79c4c9c1a865a5e14c7e621c3fc2d416cc"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "86e4c2fb90a17b068a5c62843ab16803c1b101e9"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "016fe63fcaa5a6a1335d27c4e7ad97dd5aaad9e4"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "1c4d68de1b8a6d29dd9b9d3433ffb7859832c4ed"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "011eaee136b1e34d0a0b2eeab2e0a53edecece88"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "2d54163e9219d192908f162b338bbc7cce43569a"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "3616fdf8cb30580246243b42efcd11dc13ee0bc4"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "33139dfd37b085fe77b48a0b7f3f9ad6ce12bf05"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "a043b01750615c594d0d079681e47c523601419e"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "16650e9b5c34faa71fe597e5a86eac16a85b8a63"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "e565fe7184e4c1e60804c1258d241af4d8f989cc"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "e0cd4d67f800b86c7f84a816adfd4c94c4e4ec3c"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "069e3a10f95d0d5abd9f44548e482523ba688728"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "f8678da72a388623718a2ea0b9e8e7df735c87b4"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "cef7ea6c46da2fb39802b5ed6d6626addd0842e1"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "a1476e81269f11fd966b74ddadf009356d7d8811"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "694d8dc5aa067ed1efbe6912f38ddcb501692741"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "68e4329c7ffc622d5e98923348c0eebde3d0a05d"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "421289cfe38233038c6b67c341779997cb0f7e91"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "5d6b9ed16a8cefe6ec79716d43f9d984270da12d"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "ac7648d08f55449fa4c7833edf3ac229290b3b56"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "29bce5966c7ed1b806706855611329c857ce0c89"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "7f8867dc3839573234685355965490c600c3c73e"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2f9df8cb2c6d5de83f4c77aa6938a16d93d70020"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "dd5abdc714ce34b3999e9f021b26131dfabcaece"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b5f9f4b7cdce79b0627069318fc9a0bacd251980"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "124492ee256fc578cff9e7774f679a0dc3f75a27"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "f3503b3d8889d8f097219cee2fb793f06bdff7ed"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "52dd493830ec7d3d0c1dd9d5d91449944f3ed0cb"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "bb88cfe49158d1b650bff932ccd65f750681df9f"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "883f34da9eaf2975d46f07bf4ffb7e991231f9a8"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "1757dbb135225b5b1958084fb3e8b0050451ac1f"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "839887065496742f53c7868bed5f172e0727b236"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "a0f4a097083449e81278a9accb23cb6e76cf39e1"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "7395f49cdb471d67eff6aad56fd896b2b60ca9ea"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "219ac273c48ec5018a1c62eb5c8ff1588bad466a"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "5228be973800169254e75016b5c1c11477b40fbf"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "7065cbb3fea059bf880217068704367168458c78"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "0c8cc063cd4661660b352d370281a477eb444697"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "1fdb7b783a9a90767c5c63a149f3ada590e3f81f"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "29532d5c3f3a8c9db4cc83dffea8328609eef286"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "cde75662d5b868117c76b3b4418292e6d536038c"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "272bd811c7b921ab80231c8994e04cb79aa7c868"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "01bfcb17b1524d3c5571283fa8abaa409250a640"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "40d2d3a9da8033e60e2bcd8faa0aa94a1f8acffb"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "a96f420650deb7d65c449861a05ae35154247009"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "e2db4777b68113ec300e00e1235d7aa6eaebb9a2"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "bf886b2983bd3f0528bfdba036d978230fb0f9f6"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "6b74d9b0a1b6114810a98d615b32115b39be0eed"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "9c5c21f0b7d5f6677065cc57faccc4d6fb280a39"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "72acb7bd98f689eb8cef254c72da4fd0bda3274c"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "015adba9f964ad8cfbaf5081416a380d0abbd167"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "3e1f61aaa19328f7cc729fc011dc216ef33054cf"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "bb489274879dcdfeb86c778a7aef5d971e8c1111"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "729901a823944d4f92571f3f8f07d936f6e0635c"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "3066eec76de4c79699893afe497d12540ed49d80"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "0206ebc636ab4f3264281ddbef21f3d99c72c92f"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "48d7577d158daf8d4edf988c3efbb40944f7d607"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "39e692a7227349a53cde95a18024fd8f9c47a49d"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "0f85723f4a602c5348e1f910384cb05d4b0d37b8"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "b5150224a5115403cc12bdc583d89151d29aab23"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "890bd378d14fcfcfee327405323fb18d688f9575"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "6f6b9af4610b85c73e523e8149849a21e60a078c"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "3d45d05927b18e7a3d95edad282bdb4efb41509f"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "c1cca4d312329eef5023b16d08e7bfc40c3c06c8"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "2ca19c2beb794108f7138f07d91edefa5911e6da"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "034f5d2c82e519b53afa490850ab305134c58d7d"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "66d8a48abb3fdefa2498e8bf56b5b1fffe8f61ea"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "175647bcb6c4a879887e7b5c1d1260f11980f25c"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "7bab378891240db491078084ee0904dcd8c405cf"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "71dedd0008bc788631c83ec68a2975baf7dc4ecb"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d0b620b139fa436816f2f48971bdc67a829effee"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "61f93f3ed51175afec69ab1f1ced1ad89e488cec"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "ee894635e4d584635a585702cfc364f318a8b7bc"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "ffe30c5da202fe9fa068423e8b2155d38902239c"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "bc7e04f5264f5c6542705e29adcf0e873fe22396"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "c3f4fe2dcd009ddad4ed4c4c25dd8fde364dbb6f"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "271e4f84495a75bdf539f5d3383a510832ead8b1"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7d2c74454e59220f15158fb13cf896d667b70f43"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "0e02895eeeb66cb8aaea96b566745dcb83517fde"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "753c0788ab58ab390546116dbd708cba0e5ef908"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "64be3770cf6ffa3df353cac4493b07e95dae5a1d"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "66b7184dfb39182fc3533e0601aac3d54005e7fd"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "f5f9b0ae73a57d61d32ac143aac09286bf75c8a7"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "92a25a4fdee339eb327acd0713ecb3da0975ae6f"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "b58bb2d5b2257c1f75009ee3c53289b55dbe1f64"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "a39e96d6c082035be2dd826dfb990ba76bb85c57"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "e73e5bb35aede5957437cc0f789d035cc4cba639"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "e0c69dcae50a31788695beb9562f77bb6a101a61"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "bdd0884b3c0feabf9041ce10c7c379204b64cdf4"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "19bf8ea81a02d32253db23c4c2432b4fb5437234"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "e3c86049567412e74634bda3fa419c013b9c1e1b"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "83ed1c125a7747768980c739fe4b76b47274f47b"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "4666f31d0983b7bec54c98bcfa02e85e3097d024"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "7a6fe37320351b18d0ee9257522d34213c598aa3"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "eb7418db94f041d209d89ae33f20b0fa482d5c84"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "525665b9310b099c93323dccef4e434627eb517b"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "88aa7e3b35f80474f3235f6aa087b4348f372b9e"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "78b59e7934f2014b8dc99fba210a691ba0ace966"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "8b0c11b78b6cd6363a8fb0dc51f88e306b321a34"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "f1d0bc9ccfa9ade46b1caabd511f8a6359895482"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "9b2bcf8aa3a4dabd29b69ad3a102aa6ee999bebc"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "2d3fa5a189283b4f5ddc88c5526380d1bbc9ff73"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "e8d8803075e2b3bcd44470f2563fdb7d2855021e"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "1c7695c021832d7daab3838d333a02ad141aa22d"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "1a7fec7fbbeebdf3368ad7474ea593ab6d0d0131"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "14ffc0706fe6f00d2778a3567dc27bdbc96b4fbb"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "77431a1b81c86b8da78b6a5728cf1d054b9b9a28"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "a0796dfbb45b796a3391e697320009ac761c082a"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "98aa2c4455caf0f35946ca2c6de7ff4214e33221"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "26933524c477fcd522b98f75e9e9339d80bdddf5"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "f365032803a41c57c75d06945104add35564afcd"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "ab4cb56cb1679159d1a7cca55f26b99c5ff1a784"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "829fb1baaaba4e3e43ad72b3e0bff78f8fd828e4"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b329665bc7643e7e49461112a96fa8ab23f7d15b"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "4fea5950fddc26e002f72e7a8b4763fb8620bff1"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "d678096e976ada75bff62309e09cc5c92f4eb885"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "f80f225ce9acd6f1aa91e18d351431d6ea3ca05e"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "abc31651c3c8884be2166e5d85fd09f793a9bf15"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "4e276bb56d9cf9be18788ba1a585a29c094eec0c"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "2a3816a56615b910915207c97b093d5c81f169d5"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "4d7cec0c6fb393a0bf208135efd0b13691d319a5"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "54d9e17ee54a969da8ec68881a1165cd1d49a351"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "fbc9ded1ab4d0714094beb4215dd0c547d931983"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "1e7ac8d7b657fc76aba70c2a1fc76cad3935aa0d"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "3d7fa92e91b29546aa4232f118984c0c7c8e7066"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "88e470efb8cec8a1439a7fa02684e02c801ce5ec"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "9575cc0fa4130ca5856f20a058df7850e901f531"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "ede8a5f91dd08eb8901c565462a23ec49b647b87"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "9af854901746299ee8eb542f82d8d2b302312ba7"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "55b7af838ff5c46f2c0b9593e6a621007f6207f1"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "b41e5e2ac9b2d20a2d55fcbcc34f03ac110880e3"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "fb64abf1c4b9e1cd26bafe5d0f8d8d88c59e7788"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "b2d211490dba526c2be6a71be1767ca273635229"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "e052e41cb5426e15fbb9a95ac957eb24cda7605c"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "4e37df4924c10a07dc0dc4a87e44e155dbdfa095"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "694554dd94105ba299365adacd31ccc683f33814"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "116e576e4a0dee81c98a83a15a3fbd8d2e26361c"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "1d4cdcc4809ab9dfd6368ba9fa932f658b6e05f5"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "ef6e2e49df835f2f06de46cfbaac0aa7d3a0bab0"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "f8dd4ab0936e7a1e9511290201ee7b547d3dfa96"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "2dd8f9499e9c5dee258905466ec1c9784c93e392"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "c7ac2d940151db540edf268d5649b7958157deb0"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "6b624ded66ca9f7a4b81e52b3366006830616afd"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "83a2eebb9ea12fc58fdce64d2e6cca6a642ed6c4"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "f9aeb1b9bfe90cb875967a518cc430ed78c76d34"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "31e58e62373f5482059cbdb56228e93287071c2a"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "9caa154f5f357eeff788b6069a6417f2cc6fa30d"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "96a02745a2eceb0481e72dc195754500cac1cae2"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b141df4d511d380e955a3f4c49ce6f87e687a17e"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "1cd11a61afbc4d60878d089545b74c5c7d4a24f1"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "a365160b0a1490dbf3234a2d3e05d338627dd0f2"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "cf4f384f73215fc3337775ca8933d687f19c3e51"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "b6e20b7ca13b95a17bfcab4bafa672fe814853dd"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "f6b4d3bfb92aa480c6bcec1ecf1e68c90201015e"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "df4538d39cce9cd7817c9b59b6aec949484fc84a"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "fdc2799e53e9290c1e68975ed1a906c4cf6e0252"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "c69c7a16743aa76ccbe8a89f33c5390a127f92bd"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "a7f253212f9aed52c95f260da1cb4683617b839b"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "792d883f300d2a9ccddd64fe88c9837926431c14"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "1221b7d1b7e997964b6e6e3de1364204e81682c6"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "c65f1d29b35abc7070de124422f67e2e5c48a582"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8ea761c8459bfd664cea9afddb5a716d633dd407"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "77d799feca448cb187931d8fdf80859f4a1214ad"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "ee1901e059abc81b82ccd018f3cf05b2471fd7da"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "2e0615de00051dec1cb2fb4c5cb866fbd2f349b7"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "a75e667217ee3a5ed1897bc01e07e52efb96d281"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a76447946a8273cd8ec70cbbef013563f137688f"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "93e9548ae9f3fcfea35ef08ede8da2af98d693d3"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "af0613ba8b3ce75001c2a91c977fab728a8ae36c"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "aba611c1658d64151ad57ca321fc0050773db894"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "7a047794eec69dbf15f60dfbda1b8611435d2fc4"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "c6225541a63f18923a241488263987c662847548"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "0ca98adb699801f93fe7cd76b1c386b18c1f67a6"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "679f7d72f705dcffdfc36e5b89e3db3b56f76b74"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "36ee186bc3b7c0868f344c02fe44a98585188e9d"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "f96fe078e660c69b46ae8d3e0ce3189e4725a9fd"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "700f875dbd7b16ffad92e6ce9e39de41554384e7"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "60af78da783fd8183371f7e62ea9e58b0306fa24"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "55f2172292ae2ffec2244396a3f1d8399ce4233b"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "becede293c5e225c8212e91bd97dda070ee8e677"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "0a122107f6161757744deb21bf7afd1284aa9bcb"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "0f95be8a5510fe89475346c0b3ee91bee967b4e9"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "6185a8d66a73082146fc728e1ee9108a72eb29b6"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "6a4bb348caafce8d406bb431b69161ea21290241"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "5f1c0f08d2ee49d6484f84bdd721f2e26cf09fb1"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "43b4166646f593e82bd5ffe3609960f3bdf8abd2"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "8f567accf4db46a669ac0da25ff48a843fd8c940"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "ec19b178cc82802edb2f2060c47663422d3cef2a"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "667db54905a5e539c11752f954e93ac991f958bd"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "bddfc685191b9cd686ba8911e790e4c103d2a652"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "ea92a05be86355c31fc3cbde7ce1ab3946d9239c"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "b0a25b1047e3d2a34f28750db03e9cf7247d46b3"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "2753baa3b5c486723c8ace486203ff6c7e9c1ac9"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "0d0b7a57282560bbb5e26e23f65844f0c5eac888"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "f6a44d48325d3da23cd618c78d70fd8d9201a7a4"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "44700f87ec176ffed749ae31f7dd04664a8a050b"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "24c4355e2b12886232cff0c5fe791824050d38a6"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "24f06bbdcfd94f3d0168c93f83c13fd5bbb59c5b"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ea584b5aaa279694c4550b83ddd61de586f62517"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c257cbd9ed02f699384ffb8ece286c3b8e94ea8f"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "87fff9bf03bd3208bd71d92527dbddfb0dd12a6f"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index af5eb86f0f1..a128e9d04a8 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "35.0"; in
+let version = "35.0.1"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "52f310f08ab5a52cd9d9be00016f0872a5e81774";
+    sha1 = "cf256ee1491ee502eb4432ade5a879104ebceede";
   };
 
   buildInputs =
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 330bf6def59..02bb6a55b42 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -15,6 +15,18 @@ stdenv.mkDerivation {
     desktopName = desktopName;
     genericName = "Web Browser";
     categories = "Application;Network;WebBrowser;";
+    mimeType = stdenv.lib.concatStringsSep ";" [
+      "text/html"
+      "text/xml"
+      "application/xhtml+xml"
+      "x-scheme-handler/http"
+      "x-scheme-handler/https"
+      "x-scheme-handler/ftp"
+      "x-scheme-handler/mailto"
+      "x-scheme-handler/webcal"
+      "x-scheme-handler/about"
+      "x-scheme-handler/unknown"
+    ];
   };
 
   buildInputs = [makeWrapper] ++ gst_plugins;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index ff056a66ce9..fdc5d62127d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.429";
+  version = "11.2.202.440";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0nz2rqibgby1xm1c363j9ms9371lk000aaj337cplslx8s4ryrqb";
+        sha256 = "1sx17b7w3za274r0jxb80qn3m3hvij6faka45say3a60ps8bihc4";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -55,12 +55,12 @@ let
         # The debug version also contains a player
         version = "11.1";
         url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
-        sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
+        sha256 = "0jn7klq2cyqasj6nxfka2l8nsf7sn7hi6443nv6dd2sb3g7m6x92";
       }*/
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0r706sq6w3rv44hdaanappa3krq9z1mfxc96ifapqfg0wf2w2fb4";
+        sha256 = "1qn8sg1kk61cv7vrwn6l5sb1mmczfcas1b85cq2mzzjg4af7wcf4";
       }
     else throw "Flash Player is not supported on this platform";
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
index 66309dc7f19..d707f326745 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "gmtk-1.0.8";
+  name = "gmtk-1.0.9b";
 
   src = fetchurl {
     url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
-    sha256 = "034b02nplb2bp01yn4p19345jh3yibhn4lcxznrzcsmsyj2vlzq0";
+    sha256 = "07y5hd94qhvlk9a9vhrpznqaml013j3rq52r3qxmrj74gg4yf4zc";
   };
 
   buildInputs = [ intltool pkgconfig gtk GConf alsaLib ];
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
new file mode 100644
index 00000000000..db2934785eb
--- /dev/null
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ocamlPackages, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "google-drive-ocamlfuse-0.5.12";
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/1489/${name}.tar.gz";
+    sha256 = "0yfzzrv4h7vplw6qjm9viymy51jaqqari012agar96zwa86fsrdr";
+  };
+
+  buildInputs = [ zlib ] ++ (with ocamlPackages; [ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]);
+  configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
+  buildPhase = "ocaml setup.ml -build";
+  installPhase = "ocaml setup.ml -install";
+
+  meta = {
+    
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 7f5757e68b4..97ea7719af9 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,18 +1,34 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv
-, libsodium }:
+, libsodium, libXScrnSaver }:
 
+let
 
-stdenv.mkDerivation rec {
-  name = "qtox-dev-20141201";
+  filteraudio = stdenv.mkDerivation rec {
+    name = "filter_audio-20150128";
+
+    src = fetchFromGitHub {
+      owner = "irungentoo";
+      repo = "filter_audio";
+      rev = "76428a6cda";
+      sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
+    };
+
+    doCheck = false;
+
+    makeFlags = "PREFIX=$(out)";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "qtox-dev-20150130";
 
   src = fetchFromGitHub {
     owner = "tux3";
     repo = "qTox";
-    rev = "qtox-windows-1417469442.11";
-    sha256 = "02nxj0w5qbgc79n8mgyqldk1yadf4p8pysn79f7fvi8fxq4j0j5n";
+    rev = "7574569b3d";
+    sha256 = "0a7zkhl4w2r5ifzs7vwws2lpplp6q5c4jllyf4ld64njgiz6jzip";
   };
 
-  buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium ];
+  buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium filteraudio libXScrnSaver ];
 
   configurePhase = "qmake";
 
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 5af31cdb21a..f733acf4133 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -2,13 +2,13 @@
 , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "toxic-dev-20141130";
+  name = "toxic-dev-20150125";
 
   src = fetchFromGitHub {
     owner = "Tox";
     repo = "toxic";
-    rev = "4acfe84171";
-    sha256 = "1yqglh9fm75zph4fzf3z4gwmamngypwpvb7shpqgakdg8ybq0a8s";
+    rev = "4badc983ea";
+    sha256 = "01zk6316v51f1zvp5ss53ay49h3nnaq5snlk0gxmsrmwg71bsnm6";
   };
 
   makeFlags = [ "-Cbuild" "PREFIX=$(out)" ];
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 1c6183ed330..17a7f11ccce 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,19 +1,35 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l
 , libXrender, fontconfig, libXext, libXft }:
 
+let
 
-stdenv.mkDerivation rec {
-  name = "utox-dev-20141130";
+  filteraudio = stdenv.mkDerivation rec {
+    name = "filter_audio-20150128";
+
+    src = fetchFromGitHub {
+      owner = "irungentoo";
+      repo = "filter_audio";
+      rev = "76428a6cda";
+      sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
+    };
+
+    doCheck = false;
+
+    makeFlags = "PREFIX=$(out)";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "utox-dev-20150130";
 
   src = fetchFromGitHub {
     owner = "notsecure";
     repo = "uTox";
-    rev = "38b0a2014f";
-    sha256 = "00g9fsp83yjq6dfim3hfpag0ny9w5kydghycfj3ic8qaljp47y8a";
+    rev = "cb7b8d09b08";
+    sha256 = "0vg9h07ipwyf7p54p43z9bcymy0skiyjbm7zvyjg7r5cvqxv1vpa";
   };
 
   buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype
-                  libv4l libXrender fontconfig libXext libXft ];
+                  libv4l libXrender fontconfig libXext libXft filteraudio ];
 
   doCheck = false;
   
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 8d8913cf3cd..47754db1f2d 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "irssi-0.8.16";
+  name = "irssi-0.8.17";
   
   src = fetchurl {
     url = "http://irssi.org/files/${name}.tar.bz2";
-    sha256 = "15wzs4h754jzs1l4z7qzsyjllk9wdx3qfb6gymdiykvmlb9gwyiz";
+    sha256 = "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw";
   };
   
   buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 1349e71a791..5e042579a84 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -5,10 +5,14 @@
 , ssl ? true # enable SSL support
 , previews ? false # enable webpage previews on hovering over URLs
 , tag ? "" # tag added to the package name
-, stdenv, fetchurl, cmake, makeWrapper, qt, kdelibs, automoc4, phonon, dconf }:
+, kdelibs ? null # optional
+, useQt5 ? false
+, phonon_qt5, libdbusmenu_qt5
+, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf }:
 
 assert monolithic -> !client && !daemon;
 assert client || daemon -> !monolithic;
+assert withKDE -> kdelibs != null;
 
 let
   edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
@@ -28,20 +32,19 @@ in with stdenv; mkDerivation rec {
   buildInputs = [ cmake makeWrapper qt ]
     ++ lib.optional withKDE kdelibs
     ++ lib.optional withKDE automoc4
-    ++ lib.optional withKDE phonon;
+    ++ lib.optional withKDE phonon
+    ++ lib.optional useQt5 phonon_qt5
+    ++ lib.optional useQt5 libdbusmenu_qt5;
 
   cmakeFlags = [
-    "-DWITH_DBUS=OFF"
-    "-DWITH_LIBINDICATE=OFF"
     "-DEMBED_DATA=OFF"
-    "-DSTATIC=OFF"
-    "-DWITH_PHONON=ON" ]
+    "-DSTATIC=OFF" ]
     ++ edf monolithic "WANT_MONO"
     ++ edf daemon "WANT_CORE"
     ++ edf client "WANT_QTCLIENT"
     ++ edf withKDE "WITH_KDE"
-    ++ edf ssl "WITH_OPENSSL"
-    ++ edf previews "WITH_WEBKIT"  ;
+    ++ edf previews "WITH_WEBKIT"
+    ++ edf useQt5 "USE_QT5";
 
   preFixup =
     lib.optionalString client ''
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 5b9b3c54f92..176aaec6bdb 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -3,12 +3,12 @@
 , pythonPackages, cacert, cmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.1.0";
   name = "weechat-${version}";
 
   src = fetchurl {
-    url = "http://weechat.org/files/src/${name}.tar.gz";
-    sha256 = "0ly6lih7nvhacjs642v7n9z0x3lbgipiza00n632vrpi2zfvclrz";
+    url = "http://weechat.org/files/src/weechat-1.1.tar.gz";
+    sha256 = "1hzrnqafgnkmp9ddld3f8gn2378lb3x3pmd8pp2lgh9pf2q7iww3";
   };
 
   buildInputs = 
diff --git a/pkgs/applications/networking/mailreaders/sup/.bundix/cache b/pkgs/applications/networking/mailreaders/sup/.bundix/cache
new file mode 100644
index 00000000000..5894e96022c
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/sup/.bundix/cache
@@ -0,0 +1,4 @@
+---
+gem:
+  https://rubygems.org/downloads/mini_portile-0.6.0.gem: 09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn
+  https://rubygems.org/downloads/gpgme-2.0.7.gem: 1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr
diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile b/pkgs/applications/networking/mailreaders/sup/Gemfile
new file mode 100644
index 00000000000..a57feb5d21f
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/sup/Gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem 'sup'
+gem 'gpgme'
+
+# Sup tries to `xapian-ruby` in its extconf instead of listing it as a
+# dependency.
+gem 'xapian-ruby', "~> 1.2.15"
diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
new file mode 100644
index 00000000000..fe8746b9f72
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
@@ -0,0 +1,34 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    chronic (0.9.1)
+    gpgme (2.0.7)
+      mini_portile (>= 0.5.0, <= 0.6.0)
+    highline (1.6.21)
+    locale (2.1.0)
+    lockfile (2.1.3)
+    mime-types (1.25.1)
+    mini_portile (0.6.0)
+    ncursesw (1.4.9)
+    rmail-sup (1.0.1)
+    sup (0.20.0)
+      chronic (~> 0.9.1)
+      highline
+      locale (~> 2.0)
+      lockfile
+      mime-types (~> 1.0)
+      ncursesw (~> 1.4.0)
+      rmail-sup (~> 1.0.1)
+      trollop (>= 1.12)
+      unicode (~> 0.4.4)
+    trollop (2.1.1)
+    unicode (0.4.4.2)
+    xapian-ruby (1.2.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gpgme
+  sup
+  xapian-ruby (~> 1.2.15)
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index 3d537d83f43..19715d7b255 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,79 +1,19 @@
-{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
-, xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile
-, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which
-, bundler, git }:
+{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian
+, pkgconfig, which }:
 
-stdenv.mkDerivation rec {
-  version = "0.18.0";
-  name    = "sup-${version}";
+bundlerEnv {
+  name = "sup-0.20.0";
 
-  meta = {
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
     description = "A curses threads-with-tags style email client";
     homepage    = http://supmua.org;
-    license     = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    platforms   = stdenv.lib.platforms.unix;
-    broken = true;
-  };
-
-  dontStrip = true;
-
-  src = fetchurl {
-    url    = "https://github.com/sup-heliotrope/sup/archive/release-${version}.tar.gz";
-    sha256 = "1dhg0i2v0ddhwi32ih5lc56x00kbaikd2wdplgzlshq0nljr9xy0";
+    license     = with licenses; gpl2;
+    maintainers = with maintainers; [ cstrahan lovek323 ];
+    platforms   = platforms.unix;
   };
-
-  buildInputs =
-    [ rake ruby rubygems makeWrapper gpgme ncursesw_sup xapian_ruby
-      libiconvOrEmpty git ];
-
-  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
-
-  buildPhase = ''
-    # the builder uses git to get a listing of the files
-    export EMAIL="nobody@in.here"
-    git init >/dev/null
-    git add .
-    git commit -m "message" >/dev/null
-    gem build sup.gemspec
-  '';
-
-  installPhase = ''
-    export HOME=$TMP/home; mkdir -pv "$HOME"
-
-    GEM_PATH="$GEM_PATH:$out/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${chronic}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${gettext}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${highline}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${iconv}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${locale}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${lockfile}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${mime_types}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${ncursesw_sup}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${rmail_sup}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${text}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${unicode}/${ruby.gemPath}"
-    GEM_PATH="$GEM_PATH:${xapian_ruby}/${ruby.gemPath}"
-
-    # Don't install some dependencies -- we have already installed
-    # the dependencies but gem doesn't acknowledge this
-    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri sup-${version}.gem \
-        --ignore-dependencies >/dev/null
-
-    # specify ruby interpreter explicitly
-    sed -i '1 s|^.*$|#!${ruby}/bin/ruby|' bin/sup-sync-back-maildir
-
-    cp bin/sup-sync-back-maildir "$out/bin"
-
-    for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" --prefix PATH : "${gnupg}/bin:${which}/bin"
-    done
-
-    for prog in $out/gems/*/bin/*; do
-      [[ -e "$out/bin/$(basename $prog)" ]]
-    done
-  '';
 }
diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/pkgs/applications/networking/mailreaders/sup/gemset.nix
new file mode 100644
index 00000000000..e39da3dac85
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/sup/gemset.nix
@@ -0,0 +1,107 @@
+{
+  "chronic" = {
+    version = "0.9.1";
+    source = {
+      type = "gem";
+      sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
+    };
+  };
+  "gpgme" = {
+    version = "2.0.7";
+    source = {
+      type = "gem";
+      sha256 = "1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr";
+    };
+    dependencies = [
+      "mini_portile"
+    ];
+  };
+  "highline" = {
+    version = "1.6.21";
+    source = {
+      type = "gem";
+      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+    };
+  };
+  "locale" = {
+    version = "2.1.0";
+    source = {
+      type = "gem";
+      sha256 = "18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj";
+    };
+  };
+  "lockfile" = {
+    version = "2.1.3";
+    source = {
+      type = "gem";
+      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
+    };
+  };
+  "mime-types" = {
+    version = "1.25.1";
+    source = {
+      type = "gem";
+      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+    };
+  };
+  "mini_portile" = {
+    version = "0.6.0";
+    source = {
+      type = "gem";
+      sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn";
+    };
+  };
+  "ncursesw" = {
+    version = "1.4.9";
+    source = {
+      type = "gem";
+      sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
+    };
+  };
+  "rmail-sup" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
+    };
+  };
+  "sup" = {
+    version = "0.20.0";
+    source = {
+      type = "gem";
+      sha256 = "1lpqgrqkv29xr1h1142qsbmknlshpgys7fc3w1nkyhib8s3ikamg";
+    };
+    dependencies = [
+      "chronic"
+      "highline"
+      "locale"
+      "lockfile"
+      "mime-types"
+      "ncursesw"
+      "rmail-sup"
+      "trollop"
+      "unicode"
+    ];
+  };
+  "trollop" = {
+    version = "2.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0z5dvh7glwqjprlihsjx67hfzy4whsjfhqj9akyyrby9q5va1i4k";
+    };
+  };
+  "unicode" = {
+    version = "0.4.4.2";
+    source = {
+      type = "gem";
+      sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g";
+    };
+  };
+  "xapian-ruby" = {
+    version = "1.2.19.1";
+    source = {
+      type = "gem";
+      sha256 = "1crfrmc8kf6qq1xcfcmgf213zg66badpg4d86n7y9x3i1f5lxlbv";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff b/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
new file mode 100644
index 00000000000..2037ad6acb9
--- /dev/null
+++ b/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
@@ -0,0 +1,25 @@
+*** FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c.orig	2015-01-25 19:10:03.971628580 -0800
+--- FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c	2015-01-25 19:55:05.453980544 -0800
+***************
+*** 2807,2816 ****
+  #ifdef __MACOSX__
+  	g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
+  #else
+! 	g_PCSCModule = LoadLibraryA("libpcsclite.so.1");
+  
+  	if (!g_PCSCModule)
+! 		g_PCSCModule = LoadLibraryA("libpcsclite.so");
+  #endif
+  
+  	if (!g_PCSCModule)
+--- 2807,2816 ----
+  #ifdef __MACOSX__
+  	g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
+  #else
+! 	g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so.1");
+  
+  	if (!g_PCSCModule)
+! 		g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so");
+  #endif
+  
+  	if (!g_PCSCModule)
diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
index 00e5a4f93ee..a1528dd1255 100644
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor
 , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
+, substituteAll
 , pulseaudio ? null, cups ? null, pcsclite ? null
 }:
 
@@ -13,6 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0";
   };
 
+  patches = [
+  ] ++ stdenv.lib.optional (pcsclite != null)
+      (substituteAll {
+        src = ./dlopen-absolute-paths.diff;
+        inherit pcsclite;
+      });
+
   buildInputs = [
     cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib
     alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 5ea5c890052..e3c8d148ed8 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "syncthing-${version}";
-  version = "0.10.20";
+  version = "0.10.21";
 
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "2d61a5b1ca45e4ad0805413e8965a6f3d61256cccb7a6a08cc146bf7433f5d80";
+    sha256 = "60cd8607cf7d2837252680f6c2879aba1f35a2c74a47c2f2ea874d6eed2adaa5";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index 6d4306044a4..d3ee682329d 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "vnstat-1.11";
+  name = "vnstat-1.13";
 
   src = fetchurl {
     url = "http://humdi.net/vnstat/${name}.tar.gz";
-    sha256 = "09p0mlf49zzmh6jzwyvzd9k3jv7bl8i6w8xl65ns3dmv2zc7c65p";
+    sha256 = "1kcrxpvp3al1j6kh7k69vwva6kd1ba32wglx95gv55dixfcjakkg";
   };
 
   installPhase = ''
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://humdi.net/vnstat/;
     license = stdenv.lib.licenses.gpl2Plus;
     description = "Console-based network statistics utility for Linux";
+    maintainers = with stdenv.lib.maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
new file mode 100644
index 00000000000..32123d23c5b
--- /dev/null
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -0,0 +1,66 @@
+{ fetchurl, stdenv, dpkg, makeWrapper, which
+,gcc, xlibs, qt4, zlib
+, ...}:
+
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+
+let
+  arch32 = "i686-linux";
+  arch64 = "x86_64-linux";
+
+  arch = if stdenv.system == arch32
+    then "i386"
+    else "amd64";
+
+  shortVersion = "1.13.1-stable";
+
+  version = "${shortVersion}_${arch}";
+
+  url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
+  sha256 = if stdenv.system == arch32
+    then "21491da1608daf58da23e7e5eb7619b494b10192acc0f81575daff2a38720f50"
+    else "8db101b26dd2978e991421260a2e55d849014f64005930b2528080bbbaa78600";
+
+  deps = [
+    gcc.gcc
+    qt4
+    xlibs.libX11
+    zlib
+  ];
+
+in
+
+stdenv.mkDerivation {
+  name = "mendeley-${version}";
+
+  src = fetchurl {
+    url = url;
+    sha256 = sha256;
+  };
+
+  buildInputs = [ dpkg makeWrapper which ];
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    dpkg-deb -x $src $out
+    mv $out/opt/mendeleydesktop/{bin,lib,plugins,share} $out
+
+    interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf)))
+    patchelf --set-interpreter $interpreter $out/bin/mendeleydesktop
+
+    librarypath="${stdenv.lib.makeLibraryPath deps}:$out/lib:$out/lib/qt"
+    wrapProgram $out/bin/mendeleydesktop --prefix LD_LIBRARY_PATH : "$librarypath"
+  '';
+
+  dontStrip = true;
+  dontPatchElf = true;
+
+  meta = {
+    homepage = http://www.mendeley.com;
+    description = "A reference manager and academic social network";
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 5acc8caf6b8..2ed05f9aa8b 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,46 +1,68 @@
-{ stdenv, fetchurl, useGoldLinker, bash, callPackage, gnome, xlibs }:
-
-assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
-
+{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }:
 
 let
-  /* Zotero always has a hard upper bound on its firefox/xulrunner dependency.
-   * Use private version of firefox to prevent breakage when the system
-   * packages are updated. Please update this dependency whenever zotero is
-   * updated; it should be as simple as copying the system firefox expression
-   * into place.
-   */
-
-  firefox = callPackage ./firefox-bin {
-    gconf = gnome.GConf;
-    inherit (gnome) libgnome libgnomeui;
-    inherit (xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext
-      libXfixes libXinerama libXrender libXt;
+
+  xpi = fetchurl {
+    url = "https://download.zotero.org/extension/zotero-${version}.xpi";
+    sha256 = "0di6d3s95fmb4pmghl4ix7lq5pmqrddd4y8dmnpsrhbj0awzxw3s";
   };
 
-  # Please update the firefox dependency when zotero is updated!
-  version = "4.0.23";
-  arch = if stdenv.system == "x86_64-linux"
-           then "linux-x86_64"
-           else "linux-i686";
+  version = "4.0.25.2";
+
 in
 stdenv.mkDerivation {
   name = "zotero-${version}";
+  inherit version;
 
   src = fetchurl {
-    url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2";
-    sha256 = if stdenv.system == "x86_64-linux"
-               then "1fz5xn69vapfw8d20207zr9p5r1h9x5kahh334pl2dn1h8il0sm8"
-               else "1kmsvvg2lh881rzy3rxbigzivixjamyrwf5x7vmn1kzhvsvifrng";
+    url = "https://github.com/zotero/zotero-standalone-build/archive/${version}.tar.gz";
+    sha256 = "0wjmpz7fy3ij8q22s885kv8xrgc3yx7f1mwrvb6lnpc2xl54rl5g";
   };
 
-  # Strip the bundled xulrunner
-  prePatch = ''rm -fr run-zotero.sh zotero xulrunner/'';
+  nativeBuildInputs = [ perl unzipNLS ];
 
   inherit bash firefox;
+
+  phases = "unpackPhase installPhase fixupPhase";
+
   installPhase = ''
     mkdir -p "$out/libexec/zotero"
-    cp -vR * "$out/libexec/zotero/"
+    unzip "${xpi}" -d "$out/libexec/zotero"
+
+    BUILDID=`date +%Y%m%d`
+    GECKO_VERSION="${firefox.passthru.version}"
+    UPDATE_CHANNEL="default"
+
+    # Copy branding
+    cp -R assets/branding "$out/libexec/zotero/chrome/branding"
+
+    # Adjust chrome.manifest
+    echo "" >> "$out/libexec/zotero/chrome.manifest"
+    cat assets/chrome.manifest >> "$out/libexec/zotero/chrome.manifest"
+
+    # Copy updater.ini
+    cp assets/updater.ini "$out/libexec/zotero"
+
+    # Adjust connector pref
+    perl -pi -e 's/pref\("extensions\.zotero\.httpServer\.enabled", false\);/pref("extensions.zotero.httpServer.enabled", true);/g' "$out/libexec/zotero/defaults/preferences/zotero.js"
+    perl -pi -e 's/pref\("extensions\.zotero\.connector\.enabled", false\);/pref("extensions.zotero.connector.enabled", true);/g' "$out/libexec/zotero/defaults/preferences/zotero.js"
+
+    # Copy icons
+    cp -r assets/icons "$out/libexec/zotero/chrome/icons"
+
+    # Copy application.ini and modify
+    cp assets/application.ini "$out/libexec/zotero/application.ini"
+    perl -pi -e "s/{{VERSION}}/$version/" "$out/libexec/zotero/application.ini"
+    perl -pi -e "s/{{BUILDID}}/$BUILDID/" "$out/libexec/zotero/application.ini"
+    perl -pi -e "s/^MaxVersion.*\$/MaxVersion=$GECKO_VERSION/" "$out/libexec/zotero/application.ini"
+
+    # Copy prefs.js and modify
+    cp assets/prefs.js "$out/libexec/zotero/defaults/preferences"
+    perl -pi -e 's/pref\("app\.update\.channel", "[^"]*"\);/pref\("app\.update\.channel", "'"$UPDATE_CHANNEL"'");/' "$out/libexec/zotero/defaults/preferences/prefs.js"
+    perl -pi -e 's/%GECKO_VERSION%/'"$GECKO_VERSION"'/g' "$out/libexec/zotero/defaults/preferences/prefs.js"
+
+    # Add platform-specific standalone assets
+    cp -R assets/unix "$out/libexec/zotero"
 
     mkdir -p "$out/bin"
     substituteAll "${./zotero.sh}" "$out/bin/zotero"
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 1be1328da27..85339a86733 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, libpng, lua5, automake, autoconf }:
 
 stdenv.mkDerivation rec {
-  name = "gravit-0.5.0";
+  name = "gravit-0.5.1";
 
   src = fetchurl {
     url = "http://gravit.slowchop.com/media/downloads/${name}.tgz";
-    sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp";
+    sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
   };
 
   buildInputs = [mesa SDL SDL_ttf SDL_image lua5 automake autoconf libpng];
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index d7ae496f5aa..ebe756a47f3 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5, perl
 , libiconvOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "stellarium-0.12.4";
+  name = "stellarium-0.13.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg";
+    sha256 = "1asrq1v6vjzxd2zz92brdfs5f5b1qf8zwd7k2dpg3dl4shl8wwg5";
   };
 
-  buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl ]
+  buildInputs = [ cmake freetype libpng mesa gettext openssl qt5 perl ]
     ++ libiconvOrEmpty;
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 70149522393..228d1a7c4d4 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with ocamlPackages;
-    [ coq ocaml findlib lablgtk ocamlgraph zarith ];
+    [ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith ];
 
   meta = with stdenv.lib; {
     description = "A platform for deductive program verification";
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 7a87cb5e8be..a213f6da37e 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, python, unzip, autoreconfHook }:
+{ stdenv, fetchurl, python, unzip }:
 
 stdenv.mkDerivation rec {
   name = "z3-${version}";
-  version = "4.3.1";
+  version = "4.3.2";
   src = fetchurl {
-    url    = "http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx\?ProjectName\=z3\&changeSetId\=89c1785b73225a1b363c0e485f854613121b70a7";
+    url    = "http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx\?ProjectName\=z3\&changeSetId\=cee7dd39444c9060186df79c2a2c7f8845de415b";
     name   = "${name}.zip";
-    sha256 = "3b94465c52ec174350d8707dd6a1fb0cef42f0fa23f148cc1808c14f3c2c7f76";
+    sha256 = "0hagy7xm0m52jd6vlrbizkj24mn6c49hkb3r5p66wilvp15ivpbn";
   };
 
-  buildInputs = [ python unzip autoreconfHook ];
+  buildInputs = [ python unzip ];
   enableParallelBuilding = true;
 
   # The zip file doesn't unpack a directory, just the code itself.
   unpackPhase = "mkdir ${name} && cd ${name} && unzip $src";
-  postConfigure = ''
-    python scripts/mk_make.py
+
+  configurePhase = ''
+    python scripts/mk_make.py --prefix=$out
     cd build
   '';
 
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Z3 is a high-performance theorem prover and SMT solver";
+    description = "A high-performance theorem prover and SMT solver";
     homepage    = "http://z3.codeplex.com";
     license     = stdenv.lib.licenses.msrla;
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix
index 0a9e0e4735d..6a8f9e59000 100644
--- a/pkgs/applications/science/math/pssp/default.nix
+++ b/pkgs/applications/science/math/pssp/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pspp-0.8.2";
+  name = "pspp-0.8.3";
 
   src = fetchurl {
     url = "mirror://gnu/pspp/${name}.tar.gz";
-    sha256 = "1w7h3dglgx0jlq1wb605b8pgfsk2vr1q2q2rj7bsajh9ihbcsixr";
+    sha256 = "0vri2pzvmm38qaihfvwlry30f40lcnps4blg59ixic4q20ldxf5d";
   };
 
   buildInputs = [ libxml2 readline zlib perl cairo gtk gsl pkgconfig
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 891c947e85b..523e121b471 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,7 +46,7 @@ rec {
     sendEmailSupport = !stdenv.isDarwin;
   };
 
-  gitAnnex = pkgs.haskellPackages.gitAnnex;
+  gitAnnex = pkgs.haskellngPackages.git-annex;
 
   qgit = import ./qgit {
     inherit fetchurl stdenv;
@@ -68,9 +68,7 @@ rec {
     inherit stdenv fetchurl;
   };
 
-  tig = import ./tig {
-    inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45 readline;
-  };
+  tig = callPackage ./tig { };
 
   hub = import ./hub {
     inherit go;
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index ffeb299f49b..a60d7d2a49b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  rev = "185852eac44c25ae2e8d3b3fb6c9630e754e6363";
-  version = "v0.2-185852eac44c25ae2e8d3b3fb6c9630e754e6363";
+  rev = "e716a9e1a9e460a45663694ba4e9e8894a8452b2";
+  version = "v0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2";
   name = "git-remote-hg-${version}";
 
   src = fetchgit {
     inherit rev;
-    url = "git://github.com/felipec/git-remote-hg.git";
-    sha256 = "1hc65nvxq7if1imwffyxia0i6vnkbax09gfcl9vq9yffzi8xzzfy";
+    url = "git://github.com/fingolfin/git-remote-hg.git";
+    sha256 = "7c61c8f2be47d96c4244f0f8a3c8f9b994994b15dbe1754581f746888d705463";
   };
 
   buildInputs = [ mercurial.python mercurial makeWrapper
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 3d8d3cb4355..be53a429e7b 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
     sha256 = "1f6r8vlwnmqmr85drfv24vhqx1aacz6s83c2i804v9997n0wrwfm";
   };
 
-
   buildInputs = [ go ];
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];
@@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
 # ?
   '';
 
-
   meta = with stdenv.lib; {
     description = "Command-line wrapper for git that makes you better at GitHub";
 
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 7e93893e7b1..4c82c96a7c1 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
-, readline
+, readline, makeWrapper, git
 }:
 
 stdenv.mkDerivation rec {
@@ -11,17 +11,22 @@ stdenv.mkDerivation rec {
 
   };
 
-  buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline ];
+  buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ];
 
   preConfigure = ''
     export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml'
   '';
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     make install
     make install-doc
     mkdir -p $out/etc/bash_completion.d/
     cp contrib/tig-completion.bash $out/etc/bash_completion.d/
+
+    wrapProgram $out/bin/tig \
+      --prefix PATH ':' "${git}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 3d4ae689f6b..467e39f7141 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, ruby, rubyLibs, fetchgit }:
+{ stdenv, ruby, bundler, fetchgit }:
 
 stdenv.mkDerivation rec {
   version = "2.1.0";
   name = "gitlab-shell-${version}";
-  
+
   srcs = fetchgit {
     url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
     rev = "823aba63e444afa2f45477819770fec3cb5f0159";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    ruby rubyLibs.bundler
+    ruby bundler
   ];
 
   installPhase = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     export HOME=$(pwd)
     bundle install -j4 --verbose --local --deployment --without development test
   '';
-  
+
   # gitlab-shell will try to read its config relative to the source
   # code by default which doesn't work in nixos because it's a
   # read-only filesystem
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
new file mode 100644
index 00000000000..f6f3607cbd1
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -0,0 +1,258 @@
+source "https://rubygems.org"
+
+def darwin_only(require_as)
+  RUBY_PLATFORM.include?('darwin') && require_as
+end
+
+def linux_only(require_as)
+  RUBY_PLATFORM.include?('linux') && require_as
+end
+
+gem "rails", "~> 4.1.0"
+
+# Make links from text
+gem 'rails_autolink', '~> 1.1'
+
+# Default values for AR models
+gem "default_value_for", "~> 3.0.0"
+
+# Supported DBs
+gem "mysql2", group: :mysql
+gem "pg", group: :postgres
+
+# Auth
+gem "devise", '3.2.4'
+gem "devise-async", '0.9.0'
+gem 'omniauth', "~> 1.1.3"
+gem 'omniauth-google-oauth2'
+gem 'omniauth-twitter'
+gem 'omniauth-github'
+gem 'omniauth-shibboleth'
+
+# Extracting information from a git repository
+# Provide access to Gitlab::Git library
+gem "gitlab_git", '7.0.0.rc10'
+
+# Ruby/Rack Git Smart-HTTP Server Handler
+gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
+
+# LDAP Auth
+gem 'gitlab_omniauth-ldap', '1.1.0', require: "omniauth-ldap"
+
+# Git Wiki
+gem 'gollum-lib', '~> 3.0.0'
+
+# Language detection
+gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
+
+# API
+gem "grape", "~> 0.6.1"
+gem "grape-entity", "~> 0.4.2"
+gem 'rack-cors', require: 'rack/cors'
+
+# Format dates and times
+# based on human-friendly examples
+gem "stamp"
+
+# Enumeration fields
+gem 'enumerize'
+
+# Pagination
+gem "kaminari", "~> 0.15.1"
+
+# HAML
+gem "haml-rails"
+
+# Files attachments
+gem "carrierwave"
+
+# Drag and Drop UI
+gem 'dropzonejs-rails'
+
+# for aws storage
+gem "fog", "~> 1.14"
+gem "unf"
+
+# Authorization
+gem "six"
+
+# Seed data
+gem "seed-fu"
+
+# Markup pipeline for GitLab
+gem 'html-pipeline-gitlab', '~> 0.1.0'
+
+# Markdown to HTML
+gem "github-markup"
+
+# Required markup gems by github-markdown
+gem 'redcarpet', '~> 3.1.2'
+gem 'RedCloth'
+gem 'rdoc', '~>3.6'
+gem 'org-ruby', '= 0.9.9'
+gem 'creole', '~>0.3.6'
+gem 'wikicloth', '=0.8.1'
+gem 'asciidoctor', '= 0.1.4'
+
+# Diffs
+gem 'diffy', '~> 3.0.3'
+
+# Application server
+group :unicorn do
+  gem "unicorn", '~> 4.6.3'
+  gem 'unicorn-worker-killer'
+end
+
+# State machine
+gem "state_machine"
+
+# Issue tags
+gem "acts-as-taggable-on"
+
+# Background jobs
+gem 'slim'
+gem 'sinatra', require: nil
+gem 'sidekiq', '2.17.0'
+
+# HTTP requests
+gem "httparty"
+
+# Colored output to console
+gem "colored"
+
+# GitLab settings
+gem 'settingslogic'
+
+# Misc
+gem "foreman"
+gem 'version_sorter'
+
+# Cache
+gem "redis-rails"
+
+# Campfire integration
+gem 'tinder', '~> 1.9.2'
+
+# HipChat integration
+gem "hipchat", "~> 0.14.0"
+
+# Flowdock integration
+gem "gitlab-flowdock-git-hook", "~> 0.4.2"
+
+# Gemnasium integration
+gem "gemnasium-gitlab-service", "~> 0.2"
+
+# Slack integration
+gem "slack-notifier", "~> 0.3.2"
+
+# d3
+gem "d3_rails", "~> 3.1.4"
+
+# underscore-rails
+gem "underscore-rails", "~> 1.4.4"
+
+# Sanitize user input
+gem "sanitize", '~> 2.0'
+
+# Protect against bruteforcing
+gem "rack-attack"
+
+# Ace editor
+gem 'ace-rails-ap'
+
+# Keyboard shortcuts
+gem 'mousetrap-rails'
+
+# Semantic UI Sass for Sidebar
+gem 'semantic-ui-sass', '~> 0.16.1.0'
+
+gem "sass-rails", '~> 4.0.2'
+gem "coffee-rails"
+gem "uglifier"
+gem "therubyracer"
+gem 'turbolinks'
+gem 'jquery-turbolinks'
+
+gem 'select2-rails'
+gem 'jquery-atwho-rails', "~> 0.3.3"
+gem "jquery-rails"
+gem "jquery-ui-rails"
+gem "jquery-scrollto-rails"
+gem "raphael-rails", "~> 2.1.2"
+gem 'bootstrap-sass', '~> 3.0'
+gem "font-awesome-rails", '~> 4.2'
+gem "gitlab_emoji", "~> 0.0.1.1"
+gem "gon", '~> 5.0.0'
+gem 'nprogress-rails'
+gem 'request_store'
+gem "virtus"
+
+group :development do
+  gem "annotate", "~> 2.6.0.beta2"
+  gem "letter_opener"
+  gem 'quiet_assets', '~> 1.0.1'
+  gem 'rack-mini-profiler', require: false
+
+  # Better errors handler
+  gem 'better_errors'
+  gem 'binding_of_caller'
+
+  gem 'rails_best_practices'
+
+  # Docs generator
+  gem "sdoc"
+
+  # thin instead webrick
+  gem 'thin'
+end
+
+group :development, :test do
+  gem 'coveralls', require: false
+  # gem 'rails-dev-tweaks'
+  gem 'spinach-rails'
+  gem "rspec-rails"
+  gem "capybara", '~> 2.2.1'
+  gem "pry"
+  gem "awesome_print"
+  gem "database_cleaner"
+  gem "launchy"
+  gem 'factory_girl_rails'
+
+  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
+  gem 'minitest', '~> 5.3.0'
+
+  # Generate Fake data
+  gem "ffaker"
+
+  # Guard
+  gem 'guard-rspec'
+  gem 'guard-spinach'
+
+  # Notification
+  gem 'rb-fsevent', require: darwin_only('rb-fsevent')
+  gem 'growl',      require: darwin_only('growl')
+  gem 'rb-inotify', require: linux_only('rb-inotify')
+
+  # PhantomJS driver for Capybara
+  gem 'poltergeist', '~> 1.5.1'
+
+  gem 'jasmine', '2.0.2'
+
+  gem "spring", '1.1.3'
+  gem "spring-commands-rspec", '1.0.1'
+  gem "spring-commands-spinach", '1.0.0'
+end
+
+group :test do
+  gem "simplecov", require: false
+  gem "shoulda-matchers", "~> 2.1.0"
+  gem 'email_spec'
+  gem "webmock"
+  gem 'test_after_commit'
+end
+
+group :production do
+  gem "gitlab_meta", '7.0'
+end
+
+gem "newrelic_rpm"
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 8a1141d0861..314884fa36e 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -281,6 +281,7 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.1.2)
       launchy (~> 2.2)
+    libv8 (3.16.14.3)
     listen (2.3.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -297,6 +298,7 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
+    mysql2 (0.3.16)
     net-ldap (0.7.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
@@ -420,6 +422,7 @@ GEM
       redis-store (~> 1.1.0)
     redis-store (1.1.4)
       redis (>= 2.2)
+    ref (1.0.5)
     request_store (1.0.5)
     require_all (1.3.2)
     rest-client (1.6.7)
@@ -518,6 +521,9 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     test_after_commit (0.2.2)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
+      ref
     thin (1.6.1)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
@@ -691,6 +697,7 @@ DEPENDENCIES
   stamp
   state_machine
   test_after_commit
+  therubyracer
   thin
   tinder (~> 1.9.2)
   turbolinks
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.nix b/pkgs/applications/version-management/gitlab/Gemfile.nix
deleted file mode 100644
index 2e05d883abf..00000000000
--- a/pkgs/applications/version-management/gitlab/Gemfile.nix
+++ /dev/null
@@ -1,1508 +0,0 @@
-[
-{
-name = "RedCloth";
-hash = "b4cf450a8868ca00a48d6ea43346d75dac183a8590774dd5590f4e967d87ea1a";
-url = "http://rubygems.org/downloads/RedCloth-4.2.9.gem";
-version = "4.2.9";
-}
-{
-name = "ace-rails-ap";
-hash = "7bfbec4e8f7c7b6d2733fada398253f885ee48acd08201126a47a636b3085620";
-url = "http://rubygems.org/downloads/ace-rails-ap-2.0.1.gem";
-version = "2.0.1";
-}
-{
-name = "actionmailer";
-hash = "ddf61f96ecf52b918522f063effb28985d0f76deb5c3ad85ab8cf5ec39adab92";
-url = "http://rubygems.org/downloads/actionmailer-4.1.1.gem";
-version = "4.1.1";
-}
-{
-name = "actionpack";
-hash = "c11be56442eb570ba44d3b3ac74f6949f882c8dc76c56fceeb071daf64c5111d";
-url = "http://rubygems.org/downloads/actionpack-4.1.1.gem";
-version = "4.1.1";
-}
-{
-name = "actionview";
-hash = "5892b097fc3556c4ac25307f3c406ba697b6520ca7c34b7d1ff17e0c93d79072";
-url = "http://rubygems.org/downloads/actionview-4.1.1.gem";
-version = "4.1.1";
-}
-{
-name = "activemodel";
-hash = "c1d808d85b5e7f90593cb66ac7694f9288c819cdd1cb029790617f60cfed3232";
-url = "http://rubygems.org/downloads/activemodel-4.1.1.gem";
-version = "4.1.1";
-}
-{
-name = "activerecord";
-hash = "df9f2227e00779826ea8abe13ed1c6aa9ba5422b35e37c1b82f62480d2ea13a0";
-url = "http://rubygems.org/downloads/activerecord-4.1.1.gem";
-version = "4.1.1";
-}
-{
-name = "activesupport";
-hash = "7342801d69c8ca68c9005cafbc4a8f67069d3b51c0a4f5e2bbd061dcb26bba85";
-url = "http://rubygems.org/downloads/activesupport-4.1.1.gem";
-version = "4.1.1";
-}
-{
-name = "acts-as-taggable-on";
-hash = "4b75dd427cb721f38fe354e8a37d8c3d217779c9db204398890984694def753d";
-url = "http://rubygems.org/downloads/acts-as-taggable-on-2.4.1.gem";
-version = "2.4.1";
-}
-{
-name = "addressable";
-hash = "e74d0e825fe79b12943c7e3cbd3a5c92f7e3ebb94485b2493d320d6876321b86";
-url = "http://rubygems.org/downloads/addressable-2.3.5.gem";
-version = "2.3.5";
-}
-{
-name = "annotate";
-hash = "d92ab99c6d10d98fec361bb5501ee91f8f30d1a7b2a6267334d74a1c6b363656";
-url = "http://rubygems.org/downloads/annotate-2.6.0.gem";
-version = "2.6.0";
-}
-{
-name = "arel";
-hash = "c941f07bad89af26e8837c73d8a399b7777c721609f759eda015ed0081601636";
-url = "http://rubygems.org/downloads/arel-5.0.1.20140414130214.gem";
-version = "5.0.1.20140414130214";
-}
-{
-name = "asciidoctor";
-hash = "2a2d6f9aed31200c9c74e5b81dba1673eda2f7936599df016cbe608dd8e1cf92";
-url = "http://rubygems.org/downloads/asciidoctor-0.1.4.gem";
-version = "0.1.4";
-}
-{
-name = "awesome_print";
-hash = "f9fb1d1bafddc4739266c68f3a043e409716a620aea937d54d1ae07c278305cd";
-url = "http://rubygems.org/downloads/awesome_print-1.2.0.gem";
-version = "1.2.0";
-}
-{
-name = "axiom-types";
-hash = "f67b87e9d7276f78cbee8f09f9bd474d63d7b357d271c63bfac5092b4670d54c";
-url = "http://rubygems.org/downloads/axiom-types-0.0.5.gem";
-version = "0.0.5";
-}
-{
-name = "bcrypt";
-hash = "1c30953152c7151eac21aa59eed7ea933a7bc5d5838edea1d30d79b005955702";
-url = "http://rubygems.org/downloads/bcrypt-3.1.7.gem";
-version = "3.1.7";
-}
-{
-name = "better_errors";
-hash = "eec93a02c996a8105cd9409cff2a2156a16ff1609b93b9b0d38c623cdb42186c";
-url = "http://rubygems.org/downloads/better_errors-1.0.1.gem";
-version = "1.0.1";
-}
-{
-name = "binding_of_caller";
-hash = "d327682ce1d8e8cc46e282a46052946af0de16bef734014c63df0aac66334f96";
-url = "http://rubygems.org/downloads/binding_of_caller-0.7.2.gem";
-version = "0.7.2";
-}
-{
-name = "bootstrap-sass";
-hash = "3f9269bae459b9f48bcb46524497fe7c422919708d12d9d9b1096b45339654c7";
-url = "http://rubygems.org/downloads/bootstrap-sass-3.0.3.0.gem";
-version = "3.0.3.0";
-}
-{
-name = "builder";
-hash = "62fb9ad70ea42219a0c8d209a30281803712c717df7cb8f5ce5f63b4d489d191";
-url = "http://rubygems.org/downloads/builder-3.2.2.gem";
-version = "3.2.2";
-}
-{
-name = "capybara";
-hash = "0081ff6eaa33f4b5b0427db7ef0ca0af015a9bf6606126f41016db6feb58cdeb";
-url = "http://rubygems.org/downloads/capybara-2.2.1.gem";
-version = "2.2.1";
-}
-{
-name = "carrierwave";
-hash = "859069a445ffe03551cce9e239da424dabcc3b9a855e5f615ec62f6655d82aac";
-url = "http://rubygems.org/downloads/carrierwave-0.9.0.gem";
-version = "0.9.0";
-}
-{
-name = "celluloid";
-hash = "2bb549276898d262355818b54eee45161d565af08728a5fe83e51277ea49ea52";
-url = "http://rubygems.org/downloads/celluloid-0.15.2.gem";
-version = "0.15.2";
-}
-{
-name = "charlock_holmes";
-hash = "e52db7af0f7a652f55244455f84b4f1c09144f0d5e416f677a912f9147d6dfef";
-url = "http://rubygems.org/downloads/charlock_holmes-0.6.9.4.gem";
-version = "0.6.9.4";
-}
-{
-name = "cliver";
-hash = "8775445218c612bb57f50c392c4906a1ab5cca067eab093bde3cc77d6426ce24";
-url = "http://rubygems.org/downloads/cliver-0.3.2.gem";
-version = "0.3.2";
-}
-{
-name = "code_analyzer";
-hash = "27b610b987b3421d17a615cbab0c712f90bca45e82391ab9082670af97360bed";
-url = "http://rubygems.org/downloads/code_analyzer-0.4.3.gem";
-version = "0.4.3";
-}
-{
-name = "coderay";
-hash = "5a943c59e36f7ef9dd2677855735656413af02e3f302431e9c548aabe89f3c15";
-url = "http://rubygems.org/downloads/coderay-1.1.0.gem";
-version = "1.1.0";
-}
-{
-name = "coercible";
-hash = "5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc";
-url = "http://rubygems.org/downloads/coercible-1.0.0.gem";
-version = "1.0.0";
-}
-{
-name = "coffee-rails";
-hash = "2f6e36f2c7a2b5ea4ba2aae5d8f70b443e47f010e1f645aec28368d783e1d88a";
-url = "http://rubygems.org/downloads/coffee-rails-4.0.1.gem";
-version = "4.0.1";
-}
-{
-name = "coffee-script";
-hash = "acdd9f907950cfcf2342bc621ac9d11c9b0f34e2be8ab02de7845c673fb96c8c";
-url = "http://rubygems.org/downloads/coffee-script-2.2.0.gem";
-version = "2.2.0";
-}
-{
-name = "coffee-script-source";
-hash = "64a5e37557b367c3a087643ed033b1dce485d6c21f96262aecc806d93280635c";
-url = "http://rubygems.org/downloads/coffee-script-source-1.6.3.gem";
-version = "1.6.3";
-}
-{
-name = "colored";
-hash = "9d82b47ac589ce7f6cab64b1f194a2009e9fd00c326a5357321f44afab2c1d2c";
-url = "http://rubygems.org/downloads/colored-1.2.gem";
-version = "1.2";
-}
-{
-name = "colorize";
-hash = "0f3d2c56f6a9da8dd6e8bb7c4448dab91a682615ef49feff415a8a6999dedfe5";
-url = "http://rubygems.org/downloads/colorize-0.5.8.gem";
-version = "0.5.8";
-}
-{
-name = "connection_pool";
-hash = "41c0f1ff0c5a697869344ff50ae0d952fe99b52b26c21744b06fac34323adcb9";
-url = "http://rubygems.org/downloads/connection_pool-1.2.0.gem";
-version = "1.2.0";
-}
-{
-name = "coveralls";
-hash = "449284ddd071e2297d06d0a9d18fe4c2b4027848263b1087d4180fb44e03e36b";
-url = "http://rubygems.org/downloads/coveralls-0.7.0.gem";
-version = "0.7.0";
-}
-{
-name = "crack";
-hash = "4f9690bc66278494e0c525989b8ebfa89ce44087cd1733857d6ca9162dd16271";
-url = "http://rubygems.org/downloads/crack-0.4.1.gem";
-version = "0.4.1";
-}
-{
-name = "creole";
-hash = "88ceda907e86402e629557002dfdc3a64c96ece2f85af8d787b96422639998f3";
-url = "http://rubygems.org/downloads/creole-0.3.8.gem";
-version = "0.3.8";
-}
-{
-name = "d3_rails";
-hash = "28c6b97d4167481b78525cb2e2aa6b066fff6a086bb68a25762dec502cdf24d9";
-url = "http://rubygems.org/downloads/d3_rails-3.1.10.gem";
-version = "3.1.10";
-}
-{
-name = "daemons";
-hash = "fee738586059ac5051ed89b40b63d02bdc9a19254f9b6e58848dea1c2f3135c8";
-url = "http://rubygems.org/downloads/daemons-1.1.9.gem";
-version = "1.1.9";
-}
-{
-name = "database_cleaner";
-hash = "f675eb78d4fed65ae1e8503ccef4dfd25f4a3c3702bfb792789720a39a2f82a7";
-url = "http://rubygems.org/downloads/database_cleaner-1.3.0.gem";
-version = "1.3.0";
-}
-{
-name = "debug_inspector";
-hash = "1594188ffd35b9973fa1e048497e4aa63abad0c3cbba0670e17935005e302781";
-url = "http://rubygems.org/downloads/debug_inspector-0.0.2.gem";
-version = "0.0.2";
-}
-{
-name = "default_value_for";
-hash = "1fbd89cb5e7dab1820f7da6bbf5972c36e41acaa25101f129a7adffe9b987021";
-url = "http://rubygems.org/downloads/default_value_for-3.0.0.gem";
-version = "3.0.0";
-}
-{
-name = "descendants_tracker";
-hash = "01d7079bc81d4743e138bf77a7cc1ece123834fa6883f4241646163401922920";
-url = "http://rubygems.org/downloads/descendants_tracker-0.0.3.gem";
-version = "0.0.3";
-}
-{
-name = "devise";
-hash = "a37345a41049b5c4e02da561bcf922920b406cdd41970d1eb0023315050244fd";
-url = "http://rubygems.org/downloads/devise-3.2.4.gem";
-version = "3.2.4";
-}
-{
-name = "devise-async";
-hash = "b51aec324bfa56f5e51b00e5429546e9eeab4be99ac0971625afdeffde799486";
-url = "http://rubygems.org/downloads/devise-async-0.9.0.gem";
-version = "0.9.0";
-}
-{
-name = "diff-lcs";
-hash = "a1d3dde665292317a883d319066792e3f0e6a24cade4bc4cc47605d27664c9ed";
-url = "http://rubygems.org/downloads/diff-lcs-1.2.5.gem";
-version = "1.2.5";
-}
-{
-name = "diffy";
-hash = "15a1d91b0ea81cada6ef5977543e7c255b4f8c5c3d361e557c8aee52cdf58d62";
-url = "http://rubygems.org/downloads/diffy-3.0.3.gem";
-version = "3.0.3";
-}
-{
-name = "docile";
-hash = "5d3ee40b3a6567fe460601f3f4a3e199a98de37434ebfa242d751d0c79181255";
-url = "http://rubygems.org/downloads/docile-1.1.5.gem";
-version = "1.1.5";
-}
-{
-name = "dotenv";
-hash = "838e235fa00d343c3138dbc05aa2cf1ec626ff9f065d521917a79a86b4a980be";
-url = "http://rubygems.org/downloads/dotenv-0.9.0.gem";
-version = "0.9.0";
-}
-{
-name = "dropzonejs-rails";
-hash = "de86f5f58ca2e6f7212709db879f72d3eec16477a92296f03effabdd928c122b";
-url = "http://rubygems.org/downloads/dropzonejs-rails-0.4.14.gem";
-version = "0.4.14";
-}
-{
-name = "email_spec";
-hash = "2607e556f41ab7fb90dabd3eda3d21acec5c2afd3ee607ab713664473dda503f";
-url = "http://rubygems.org/downloads/email_spec-1.5.0.gem";
-version = "1.5.0";
-}
-{
-name = "emoji";
-hash = "2a74a4c6ff196cdc81e63198d30d8660b39b1147a59bd5f3639b39edf8fccf05";
-url = "http://rubygems.org/downloads/emoji-1.0.1.gem";
-version = "1.0.1";
-}
-{
-name = "enumerize";
-hash = "4608034132557260e16a936c0eef54bf26c21eda261da25f89e49edd475de665";
-url = "http://rubygems.org/downloads/enumerize-0.7.0.gem";
-version = "0.7.0";
-}
-{
-name = "equalizer";
-hash = "d66d02ece6935c217e3a81b2e33487825633fd203144e495b6e29f07278909da";
-url = "http://rubygems.org/downloads/equalizer-0.0.8.gem";
-version = "0.0.8";
-}
-{
-name = "erubis";
-hash = "63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba";
-url = "http://rubygems.org/downloads/erubis-2.7.0.gem";
-version = "2.7.0";
-}
-{
-name = "escape_utils";
-hash = "8f14b54e78845b9673d4ade8ec7f748652e18e19cd9800605f810ba0d4bbe555";
-url = "http://rubygems.org/downloads/escape_utils-0.2.4.gem";
-version = "0.2.4";
-}
-{
-name = "eventmachine";
-hash = "34424c87fc517f70ba137fe2281d16b53ce9c13f5cbfc2dda3ada56e96a65827";
-url = "http://rubygems.org/downloads/eventmachine-1.0.3.gem";
-version = "1.0.3";
-}
-{
-name = "excon";
-hash = "aa1018571cb72248f82a9b88ab631b53179d0de0f8169957eebe512404805f79";
-url = "http://rubygems.org/downloads/excon-0.32.1.gem";
-version = "0.32.1";
-}
-{
-name = "execjs";
-hash = "5a2e097ea0ae440cbbe6aebf54d83cf8596324fa85b7a725dfdb1e8afd5cf398";
-url = "http://rubygems.org/downloads/execjs-2.0.2.gem";
-version = "2.0.2";
-}
-{
-name = "expression_parser";
-hash = "2b56db3cffc48c3337f4f29f5bc2374c86e7ba29acb40269c74bb55af9f868a4";
-url = "http://rubygems.org/downloads/expression_parser-0.9.0.gem";
-version = "0.9.0";
-}
-{
-name = "factory_girl";
-hash = "bfa55ba5d3218c8e86adf251be79a3f936adadcae563f0d7462cfcb38802e28f";
-url = "http://rubygems.org/downloads/factory_girl-4.3.0.gem";
-version = "4.3.0";
-}
-{
-name = "factory_girl_rails";
-hash = "1fe68aa430afa25807a135ac348b5157ec5b70608fb7741e598d46570df540ca";
-url = "http://rubygems.org/downloads/factory_girl_rails-4.3.0.gem";
-version = "4.3.0";
-}
-{
-name = "faraday";
-hash = "289c3b5b57821b52988bdb5178d3e1149741f2bae5fbee2a80bc83feb44ba79d";
-url = "http://rubygems.org/downloads/faraday-0.8.9.gem";
-version = "0.8.9";
-}
-{
-name = "faraday_middleware";
-hash = "02b37848159983ed1e4374f46f02325bf0364e8eb1e0a38839d2b4deb4889bcf";
-url = "http://rubygems.org/downloads/faraday_middleware-0.9.0.gem";
-version = "0.9.0";
-}
-{
-name = "ffaker";
-hash = "18e03e1390c5bf0fc7ebf9a457fcce365b5e51e937b79c9e0c03e1191cc4f79f";
-url = "http://rubygems.org/downloads/ffaker-1.22.1.gem";
-version = "1.22.1";
-}
-{
-name = "ffi";
-hash = "57977d095c1c324ac1cb134863180b34d5743fed2b6d7528adc5ec71a581e320";
-url = "http://rubygems.org/downloads/ffi-1.9.3.gem";
-version = "1.9.3";
-}
-{
-name = "fog";
-hash = "ee28b0bae7004a98e139f65d8fe606d666534f4b5f96cef247bdd0374ec10b92";
-url = "http://rubygems.org/downloads/fog-1.21.0.gem";
-version = "1.21.0";
-}
-{
-name = "fog-brightbox";
-hash = "7362f7497c45e7aa9621a23d4486211c90126afd86d0a5603270d88894bb2b48";
-url = "http://rubygems.org/downloads/fog-brightbox-0.0.1.gem";
-version = "0.0.1";
-}
-{
-name = "fog-core";
-hash = "64e023ca8de23a0317ff3608c65068bbf722691c07a26c00752b9e51168d9df1";
-url = "http://rubygems.org/downloads/fog-core-1.21.1.gem";
-version = "1.21.1";
-}
-{
-name = "fog-json";
-hash = "dcd321b42f551a9ed3a2a5d43bdfe703b7588dcac5a9e504577501ba50d52794";
-url = "http://rubygems.org/downloads/fog-json-1.0.0.gem";
-version = "1.0.0";
-}
-{
-name = "font-awesome-rails";
-hash = "00ca8028187d17176a397588003c6db779ed14197dbbe28d369561ae2919dde4";
-url = "http://rubygems.org/downloads/font-awesome-rails-4.2.0.0.gem";
-version = "4.2.0.0";
-}
-{
-name = "foreman";
-hash = "937e1b895042139d578936b1c099bc1989dcb7188c0f4798e79154997a941e7b";
-url = "http://rubygems.org/downloads/foreman-0.63.0.gem";
-version = "0.63.0";
-}
-{
-name = "formatador";
-hash = "2238f3794fc3b5d69578fdd9bad7ea82116540a3587a67a966a39a686098f55d";
-url = "http://rubygems.org/downloads/formatador-0.2.4.gem";
-version = "0.2.4";
-}
-{
-name = "gemnasium-gitlab-service";
-hash = "82b9b6ef02f625a30198cefe5fd46b8c4551ec749a320d3b56fdcd1ebef07228";
-url = "http://rubygems.org/downloads/gemnasium-gitlab-service-0.2.2.gem";
-version = "0.2.2";
-}
-{
-name = "gherkin-ruby";
-hash = "9856207d67c184a07e7e35e91fd4322f89ad15704ba1f3764307f8798864f482";
-url = "http://rubygems.org/downloads/gherkin-ruby-0.3.1.gem";
-version = "0.3.1";
-}
-{
-name = "github-markup";
-hash = "ef345d335058b050ecbe0f2e59450e1f6648574fa67f31b8537cdead9ea4fa1b";
-url = "http://rubygems.org/downloads/github-markup-1.1.0.gem";
-version = "1.1.0";
-}
-{
-name = "gitlab-flowdock-git-hook";
-hash = "9bdb3455e46de3a6642d72a23f8f62b57669d1d0f2ea98561c653736ffe4d064";
-url = "http://rubygems.org/downloads/gitlab-flowdock-git-hook-0.4.2.2.gem";
-version = "0.4.2.2";
-}
-{
-name = "gitlab-grack";
-hash = "197qdlymn6cf0qk3698kn0miizv7x9hr1429g9l900rnc85a5rdb";
-url = "https://rubygems.org/downloads/gitlab-grack-2.0.0.pre.gem";
-version = "2.0.0.pre";
-}
-{
-name = "gitlab-grit";
-hash = "88996ec1e14017bfd4c70baae6e72110317704ae689f3fdb26e3bd371887cf03";
-url = "http://rubygems.org/downloads/gitlab-grit-2.6.12.gem";
-version = "2.6.12";
-}
-{
-name = "gitlab-linguist";
-hash = "6652604cdf0168832ba5fe6662251f792730fbcb9253869625658cb1e8d9563c";
-url = "http://rubygems.org/downloads/gitlab-linguist-3.0.0.gem";
-version = "3.0.0";
-}
-{
-name = "gitlab_emoji";
-hash = "760fc5df13080ef39bb8f06878b5b49b7206d4259471d6569fbb0e56f0821d33";
-url = "http://rubygems.org/downloads/gitlab_emoji-0.0.1.1.gem";
-version = "0.0.1.1";
-}
-{
-name = "gitlab_git";
-hash = "0kjljz76wh4344z05mv3wiad7qdf6nwaa0yl1jls1j0hk9i4bb4k";
-url = "https://rubygems.org/downloads/gitlab_git-7.0.0.rc10.gem";
-version = "7.0.0.rc10";
-}
-{
-name = "gitlab_meta";
-hash = "e96e1ced109b39bfcbefb30623e31c8eab4dc7d385a01bf7ba9ed1f5ce866a93";
-url = "http://rubygems.org/downloads/gitlab_meta-7.0.gem";
-version = "7.0";
-}
-{
-name = "gitlab_omniauth-ldap";
-hash = "07df91c1993de0e5fa2fda845e2109e7b0bce228960bf41f770350873e82fa2e";
-url = "http://rubygems.org/downloads/gitlab_omniauth-ldap-1.1.0.gem";
-version = "1.1.0";
-}
-{
-name = "gollum-lib";
-hash = "7a0896cae6d443e42b19e1353f1f900684b63109844cfdb52c48d40f2824e7a1";
-url = "http://rubygems.org/downloads/gollum-lib-3.0.0.gem";
-version = "3.0.0";
-}
-{
-name = "gon";
-hash = "f593d15ba8616a0c9482b53113e03bc8a69cd0392e21f0189b2a96338837eaa5";
-url = "http://rubygems.org/downloads/gon-5.0.1.gem";
-version = "5.0.1";
-}
-{
-name = "grape";
-hash = "e83ff1ae19bb2a402a75bdf81372ae31d25399ec6079f4e31d6be1572f9854ea";
-url = "http://rubygems.org/downloads/grape-0.6.1.gem";
-version = "0.6.1";
-}
-{
-name = "grape-entity";
-hash = "93bc04e43bac2ab8959d66beffcac3d60e88681cb7c09de923c80a0e8fbc7b97";
-url = "http://rubygems.org/downloads/grape-entity-0.4.2.gem";
-version = "0.4.2";
-}
-{
-name = "growl";
-hash = "c926f6fa77800a1cfab1c0a9e4c3608c93b5619145062cf6ba545949553d1e68";
-url = "http://rubygems.org/downloads/growl-1.0.3.gem";
-version = "1.0.3";
-}
-{
-name = "guard";
-hash = "182ecf687c58d19de444a711892a44b6ef607589073f16c413c8ffcb663e827c";
-url = "http://rubygems.org/downloads/guard-2.2.4.gem";
-version = "2.2.4";
-}
-{
-name = "guard-rspec";
-hash = "1631dd0b0172e528d23d92de3ad8c2903fcae195707bb18bdac023c4592a8158";
-url = "http://rubygems.org/downloads/guard-rspec-4.2.0.gem";
-version = "4.2.0";
-}
-{
-name = "guard-spinach";
-hash = "2d76e05c747fc3ef163449c3f5d0b850af92bbd66f7133f3b79bfbe8a23750bb";
-url = "http://rubygems.org/downloads/guard-spinach-0.0.2.gem";
-version = "0.0.2";
-}
-{
-name = "haml";
-hash = "05b1cde6e0d770e800cb74f6bf1212446bc4573bbbfecc4002e1085c2658bff6";
-url = "http://rubygems.org/downloads/haml-4.0.5.gem";
-version = "4.0.5";
-}
-{
-name = "haml-rails";
-hash = "4598b9c3204a04ce27dfe5ce88f278af0a1069c7a5f2708a80c49df5026ce439";
-url = "http://rubygems.org/downloads/haml-rails-0.5.3.gem";
-version = "0.5.3";
-}
-{
-name = "hashie";
-hash = "a9e1e4928bf4f5a5683ea9c7ef29e50fb93f72542f9a9550e205fe33a6568923";
-url = "http://rubygems.org/downloads/hashie-2.1.2.gem";
-version = "2.1.2";
-}
-{
-name = "hike";
-hash = "154e2f2593845e5bcd8ed2ba3092600c55c6ad8c630722857de3fdaf334ccc44";
-url = "http://rubygems.org/downloads/hike-1.2.3.gem";
-version = "1.2.3";
-}
-{
-name = "hipchat";
-hash = "1678c4ee7de2beacc2986792c29dbe5008b09247f1088046f02a062155896bf8";
-url = "http://rubygems.org/downloads/hipchat-0.14.0.gem";
-version = "0.14.0";
-}
-{
-name = "html-pipeline";
-hash = "3461d1f709ef4812f11cc9789bdebb801813ba726e5544df3aad6c62336d93f9";
-url = "http://rubygems.org/downloads/html-pipeline-1.11.0.gem";
-version = "1.11.0";
-}
-{
-name = "html-pipeline-gitlab";
-hash = "cf36fa0aded375a210d38586e023642a88585360b9fc203621a210ac8f4430be";
-url = "http://rubygems.org/downloads/html-pipeline-gitlab-0.1.5.gem";
-version = "0.1.5";
-}
-{
-name = "http_parser.rb";
-hash = "d64f525eb1c580598d5bdef4fad98e948b6e016fa7803f45e13ac8714a2b8e3b";
-url = "http://rubygems.org/downloads/http_parser.rb-0.5.3.gem";
-version = "0.5.3";
-}
-{
-name = "httparty";
-hash = "5c8ad1664ebd51c7bded6a96138d804549c030b413ad685b8b3940dea137aae1";
-url = "http://rubygems.org/downloads/httparty-0.13.0.gem";
-version = "0.13.0";
-}
-{
-name = "httpauth";
-hash = "0d4991e48dfe46aae27ec709b896e54b7a1c402d84a4dbc93a6fe86d8353b4f9";
-url = "http://rubygems.org/downloads/httpauth-0.2.1.gem";
-version = "0.2.1";
-}
-{
-name = "i18n";
-hash = "b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b";
-url = "http://rubygems.org/downloads/i18n-0.6.11.gem";
-version = "0.6.11";
-}
-{
-name = "ice_nine";
-hash = "108f7538b32819623db949583895a962f5934dcfd183e7fff8b7e6d70db04c42";
-url = "http://rubygems.org/downloads/ice_nine-0.10.0.gem";
-version = "0.10.0";
-}
-{
-name = "jasmine";
-hash = "39426ce310c74f2efbe8dfae6efb3770f58687a11bb84a4115e15a528b2a1fec";
-url = "http://rubygems.org/downloads/jasmine-2.0.2.gem";
-version = "2.0.2";
-}
-{
-name = "jasmine-core";
-hash = "f23bfecc48cca26fe2f81bb7b1782f1a853168f7a0c14c187a8aabec9b4d39bb";
-url = "http://rubygems.org/downloads/jasmine-core-2.0.0.gem";
-version = "2.0.0";
-}
-{
-name = "jquery-atwho-rails";
-hash = "7abb6386fb377165e7ed8cb1665536f4b340c3c208400addc7441be2f10c1cb9";
-url = "http://rubygems.org/downloads/jquery-atwho-rails-0.3.3.gem";
-version = "0.3.3";
-}
-{
-name = "jquery-rails";
-hash = "9d192f83aaa54196b380753cb20b42ca1ad210715063ef0fb15fac63ec430a8c";
-url = "http://rubygems.org/downloads/jquery-rails-3.1.0.gem";
-version = "3.1.0";
-}
-{
-name = "jquery-scrollto-rails";
-hash = "77dbb8add00d4f1baec5f34859b992649a86a9ca054b1c2a7d3e03c3fb072c8a";
-url = "http://rubygems.org/downloads/jquery-scrollto-rails-1.4.3.gem";
-version = "1.4.3";
-}
-{
-name = "jquery-turbolinks";
-hash = "6d9a82a44ddf652f74b6181e5892860cdbda3f000eb1497fa91e3dc098d9ca34";
-url = "http://rubygems.org/downloads/jquery-turbolinks-2.0.1.gem";
-version = "2.0.1";
-}
-{
-name = "jquery-ui-rails";
-hash = "5b349e7066150b16d7a784183f040c083d51af3357937b8564aa0cc8b1cd59bd";
-url = "http://rubygems.org/downloads/jquery-ui-rails-4.2.1.gem";
-version = "4.2.1";
-}
-{
-name = "json";
-hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200";
-url = "http://rubygems.org/downloads/json-1.8.1.gem";
-version = "1.8.1";
-}
-{
-name = "jwt";
-hash = "5653fb76aa0b4b280624b314cd6c00a64de7cb2d61c2ab27587b434b8ad7880d";
-url = "http://rubygems.org/downloads/jwt-0.1.13.gem";
-version = "0.1.13";
-}
-{
-name = "kaminari";
-hash = "6d8c87cdcd1bff99cc97436160ec31dae3228403a04169c33421c3522e7cc7d4";
-url = "http://rubygems.org/downloads/kaminari-0.15.1.gem";
-version = "0.15.1";
-}
-{
-name = "kgio";
-hash = "92e59a3b97d044177b354f1434f6ebddfe50309d18d84754ab08d632a61dfc6e";
-url = "http://rubygems.org/downloads/kgio-2.8.1.gem";
-version = "2.8.1";
-}
-{
-name = "launchy";
-hash = "3b22fd75759a8af480e1a7545c17e10eada3146605e1789cc162da8b33ad3644";
-url = "http://rubygems.org/downloads/launchy-2.4.2.gem";
-version = "2.4.2";
-}
-{
-name = "letter_opener";
-hash = "b43060c7b223b00caa94dafe7016b424d809c83378326fbf24d041830cabebcf";
-url = "http://rubygems.org/downloads/letter_opener-1.1.2.gem";
-version = "1.1.2";
-}
-{
-name = "listen";
-hash = "5549b607337a95bb3248a97660ccaa0c3eeec70e01e61b8a08d4a6c36dd93720";
-url = "http://rubygems.org/downloads/listen-2.3.1.gem";
-version = "2.3.1";
-}
-{
-name = "lumberjack";
-hash = "2d85f466e25623f5c1d8476523f5e4b7903fa622007ac109fd7b560b45a846d6";
-url = "http://rubygems.org/downloads/lumberjack-1.0.4.gem";
-version = "1.0.4";
-}
-{
-name = "mail";
-hash = "446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c";
-url = "http://rubygems.org/downloads/mail-2.5.4.gem";
-version = "2.5.4";
-}
-{
-name = "method_source";
-hash = "c2e9d0f4ebefd6b37efe38fe2964337b1d315fe198cad850681fd2da0027b1bc";
-url = "http://rubygems.org/downloads/method_source-0.8.2.gem";
-version = "0.8.2";
-}
-{
-name = "mime-types";
-hash = "88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56";
-url = "http://rubygems.org/downloads/mime-types-1.25.1.gem";
-version = "1.25.1";
-}
-{
-name = "mini_portile";
-hash = "762b3e241362de24b2eb2bb1b98638399b931e9e51bece5f8e2df7611eb16c26";
-url = "http://rubygems.org/downloads/mini_portile-0.6.0.gem";
-version = "0.6.0";
-}
-{
-name = "minitest";
-hash = "b99fb077a6ace47d496f981041395ec565b9a1a59c45a73a2edd880bb27493a2";
-url = "http://rubygems.org/downloads/minitest-5.3.5.gem";
-version = "5.3.5";
-}
-{
-name = "mousetrap-rails";
-hash = "555caf5075543bb0f5bf642ea11ce02d08001ddb48041400de64667e4b1ec102";
-url = "http://rubygems.org/downloads/mousetrap-rails-1.4.6.gem";
-version = "1.4.6";
-}
-{
-name = "multi_json";
-hash = "2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2";
-url = "http://rubygems.org/downloads/multi_json-1.10.1.gem";
-version = "1.10.1";
-}
-{
-name = "multi_xml";
-hash = "08936dc294586ee1d178217cce577febe26315d7880e01e4f8e97cf2753b1945";
-url = "http://rubygems.org/downloads/multi_xml-0.5.5.gem";
-version = "0.5.5";
-}
-{
-name = "multipart-post";
-hash = "ccf26a61706f128a2a3f3745aba0f79fde7b6fee068e03490eb189c2aaa5e78a";
-url = "http://rubygems.org/downloads/multipart-post-1.2.0.gem";
-version = "1.2.0";
-}
-{
-name = "net-ldap";
-hash = "d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4";
-url = "http://rubygems.org/downloads/net-ldap-0.7.0.gem";
-version = "0.7.0";
-}
-{
-name = "net-scp";
-hash = "f3d8848f63f9b7670e57af2e2c308e9bd6fddb7c5440a36e892478a1e62b5977";
-url = "http://rubygems.org/downloads/net-scp-1.1.2.gem";
-version = "1.1.2";
-}
-{
-name = "net-ssh";
-hash = "42f5c53fc4b8fb8c75de7c6b996613d7915e6f7387d4b5f7394fa51402500951";
-url = "http://rubygems.org/downloads/net-ssh-2.8.0.gem";
-version = "2.8.0";
-}
-{
-name = "newrelic_rpm";
-hash = "36faff761a443f00d6e36502b23de96007ec007b3428215f701ac7cab9093d64";
-url = "http://rubygems.org/downloads/newrelic_rpm-3.9.4.245.gem";
-version = "3.9.4.245";
-}
-{
-name = "nokogiri";
-hash = "dfb23254b87672a93582981c4ac5880d178ff32db6878fc351d75198aa544836";
-url = "http://rubygems.org/downloads/nokogiri-1.6.2.1.gem";
-version = "1.6.2.1";
-}
-{
-name = "nprogress-rails";
-hash = "048ca784af666dde59940a804801f2471ad791952b2dc43cfbdb7d6cbd54f899";
-url = "http://rubygems.org/downloads/nprogress-rails-0.1.2.3.gem";
-version = "0.1.2.3";
-}
-{
-name = "oauth";
-hash = "bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc";
-url = "http://rubygems.org/downloads/oauth-0.4.7.gem";
-version = "0.4.7";
-}
-{
-name = "oauth2";
-hash = "e18808a91165f22b8ce7939a216a51bb50d16a90b592347084b5112a4815f3a1";
-url = "http://rubygems.org/downloads/oauth2-0.8.1.gem";
-version = "0.8.1";
-}
-{
-name = "omniauth";
-hash = "d47132daf1c59b8c97b4c51f3f2e379b5b6ae2cd9e169d0a3e46de45b335efbd";
-url = "http://rubygems.org/downloads/omniauth-1.1.4.gem";
-version = "1.1.4";
-}
-{
-name = "omniauth-github";
-hash = "94b41beb49cc16b1e7c5f7a91999d867b76d84a33c9a44e5839178289b8ddac2";
-url = "http://rubygems.org/downloads/omniauth-github-1.1.1.gem";
-version = "1.1.1";
-}
-{
-name = "omniauth-google-oauth2";
-hash = "1c11a1c330f91a9a77e5c51b7f1b378aa8b06b548a3bc1545056cee28360ebdd";
-url = "http://rubygems.org/downloads/omniauth-google-oauth2-0.2.5.gem";
-version = "0.2.5";
-}
-{
-name = "omniauth-oauth";
-hash = "9f1bfb30fe6ba823935330d2036e08a5406e980f1e20c9b1271b82ee34fbe759";
-url = "http://rubygems.org/downloads/omniauth-oauth-1.0.1.gem";
-version = "1.0.1";
-}
-{
-name = "omniauth-oauth2";
-hash = "72b8ba77b9ead4320e7f4e430aee0f3ef759aed79ae52c3b0e8fb2f41785eb68";
-url = "http://rubygems.org/downloads/omniauth-oauth2-1.1.1.gem";
-version = "1.1.1";
-}
-{
-name = "omniauth-shibboleth";
-hash = "b0a92a0bc1e47d96c70f1bec982425c73029725da331dcda2022af762b929276";
-url = "http://rubygems.org/downloads/omniauth-shibboleth-1.1.1.gem";
-version = "1.1.1";
-}
-{
-name = "omniauth-twitter";
-hash = "cd110801549953505a6152ae1426956785aca0cb749ff82835e8d49898b30f18";
-url = "http://rubygems.org/downloads/omniauth-twitter-1.0.1.gem";
-version = "1.0.1";
-}
-{
-name = "org-ruby";
-hash = "ea272d4c7d0ac0310c8bb58ac503ca04c5180ca5c64642be0c96569d514327e5";
-url = "http://rubygems.org/downloads/org-ruby-0.9.9.gem";
-version = "0.9.9";
-}
-{
-name = "orm_adapter";
-hash = "aa5d0be5d540cbb46d3a93e88061f4ece6a25f6e97d6a47122beb84fe595e9b9";
-url = "http://rubygems.org/downloads/orm_adapter-0.5.0.gem";
-version = "0.5.0";
-}
-{
-name = "pg";
-hash = "ba6827400e0614f8fd464543f6e10b307aadef58c59280c6560e6f2548599ed3";
-url = "http://rubygems.org/downloads/pg-0.15.1.gem";
-version = "0.15.1";
-}
-{
-name = "phantomjs";
-hash = "42f3d5b561832a383076c1d49720ed4d2711f29acb85c701a07015b412436f33";
-url = "http://rubygems.org/downloads/phantomjs-1.9.2.0.gem";
-version = "1.9.2.0";
-}
-{
-name = "poltergeist";
-hash = "db4580c0197729b1e7d2cc872ab3d1c5d98b759ac67720c0ba77fbc8752a6a23";
-url = "http://rubygems.org/downloads/poltergeist-1.5.1.gem";
-version = "1.5.1";
-}
-{
-name = "polyglot";
-hash = "05409d9f736e1fd39635f8700b24e1156ae8e308e785d5d0f939c603fd529649";
-url = "http://rubygems.org/downloads/polyglot-0.3.4.gem";
-version = "0.3.4";
-}
-{
-name = "posix-spawn";
-hash = "634746d6f090c1b15d2f92fa90c5ed4868e59c8752ca56a5d83af8f79c0a5110";
-url = "http://rubygems.org/downloads/posix-spawn-0.3.9.gem";
-version = "0.3.9";
-}
-{
-name = "pry";
-hash = "3a521a98344c62096561773ab5b831f862432bc40ce3798bbbdead1c7f86b159";
-url = "http://rubygems.org/downloads/pry-0.9.12.4.gem";
-version = "0.9.12.4";
-}
-{
-name = "pyu-ruby-sasl";
-hash = "5683a6bc5738db5a1bf5ceddeaf545405fb241b4184dd4f2587e679a7e9497e5";
-url = "http://rubygems.org/downloads/pyu-ruby-sasl-0.0.3.3.gem";
-version = "0.0.3.3";
-}
-{
-name = "quiet_assets";
-hash = "3fbc8728462a42d58cd9101b0ad8a240d3cb90a248d5d4072af432fa946a2fa8";
-url = "http://rubygems.org/downloads/quiet_assets-1.0.2.gem";
-version = "1.0.2";
-}
-{
-name = "racc";
-hash = "6282f61f123f4e1d39bac5ad19027e34c336a5e1d80f9e4769c80b16db11b583";
-url = "http://rubygems.org/downloads/racc-1.4.10.gem";
-version = "1.4.10";
-}
-{
-name = "rack";
-hash = "e64af00234e8faaa69ea81ef4e3800f40743c69560f0dda8fc9969660e775fa7";
-url = "http://rubygems.org/downloads/rack-1.5.2.gem";
-version = "1.5.2";
-}
-{
-name = "rack-accept";
-hash = "66247b5449db64ebb93ae2ec4af4764b87d1ae8a7463c7c68893ac13fa8d4da2";
-url = "http://rubygems.org/downloads/rack-accept-0.4.5.gem";
-version = "0.4.5";
-}
-{
-name = "rack-attack";
-hash = "f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c";
-url = "http://rubygems.org/downloads/rack-attack-2.3.0.gem";
-version = "2.3.0";
-}
-{
-name = "rack-cors";
-hash = "5a256bda2673c7bbba014587b1f93fd2e6fd80b7ac9804a0f90665add6ba087d";
-url = "http://rubygems.org/downloads/rack-cors-0.2.9.gem";
-version = "0.2.9";
-}
-{
-name = "rack-mini-profiler";
-hash = "1c77870679e17b54c5657ce3e15a3b7f54813844c4ab3ff292181f2904d1404b";
-url = "http://rubygems.org/downloads/rack-mini-profiler-0.9.0.gem";
-version = "0.9.0";
-}
-{
-name = "rack-mount";
-hash = "a25100725157aea263dcea4f75aaab4e23922dc0e09fffd60c94eade95c34125";
-url = "http://rubygems.org/downloads/rack-mount-0.8.3.gem";
-version = "0.8.3";
-}
-{
-name = "rack-protection";
-hash = "ad8d7e99b47418e1361ae8aaa0a8591671c8065b958bcedaef92da121a2db863";
-url = "http://rubygems.org/downloads/rack-protection-1.5.1.gem";
-version = "1.5.1";
-}
-{
-name = "rack-test";
-hash = "7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306";
-url = "http://rubygems.org/downloads/rack-test-0.6.2.gem";
-version = "0.6.2";
-}
-{
-name = "rails";
-hash = "602275642419e731637c91421cf498f2994c2d9f1b94f6c713f3b7b8757b2aa5";
-url = "http://rubygems.org/downloads/rails-4.1.1.gem";
-version = "4.1.1";
-}
-{
-name = "rails_autolink";
-hash = "384c17bee71ca5dc44f49401762f91abb6bc356dd564f380713fc974d2c25671";
-url = "http://rubygems.org/downloads/rails_autolink-1.1.6.gem";
-version = "1.1.6";
-}
-{
-name = "rails_best_practices";
-hash = "859371ff63fcfe6a33e7012ce3e18df0c0f00579520c684a544dccfd33c7c691";
-url = "http://rubygems.org/downloads/rails_best_practices-1.14.4.gem";
-version = "1.14.4";
-}
-{
-name = "railties";
-hash = "0cef786bd54741f6b6c2ff0bfb769a200222f7e8928b93caf61f87c7325f8ee6";
-url = "http://rubygems.org/downloads/railties-4.1.1.gem";
-version = "4.1.1";
-}
-{
-name = "raindrops";
-hash = "2077f24017dad9637bc4e20e77f3cc533054190516e9e330476678e3cc7a689a";
-url = "http://rubygems.org/downloads/raindrops-0.12.0.gem";
-version = "0.12.0";
-}
-{
-name = "rake";
-hash = "b504ad9d610b85ef0856a4771d024e4a66656c63a17121a3ed1d4d7db39c775b";
-url = "http://rubygems.org/downloads/rake-10.3.2.gem";
-version = "10.3.2";
-}
-{
-name = "raphael-rails";
-hash = "6c89daf65f82621f7ff59948db1db0ca2f41422ceadf905ba18a58b7ab57516a";
-url = "http://rubygems.org/downloads/raphael-rails-2.1.2.gem";
-version = "2.1.2";
-}
-{
-name = "rb-fsevent";
-hash = "e1aed0fa5b42f74ecc1321dd807296d688b0f4fada96e87a9b2113d91befb62d";
-url = "http://rubygems.org/downloads/rb-fsevent-0.9.3.gem";
-version = "0.9.3";
-}
-{
-name = "rb-inotify";
-hash = "3b1e16da8b00849dfa3c6348cc6df6888a2d35d2bf432bc50267f4ec1e74a21c";
-url = "http://rubygems.org/downloads/rb-inotify-0.9.2.gem";
-version = "0.9.2";
-}
-{
-name = "rdoc";
-hash = "a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed";
-url = "http://rubygems.org/downloads/rdoc-3.12.2.gem";
-version = "3.12.2";
-}
-{
-name = "redcarpet";
-hash = "ff5397c2b0d1344f065d07e58ed157f5bc25b49d44e723348620693ba928d71c";
-url = "http://rubygems.org/downloads/redcarpet-3.1.2.gem";
-version = "3.1.2";
-}
-{
-name = "redis";
-hash = "e3c8203afbfb9e0cfe915a0610f6795e02ba2298e72e9326076eed2c048142c1";
-url = "http://rubygems.org/downloads/redis-3.0.6.gem";
-version = "3.0.6";
-}
-{
-name = "redis-actionpack";
-hash = "e49029df46b15434591962cc004a1f0b07ab11276e00fd53ec835b85c7064d55";
-url = "http://rubygems.org/downloads/redis-actionpack-4.0.0.gem";
-version = "4.0.0";
-}
-{
-name = "redis-activesupport";
-hash = "cd802d06716638fb000e209a769f1a3932285c8ba2b328aa0c501f0999fcb4a2";
-url = "http://rubygems.org/downloads/redis-activesupport-4.0.0.gem";
-version = "4.0.0";
-}
-{
-name = "redis-namespace";
-hash = "c7c119c0a8c3876b7d7f0dc0ae2e3343352f1dfc6d978c9711b63b58518a6639";
-url = "http://rubygems.org/downloads/redis-namespace-1.4.1.gem";
-version = "1.4.1";
-}
-{
-name = "redis-rack";
-hash = "68be24901183f1973059e837b1acc421cebd34766753ca6f6e7902fb50ef35f8";
-url = "http://rubygems.org/downloads/redis-rack-1.5.0.gem";
-version = "1.5.0";
-}
-{
-name = "redis-rails";
-hash = "a7224c9a7c9bfc9d6080a0418b3c290b9d27ff88b481022b3958a1b2e0e1fc45";
-url = "http://rubygems.org/downloads/redis-rails-4.0.0.gem";
-version = "4.0.0";
-}
-{
-name = "redis-store";
-hash = "9fb47e5dbc6bce6ab4206899f49c6ee8d4a0c6d4830bb0f042ea49df72804249";
-url = "http://rubygems.org/downloads/redis-store-1.1.4.gem";
-version = "1.1.4";
-}
-{
-name = "request_store";
-hash = "70adb9485eb22113bd165e259b929a449dfe2d2410a880566f06df6a164fc1cf";
-url = "http://rubygems.org/downloads/request_store-1.0.5.gem";
-version = "1.0.5";
-}
-{
-name = "require_all";
-hash = "1d4e5729811a1d976916465b64c508481c7fe229bc1ca88c8b1665ad4c46809a";
-url = "http://rubygems.org/downloads/require_all-1.3.2.gem";
-version = "1.3.2";
-}
-{
-name = "rest-client";
-hash = "a3203433b8b0c914648caea54395a8791a61e0df7d401c81f4e2b7f8a8fac75a";
-url = "http://rubygems.org/downloads/rest-client-1.6.7.gem";
-version = "1.6.7";
-}
-{
-name = "rinku";
-hash = "eb5cec33af86da3002e66470d9a741a0726d6864a69b580abc798931b4b706ca";
-url = "http://rubygems.org/downloads/rinku-1.7.3.gem";
-version = "1.7.3";
-}
-{
-name = "rouge";
-hash = "b41278cf37dcef392e1d195519b482f03d1b80878837926a8322c7db9cef0251";
-url = "http://rubygems.org/downloads/rouge-1.3.3.gem";
-version = "1.3.3";
-}
-{
-name = "rspec";
-hash = "4f9fc6c58696faa22571ca80d710fd0e4f30eaeb700155968d36df303f279e8c";
-url = "http://rubygems.org/downloads/rspec-2.14.1.gem";
-version = "2.14.1";
-}
-{
-name = "rspec-core";
-hash = "e714621feb592e515c3ca19a685505af1c2bbb2d713b85c0610ab80985624348";
-url = "http://rubygems.org/downloads/rspec-core-2.14.7.gem";
-version = "2.14.7";
-}
-{
-name = "rspec-expectations";
-hash = "3cb74fd8427a56321ca09e598f2db509231bae0996800b12f30084d7c3882f3a";
-url = "http://rubygems.org/downloads/rspec-expectations-2.14.4.gem";
-version = "2.14.4";
-}
-{
-name = "rspec-mocks";
-hash = "e745b215de211099681d3b128fc8af15616eb19101bdd76da47dca1c1dd86b8b";
-url = "http://rubygems.org/downloads/rspec-mocks-2.14.4.gem";
-version = "2.14.4";
-}
-{
-name = "rspec-rails";
-hash = "6ee4375e977d03ca4945fd5d79debfa72239f7f35f3de9a162ab4adcd4d735e9";
-url = "http://rubygems.org/downloads/rspec-rails-2.14.0.gem";
-version = "2.14.0";
-}
-{
-name = "ruby-progressbar";
-hash = "94265728146504d311c3d6a3c040fc4d45ada6fc9bf42b58dbef208c6cc97d9b";
-url = "http://rubygems.org/downloads/ruby-progressbar-1.2.0.gem";
-version = "1.2.0";
-}
-{
-name = "rubyntlm";
-hash = "a07b9bacc0cf531c76d4f71ed0813b4055fe881447aede2bc7cd7e89ec808870";
-url = "http://rubygems.org/downloads/rubyntlm-0.1.1.gem";
-version = "0.1.1";
-}
-{
-name = "rubypants";
-hash = "f07e38eac793655a0323fe91946081052341b9e69807026fcf102346589eedee";
-url = "http://rubygems.org/downloads/rubypants-0.2.0.gem";
-version = "0.2.0";
-}
-{
-name = "rugged";
-hash = "e536ec53d7f08109960e159e5401e682dd03f6ab386f84f93ef71e1968817529";
-url = "http://rubygems.org/downloads/rugged-0.21.0.gem";
-version = "0.21.0";
-}
-{
-name = "safe_yaml";
-hash = "139285ff8e70413d2a3721da4e742c736b4948682f0b80330a353e34d5dd6478";
-url = "http://rubygems.org/downloads/safe_yaml-0.9.7.gem";
-version = "0.9.7";
-}
-{
-name = "sanitize";
-hash = "c3be075f5b38a1b02404be5778b181e50fba9ab253bac851cb217d9a71375b77";
-url = "http://rubygems.org/downloads/sanitize-2.1.0.gem";
-version = "2.1.0";
-}
-{
-name = "sass";
-hash = "ddcd7d76d98daa8f3ebbaec196972500a6cf6e854f9c328fcfc9aa556f29bfac";
-url = "http://rubygems.org/downloads/sass-3.2.19.gem";
-version = "3.2.19";
-}
-{
-name = "sass-rails";
-hash = "b57665f95f63f063137e365d3e8a1c6d1340ec892d875aeeab93fb60e13f2ec8";
-url = "http://rubygems.org/downloads/sass-rails-4.0.3.gem";
-version = "4.0.3";
-}
-{
-name = "sdoc";
-hash = "c2f54086862252f487e0c4b05fc46d8659a4dba6deb2ad0a24ff9046c1c4889e";
-url = "http://rubygems.org/downloads/sdoc-0.3.20.gem";
-version = "0.3.20";
-}
-{
-name = "seed-fu";
-hash = "eb09cfeb574f46a22b313e38fe7d4ae6bf2c6a57554d3f157778756b58bc81db";
-url = "http://rubygems.org/downloads/seed-fu-2.3.1.gem";
-version = "2.3.1";
-}
-{
-name = "select2-rails";
-hash = "dcae2d6f92f94975080c14bee21a2b9745675135824f7ec298a9c94e329e9f7e";
-url = "http://rubygems.org/downloads/select2-rails-3.5.2.gem";
-version = "3.5.2";
-}
-{
-name = "semantic-ui-sass";
-hash = "54a9f7c3ac28203f91e99f4f929c2851356796e3d7d2de3468ff060528db71a1";
-url = "http://rubygems.org/downloads/semantic-ui-sass-0.16.1.0.gem";
-version = "0.16.1.0";
-}
-{
-name = "settingslogic";
-hash = "5925a91d0d48dfb59a6e48ae2bb9c9b801fe6fab25a8e8d302ce8699d92f2ae6";
-url = "http://rubygems.org/downloads/settingslogic-2.0.9.gem";
-version = "2.0.9";
-}
-{
-name = "sexp_processor";
-hash = "71591ddbda99b5e12e4a46d377c87513850ca7aa4b1aa800ae02792cadee6be7";
-url = "http://rubygems.org/downloads/sexp_processor-4.4.0.gem";
-version = "4.4.0";
-}
-{
-name = "shoulda-matchers";
-hash = "da4ce8e10970a5dfa88d30b7be06dbef87caf2aca4508343b31a59c434449fc6";
-url = "http://rubygems.org/downloads/shoulda-matchers-2.1.0.gem";
-version = "2.1.0";
-}
-{
-name = "sidekiq";
-hash = "81c57e05311c7176e8e71373cf78874c9365f00ed40b9fd1a969863e56a10c53";
-url = "http://rubygems.org/downloads/sidekiq-2.17.0.gem";
-version = "2.17.0";
-}
-{
-name = "simple_oauth";
-hash = "723f19781f5562182e075a0f31bca11a955962d933064abb23bce98ed035602d";
-url = "http://rubygems.org/downloads/simple_oauth-0.1.9.gem";
-version = "0.1.9";
-}
-{
-name = "simplecov";
-hash = "4f205752a4f3730fd4c58678bbab4c83f4e2a6ca3bbea4cdf18cd86a70589eb7";
-url = "http://rubygems.org/downloads/simplecov-0.9.0.gem";
-version = "0.9.0";
-}
-{
-name = "simplecov-html";
-hash = "69393ce932c2898dd5074913e360078f651f094a9b7300b286a78f43b11c164a";
-url = "http://rubygems.org/downloads/simplecov-html-0.8.0.gem";
-version = "0.8.0";
-}
-{
-name = "sinatra";
-hash = "1a16a552d559be0fff6cefd2c84c1fecafcc54668fba540e99fe8f2692033e8a";
-url = "http://rubygems.org/downloads/sinatra-1.4.4.gem";
-version = "1.4.4";
-}
-{
-name = "six";
-hash = "83c73d4aa60ff76172ec257f45b098c66f7a8b89883bcaaec42517287dbc0aae";
-url = "http://rubygems.org/downloads/six-0.2.0.gem";
-version = "0.2.0";
-}
-{
-name = "slack-notifier";
-hash = "64166343518084e3b1cdf03bb49ff42469dae8aab868fafa001c9f6a4f8d4604";
-url = "http://rubygems.org/downloads/slack-notifier-0.3.2.gem";
-version = "0.3.2";
-}
-{
-name = "slim";
-hash = "07cdf67f971b99a360c9ded6ea70ae5351e1236182997dff8118ef5ea242a7ea";
-url = "http://rubygems.org/downloads/slim-2.0.2.gem";
-version = "2.0.2";
-}
-{
-name = "slop";
-hash = "568b7d1d48d675ce2778e5fd1b9de56ff754e3eb4b589e4918f2cf8d25e56df4";
-url = "http://rubygems.org/downloads/slop-3.4.7.gem";
-version = "3.4.7";
-}
-{
-name = "spinach";
-hash = "a43718a977de8c2bb0fd952af23d56a69c046d28dac687057405c7301ccfdf0c";
-url = "http://rubygems.org/downloads/spinach-0.8.7.gem";
-version = "0.8.7";
-}
-{
-name = "spinach-rails";
-hash = "e0d045ae1266f46549570c148d1696ac7d4baa518f8b974a7c8ed949bd63cad9";
-url = "http://rubygems.org/downloads/spinach-rails-0.2.1.gem";
-version = "0.2.1";
-}
-{
-name = "spring";
-hash = "92aa8cf28fec20b0f760e2cf8efd1990be2c30c2e79167cdd19e8344420b72c5";
-url = "http://rubygems.org/downloads/spring-1.1.3.gem";
-version = "1.1.3";
-}
-{
-name = "spring-commands-rspec";
-hash = "61d75e234afd79f247942dca387c3a7fffc0de9527f16aea4d5fdd66fd82cffc";
-url = "http://rubygems.org/downloads/spring-commands-rspec-1.0.1.gem";
-version = "1.0.1";
-}
-{
-name = "spring-commands-spinach";
-hash = "694fbf041b5f357bd29fab2ff44013f42e894bf1af498bcce726498f5b56128d";
-url = "http://rubygems.org/downloads/spring-commands-spinach-1.0.0.gem";
-version = "1.0.0";
-}
-{
-name = "sprockets";
-hash = "b06a4a66a74cce8a3dbd53a9078c9b71b94f5652a6fe92809f28786d8fcd5920";
-url = "http://rubygems.org/downloads/sprockets-2.11.0.gem";
-version = "2.11.0";
-}
-{
-name = "sprockets-rails";
-hash = "9e134d28c4d05f86f3c8ebcdecd50ec060bd33e8bdcb6461cfcf0f2b77f26d8a";
-url = "http://rubygems.org/downloads/sprockets-rails-2.1.3.gem";
-version = "2.1.3";
-}
-{
-name = "stamp";
-hash = "1ad6622d000cd390b9b523eb9270fc902abd24a685ce0c73529f344d6a9fa4f0";
-url = "http://rubygems.org/downloads/stamp-0.5.0.gem";
-version = "0.5.0";
-}
-{
-name = "state_machine";
-hash = "80fcddc91976baec8713c37c28b5bc0655f5f2e0a1412a1a4a3aac41082cc2ed";
-url = "http://rubygems.org/downloads/state_machine-1.2.0.gem";
-version = "1.2.0";
-}
-{
-name = "stringex";
-hash = "dbd556b4b59d994de64c8fa91ef959667338d840b814fc72531f8253dbba179d";
-url = "http://rubygems.org/downloads/stringex-2.5.1.gem";
-version = "2.5.1";
-}
-{
-name = "temple";
-hash = "3374f339c3b54611538b9811c0c46db8e06b48ed212db741cd7f52baf59caa26";
-url = "http://rubygems.org/downloads/temple-0.6.7.gem";
-version = "0.6.7";
-}
-{
-name = "term-ansicolor";
-hash = "b9534713ba4c2a48f2291fadf9ce2edae9f2dc96157ee812fe8fe16a70c081ac";
-url = "http://rubygems.org/downloads/term-ansicolor-1.2.2.gem";
-version = "1.2.2";
-}
-{
-name = "test_after_commit";
-hash = "8be009b5b7dd8f6e712ea92a079625b9a84f9a010ef2d5d5e44bcd45c353fa8f";
-url = "http://rubygems.org/downloads/test_after_commit-0.2.2.gem";
-version = "0.2.2";
-}
-{
-name = "thin";
-hash = "a0b80e1632d3529a5c4b87e07d9ab146e0dde5e506c20f3a740fe8b364d5bd18";
-url = "http://rubygems.org/downloads/thin-1.6.1.gem";
-version = "1.6.1";
-}
-{
-name = "thor";
-hash = "9ff834f031b5550c743bb8a3139317fefdae9cdebd02d60de376658f427fe522";
-url = "http://rubygems.org/downloads/thor-0.19.1.gem";
-version = "0.19.1";
-}
-{
-name = "thread_safe";
-hash = "16315baa971c48d00104bcd35e8934e3f9ccfd3b8f429e3fca7ee2dfd81734b2";
-url = "http://rubygems.org/downloads/thread_safe-0.3.4.gem";
-version = "0.3.4";
-}
-{
-name = "tilt";
-hash = "39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903";
-url = "http://rubygems.org/downloads/tilt-1.4.1.gem";
-version = "1.4.1";
-}
-{
-name = "timers";
-hash = "3bbb9651a73e43e47950a5e13a7fa62f852cd5c46e421bb671e9ade1fbb47b74";
-url = "http://rubygems.org/downloads/timers-1.1.0.gem";
-version = "1.1.0";
-}
-{
-name = "tinder";
-hash = "0b06fd2a72ed424e82b1896852dd9ebb10791ef6ab8412e74ad2fa9069f6bd47";
-url = "http://rubygems.org/downloads/tinder-1.9.3.gem";
-version = "1.9.3";
-}
-{
-name = "tins";
-hash = "c53bf237462be8d61cfa2a5f4b48f372d010825b0dc594c952d9857fe4c3ef30";
-url = "http://rubygems.org/downloads/tins-0.13.1.gem";
-version = "0.13.1";
-}
-{
-name = "treetop";
-hash = "ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff";
-url = "http://rubygems.org/downloads/treetop-1.4.15.gem";
-version = "1.4.15";
-}
-{
-name = "turbolinks";
-hash = "d92fd8f1627a6eadfaa39b76da83c257181e786557f54859d81ab2b08d73e8ff";
-url = "http://rubygems.org/downloads/turbolinks-2.0.0.gem";
-version = "2.0.0";
-}
-{
-name = "twitter-stream";
-hash = "3866afdfbdf083e773b46afb3037ff3e3b1ebf8014ab88353153daddc70b4847";
-url = "http://rubygems.org/downloads/twitter-stream-0.1.16.gem";
-version = "0.1.16";
-}
-{
-name = "tzinfo";
-hash = "fdb1d3fdf2776d490c82a0e589a08e7cbde70ac1ae7d2b1f0b7e77f3e6b801b0";
-url = "http://rubygems.org/downloads/tzinfo-1.2.2.gem";
-version = "1.2.2";
-}
-{
-name = "uglifier";
-hash = "5e942f02d11d9e4f6e18aa84cfd909e569fe887b12c3ecf66d92e8cf4162acf0";
-url = "http://rubygems.org/downloads/uglifier-2.3.2.gem";
-version = "2.3.2";
-}
-{
-name = "underscore-rails";
-hash = "e229a9668f799ea169616fa59da3f6cf48f259d9c1dd2ef52ff2a151bd6be3f5";
-url = "http://rubygems.org/downloads/underscore-rails-1.4.4.gem";
-version = "1.4.4";
-}
-{
-name = "unf";
-hash = "4999517a531f2a955750f8831941891f6158498ec9b6cb1c81ce89388e63022e";
-url = "http://rubygems.org/downloads/unf-0.1.4.gem";
-version = "0.1.4";
-}
-{
-name = "unf_ext";
-hash = "afcdba30a57665a4540c5d43b2833c6a3677a3296428fa70fbd7b4c8feaceb1f";
-url = "http://rubygems.org/downloads/unf_ext-0.0.6.gem";
-version = "0.0.6";
-}
-{
-name = "unicorn";
-hash = "fd0b12148a24acfd8bf28a0322e4116061e64e271253e077999e4ec531a74966";
-url = "http://rubygems.org/downloads/unicorn-4.6.3.gem";
-version = "4.6.3";
-}
-{
-name = "unicorn-worker-killer";
-hash = "6d2819347c514ff65bcdbda745a416a2c93e18e90e1e347c6f4931e7b1a6c78b";
-url = "http://rubygems.org/downloads/unicorn-worker-killer-0.4.2.gem";
-version = "0.4.2";
-}
-{
-name = "version_sorter";
-hash = "aeeae527de4fb3146bbdaa9283f3fb087fedbe0cee80645c12d1970fe4947873";
-url = "http://rubygems.org/downloads/version_sorter-1.1.0.gem";
-version = "1.1.0";
-}
-{
-name = "virtus";
-hash = "03d81d65377a603894b058c0ee78130dda1c3e6d56918d40444f11dba5d644a6";
-url = "http://rubygems.org/downloads/virtus-1.0.1.gem";
-version = "1.0.1";
-}
-{
-name = "warden";
-hash = "97769e5b5d230fec4f77e91b1116b28fdd27428f4acab68dc5ed025af9d37f7a";
-url = "http://rubygems.org/downloads/warden-1.2.3.gem";
-version = "1.2.3";
-}
-{
-name = "webmock";
-hash = "89e8ced0a58bcf68bec818f901ce966b4f8938dd20b101044bd6408589a957f8";
-url = "http://rubygems.org/downloads/webmock-1.16.0.gem";
-version = "1.16.0";
-}
-{
-name = "websocket-driver";
-hash = "4e9a04c1e370dada829738ee1433a98e6721e7fa83b98fceef089fe6bce97638";
-url = "http://rubygems.org/downloads/websocket-driver-0.3.3.gem";
-version = "0.3.3";
-}
-{
-name = "wikicloth";
-hash = "7ac8a9ca0a948cf472851e521afc6c2a6b04a8f91ef1d824ba6a61ffbd60e6ca";
-url = "http://rubygems.org/downloads/wikicloth-0.8.1.gem";
-version = "0.8.1";
-}
-{
-name = "xpath";
-hash = "9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12";
-url = "http://rubygems.org/downloads/xpath-2.0.0.gem";
-version = "2.0.0";
-}
-]
diff --git a/pkgs/applications/version-management/gitlab/README b/pkgs/applications/version-management/gitlab/README
deleted file mode 100644
index cd8d4748e70..00000000000
--- a/pkgs/applications/version-management/gitlab/README
+++ /dev/null
@@ -1,5 +0,0 @@
-to regenerate Gemfile.nix and Gemfile.lock you need to
-
-  % nix-build bootstrap.nix
-  % cp result/Gemfile.nix ./
-  % cp result/Gemfile.lock ./
diff --git a/pkgs/applications/version-management/gitlab/bootstrap.nix b/pkgs/applications/version-management/gitlab/bootstrap.nix
deleted file mode 100644
index a983ede333a..00000000000
--- a/pkgs/applications/version-management/gitlab/bootstrap.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs ? import <nixpkgs> {}
-}:
-
-with pkgs;
-
-let
-
-in stdenv.mkDerivation rec {
-  version = "7.4.2";
-  name = "gitlab-${version}";
-  __noChroot = true;
-  src = fetchurl {
-    url = "https://github.com/gitlabhq/gitlabhq/archive/v${version}.zip";
-    sha256 = "01iplkpa4scr0wcap6vjrc960dj15z4ciclaqswj0sz5hrp9glw6";
-  };
-  buildInputs = [
-    ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig
-    libffi postgresql which stdenv unzip
-  ];
-  installPhase = ''
-    unset http_proxy
-    unset ftp_proxy
-
-    cp -R . $out
-    cp ${./generate_nix_requirements.rb} $out/generate_nix_requirements.rb
-    cd $out
-
-    cat > config/database.yml <<EOF
-    production:
-      adapter: postgresql
-    EOF
-
-    substituteInPlace Gemfile --replace 'gem "therubyracer"' ""
-
-    bundle config --local build.nokogiri --use-system-libraries \
-      --with-iconv-dir=${libiconv} \
-      --with-xslt-dir=${libxslt} \
-      --with-xml2-dir=${libxml2} \
-      --with-pkg-config \
-      --with-pg-config=${postgresql}/bin/pg_config
-
-    HOME="/tmp/gitlab-${version}" ruby generate_nix_requirements.rb
-    rm -R /tmp/gems
-  '';
-}
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 2e0fcc43eb7..34a7c601cac 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,41 +1,54 @@
-{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, postgresql, libyaml, ncurses, curl, openssh, redis, zlib, icu, checkinstall, logrotate, docutils, cmake, git, gdbm, readline, unzip, gnumake, which, tzdata, nodejs }:
+{ stdenv, lib, bundler, fetchgit, bundlerEnv, defaultGemConfig, libiconv, ruby
+, tzdata, git
+}:
 
 let
-  gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix);
-
-
-in stdenv.mkDerivation rec {
-  version = "7.4.2";
-  name = "gitlab-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/gitlabhq/gitlabhq/archive/v${version}.zip";
-    sha256 = "01iplkpa4scr0wcap6vjrc960dj15z4ciclaqswj0sz5hrp9glw6";
+  gitlab = fetchgit {
+    url = "https://github.com/gitlabhq/gitlabhq.git";
+    rev = "477743a154e85c411e8a533980abce460b5669fc";
+    fetchSubmodules = false;
+    sha256 = "0jl1w9d46v8hc27h9s380ha07m3fd2zpflj4q9vywwcf570ahj7x";
   };
 
-  buildInputs = [
-    ruby rubyLibs.bundler libyaml gdbm readline ncurses curl openssh redis zlib
-    postgresql libxslt libxml2 pkgconfig libffi icu checkinstall logrotate docutils nodejs
-    git unzip gnumake which cmake
-  ];
+  env = bundlerEnv {
+    name = "gitlab";
+    inherit ruby;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    meta = with lib; {
+      homepage = http://www.gitlab.com/;
+      platforms = platforms.linux;
+      maintainers = [ ];
+      license = licenses.mit;
+    };
+  };
 
-  # cmake is required by a build depdenceny, not the main binary:
-  dontUseCmakeConfigure = true;
+in
 
+stdenv.mkDerivation rec {
+  name = "gitlab-${version}";
+  version = "7.4.2";
+  buildInputs = [ ruby bundler tzdata git ];
+  unpackPhase = ''
+    runHook preUnpack
+    cp -r ${gitlab}/* .
+    chmod -R +w .
+    cp ${./Gemfile} Gemfile
+    cp ${./Gemfile.lock} Gemfile.lock
+    runHook postUnpack
+  '';
   patches = [
     ./remove-hardcoded-locations.patch
   ];
   postPatch = ''
-    mv config/gitlab.yml.example config/gitlab.yml
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/gitlab
-    cp -R . $out/share/gitlab
-    cd $out/share/gitlab
+    # For reasons I don't understand "bundle exec" ignores the
+    # RAILS_ENV causing tests to be executed that fail because we're
+    # not installing development and test gems above. Deleting the
+    # tests works though.:
+    rm lib/tasks/test.rake
 
-    export HOME=$(pwd)
-    export GITLAB_EMAIL_FROM="required@to-make-it-work.org"
+    mv config/gitlab.yml.example config/gitlab.yml
 
     # required for some gems:
     cat > config/database.yml <<EOF
@@ -47,41 +60,17 @@ in stdenv.mkDerivation rec {
         username: gitlab
         encoding: utf8
     EOF
-
-    mkdir -p vendor/cache
-    ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)}
-
-    cp ${./Gemfile.lock} Gemfile.lock
-    substituteInPlace Gemfile --replace 'gem "therubyracer"' ""
-
-    bundle config build.nokogiri \
-      --use-system-libraries \
-      --with-xslt-dir=${libxslt} \
-      --with-xml2-dir=${libxml2} \
-      --with-pkg-config=${pkgconfig}/bin/pkg-config \
-      --with-pg-config=${postgresql}/bin/pg_config
-
-    # See https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide:
-    bundle install -j4 --verbose --local --deployment --without development test mysql
-
-    # Fix timezone data directory
-    substituteInPlace $out/share/gitlab/vendor/bundle/ruby/*/gems/tzinfo-*/lib/tzinfo/zoneinfo_data_source.rb \
-      --replace "/etc/zoneinfo" "${tzdata}/share/zoneinfo"
-
-    # For reasons I don't understand "bundle exec" ignores the
-    # RAILS_ENV causing tests to be executed that fail because we're
-    # not installing development and test gems above. Deleting the
-    # tests works though.:
-    rm $out/share/gitlab/lib/tasks/test.rake
-
-    # Assets
+  '';
+  buildPhase = ''
+    export GEM_HOME=${env}/${ruby.gemPath}
     bundle exec rake assets:precompile RAILS_ENV=production
   '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gitlab.com/;
-    platforms = platforms.linux;
-    maintainers = [ ];
-    license = licenses.mit;
+  installPhase = ''
+    mkdir -p $out/share
+    cp -r . $out/share/gitlab
+  '';
+  passthru = {
+    inherit env;
+    inherit ruby;
   };
 }
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
new file mode 100644
index 00000000000..392550daae5
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -0,0 +1,2398 @@
+{
+  "RedCloth" = {
+    version = "4.2.9";
+    source = {
+      type = "gem";
+      sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
+    };
+  };
+  "ace-rails-ap" = {
+    version = "2.0.1";
+    source = {
+      type = "gem";
+      sha256 = "082n12rkd9j7d89030nhmi4fx1gqaf13knps6cknsyvwix7fryvv";
+    };
+  };
+  "actionmailer" = {
+    version = "4.1.1";
+    source = {
+      type = "gem";
+      sha256 = "14mbmlwyrxccmf2svhxmvrv0ypcq53xyyqzh4a2r2azmxjb1zxnx";
+    };
+    dependencies = [
+      "actionpack"
+      "actionview"
+      "mail"
+    ];
+  };
+  "actionpack" = {
+    version = "4.1.1";
+    source = {
+      type = "gem";
+      sha256 = "078iqmjay787xg76zibnvk485y29d57wffiv9nj0nmzb89jfa6y1";
+    };
+    dependencies = [
+      "actionview"
+      "activesupport"
+      "rack"
+      "rack-test"
+    ];
+  };
+  "actionview" = {
+    version = "4.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0wlhsy9hqzpi3xylphx71i9bd5x6dd03qzrh4nnc8mimzjbv14jq";
+    };
+    dependencies = [
+      "activesupport"
+      "builder"
+      "erubis"
+    ];
+  };
+  "activemodel" = {
+    version = "4.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0cijxp7n0zv1j2bh5jyirlcwi24j9xlwfsmn7icr0zsybgc0in61";
+    };
+    dependencies = [
+      "activesupport"
+      "builder"
+    ];
+  };
+  "activerecord" = {
+    version = "4.1.1";
+    source = {
+      type = "gem";
+      sha256 = "180kxb98097nh8dprqrm5d1ab6xaqv8kxqdbm1p84y87w0kj57yz";
+    };
+    dependencies = [
+      "activemodel"
+      "activesupport"
+      "arel"
+    ];
+  };
+  "activesupport" = {
+    version = "4.1.1";
+    source = {
+      type = "gem";
+      sha256 = "11dsdfrdqqfhpgigb960a4xrs1k7ix5brbsw034nijn8d4fq0hkk";
+    };
+    dependencies = [
+      "i18n"
+      "json"
+      "minitest"
+      "thread_safe"
+      "tzinfo"
+    ];
+  };
+  "acts-as-taggable-on" = {
+    version = "2.4.1";
+    source = {
+      type = "gem";
+      sha256 = "0gbmxx6nk109i6c4686vr5wpf89xiiys7s2lwf7z68dpgi1dsxab";
+    };
+    dependencies = [
+      "rails"
+    ];
+  };
+  "addressable" = {
+    version = "2.3.5";
+    source = {
+      type = "gem";
+      sha256 = "11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7";
+    };
+  };
+  "annotate" = {
+    version = "2.6.0";
+    source = {
+      type = "gem";
+      sha256 = "0min6rmiqjnp6irjd9mjlz8k13qzx4g51d8v6vn8zn8hdnfbjanr";
+    };
+    dependencies = [
+      "activerecord"
+      "rake"
+    ];
+  };
+  "arel" = {
+    version = "5.0.1.20140414130214";
+    source = {
+      type = "gem";
+      sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9";
+    };
+  };
+  "asciidoctor" = {
+    version = "0.1.4";
+    source = {
+      type = "gem";
+      sha256 = "14ngw7c8sq5ydh0xz6b5jgvs5vbk2sx1vf75fjf0q81ixnd6yb9a";
+    };
+  };
+  "awesome_print" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1k85hckprq0s9pakgadf42k1d5s07q23m3y6cs977i6xmwdivyzr";
+    };
+  };
+  "axiom-types" = {
+    version = "0.0.5";
+    source = {
+      type = "gem";
+      sha256 = "0k6mf132n2f5z8xwcwfjayrxfqsd8yyzj2cgxv5phvr7szlqfyzn";
+    };
+    dependencies = [
+      "descendants_tracker"
+      "ice_nine"
+    ];
+  };
+  "bcrypt" = {
+    version = "3.1.7";
+    source = {
+      type = "gem";
+      sha256 = "00jpjl2v0y8dsfhxx3l3sp2pnflkxbbywnda46n1w5f7a8qrac0w";
+    };
+  };
+  "better_errors" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "0v0q8bdkqqlcsfqbk4wvc3qnz8an44mgz720v5f11a4nr413mjgf";
+    };
+    dependencies = [
+      "coderay"
+      "erubis"
+    ];
+  };
+  "binding_of_caller" = {
+    version = "0.7.2";
+    source = {
+      type = "gem";
+      sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
+    };
+    dependencies = [
+      "debug_inspector"
+    ];
+  };
+  "bootstrap-sass" = {
+    version = "3.0.3.0";
+    source = {
+      type = "gem";
+      sha256 = "1isljqrlasq9n7cxj4ldf0cjjhkwzsbl8lj6rf5z9farwjx6k4iz";
+    };
+    dependencies = [
+      "sass"
+    ];
+  };
+  "builder" = {
+    version = "3.2.2";
+    source = {
+      type = "gem";
+      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+    };
+  };
+  "capybara" = {
+    version = "2.2.1";
+    source = {
+      type = "gem";
+      sha256 = "1sydb3mnznqn23s2cqb0ysdml0dgl06fzdvx8aqbbx1km9pgz080";
+    };
+    dependencies = [
+      "mime-types"
+      "nokogiri"
+      "rack"
+      "rack-test"
+      "xpath"
+    ];
+  };
+  "carrierwave" = {
+    version = "0.9.0";
+    source = {
+      type = "gem";
+      sha256 = "1b1av1ancby6brhmypl5k8xwrasd8bd3kqp9ri8kbq7z8nj6k445";
+    };
+    dependencies = [
+      "activemodel"
+      "activesupport"
+      "json"
+    ];
+  };
+  "celluloid" = {
+    version = "0.15.2";
+    source = {
+      type = "gem";
+      sha256 = "0lpa97m7f4p5hgzaaa47y1d5c78n8pp4xd8qb0sn5llqd0klkd9b";
+    };
+    dependencies = [
+      "timers"
+    ];
+  };
+  "charlock_holmes" = {
+    version = "0.6.9.4";
+    source = {
+      type = "gem";
+      sha256 = "1vyzsr3r2bwig9knyhay1m7i828w9x5zhma44iajyrbs1ypvfbg5";
+    };
+  };
+  "cliver" = {
+    version = "0.3.2";
+    source = {
+      type = "gem";
+      sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7";
+    };
+  };
+  "code_analyzer" = {
+    version = "0.4.3";
+    source = {
+      type = "gem";
+      sha256 = "1v8b6sbsyw1612wilfc2bsjbr41gf46apjqmlqbishmkhywi1di7";
+    };
+    dependencies = [
+      "sexp_processor"
+    ];
+  };
+  "coderay" = {
+    version = "1.1.0";
+    source = {
+      type = "gem";
+      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
+    };
+  };
+  "coercible" = {
+    version = "1.0.0";
+    source = {
+      type = "gem";
+      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
+    };
+    dependencies = [
+      "descendants_tracker"
+    ];
+  };
+  "coffee-rails" = {
+    version = "4.0.1";
+    source = {
+      type = "gem";
+      sha256 = "12nqw61xfs43qap4bxp123q4fgj41gvxirdal95ymdd2qzr3cvig";
+    };
+    dependencies = [
+      "coffee-script"
+      "railties"
+    ];
+  };
+  "coffee-script" = {
+    version = "2.2.0";
+    source = {
+      type = "gem";
+      sha256 = "133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc";
+    };
+    dependencies = [
+      "coffee-script-source"
+      "execjs"
+    ];
+  };
+  "coffee-script-source" = {
+    version = "1.6.3";
+    source = {
+      type = "gem";
+      sha256 = "0p33h0rdj1n8xhm2d5hzqbb8br6wn4rx0gk4hyhc6rxkaxsy79b4";
+    };
+  };
+  "colored" = {
+    version = "1.2";
+    source = {
+      type = "gem";
+      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+    };
+  };
+  "colorize" = {
+    version = "0.5.8";
+    source = {
+      type = "gem";
+      sha256 = "1rfzvscnk2js87zzwjgg2lk6h6mrv9448z5vx3b8vnm9yrb2qg8g";
+    };
+  };
+  "connection_pool" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1ffw78r39b3gn121ghi65fsrkzjjv7h0mxag6ilphsas1kzz3h21";
+    };
+  };
+  "coveralls" = {
+    version = "0.7.0";
+    source = {
+      type = "gem";
+      sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4";
+    };
+    dependencies = [
+      "multi_json"
+      "rest-client"
+      "simplecov"
+      "term-ansicolor"
+      "thor"
+    ];
+  };
+  "crack" = {
+    version = "0.4.1";
+    source = {
+      type = "gem";
+      sha256 = "0wb2s4nidabcgn2k65ydhx0f9758py79p615qph99117csy915jg";
+    };
+    dependencies = [
+      "safe_yaml"
+    ];
+  };
+  "creole" = {
+    version = "0.3.8";
+    source = {
+      type = "gem";
+      sha256 = "1wwqk5ij4r5rhzbzhnpqwbn9ck56qgyjs02pjmi2wh46gs8dmkl8";
+    };
+  };
+  "d3_rails" = {
+    version = "3.1.10";
+    source = {
+      type = "gem";
+      sha256 = "1n94vwn51v1dfqjqmdkb11mgyvq6dfmf5cjwa9w1nj3785yvkii8";
+    };
+    dependencies = [
+      "railties"
+    ];
+  };
+  "daemons" = {
+    version = "1.1.9";
+    source = {
+      type = "gem";
+      sha256 = "1j1m64pirsldhic6x6sg4lcrmp1bs1ihpd49xm8m1b2rc1c3irzy";
+    };
+  };
+  "database_cleaner" = {
+    version = "1.3.0";
+    source = {
+      type = "gem";
+      sha256 = "19w25yda684pg29bggq26wy4lpyjvzscwg2hx3hmmmpysiwfnxgn";
+    };
+  };
+  "debug_inspector" = {
+    version = "0.0.2";
+    source = {
+      type = "gem";
+      sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m";
+    };
+  };
+  "default_value_for" = {
+    version = "3.0.0";
+    source = {
+      type = "gem";
+      sha256 = "08bhk2dzxpvsk891y415man42vn3f9cvysysywh1iavxbv5qkg8z";
+    };
+    dependencies = [
+      "activerecord"
+    ];
+  };
+  "descendants_tracker" = {
+    version = "0.0.3";
+    source = {
+      type = "gem";
+      sha256 = "0819j80k85j62qjg90v8z8s3h4nf3v6afxxz73hl6iqxr2dhgmq1";
+    };
+  };
+  "devise" = {
+    version = "3.2.4";
+    source = {
+      type = "gem";
+      sha256 = "1za4082iacq2n0g0v5s1vmn402wj4bwvqqd55phc9da922j4awx3";
+    };
+    dependencies = [
+      "bcrypt"
+      "orm_adapter"
+      "railties"
+      "thread_safe"
+      "warden"
+    ];
+  };
+  "devise-async" = {
+    version = "0.9.0";
+    source = {
+      type = "gem";
+      sha256 = "11llg7ggzpmg4lb9gh4sx55spvp98sal5r803gjzamps9crfq6mm";
+    };
+    dependencies = [
+      "devise"
+    ];
+  };
+  "diff-lcs" = {
+    version = "1.2.5";
+    source = {
+      type = "gem";
+      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
+    };
+  };
+  "diffy" = {
+    version = "3.0.3";
+    source = {
+      type = "gem";
+      sha256 = "0qldyp6m5vlagiaiwdixbj64ynr5ghz58xsrxykas7581qdxk88m";
+    };
+  };
+  "docile" = {
+    version = "1.1.5";
+    source = {
+      type = "gem";
+      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+    };
+  };
+  "dotenv" = {
+    version = "0.9.0";
+    source = {
+      type = "gem";
+      sha256 = "1gl0m6s8d6m72wcm4p86kzzjdihyryi5mh6v70qkqd0dl1gj73l3";
+    };
+  };
+  "dropzonejs-rails" = {
+    version = "0.4.14";
+    source = {
+      type = "gem";
+      sha256 = "0aqjij9dvazz7vq9c8m9fxjc3vnkfagqgnq94whzgrm2ikszb1ny";
+    };
+    dependencies = [
+      "rails"
+    ];
+  };
+  "email_spec" = {
+    version = "1.5.0";
+    source = {
+      type = "gem";
+      sha256 = "0gshv8ylfr1nf6mhgriyzlm5rv5c44yxlgmxva8gpdqsyibfa1r6";
+    };
+    dependencies = [
+      "launchy"
+      "mail"
+    ];
+  };
+  "emoji" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "01fgzkwfsfcvcgrxb6x58w8rpcv0hq6x761iws0xqv0rzz3a8x1a";
+    };
+    dependencies = [
+      "json"
+    ];
+  };
+  "enumerize" = {
+    version = "0.7.0";
+    source = {
+      type = "gem";
+      sha256 = "0rg6bm3xv7p4i5gs4796v8gc49mzakphwv4kdbhn0wjm690h6226";
+    };
+    dependencies = [
+      "activesupport"
+    ];
+  };
+  "equalizer" = {
+    version = "0.0.8";
+    source = {
+      type = "gem";
+      sha256 = "1nh9i4khg7z2nsay8i1i43yk6ml2hwsf7cl179z22p4kwvn04vfn";
+    };
+  };
+  "erubis" = {
+    version = "2.7.0";
+    source = {
+      type = "gem";
+      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+    };
+  };
+  "escape_utils" = {
+    version = "0.2.4";
+    source = {
+      type = "gem";
+      sha256 = "0mg5pgaa02w1bxh0166d367f2ll6fizyrs5dsirrcnw4g17ba54g";
+    };
+  };
+  "eventmachine" = {
+    version = "1.0.3";
+    source = {
+      type = "gem";
+      sha256 = "09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil";
+    };
+  };
+  "excon" = {
+    version = "0.32.1";
+    source = {
+      type = "gem";
+      sha256 = "0yazh0228ldyxrbrj5pqw06rs5sk3disp24v5bw4h8mp3ibih45a";
+    };
+  };
+  "execjs" = {
+    version = "2.0.2";
+    source = {
+      type = "gem";
+      sha256 = "167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs";
+    };
+  };
+  "expression_parser" = {
+    version = "0.9.0";
+    source = {
+      type = "gem";
+      sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
+    };
+  };
+  "factory_girl" = {
+    version = "4.3.0";
+    source = {
+      type = "gem";
+      sha256 = "13z20a4b7z1c8vbz0qz5ranssdprldwvwlgjmn38x311sfjmp9dz";
+    };
+    dependencies = [
+      "activesupport"
+    ];
+  };
+  "factory_girl_rails" = {
+    version = "4.3.0";
+    source = {
+      type = "gem";
+      sha256 = "1jj0yl6mfildb4g79dwgc1q5pv2pa65k9b1ml43mi8mg62j8mrhz";
+    };
+    dependencies = [
+      "factory_girl"
+      "railties"
+    ];
+  };
+  "faraday" = {
+    version = "0.8.9";
+    source = {
+      type = "gem";
+      sha256 = "17d79fsgx0xwh0mfxyz5pbr435qlw79phlfvifc546w2axdkp718";
+    };
+    dependencies = [
+      "multipart-post"
+    ];
+  };
+  "faraday_middleware" = {
+    version = "0.9.0";
+    source = {
+      type = "gem";
+      sha256 = "1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2";
+    };
+    dependencies = [
+      "faraday"
+    ];
+  };
+  "ffaker" = {
+    version = "1.22.1";
+    source = {
+      type = "gem";
+      sha256 = "17zpqhf1kq831jg9rdrpx58mwnrnrvy5g97rxg3hzgy5j09kxq0q";
+    };
+  };
+  "ffi" = {
+    version = "1.9.3";
+    source = {
+      type = "gem";
+      sha256 = "0873h6jp3v65mll7av9bxlzp9m9l1cc66j0krg0llchwbh4pv5sp";
+    };
+  };
+  "fog" = {
+    version = "1.21.0";
+    source = {
+      type = "gem";
+      sha256 = "14hbq573gl5x8zrcx5jz9d7m6rnn0vk8ypgn77hrhjh0wyxb0a7f";
+    };
+    dependencies = [
+      "fog-brightbox"
+      "fog-core"
+      "fog-json"
+      "nokogiri"
+    ];
+  };
+  "fog-brightbox" = {
+    version = "0.0.1";
+    source = {
+      type = "gem";
+      sha256 = "0j1bpfa8in3h69habl46zmm1540w46348gd246bamrs5gi4zfqkk";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+    ];
+  };
+  "fog-core" = {
+    version = "1.21.1";
+    source = {
+      type = "gem";
+      sha256 = "1wcxilb537ibfl06r8h73ilj5xxvd18cc21nzwbh6fp2ip527q34";
+    };
+    dependencies = [
+      "builder"
+      "excon"
+      "formatador"
+      "mime-types"
+      "net-scp"
+      "net-ssh"
+    ];
+  };
+  "fog-json" = {
+    version = "1.0.0";
+    source = {
+      type = "gem";
+      sha256 = "1517sm8bl0bmaw2fbaf5ra6midq3wzgkpm55lb9rw6jm5ys23lyw";
+    };
+    dependencies = [
+      "multi_json"
+    ];
+  };
+  "font-awesome-rails" = {
+    version = "4.2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "1r6x34lswqcm6s6y5fvx34afsydpdly0123m75m1f5vx30l81jh0";
+    };
+    dependencies = [
+      "railties"
+    ];
+  };
+  "foreman" = {
+    version = "0.63.0";
+    source = {
+      type = "gem";
+      sha256 = "0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk";
+    };
+    dependencies = [
+      "dotenv"
+      "thor"
+    ];
+  };
+  "formatador" = {
+    version = "0.2.4";
+    source = {
+      type = "gem";
+      sha256 = "0pgmk1h6i6m3cslnfyjqld06a4c2xbbvmngxg2axddf39xwz6f12";
+    };
+  };
+  "gemnasium-gitlab-service" = {
+    version = "0.2.2";
+    source = {
+      type = "gem";
+      sha256 = "0a3jy2z1xkgxaqxhsclsfkn52iccdga5zznfk00s69gn0bpvdfc2";
+    };
+    dependencies = [
+      "rugged"
+    ];
+  };
+  "gherkin-ruby" = {
+    version = "0.3.1";
+    source = {
+      type = "gem";
+      sha256 = "10plcj47ky078dvg78abf0asv29g6ba1zs9mgrza1161cxyj0mlq";
+    };
+    dependencies = [
+      "racc"
+    ];
+  };
+  "github-markup" = {
+    version = "1.1.0";
+    source = {
+      type = "gem";
+      sha256 = "06zsljgavpkwafw32zx69xblhrhz1r2mjbhgpvn51c2qa0rmsd7g";
+    };
+  };
+  "gitlab-flowdock-git-hook" = {
+    version = "0.4.2.2";
+    source = {
+      type = "gem";
+      sha256 = "0r6hwkzkcdv53ib9ispjs38njxmmca7kz8kj5mjadqvdwiak9nwv";
+    };
+    dependencies = [
+      "gitlab-grit"
+      "multi_json"
+    ];
+  };
+  "gitlab-grack" = {
+    version = "2.0.0.pre";
+    source = {
+      type = "gem";
+      sha256 = "197qdlymn6cf0qk3698kn0miizv7x9hr1429g9l900rnc85a5rdb";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "gitlab-grit" = {
+    version = "2.6.12";
+    source = {
+      type = "gem";
+      sha256 = "00yghwc3ggg34vdkz7v8mq27fc8h47kydahbqzaby5s0w70nx6c8";
+    };
+    dependencies = [
+      "charlock_holmes"
+      "diff-lcs"
+      "mime-types"
+      "posix-spawn"
+    ];
+  };
+  "gitlab-linguist" = {
+    version = "3.0.0";
+    source = {
+      type = "gem";
+      sha256 = "0g2nv7lb33354nb8clwjrgxk09vr3wjn4rpyllmq6s01vx660lk6";
+    };
+    dependencies = [
+      "charlock_holmes"
+      "escape_utils"
+      "mime-types"
+    ];
+  };
+  "gitlab_emoji" = {
+    version = "0.0.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0cqxhbq5c3mvkxbdcwcl4pa0cwlvnjsphs7hp2dz63h82ggwa3vn";
+    };
+    dependencies = [
+      "emoji"
+    ];
+  };
+  "gitlab_git" = {
+    version = "7.0.0.rc10";
+    source = {
+      type = "gem";
+      sha256 = "0kjljz76wh4344z05mv3wiad7qdf6nwaa0yl1jls1j0hk9i4bb4k";
+    };
+    dependencies = [
+      "activesupport"
+      "charlock_holmes"
+      "gitlab-linguist"
+      "rugged"
+    ];
+  };
+  "gitlab_meta" = {
+    version = "7.0";
+    source = {
+      type = "gem";
+      sha256 = "14vahv7gblcypbvip845sg3lvawf3kij61mkxz5vyfcv23niqvp9";
+    };
+  };
+  "gitlab_omniauth-ldap" = {
+    version = "1.1.0";
+    source = {
+      type = "gem";
+      sha256 = "0bpsh8z8fl03fwgz82wn53ibrc7714hmx16s5zxfbq1xk70r3pq7";
+    };
+    dependencies = [
+      "net-ldap"
+      "omniauth"
+      "pyu-ruby-sasl"
+      "rubyntlm"
+    ];
+  };
+  "gollum-lib" = {
+    version = "3.0.0";
+    source = {
+      type = "gem";
+      sha256 = "18g74hl0zm285jszsk4414qvd106j0gkydg134my8hylwv59c23s";
+    };
+    dependencies = [
+      "github-markup"
+      "gitlab-grit"
+      "nokogiri"
+      "rouge"
+      "sanitize"
+      "stringex"
+    ];
+  };
+  "gon" = {
+    version = "5.0.1";
+    source = {
+      type = "gem";
+      sha256 = "19ga6y4375iakccg089f7789r9n87gh16cdmhaa0qsk1m1dx34zm";
+    };
+    dependencies = [
+      "actionpack"
+      "json"
+    ];
+  };
+  "grape" = {
+    version = "0.6.1";
+    source = {
+      type = "gem";
+      sha256 = "1sjlk0pmgqbb3piz8yb0xjcm7liimrr17y5xflm40amv36pg2gz8";
+    };
+    dependencies = [
+      "activesupport"
+      "builder"
+      "hashie"
+      "multi_json"
+      "multi_xml"
+      "rack"
+      "rack-accept"
+      "rack-mount"
+      "virtus"
+    ];
+  };
+  "grape-entity" = {
+    version = "0.4.2";
+    source = {
+      type = "gem";
+      sha256 = "15vvpj7hw2n84glrvh5p3il8h3nnqg5gzgk6knavhamc7gj09g4k";
+    };
+    dependencies = [
+      "activesupport"
+      "multi_json"
+    ];
+  };
+  "growl" = {
+    version = "1.0.3";
+    source = {
+      type = "gem";
+      sha256 = "0s0y7maljnalpbv2q1j5j5hvb4wcc31y9af0n7x1q2l0fzxgc9n9";
+    };
+  };
+  "guard" = {
+    version = "2.2.4";
+    source = {
+      type = "gem";
+      sha256 = "0z427rkcpzy82g21cgq7i5sn1vxn8hm8j4d78kj9vlaqgilcybhq";
+    };
+    dependencies = [
+      "formatador"
+      "listen"
+      "lumberjack"
+      "pry"
+      "thor"
+    ];
+  };
+  "guard-rspec" = {
+    version = "4.2.0";
+    source = {
+      type = "gem";
+      sha256 = "0n4159cw88y0va5v2yvhjphwlgwhqbc3mplj7p92irbj045xsc8n";
+    };
+    dependencies = [
+      "guard"
+      "rspec"
+    ];
+  };
+  "guard-spinach" = {
+    version = "0.0.2";
+    source = {
+      type = "gem";
+      sha256 = "1fsh6yifiywvnzrk6wbgssxr5bshp38gbhs96hbfzhvzfiff0xid";
+    };
+    dependencies = [
+      "guard"
+      "spinach"
+    ];
+  };
+  "haml" = {
+    version = "4.0.5";
+    source = {
+      type = "gem";
+      sha256 = "1xmzb0k5q271090crzmv7dbw8ss4289bzxklrc0fhw6pw3kcvc85";
+    };
+    dependencies = [
+      "tilt"
+    ];
+  };
+  "haml-rails" = {
+    version = "0.5.3";
+    source = {
+      type = "gem";
+      sha256 = "0fg4dh1gb7f4h2571wm5qxli02mgg3r8ikp5vwkww12a431vk625";
+    };
+    dependencies = [
+      "actionpack"
+      "activesupport"
+      "haml"
+      "railties"
+    ];
+  };
+  "hashie" = {
+    version = "2.1.2";
+    source = {
+      type = "gem";
+      sha256 = "08w9ask37zh5w989b6igair3zf8gwllyzix97rlabxglif9f9qd9";
+    };
+  };
+  "hike" = {
+    version = "1.2.3";
+    source = {
+      type = "gem";
+      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
+    };
+  };
+  "hipchat" = {
+    version = "0.14.0";
+    source = {
+      type = "gem";
+      sha256 = "1y3bi5aj21iay138027i8y9b022hpsfw54k7k31argp2gppc8y0n";
+    };
+    dependencies = [
+      "httparty"
+      "httparty"
+    ];
+  };
+  "html-pipeline" = {
+    version = "1.11.0";
+    source = {
+      type = "gem";
+      sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l";
+    };
+    dependencies = [
+      "activesupport"
+      "nokogiri"
+    ];
+  };
+  "html-pipeline-gitlab" = {
+    version = "0.1.5";
+    source = {
+      type = "gem";
+      sha256 = "1gih8j7sq45244v21z5rc19mi21achiy11l5sc8a4xfkvq5gldng";
+    };
+    dependencies = [
+      "actionpack"
+      "gitlab_emoji"
+      "html-pipeline"
+      "sanitize"
+    ];
+  };
+  "http_parser.rb" = {
+    version = "0.5.3";
+    source = {
+      type = "gem";
+      sha256 = "0fwf5d573j1sw52kz057dw0nx2wlivczmx6ybf6mk065n5g54kyn";
+    };
+  };
+  "httparty" = {
+    version = "0.13.0";
+    source = {
+      type = "gem";
+      sha256 = "1qda6yhxwh1riddnib8knhqc0ja5h26i75kaxnywfldx9rkd32jw";
+    };
+    dependencies = [
+      "json"
+      "multi_xml"
+    ];
+  };
+  "httpauth" = {
+    version = "0.2.1";
+    source = {
+      type = "gem";
+      sha256 = "1ydlaf1nvs3g7b4xp9445m01qyjbwnbbh2f7gvialipyipj92j8d";
+    };
+  };
+  "i18n" = {
+    version = "0.6.11";
+    source = {
+      type = "gem";
+      sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk";
+    };
+  };
+  "ice_nine" = {
+    version = "0.10.0";
+    source = {
+      type = "gem";
+      sha256 = "0hjcn06xgrmpz3zyg0yirx6r7xb2m6akhn29p4yn4698ncw7b3qh";
+    };
+  };
+  "jasmine" = {
+    version = "2.0.2";
+    source = {
+      type = "gem";
+      sha256 = "1v0z5a5m4np12m0lmf0vl63qdxbh6zxnxbnzx3xjwky723inqhir";
+    };
+    dependencies = [
+      "jasmine-core"
+      "phantomjs"
+      "rack"
+      "rake"
+    ];
+  };
+  "jasmine-core" = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "1frr9ndyrawag8c4rhd0yxl3318s5xwb3dqvz3i6z8nc936gwfzj";
+    };
+  };
+  "jquery-atwho-rails" = {
+    version = "0.3.3";
+    source = {
+      type = "gem";
+      sha256 = "1f8w1kqy46s4qzfhlh08qb1l1czl6randcccxpknaw9pzf367fvs";
+    };
+  };
+  "jquery-rails" = {
+    version = "3.1.0";
+    source = {
+      type = "gem";
+      sha256 = "130a8gn67b2zn47yyqshf48d46na885v4g3mh2rrchd5ma1jy6cx";
+    };
+    dependencies = [
+      "railties"
+      "thor"
+    ];
+  };
+  "jquery-scrollto-rails" = {
+    version = "1.4.3";
+    source = {
+      type = "gem";
+      sha256 = "12ic0zxw60ryglm1qjq5ralqd6k4jawmjj7kqnp1nkqds2nvinvp";
+    };
+    dependencies = [
+      "railties"
+    ];
+  };
+  "jquery-turbolinks" = {
+    version = "2.0.1";
+    source = {
+      type = "gem";
+      sha256 = "0d6av6cc0g8ym5zlkc8f00zxmnqchs95h7hqnrs2yrfz9nj856kd";
+    };
+    dependencies = [
+      "railties"
+      "turbolinks"
+    ];
+  };
+  "jquery-ui-rails" = {
+    version = "4.2.1";
+    source = {
+      type = "gem";
+      sha256 = "1garrnqwh35acj2pp4sp6fpm2g881h23y644lzbic2qmcrq9wd2v";
+    };
+    dependencies = [
+      "railties"
+    ];
+  };
+  "json" = {
+    version = "1.8.1";
+    source = {
+      type = "gem";
+      sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn";
+    };
+  };
+  "jwt" = {
+    version = "0.1.13";
+    source = {
+      type = "gem";
+      sha256 = "03c8sy54nhvvb0ksphk15p5yfkd601ncs55k4h32hjqbm9vgnlsn";
+    };
+    dependencies = [
+      "multi_json"
+    ];
+  };
+  "kaminari" = {
+    version = "0.15.1";
+    source = {
+      type = "gem";
+      sha256 = "1m67ghp55hr16k1njhd00f225qys67n60qa3jz69kzqvrp6qg33d";
+    };
+    dependencies = [
+      "actionpack"
+      "activesupport"
+    ];
+  };
+  "kgio" = {
+    version = "2.8.1";
+    source = {
+      type = "gem";
+      sha256 = "0vpw3nk35mh8mda4gn0qklq51znxxgv3852g6mxifi6hjwxrmrcj";
+    };
+  };
+  "launchy" = {
+    version = "2.4.2";
+    source = {
+      type = "gem";
+      sha256 = "0i1nmlrqpnk2q6f7iq85cqaa7b8fw4bmqm57w60g92lsfmszs8iv";
+    };
+    dependencies = [
+      "addressable"
+    ];
+  };
+  "letter_opener" = {
+    version = "1.1.2";
+    source = {
+      type = "gem";
+      sha256 = "1kzbmc686hfh4jznyckq6g40kn14nhb71znsjjm0rc13nb3n0c5l";
+    };
+    dependencies = [
+      "launchy"
+    ];
+  };
+  "libv8" = {
+    version = "3.16.14.3";
+    source = {
+      type = "gem";
+      sha256 = "1arjjbmr9zxkyv6pdrihsz1p5cadzmx8308vgfvrhm380ccgridm";
+    };
+  };
+  "listen" = {
+    version = "2.3.1";
+    source = {
+      type = "gem";
+      sha256 = "081pv5nw79nl1251prh11v3ywghcmb660xm990rbp5bs6c3vcjam";
+    };
+    dependencies = [
+      "celluloid"
+      "rb-fsevent"
+      "rb-inotify"
+    ];
+  };
+  "lumberjack" = {
+    version = "1.0.4";
+    source = {
+      type = "gem";
+      sha256 = "1mj6m12hnmkvzl4w2yh04ak3z45pwksj6ra7v30za8snw9kg919d";
+    };
+  };
+  "mail" = {
+    version = "2.5.4";
+    source = {
+      type = "gem";
+      sha256 = "0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4";
+    };
+    dependencies = [
+      "mime-types"
+      "treetop"
+    ];
+  };
+  "method_source" = {
+    version = "0.8.2";
+    source = {
+      type = "gem";
+      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
+    };
+  };
+  "mime-types" = {
+    version = "1.25.1";
+    source = {
+      type = "gem";
+      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+    };
+  };
+  "mini_portile" = {
+    version = "0.6.0";
+    source = {
+      type = "gem";
+      sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn";
+    };
+  };
+  "minitest" = {
+    version = "5.3.5";
+    source = {
+      type = "gem";
+      sha256 = "18lkfjr0p26x5qxaficwlnhvjrf5bqwl244qdx4pvr5clrvv17xr";
+    };
+  };
+  "mousetrap-rails" = {
+    version = "1.4.6";
+    source = {
+      type = "gem";
+      sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
+    };
+  };
+  "multi_json" = {
+    version = "1.10.1";
+    source = {
+      type = "gem";
+      sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c";
+    };
+  };
+  "multi_xml" = {
+    version = "0.5.5";
+    source = {
+      type = "gem";
+      sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8";
+    };
+  };
+  "multipart-post" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc";
+    };
+  };
+  "mysql2" = {
+    version = "0.3.16";
+    source = {
+      type = "gem";
+      sha256 = "0ikg892bvyviqvxsyn0v6vj9ndhgdbc1339488n8y4s9zh35y71f";
+    };
+  };
+  "net-ldap" = {
+    version = "0.7.0";
+    source = {
+      type = "gem";
+      sha256 = "1d54cm02w8xi5nylss5b9vmzsscflcrbwg5qv1rp5frak4f397fk";
+    };
+  };
+  "net-scp" = {
+    version = "1.1.2";
+    source = {
+      type = "gem";
+      sha256 = "0xsr5gka2y14i5pa6h2lgkdzvmlviqq2qbmgaw76gdzrcf7q9n7k";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
+  "net-ssh" = {
+    version = "2.8.0";
+    source = {
+      type = "gem";
+      sha256 = "0l89a01199ag77vvbm47fdpmx4fp2dk9jsvwvrsqryxqqhzwbxa2";
+    };
+  };
+  "newrelic_rpm" = {
+    version = "3.9.4.245";
+    source = {
+      type = "gem";
+      sha256 = "0r1x16wwmiqsf1gj2a1lgc0fq1v0x4yv40k5wgb00gs439vgzyin";
+    };
+  };
+  "nokogiri" = {
+    version = "1.6.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0dj8ajm9hlfpa71qz1xn5prqy5qdi32ll74qh8ssjwknp1a35cnz";
+    };
+    dependencies = [
+      "mini_portile"
+    ];
+  };
+  "nprogress-rails" = {
+    version = "0.1.2.3";
+    source = {
+      type = "gem";
+      sha256 = "16gqajynqzfvzcyc8b9bjn8xf6j7y80li00ajicxwvb6my2ag304";
+    };
+  };
+  "oauth" = {
+    version = "0.4.7";
+    source = {
+      type = "gem";
+      sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w";
+    };
+  };
+  "oauth2" = {
+    version = "0.8.1";
+    source = {
+      type = "gem";
+      sha256 = "18gk2m42l4dmhiq394mmj1md2l5va5m236lkwy62pwk526lhi271";
+    };
+    dependencies = [
+      "faraday"
+      "httpauth"
+      "jwt"
+      "multi_json"
+      "rack"
+    ];
+  };
+  "omniauth" = {
+    version = "1.1.4";
+    source = {
+      type = "gem";
+      sha256 = "1ggg6nrlbpj67q59s5lyrpi6lnwv6wp3y7y5njbqr6y5y7d34wfl";
+    };
+    dependencies = [
+      "hashie"
+      "rack"
+    ];
+  };
+  "omniauth-github" = {
+    version = "1.1.1";
+    source = {
+      type = "gem";
+      sha256 = "1hnsindjhy4ihgjl96iwlf26vdv7v2cikagpqpkv25nc97mipd4l";
+    };
+    dependencies = [
+      "omniauth"
+      "omniauth-oauth2"
+    ];
+  };
+  "omniauth-google-oauth2" = {
+    version = "0.2.5";
+    source = {
+      type = "gem";
+      sha256 = "1pgbc21y5kjna1ac2fwaaimv1a4a6wdpy6y5wmvrl6pr631s248w";
+    };
+    dependencies = [
+      "omniauth"
+      "omniauth-oauth2"
+    ];
+  };
+  "omniauth-oauth" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "0ng7zcsfx0hv4yqwj80y1yc6wh5511p07lihaf9j7a3bzqqgn6wz";
+    };
+    dependencies = [
+      "oauth"
+      "omniauth"
+    ];
+  };
+  "omniauth-oauth2" = {
+    version = "1.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0s7bhlbz9clg1qxjrrcssyp5kxry1zp0lhsfgw735m7ap5vvmf3j";
+    };
+    dependencies = [
+      "oauth2"
+      "omniauth"
+    ];
+  };
+  "omniauth-shibboleth" = {
+    version = "1.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0xljj8mpdbr243ddqcd3bmr2jc674lj9iv0v1z3rczg4q45jmadh";
+    };
+    dependencies = [
+      "omniauth"
+    ];
+  };
+  "omniauth-twitter" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "060gnfc9im786llgi7vlrfhar1b7jlk19bjjc5d50lwrah0hh4fd";
+    };
+    dependencies = [
+      "multi_json"
+      "omniauth-oauth"
+    ];
+  };
+  "org-ruby" = {
+    version = "0.9.9";
+    source = {
+      type = "gem";
+      sha256 = "1r978d8rsmln1jz44in6ll61ii84r81wb2mmic633h0agm62s9za";
+    };
+    dependencies = [
+      "rubypants"
+    ];
+  };
+  "orm_adapter" = {
+    version = "0.5.0";
+    source = {
+      type = "gem";
+      sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda";
+    };
+  };
+  "pg" = {
+    version = "0.15.1";
+    source = {
+      type = "gem";
+      sha256 = "1lwyb542avqfav3814n5b3pssyih1ghzchs58vyzh5061r02fs5s";
+    };
+  };
+  "phantomjs" = {
+    version = "1.9.2.0";
+    source = {
+      type = "gem";
+      sha256 = "0cvg8c9b85bhl00wg1fbkbr129sdxlh9gm61fqq3hal3c6sxbws2";
+    };
+  };
+  "poltergeist" = {
+    version = "1.5.1";
+    source = {
+      type = "gem";
+      sha256 = "08va59swiyvppb020xy6k9sqpnf5s6rjm1ycsbkv2abp37080ifv";
+    };
+    dependencies = [
+      "capybara"
+      "cliver"
+      "multi_json"
+      "websocket-driver"
+    ];
+  };
+  "polyglot" = {
+    version = "0.3.4";
+    source = {
+      type = "gem";
+      sha256 = "0jcnabyh7iirz78db1g713iyhshmw4j0nw7q6nbd67vfffgrsh05";
+    };
+  };
+  "posix-spawn" = {
+    version = "0.3.9";
+    source = {
+      type = "gem";
+      sha256 = "042i1afggy1sv2jmdjjjhyffas28xp2r1ylj5xfv3hchy3b4civ3";
+    };
+  };
+  "pry" = {
+    version = "0.9.12.4";
+    source = {
+      type = "gem";
+      sha256 = "0ndihrzirbfypf5pkqqcqhml6qpq66wbafkpc5jhjqjc6jc1llis";
+    };
+    dependencies = [
+      "coderay"
+      "method_source"
+      "slop"
+    ];
+  };
+  "pyu-ruby-sasl" = {
+    version = "0.0.3.3";
+    source = {
+      type = "gem";
+      sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn";
+    };
+  };
+  "quiet_assets" = {
+    version = "1.0.2";
+    source = {
+      type = "gem";
+      sha256 = "1a1gdaaglcpl583x9ma8la8cpls0lbc0l6qhv66dahia8ql8gg1z";
+    };
+    dependencies = [
+      "railties"
+    ];
+  };
+  "racc" = {
+    version = "1.4.10";
+    source = {
+      type = "gem";
+      sha256 = "10xm27dic2y8d53rw3yqw6jkdhrlgq11kbf5p8wiskiz28gzd0k2";
+    };
+  };
+  "rack" = {
+    version = "1.5.2";
+    source = {
+      type = "gem";
+      sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6";
+    };
+  };
+  "rack-accept" = {
+    version = "0.4.5";
+    source = {
+      type = "gem";
+      sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "rack-attack" = {
+    version = "2.3.0";
+    source = {
+      type = "gem";
+      sha256 = "177l9q3gi5lypcxs7141mw62cmg4l20i84dzhvhcfz2blp8fa47r";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "rack-cors" = {
+    version = "0.2.9";
+    source = {
+      type = "gem";
+      sha256 = "0z88pbbasr86z6h0965cny0gvrnj7zwv31s506xbpivk4vd6n9as";
+    };
+  };
+  "rack-mini-profiler" = {
+    version = "0.9.0";
+    source = {
+      type = "gem";
+      sha256 = "0js0s422j7qqjbr3zay48hw82m3z7ddf3qvwcp2m8yz1g438fxqw";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "rack-mount" = {
+    version = "0.8.3";
+    source = {
+      type = "gem";
+      sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "rack-protection" = {
+    version = "1.5.1";
+    source = {
+      type = "gem";
+      sha256 = "0qxq5ld15nljxzdcx2wmbc3chw8nb6la1ap838vf263lnjcpx3dd";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "rack-test" = {
+    version = "0.6.2";
+    source = {
+      type = "gem";
+      sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "rails" = {
+    version = "4.1.1";
+    source = {
+      type = "gem";
+      sha256 = "199agdsvidzk2g3zd50vkwnlr6gjk3s1qhligiik3rqr4ij7a8k0";
+    };
+    dependencies = [
+      "actionmailer"
+      "actionpack"
+      "actionview"
+      "activemodel"
+      "activerecord"
+      "activesupport"
+      "railties"
+      "sprockets-rails"
+    ];
+  };
+  "rails_autolink" = {
+    version = "1.1.6";
+    source = {
+      type = "gem";
+      sha256 = "0wanqb979j9zf60g6r6mdlsvrdmbj4ppc0clyi2dr98wwyz1fk1q";
+    };
+    dependencies = [
+      "rails"
+    ];
+  };
+  "rails_best_practices" = {
+    version = "1.14.4";
+    source = {
+      type = "gem";
+      sha256 = "14f6qwrzvk2dai56h32jg42z1h7hiphy6b01wwrnmzpwcgzp34w5";
+    };
+    dependencies = [
+      "activesupport"
+      "awesome_print"
+      "code_analyzer"
+      "colored"
+      "erubis"
+      "i18n"
+      "require_all"
+      "ruby-progressbar"
+    ];
+  };
+  "railties" = {
+    version = "4.1.1";
+    source = {
+      type = "gem";
+      sha256 = "1rlfbwrcg1qzyv5972wjx3vj40i0k9vgn2zzqavgcha7smmpivqc";
+    };
+    dependencies = [
+      "actionpack"
+      "activesupport"
+      "rake"
+      "thor"
+    ];
+  };
+  "raindrops" = {
+    version = "0.12.0";
+    source = {
+      type = "gem";
+      sha256 = "16k8gb6f6y368wqf7s8n0lcm8c2krkrpf3p2qixn7nfs2x0g4xr0";
+    };
+  };
+  "rake" = {
+    version = "10.3.2";
+    source = {
+      type = "gem";
+      sha256 = "0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m";
+    };
+  };
+  "raphael-rails" = {
+    version = "2.1.2";
+    source = {
+      type = "gem";
+      sha256 = "0sjiaymvfn4al5dr1pza5i142byan0fxnj4rymziyql2bzvdm2bc";
+    };
+  };
+  "rb-fsevent" = {
+    version = "0.9.3";
+    source = {
+      type = "gem";
+      sha256 = "0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1";
+    };
+  };
+  "rb-inotify" = {
+    version = "0.9.2";
+    source = {
+      type = "gem";
+      sha256 = "0752fhgfrx370b2jnhxzs8sjv2l8yrnwqj337kx9v100igd1c7iv";
+    };
+    dependencies = [
+      "ffi"
+    ];
+  };
+  "rdoc" = {
+    version = "3.12.2";
+    source = {
+      type = "gem";
+      sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8";
+    };
+    dependencies = [
+      "json"
+    ];
+  };
+  "redcarpet" = {
+    version = "3.1.2";
+    source = {
+      type = "gem";
+      sha256 = "076p52lkns90hqs27rs4kns2bg7maz8qxr87bl34yd6in319flzz";
+    };
+  };
+  "redis" = {
+    version = "3.0.6";
+    source = {
+      type = "gem";
+      sha256 = "1ha2h422rvbf0wk96bp7k0ibl0jyg7v101jsj7z0r7pvzcx21j73";
+    };
+  };
+  "redis-actionpack" = {
+    version = "4.0.0";
+    source = {
+      type = "gem";
+      sha256 = "0mad0v3qanw3xi9zs03f4w8sn1qb3x501k3235ck8m5i8vgjk474";
+    };
+    dependencies = [
+      "actionpack"
+      "redis-rack"
+      "redis-store"
+    ];
+  };
+  "redis-activesupport" = {
+    version = "4.0.0";
+    source = {
+      type = "gem";
+      sha256 = "18mlzjchj7sh1jm2icx2idf2hcir3agpd6i01q0gnf36f432v06d";
+    };
+    dependencies = [
+      "activesupport"
+      "redis-store"
+    ];
+  };
+  "redis-namespace" = {
+    version = "1.4.1";
+    source = {
+      type = "gem";
+      sha256 = "0fb6i98mhfxn26bqr5vdzhfjyda36cpaxh0dgxynp1y3m301khf7";
+    };
+    dependencies = [
+      "redis"
+    ];
+  };
+  "redis-rack" = {
+    version = "1.5.0";
+    source = {
+      type = "gem";
+      sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8";
+    };
+    dependencies = [
+      "rack"
+      "redis-store"
+    ];
+  };
+  "redis-rails" = {
+    version = "4.0.0";
+    source = {
+      type = "gem";
+      sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7";
+    };
+    dependencies = [
+      "redis-actionpack"
+      "redis-activesupport"
+      "redis-store"
+    ];
+  };
+  "redis-store" = {
+    version = "1.1.4";
+    source = {
+      type = "gem";
+      sha256 = "0ja2h1rdyjga8bqb02w3sk3a1m78dsfg96b842s6mkkbpifpxd4z";
+    };
+    dependencies = [
+      "redis"
+    ];
+  };
+  "ref" = {
+    version = "1.0.5";
+    source = {
+      type = "gem";
+      sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la";
+    };
+  };
+  "request_store" = {
+    version = "1.0.5";
+    source = {
+      type = "gem";
+      sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh";
+    };
+  };
+  "require_all" = {
+    version = "1.3.2";
+    source = {
+      type = "gem";
+      sha256 = "16l08r6asr8nif6ah75w57i7y728132n8ns62rlrf78sh4lmfkhx";
+    };
+  };
+  "rest-client" = {
+    version = "1.6.7";
+    source = {
+      type = "gem";
+      sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853";
+    };
+    dependencies = [
+      "mime-types"
+    ];
+  };
+  "rinku" = {
+    version = "1.7.3";
+    source = {
+      type = "gem";
+      sha256 = "1jh6nys332brph55i6x6cil6swm086kxjw34wq131nl6mwryqp7b";
+    };
+  };
+  "rouge" = {
+    version = "1.3.3";
+    source = {
+      type = "gem";
+      sha256 = "0l82xyfdpir2hdm94dw8hy01ngghhas1jm8r3lp3kvyw6z7ph4ml";
+    };
+  };
+  "rspec" = {
+    version = "2.14.1";
+    source = {
+      type = "gem";
+      sha256 = "134y4wzk1prninb5a0bhxgm30kqfzl8dg06af4js5ylnhv2wd7sg";
+    };
+    dependencies = [
+      "rspec-core"
+      "rspec-expectations"
+      "rspec-mocks"
+    ];
+  };
+  "rspec-core" = {
+    version = "2.14.7";
+    source = {
+      type = "gem";
+      sha256 = "0j23ca2hkf0ac708afvi5nxjn75g0mani6m17if52bjrxcgn4577";
+    };
+  };
+  "rspec-expectations" = {
+    version = "2.14.4";
+    source = {
+      type = "gem";
+      sha256 = "0figi31xg100yc90p04n16p1n8q9nlnqyncyl0f34mks8bc4zdrw";
+    };
+    dependencies = [
+      "diff-lcs"
+    ];
+  };
+  "rspec-mocks" = {
+    version = "2.14.4";
+    source = {
+      type = "gem";
+      sha256 = "12vbv0firjkxlinxgg81j6qnwq8mmz48y4iv3ml9j411vqav4ig7";
+    };
+  };
+  "rspec-rails" = {
+    version = "2.14.0";
+    source = {
+      type = "gem";
+      sha256 = "1s9mszadqjmbcahyjgazygvkj8m7pzg7jpgx8m4wl0vxjxg3gr3f";
+    };
+    dependencies = [
+      "actionpack"
+      "activesupport"
+      "railties"
+      "rspec-core"
+      "rspec-expectations"
+      "rspec-mocks"
+    ];
+  };
+  "ruby-progressbar" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "16vxr5n8q87gvdc2px4vzjkasiadzi0c18ynqc8x61352hl5f9ll";
+    };
+  };
+  "rubyntlm" = {
+    version = "0.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0w48h3n8jzndqwmxxbj72j4gwma07f0x07ppsiv1qlygq2n9nyx0";
+    };
+  };
+  "rubypants" = {
+    version = "0.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph";
+    };
+  };
+  "rugged" = {
+    version = "0.21.0";
+    source = {
+      type = "gem";
+      sha256 = "0abmh5l1j7pp7vwq8vrqmgv07pc2wq0m97hm1sb0k0ghsx9yqdp5";
+    };
+  };
+  "safe_yaml" = {
+    version = "0.9.7";
+    source = {
+      type = "gem";
+      sha256 = "0y34vpak8gim18rq02rgd144jsvk5is4xni16wm3shbhivzqb4hk";
+    };
+  };
+  "sanitize" = {
+    version = "2.1.0";
+    source = {
+      type = "gem";
+      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+    };
+    dependencies = [
+      "nokogiri"
+    ];
+  };
+  "sass" = {
+    version = "3.2.19";
+    source = {
+      type = "gem";
+      sha256 = "1b5z55pmban9ry7k572ghmpcz9h04nbrdhdfpcz8zaldv5v7vkfx";
+    };
+  };
+  "sass-rails" = {
+    version = "4.0.3";
+    source = {
+      type = "gem";
+      sha256 = "1j1f7zhn1ywkmgp5m1rdi7n404vd3j53wp9ngq9n7w33bzwnaxmm";
+    };
+    dependencies = [
+      "railties"
+      "sass"
+      "sprockets"
+      "sprockets-rails"
+    ];
+  };
+  "sdoc" = {
+    version = "0.3.20";
+    source = {
+      type = "gem";
+      sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2";
+    };
+    dependencies = [
+      "json"
+      "rdoc"
+    ];
+  };
+  "seed-fu" = {
+    version = "2.3.1";
+    source = {
+      type = "gem";
+      sha256 = "1nw1pic6nxbqfwakykamaxm2rgz699yzwf1y64ms4ijgazmwy2gb";
+    };
+    dependencies = [
+      "activerecord"
+      "activesupport"
+    ];
+  };
+  "select2-rails" = {
+    version = "3.5.2";
+    source = {
+      type = "gem";
+      sha256 = "0zlzkqr4xjd9k317wkw26m8nficp5cdf5ghl1h47ajgrj9pjvbnw";
+    };
+    dependencies = [
+      "thor"
+    ];
+  };
+  "semantic-ui-sass" = {
+    version = "0.16.1.0";
+    source = {
+      type = "gem";
+      sha256 = "18bivcl0a1pzd0sdxlnpwfb6fdai52f94kwzx68ky818mk1zgaal";
+    };
+    dependencies = [
+      "sass"
+    ];
+  };
+  "settingslogic" = {
+    version = "2.0.9";
+    source = {
+      type = "gem";
+      sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
+    };
+  };
+  "sexp_processor" = {
+    version = "4.4.0";
+    source = {
+      type = "gem";
+      sha256 = "1rvbxsnjqy82mq0ah6jbmakhr18kfp47gls698pf3dcrvbdisnbi";
+    };
+  };
+  "shoulda-matchers" = {
+    version = "2.1.0";
+    source = {
+      type = "gem";
+      sha256 = "1ilz8hsc8n8snd1q6l54mkrcm1zgvc3bxdrhinldz9bh17hyhk6s";
+    };
+    dependencies = [
+      "activesupport"
+    ];
+  };
+  "sidekiq" = {
+    version = "2.17.0";
+    source = {
+      type = "gem";
+      sha256 = "0lqcl5b3x1k9m78ry2yl1vq6b4schxwcywqkwzl7cw8w642pxic1";
+    };
+    dependencies = [
+      "celluloid"
+      "connection_pool"
+      "json"
+      "redis"
+      "redis-namespace"
+    ];
+  };
+  "simple_oauth" = {
+    version = "0.1.9";
+    source = {
+      type = "gem";
+      sha256 = "0bb06p88xsdw4fxll1ikv5i5k58sl6y323ss0wp1hqjm3xw1jgvj";
+    };
+  };
+  "simplecov" = {
+    version = "0.9.0";
+    source = {
+      type = "gem";
+      sha256 = "1dwyb1q6mn4cy76s9givrakf5x439jmvny46qpa0ywzkli95f82g";
+    };
+    dependencies = [
+      "docile"
+      "multi_json"
+      "simplecov-html"
+    ];
+  };
+  "simplecov-html" = {
+    version = "0.8.0";
+    source = {
+      type = "gem";
+      sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9";
+    };
+  };
+  "sinatra" = {
+    version = "1.4.4";
+    source = {
+      type = "gem";
+      sha256 = "12iy0f92d3zyk4759flgcracrbzc3x6cilpgdkzhzgjrsm9aa5hs";
+    };
+    dependencies = [
+      "rack"
+      "rack-protection"
+      "tilt"
+    ];
+  };
+  "six" = {
+    version = "0.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1bhapiyjh5r5qjpclfw8i65plvy6k2q4azr5xir63xqglr53viw3";
+    };
+  };
+  "slack-notifier" = {
+    version = "0.3.2";
+    source = {
+      type = "gem";
+      sha256 = "0126im7nm7qw03xgls5qmbldls94yjgv8fzhrnqy7140a51n65k4";
+    };
+  };
+  "slim" = {
+    version = "2.0.2";
+    source = {
+      type = "gem";
+      sha256 = "1sm78ai5xvqqh7zpv6c2c4iy2lakmrqfmmnyr5ha768vjxzzdk87";
+    };
+    dependencies = [
+      "temple"
+      "tilt"
+    ];
+  };
+  "slop" = {
+    version = "3.4.7";
+    source = {
+      type = "gem";
+      sha256 = "1x3dwljqvkzj314rwn2bxgim9xvgwnfipzg5g0kwwxfn90fpv2sn";
+    };
+  };
+  "spinach" = {
+    version = "0.8.7";
+    source = {
+      type = "gem";
+      sha256 = "036zrwf31iq5fh2qgins51nh9756aqyz4almznq2p36yfylihdx4";
+    };
+    dependencies = [
+      "colorize"
+      "gherkin-ruby"
+    ];
+  };
+  "spinach-rails" = {
+    version = "0.2.1";
+    source = {
+      type = "gem";
+      sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70";
+    };
+    dependencies = [
+      "capybara"
+      "railties"
+      "spinach"
+    ];
+  };
+  "spring" = {
+    version = "1.1.3";
+    source = {
+      type = "gem";
+      sha256 = "1ibj1d1490wys76ng4g7q8q2rglh37yqxkz2c3vv087cizr8ralj";
+    };
+  };
+  "spring-commands-rspec" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "1z6ghbyndpaz9pm6mw97jpgc1zvz79y3ijidji3z4ygx98imxmv1";
+    };
+    dependencies = [
+      "spring"
+    ];
+  };
+  "spring-commands-spinach" = {
+    version = "1.0.0";
+    source = {
+      type = "gem";
+      sha256 = "138jardqyj96wz68njdgy55qjbpl2d0g8bxbkz97ndaz3c2bykv9";
+    };
+    dependencies = [
+      "spring"
+    ];
+  };
+  "sprockets" = {
+    version = "2.11.0";
+    source = {
+      type = "gem";
+      sha256 = "082rrn7nsy18ky095zm6a9b4zfbikf60gaakplyqmkjclxk4lsmh";
+    };
+    dependencies = [
+      "hike"
+      "multi_json"
+      "rack"
+      "tilt"
+    ];
+  };
+  "sprockets-rails" = {
+    version = "2.1.3";
+    source = {
+      type = "gem";
+      sha256 = "12kdy9vjn3ygrxhn9jxxx0rvsq601vayrkgbr3rqcpyhqhl4s4wy";
+    };
+    dependencies = [
+      "actionpack"
+      "activesupport"
+      "sprockets"
+    ];
+  };
+  "stamp" = {
+    version = "0.5.0";
+    source = {
+      type = "gem";
+      sha256 = "1w54kxm4sd4za9rhrkl5lqjbsalhziq95sr3nnwr1lqc00nn5mhs";
+    };
+  };
+  "state_machine" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1vf25h443b1s98d2lhd1w3rgam86pjsjhz632f3yrfkn374xvz40";
+    };
+  };
+  "stringex" = {
+    version = "2.5.1";
+    source = {
+      type = "gem";
+      sha256 = "178ppbdm70hzadrgq55q83c3hwv6b7wixacg9kk4v6cxnns5dmfv";
+    };
+  };
+  "temple" = {
+    version = "0.6.7";
+    source = {
+      type = "gem";
+      sha256 = "09makksvllkzrm0vfb91xm46pq5qdp2c04cqid9i2immqcwz6x1k";
+    };
+  };
+  "term-ansicolor" = {
+    version = "1.2.2";
+    source = {
+      type = "gem";
+      sha256 = "1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr";
+    };
+    dependencies = [
+      "tins"
+    ];
+  };
+  "test_after_commit" = {
+    version = "0.2.2";
+    source = {
+      type = "gem";
+      sha256 = "13zsag1lbkabwkaxbwhf06d4za5r4nb0fam95rqnx3yxnyshkq4b";
+    };
+  };
+  "therubyracer" = {
+    version = "0.12.0";
+    source = {
+      type = "gem";
+      sha256 = "185k2kvn2q9xznrij3swf9xp3d13h3hdc4w4ldhbrjkg7k1139q6";
+    };
+    dependencies = [
+      "libv8"
+      "ref"
+    ];
+  };
+  "thin" = {
+    version = "1.6.1";
+    source = {
+      type = "gem";
+      sha256 = "065xsmjb7s0gfhx0zhh6wpjxvq26n6d7vq479df9llnk68b0xf50";
+    };
+    dependencies = [
+      "daemons"
+      "eventmachine"
+      "rack"
+    ];
+  };
+  "thor" = {
+    version = "0.19.1";
+    source = {
+      type = "gem";
+      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+    };
+  };
+  "thread_safe" = {
+    version = "0.3.4";
+    source = {
+      type = "gem";
+      sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n";
+    };
+  };
+  "tilt" = {
+    version = "1.4.1";
+    source = {
+      type = "gem";
+      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
+    };
+  };
+  "timers" = {
+    version = "1.1.0";
+    source = {
+      type = "gem";
+      sha256 = "0x3vnkxy3bg9f6v1nhkfqkajr19glrzkmqd5a1wy8hrylx8rdfrv";
+    };
+  };
+  "tinder" = {
+    version = "1.9.3";
+    source = {
+      type = "gem";
+      sha256 = "0ixxyrlr1ynj9bki515byqg7j45vkvfm4s49n614whpdf8mgs1hb";
+    };
+    dependencies = [
+      "eventmachine"
+      "faraday"
+      "faraday_middleware"
+      "hashie"
+      "json"
+      "mime-types"
+      "multi_json"
+      "twitter-stream"
+    ];
+  };
+  "tins" = {
+    version = "0.13.1";
+    source = {
+      type = "gem";
+      sha256 = "0c7gqgj7z1frab4r9i8dbf111l3jyd44npraz8fdds1b8qvz4fy5";
+    };
+  };
+  "treetop" = {
+    version = "1.4.15";
+    source = {
+      type = "gem";
+      sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz";
+    };
+    dependencies = [
+      "polyglot"
+      "polyglot"
+    ];
+  };
+  "turbolinks" = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "1zz8ff6v1chsv1clixapcmw1w62pqa1xlxlvlgxasvkscbqxhbyr";
+    };
+    dependencies = [
+      "coffee-rails"
+    ];
+  };
+  "twitter-stream" = {
+    version = "0.1.16";
+    source = {
+      type = "gem";
+      sha256 = "0is81g3xvnjk64sqiaqlh2ziwfryzwvk1yvaniryg0zhppgsyriq";
+    };
+    dependencies = [
+      "eventmachine"
+      "http_parser.rb"
+      "simple_oauth"
+    ];
+  };
+  "tzinfo" = {
+    version = "1.2.2";
+    source = {
+      type = "gem";
+      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
+    };
+    dependencies = [
+      "thread_safe"
+    ];
+  };
+  "uglifier" = {
+    version = "2.3.2";
+    source = {
+      type = "gem";
+      sha256 = "1w5cc90wzs4jdpvfrhqjgf4gwsg517cwz15a31p4z7hxs412z52y";
+    };
+    dependencies = [
+      "execjs"
+      "json"
+    ];
+  };
+  "underscore-rails" = {
+    version = "1.4.4";
+    source = {
+      type = "gem";
+      sha256 = "1xg3dfym38gj5zsjxpf1v5cz4j6gysirv9bgc5ls37krixkajag2";
+    };
+  };
+  "unf" = {
+    version = "0.1.4";
+    source = {
+      type = "gem";
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+    };
+    dependencies = [
+      "unf_ext"
+    ];
+  };
+  "unf_ext" = {
+    version = "0.0.6";
+    source = {
+      type = "gem";
+      sha256 = "07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg";
+    };
+  };
+  "unicorn" = {
+    version = "4.6.3";
+    source = {
+      type = "gem";
+      sha256 = "0rj9lwqwaklyk5vy0lqj4x7fcqb027j240waya5zvb14i8a142zx";
+    };
+    dependencies = [
+      "kgio"
+      "rack"
+      "raindrops"
+    ];
+  };
+  "unicorn-worker-killer" = {
+    version = "0.4.2";
+    source = {
+      type = "gem";
+      sha256 = "12y7lsqyfca9dxy387hfx4c3xjd22sj4b9xxrmdzcksighs1ja3d";
+    };
+    dependencies = [
+      "unicorn"
+    ];
+  };
+  "version_sorter" = {
+    version = "1.1.0";
+    source = {
+      type = "gem";
+      sha256 = "0wvqjkj0z5yi29f6907f1jzfszq8zgrq74mapmmi9csgvqkybsmf";
+    };
+  };
+  "virtus" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "19j4ssjxn4ag8i08v4andlz1rnhd2dwfxh2qn2a3hq3s6xjivn03";
+    };
+    dependencies = [
+      "axiom-types"
+      "coercible"
+      "descendants_tracker"
+      "equalizer"
+    ];
+  };
+  "warden" = {
+    version = "1.2.3";
+    source = {
+      type = "gem";
+      sha256 = "0ykzsgwml0pdqn6vdjjaix12gpcgn8b126z9fx7yq3r3bmdrwxlp";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "webmock" = {
+    version = "1.16.0";
+    source = {
+      type = "gem";
+      sha256 = "1y2pm64qah6n9c203c90vlw8jkvbjv703y8qr2z6ikwblp8cxs49";
+    };
+    dependencies = [
+      "addressable"
+      "crack"
+    ];
+  };
+  "websocket-driver" = {
+    version = "0.3.3";
+    source = {
+      type = "gem";
+      sha256 = "0f3nx6yfd7q8xz78zfc3zbkj2rwfm4ri9viqjy1dmnkhwg0h96jf";
+    };
+  };
+  "wikicloth" = {
+    version = "0.8.1";
+    source = {
+      type = "gem";
+      sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
+    };
+    dependencies = [
+      "builder"
+      "expression_parser"
+      "rinku"
+    ];
+  };
+  "xpath" = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
+    };
+    dependencies = [
+      "nokogiri"
+    ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb b/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb
deleted file mode 100755
index ed47d52c9c1..00000000000
--- a/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'bundler'
-require 'fileutils'
-require 'net/http'
-require 'net/https'
-require 'uri'
-
-TMP_DIR = "/tmp/gems"
-
-FileUtils.rm_rf(TMP_DIR) if File.exists?(TMP_DIR)
-FileUtils.mkdir TMP_DIR
-
-GEMSERVER = "http://rubygems.org"
-
-# inspect Gemfile.lock
-lockfile = Bundler::LockfileParser.new(Bundler.read_file("Gemfile.lock"))
-
-to_mirror = {}
-
-uri = URI(GEMSERVER)
-http = Net::HTTP.new(uri.host, uri.port)
-http.use_ssl = uri.scheme == 'https'
-
-requirements = {}
-
-lockfile.specs.each do |s|
-  possible_gem_name = "#{s.name}-#{s.version.to_s}.gem"
-
-  Dir.chdir TMP_DIR do
-    filename = `gem fetch #{s.name} -v #{s.version.to_s}`.split()[1]
-    hash = `sha256sum #{filename}.gem`
-    url = "#{GEMSERVER}/downloads/#{filename}.gem"
-    puts url
-    requirements[s.name] = { :version => s.version.to_s, 
-                             :hash => hash.split().first,
-                             :url => url,}
-    
-  end
-end
-
-filename = 'Gemfile.nix'
-
-File.open(filename, 'w') do |file|
-  file.puts "["
-  requirements.each do |name, info|
-    file.puts "{"
-    file.puts ['name = ', '"', name, '";'].join('')
-    file.puts ['hash = ', '"', info[:hash], '";'].join('')
-    file.puts ['url = ', '"', info[:url], '";'].join('')
-    file.puts ['version = ', '"', info[:version], '";'].join('')
-    file.puts "}"
-  end
-  file.puts "]"
-end
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 67e3cba70ca..72640662ead 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gitolite-${version}";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchurl {
     url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz";
-    sha256 = "0sizzv705aypasi9vf9kmdbzcl3gmyfxg9dwdl5prn64biqkvq3y";
+    sha256 = "1gsgzi9ayb4rablki3mqr11b0h8db4xg43df660marfpacmkfb01";
   };
 
   buildInputs = [ perl git ];
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 145496cb49c..36dcb256212 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,33 +1,53 @@
-{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
+{ stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper
+, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
+}:
+
 
 let
-  minor = "1.8";
-  version = "${minor}.6";
+  minor = "3.12";
+  version = "${minor}.3";
 in
 
-stdenv.mkDerivation {
+buildPythonPackage rec {
   name = "meld-${version}";
+  namePrefix = "";
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "19g86rksrs77hd58zhs3zwbjmmhqc98v2ly8451avwsbiwmni5mg";
+    sha256 = "1zg6qhm53j0vxmjj3pcj2hwi8c12dxzmlh98zks0jnwhqv2p4dfv";
   };
 
-  buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
+  buildInputs = [
+    python27 intltool makeWrapper itstool libxml2
+    gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
+  ];
+  propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
 
-  patchPhase = ''
-    sed -e s,/usr/local,$out, -i INSTALL
-    sed -e 's,#!.*,#!${python}/bin/python,' -i bin/meld
+  installPhase = ''
+    mkdir -p "$out/lib/${python27.libPrefix}/site-packages"
+
+    export PYTHONPATH="$out/lib/${python27.libPrefix}/site-packages:$PYTHONPATH"
+
+    ${python27}/bin/${python27.executable} setup.py install \
+      --install-lib=$out/lib/${python27.libPrefix}/site-packages \
+      --prefix="$out"
+
+    wrapProgram $out/bin/meld \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
   '';
 
-  postInstall = ''
-    wrapProgram $out/bin/meld --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
+  patchPhase = ''
+    sed -e 's,#!.*,#!${python27}/bin/python27,' -i bin/meld
   '';
 
+  pythonPath = [ gtk3 ];
+
   meta = with stdenv.lib; {
     description = "Visual diff and merge tool";
     homepage = http://meld.sourceforge.net;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = stdenv.lib.licenses.gpl2;
     platforms = platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index d58c9ed15c8..266ab81777b 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ed }:
 
 stdenv.mkDerivation rec {
-  name = "rcs-5.9.3";
+  name = "rcs-5.9.4";
 
   src = fetchurl {
     url = "mirror://gnu/rcs/${name}.tar.xz";
-    sha256 = "0isvzwfvqkg7zcsznra6wqh650z49ib113n7gp6ncxv5p30x3c38";
+    sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86";
   };
 
   buildInputs = [ ed ];
diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix
index 4b4359603c9..5971f2e9cdd 100644
--- a/pkgs/applications/version-management/redmine/bootstrap.nix
+++ b/pkgs/applications/version-management/redmine/bootstrap.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0";
   };
   buildInputs = [
-    ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig
+    ruby bundler libiconv libxslt libxml2 pkgconfig
     libffi imagemagickBig postgresql which stdenv
   ];
   installPhase = ''
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index a4254384e5b..b1ef5ee757c 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libiconvOrNull, libiconvOrLibc, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }:
+{ stdenv, fetchurl, ruby, bundler, libiconv, libiconvOrNull, libiconvOrLibc, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }:
 
 let
   gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix);
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    ruby rubyLibs.bundler 
+    ruby bundler
   ] ++ (if (libiconvOrNull != null) then [libiconv] else []) ++ [
     libxslt libxml2 pkgconfig libffi
     imagemagickBig postgresql
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
new file mode 100644
index 00000000000..e38e00bc61f
--- /dev/null
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -0,0 +1,108 @@
+{ stdenv, fetchFromGitHub, kodi }:
+
+let
+
+  pluginDir = "/lib/kodi/plugin";
+
+  mkKodiPlugin = { plugin, namespace, version, src, meta, ... }:
+  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
+    inherit src meta;
+    name = "kodi-plugin-${plugin}-${version}";
+    passthru = {
+      kodiPlugin = pluginDir;
+      namespace = namespace;
+    };
+    dontStrip = true;
+    installPhase = ''
+      d=$out${pluginDir}/${namespace}
+      mkdir -p $d
+      sauce="."
+      [ -d ${namespace} ] && sauce=${namespace}
+      cp -R $sauce/* $d
+    '';
+  };
+
+in
+{
+
+  advanced-launcher = mkKodiPlugin rec {
+
+    plugin = "advanced-launcher";
+    namespace = "plugin.program.advanced.launcher";
+    version = "2.5.8";
+
+    src = fetchFromGitHub {
+      owner = "Angelscry";
+      repo = namespace;
+      rev = "bb380b6e8b664246a791f553ddc856cbc60dae1f";
+      sha256 = "0g4kk68zjl5rf6mll4g4cywq70s267471dp5r1qp3bpfpzkn0vf2";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "http://forum.kodi.tv/showthread.php?tid=85724";
+      description = "A program launcher for Kodi";
+      longDescription = ''
+        Advanced Launcher allows you to start any Linux, Windows and
+        OS X external applications (with command line support or not)
+        directly from the Kodi GUI. Advanced Launcher also give you
+        the possibility to edit, download (from Internet resources)
+        and manage all the meta-data (informations and images) related
+        to these applications.
+      '';
+      platforms = platforms.all;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+
+  };
+
+  genesis = mkKodiPlugin rec {
+
+    plugin = "genesis";
+    namespace = "plugin.video.genesis";
+    version = "2.4.1";
+
+    src = fetchFromGitHub {
+      owner = "lambda81";
+      repo = "lambda-addons";
+      rev = "1eb1632063e18f3f30e9fdbed2a15cf1e9c05315";
+      sha256 = "1gzx0jq4gyhkpdd21a70lhww9djr5dlgyl93b4l7dhgr3hnzxccl";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-kodi-addons";
+      description = "The origins of streaming";
+      platforms = platforms.all;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+
+  };
+
+  svtplay = mkKodiPlugin rec {
+
+    plugin = "svtplay";
+    namespace = "plugin.video.svtplay";
+    version = "4.0.9";
+
+    src = fetchFromGitHub {
+      owner = "nilzen";
+      repo = "xbmc-" + plugin;
+      rev = "29a754e49584d1ca32f0c07b87304669cf266bb0";
+      sha256 = "0k7mwaknw4h1jlq7ialbzgxxpb11j8bk29dx2gimp40lvnyw4yhz";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "http://forum.kodi.org/showthread.php?tid=67110";
+      description = "Watch content from SVT Play";
+      longDescription = ''
+        With this addon you can stream content from SVT Play
+        (svtplay.se). The plugin fetches the video URL from the SVT
+        Play website and feeds it to the Kodi video player. HLS (m3u8)
+        is the preferred video format by the plugin.
+      '';
+      platforms = platforms.all;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
new file mode 100644
index 00000000000..9f7a87f9987
--- /dev/null
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -0,0 +1,53 @@
+{ stdenv, lib, makeWrapper, kodi, plugins }:
+
+let
+
+  p = builtins.parseDrvName kodi.name;
+
+in
+
+stdenv.mkDerivation {
+
+  name = "kodi-" + p.version;
+  version = p.version;
+
+  buildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/share/kodi/addons/packages
+    ${stdenv.lib.concatMapStrings
+        (plugin: "ln -s ${plugin.out
+                            + plugin.kodiPlugin
+                            + "/" + plugin.namespace
+                          } $out/share/kodi/addons/.;") plugins}
+    $(for plugin in ${kodi}/share/kodi/addons/*
+    do
+      $(ln -s $plugin/ $out/share/kodi/addons/.)
+    done)
+    $(for share in ${kodi}/share/kodi/*
+    do
+      $(ln -s $share $out/share/kodi/.)
+    done)
+    $(for passthrough in icons xsessions applications
+    do
+      ln -s ${kodi}/share/$passthrough $out/share/
+    done)
+    $(for exe in kodi{,-standalone}
+    do
+    makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
+      --prefix KODI_HOME : $out/share/kodi;
+    done)
+  '';
+
+  preferLocalBuilds = true;
+
+  meta = with kodi.meta; {
+    inherit license homepage;
+    description = description
+                + " (with plugins: "
+                + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
+                + ")";
+
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
new file mode 100644
index 00000000000..7cacc4fcf05
--- /dev/null
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchsvn, pkgconfig, libjpeg, imagemagick, libv4l}:
+
+stdenv.mkDerivation rec {
+  rev = "182";
+  name = "mjpg-streamer-${rev}";
+
+  src = fetchsvn {
+    url = https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer;
+    inherit rev;
+    sha256 = "008k2wk6xagprbiwk8fvzbz4dd6i8kzrr9n62gj5i1zdv7zcb16q";
+  };
+
+  patchPhase = ''
+    substituteInPlace Makefile "make -C plugins\/input_gspcav1" "# make -C plugins\/input_gspcav1"
+    substituteInPlace Makefile "cp plugins\/input_gspcav1\/input_gspcav1.so" "# cp plugins\/input_gspcav1\/input_gspcav1.so"
+  '';
+
+  postFixup = ''
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/mjpg_streamer):$out/lib:$out/lib/plugins" $out/bin/mjpg_streamer
+  '';
+
+  makeFlags = "DESTDIR=$(out)";
+
+  preInstall = ''
+    mkdir -p $out/{bin,lib}
+  '';
+
+  buildInputs = [ pkgconfig libjpeg imagemagick libv4l ];
+  
+  meta = {
+    homepage = http://sourceforge.net/projects/mjpg-streamer/;
+    description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
+  };
+}
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 052add92a1f..7643cf1a18c 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -58,11 +58,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "1grnmhj7hymi77ivvyzpgykj4wwrjd7a9apm5vyz2xqrankn3hyc";
+    sha256 = "13yswsl5xfzhzbh5fv7ds5x2wviiq8r7kp75y3zb8ni49293n23x";
   };
 
   buildInputs = with stdenv.lib;
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 5822390604c..7320a7f6d74 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "simplescreenrecorder-${version}";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchurl {
     url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
-    sha256 = "0g226n09h0m3n36ahfmvm70szwvn8345zywb1f05l1nab6mx6wj3";
+    sha256 = "09mcmvqbzq2blv404pklv6fc8ci3a9090p42rdsgmlr775bdyxfb";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index f8144b8b827..128227d8765 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "smtube-14.12.0";
+  name = "smtube-15.1.0";
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "1q3gh0yv1lz63prllrjqzkj15x84lcxl2bwpy96iq5n89lf6i2kw";
+    sha256 = "0l87afj1fwhq8lnhv0djqdc8fy0kvs4q4jrvyiz46ifq7q10qyaf";
   };
 
   buildInputs = [ qt4 ];
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 3483b0ac6d2..d0fabb0d3c9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.3.3";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
-    sha256 = "1jxvbm81zinh0achh8r2aac3x650aqiwn3w6iq1fg57fir1lw1cw";
+    sha256 = "0d98c7dfzv1gj5ssbyln4pbkbml6rrmy22v5v4ricbsx9qhhwc1l";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs];
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 39705aca116..19d72559c5f 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
+    mkdir -p $out/man/man1
+    cp man/*.1 $out/man/man1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 5af4519af03..b9d5ac168b2 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -14,13 +14,17 @@ stdenv.mkDerivation rec {
 
   makeFlags = "all";
   installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp *.1 $out/share/man/man1
+  '';
 
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = http://i3wm.org;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    description = "i3lock is a simple screen locker like slock";
+    homepage = http://i3wm.org/i3lock/;
+    maintainers = with maintainers; [ garbas malyn ];
+    license = licenses.bsd3;
+    platforms = platforms.all;
   };
 
 }
diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix
new file mode 100644
index 00000000000..ec4a2beb4d0
--- /dev/null
+++ b/pkgs/build-support/autonix/default.nix
@@ -0,0 +1,174 @@
+{ bash, callPackage, coreutils, fetchurl, findutils, nix, runCommand, stdenv
+, substituteAll, wget, writeText }:
+
+/* autonix is a collection of tools to automate packaging large collections
+ * of software, particularly KDE. It consists of three components:
+ *   1. a script (manifest) to download and hash the packages
+ *   2. a dependency scanner (autonix-deps) written in Haskell that examines
+ *      the package sources and tries to guess their dependencies
+ *   3. a library of Nix routines (generateCollection) to generate Nix
+ *      expressions from the output of the previous steps.
+ */
+
+with stdenv.lib;
+
+let
+
+  /* Download the packages into the Nix store, compute their hashes,
+   * and generate a package manifest in ./manifest.nix.
+   */
+  manifest =
+    let
+      script =
+        substituteAll
+          {
+            src = ./manifest.sh;
+            inherit bash coreutils findutils nix wget;
+          };
+    in
+      runCommand "autonix-manifest" {}
+        ''
+          cp ${script} $out
+          chmod +x $out
+        '';
+
+  /* Convert a manifest.nix file to XML to be read by autonix-deps. */
+  writeManifestXML = filename:
+    let
+      generateStores = mapAttrs (n: pkg: pkg.store);
+      manifest = generateStores (importManifest filename { mirror = ""; });
+    in
+      writeText "manifest.xml" (builtins.toXML manifest);
+
+  /* Generate a set of Nix expressions for the collection, given a
+   * manifest.nix, dependencies.nix, and renames.nix in the same directory.
+   */
+  generateCollection = dir: # path to directory
+    { mirror # mirror to download packages from
+    , mkDerivation ? mkDerivation
+    , preResolve ? id # modify package set before dependency resolution
+    , postResolve ? id # modify package set after dependency resolution
+    , renames ? {}
+    , scope ? {}
+    }:
+    let
+
+      fix = f: let x = f x; in x;
+
+      resolvePkg = name:
+        mapAttrs (attr: if isDepAttr attr then resolveDeps scope else id);
+
+      resolve = mapAttrs resolvePkg;
+
+      derive = mapAttrs (name: mkDerivation);
+
+      renames_ =
+        if renames == {} then (import (dir + "/renames.nix") {}) else renames;
+
+      packages = importPackages dir renames_ { inherit mirror; };
+
+    in derive (postResolve (resolve (preResolve packages)));
+
+  pkgNameVersion = pkg: nameFromURL pkg.name ".tar";
+  pkgAttrName = pkg: (builtins.parseDrvName (pkgNameVersion pkg)).name;
+  pkgVersion = pkg: (builtins.parseDrvName (pkgNameVersion pkg)).version;
+
+  depAttrNames = [
+    "buildInputs" "nativeBuildInputs"
+    "propagatedBuildInputs" "propagatedNativeBuildInputs"
+    "propagatedUserEnvPkgs"
+  ];
+
+  isDepAttr = name: builtins.elem name depAttrNames;
+
+  removePkgDeps = deps:
+    let removeDepsIfDepAttr = attr: value:
+          if isDepAttr attr then fold remove value deps else value;
+    in mapAttrs removeDepsIfDepAttr;
+
+  hasDep = dep: pkg:
+    let depAttrs = attrValues (filterAttrs (n: v: isDepAttr n) pkg);
+        allDeps = concatLists depAttrs;
+    in elem dep allDeps;
+
+  importManifest = path: { mirror }:
+    let
+      uniqueNames = manifest:
+        unique (map pkgAttrName manifest);
+
+      versionsOf = manifest: name:
+        filter (pkg: pkgAttrName pkg == name) manifest;
+
+      bestVersions = manifest:
+        let best = versions:
+              let
+                strictlyLess = a: b:
+                  builtins.compareVersions (pkgVersion a) (pkgVersion b) > 0;
+                sorted = sort strictlyLess versions;
+              in head sorted;
+        in map (name: best (versionsOf manifest name)) (uniqueNames manifest);
+
+      withNames = manifest:
+        builtins.listToAttrs
+          (map (p: nameValuePair (toLower (pkgAttrName p)) p) manifest);
+
+      orig = import path { inherit mirror; };
+    in
+      fold (f: x: f x) orig [ withNames bestVersions ];
+
+  importPackages = path: renames: manifestScope:
+    let
+
+      # Do not allow any package to depend on itself.
+      breakRecursion =
+        let removeSelfDep = pkg:
+              mapAttrs
+                (n: if isDepAttr n
+                      then filter (dep: dep != pkg && renamed dep != pkg)
+                    else id);
+        in mapAttrs removeSelfDep;
+
+      renamed = dep: renames."${dep}" or dep;
+
+      manifest = importManifest (path + "/manifest.nix") manifestScope;
+
+      deps = import (path + "/dependencies.nix") {};
+
+      mkPkg = pkg: pkgManifest:
+        {
+          name = nameFromURL pkgManifest.name ".tar";
+          src = { inherit (pkgManifest) sha256 name url; };
+          inherit (deps."${pkg}")
+            buildInputs nativeBuildInputs propagatedBuildInputs
+            propagatedNativeBuildInputs propagatedUserEnvPkgs;
+        };
+
+    in breakRecursion (mapAttrs mkPkg manifest);
+
+  mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; });
+
+  resolveDeps = scope: map (dep: scope."${dep}" or null);
+
+  userEnvPkg = dep:
+    mapAttrs
+      (name: pkg: pkg // {
+        propagatedUserEnvPkgs =
+          (pkg.propagatedUserEnvPkgs or [])
+          ++ optional (hasDep dep pkg) dep;
+      });
+
+in
+{
+  inherit generateCollection;
+  inherit isDepAttr;
+  inherit manifest;
+  inherit resolveDeps;
+  inherit userEnvPkg;
+  inherit writeManifestXML;
+
+  blacklist = names: pkgs:
+    let
+      removeDeps = deps: mapAttrs (name: removePkgDeps deps);
+      removePkgs = names: pkgs: builtins.removeAttrs pkgs names;
+    in removeDeps names (removePkgs names pkgs);
+}
diff --git a/pkgs/build-support/autonix/manifest.sh b/pkgs/build-support/autonix/manifest.sh
new file mode 100755
index 00000000000..eb59d5f1330
--- /dev/null
+++ b/pkgs/build-support/autonix/manifest.sh
@@ -0,0 +1,38 @@
+#!@bash@/bin/bash
+
+@coreutils@/bin/mkdir tmp; cd tmp
+
+@wget@/bin/wget -nH -r -c --no-parent $*
+
+cat >../manifest.nix <<EOF
+# This file is generated automatically. DO NOT EDIT!
+{ mirror }:
+[
+EOF
+
+workdir=$(pwd)
+
+@findutils@/bin/find . | while read path; do
+    if [[ -f "${path}" ]]; then
+        url="${path:2}"
+        # Sanitize file name
+        name=$(@coreutils@/bin/basename "${path}" | tr '@' '_')
+        dirname=$(@coreutils@/bin/dirname "${path}")
+        mv "${workdir}/${path}" "${workdir}/${dirname}/${name}"
+        # Prefetch and hash source file
+        sha256=$(@nix@/bin/nix-prefetch-url "file://${workdir}/${dirname}/${name}")
+        store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$name")
+        cat >>../manifest.nix <<EOF
+  {
+    url = "\${mirror}/${url}";
+    sha256 = "${sha256}";
+    name = "${name}";
+    store = "${store}";
+  }
+EOF
+    fi
+done
+
+echo "]" >>../manifest.nix
+
+cd ..
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 3f8c3de6a2f..0faec6aec21 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -8,6 +8,7 @@
 { name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
 , zlib ? null, extraPackages ? []
+, setupHook ? ./setup-hook.sh
 , libcxx ? null, libcxxabi ? null
 }:
 
@@ -213,7 +214,7 @@ stdenv.mkDerivation {
     ''
 
     + ''
-      substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
+      substituteAll ${setupHook} $out/nix-support/setup-hook
       substituteAll ${./add-flags} $out/nix-support/add-flags.sh
       cp -p ${./utils.sh} $out/nix-support/utils.sh
     '';
diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
index abad090ebcb..abad090ebcb 100755..100644
--- a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
+++ b/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 9641378f018..8e9e9297372 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -53,6 +53,7 @@ rec {
 
   # GnuPG.
   gnupg = [
+    http://gd.tuwien.ac.at/privacy/gnupg/
     ftp://gd.tuwien.ac.at/privacy/gnupg/
     ftp://gnupg.x-zone.org/pub/gnupg/
     ftp://ftp.gnupg.cz/pub/gcrypt/
@@ -431,4 +432,13 @@ rec {
     http://mysql.mirrors.pair.com/Downloads/
     http://cdn.mysql.com/Downloads/
   ];
+
+  # OpenBSD mirrors
+  openbsd = [
+    http://ftp.openbsd.org/pub/OpenBSD/
+    ftp://ftp.nluug.nl/pub/OpenBSD/
+    ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/
+    ftp://ftp.halifax.rwth-aachen.de/pub/OpenBSD/
+    ftp://mirror.switch.ch/pub/OpenBSD/
+  ];
 }
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index dd927ed8363..46e7d917160 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -23,22 +23,31 @@ lib.overrideDerivation (fetchurl ({
     ''
       export PATH=${unzip}/bin:$PATH
       mkdir $out
-      cd $out
+
+      unpackDir="$TMPDIR/unpack"
+      mkdir "$unpackDir"
+      cd "$unpackDir"
+
       renamed="$TMPDIR/${baseNameOf url}"
       mv "$downloadedFile" "$renamed"
       unpackFile "$renamed"
-    ''
-    # FIXME: handle zip files that contain a single regular file.
-    + lib.optionalString stripRoot ''
+
       shopt -s dotglob
-      if [ "$(ls -d $out/* | wc -l)" != 1 ]; then
-        echo "error: zip file must contain a single directory."
+    ''
+    + (if stripRoot then ''
+      if [ $(ls "$unpackDir" | wc -l) != 1 ]; then
+        echo "error: zip file must contain a single file or directory."
         exit 1
       fi
-      fn=$(cd "$out" && echo *)
-      mv $out/$fn/* "$out/"
-      rmdir "$out/$fn"
-    '';
-} // args))
+      fn=$(cd "$unpackDir" && echo *)
+      if [ -f "$unpackDir/$fn" ]; then
+        mv "$unpackDir/$fn" "$out"
+      else
+        mv "$unpackDir/$fn"/* "$out/"
+      fi
+    '' else ''
+      mv "$unpackDir"/* "$out/"
+    '');
+} // removeAttrs args [ "stripRoot" ]))
 # Hackety-hack: we actually need unzip hooks, too
 (x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];})
diff --git a/pkgs/build-support/fetchzip/nix-prefetch-zip b/pkgs/build-support/fetchzip/nix-prefetch-zip
index 76255ab3674..ccc03e087e5 100755
--- a/pkgs/build-support/fetchzip/nix-prefetch-zip
+++ b/pkgs/build-support/fetchzip/nix-prefetch-zip
@@ -15,6 +15,7 @@ Options:
 }
 
 
+name=""
 argi=0
 argfun=""
 for arg; do
@@ -66,8 +67,12 @@ hashFormat="--base32"
 tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$")
 trap "rm -rf '$tmp'" EXIT
 
+unpackDirTmp=$tmp/unpacked-tmp/$name
+mkdir -p $unpackDirTmp
+
 unpackDir=$tmp/unpacked/$name
 mkdir -p $unpackDir
+
 downloadedFile=$tmp/$name
 
 unpackFile() {
@@ -116,19 +121,27 @@ if test -z "$finalPath"; then
     exit 1
   fi
 
-  cd $unpackDir
-  unpackFile "$downloadedFile"
-
-  # FIXME: handle zip files that contain a single regular file.
   if [ -z "$leaveRoot" ]; then
     shopt -s dotglob
-    if [ $(ls -d $unpackDir/* | wc -l) != 1 ]; then
-      echo "error: zip file must contain a single directory."
+
+    cd "$unpackDirTmp"
+    unpackFile "$downloadedFile"
+
+    if [ $(ls "$unpackDirTmp" | wc -l) != 1 ]; then
+      echo "error: zip file must contain a single file or directory."
       exit 1
     fi
-    fn=$(cd "$unpackDir" && echo *)
-    mv $unpackDir/$fn/* "$unpackDir/"
-    rmdir "$unpackDir/$fn"
+
+    fn=$(cd "$unpackDirTmp" && echo *)
+
+    if [ -f "$unpackDirTmp/$fn" ]; then
+      mv "$unpackDirTmp/$fn" "$unpackDir"
+    else
+      mv "$unpackDirTmp/$fn/"* "$unpackDir/"
+    fi
+  else
+    cd $unpackDir
+    unpackFile "$downloadedFile"
   fi
 
   # Compute the hash.
diff --git a/pkgs/build-support/gcc-wrapper/setup-hook-stdinc.sh b/pkgs/build-support/gcc-wrapper/setup-hook-stdinc.sh
new file mode 100644
index 00000000000..22e778b0690
--- /dev/null
+++ b/pkgs/build-support/gcc-wrapper/setup-hook-stdinc.sh
@@ -0,0 +1,44 @@
+# This is an alternate setup hook for gcc-wrapper that uses the -I flag to
+# add include search paths instead of -isystem. We need this for some packages
+# because -isystem can change the search order specified by prior -I flags.
+# Changing the search order can point gcc to the wrong package's headers.
+# The -I flag will never change the order of prior flags.
+
+export NIX_CC=@out@
+
+addCVars () {
+    if [ -d $1/include ]; then
+        export NIX_CFLAGS_COMPILE+=" -I $1/include"
+    fi
+
+    if [ -d $1/lib64 -a ! -L $1/lib64 ]; then
+        export NIX_LDFLAGS+=" -L$1/lib64"
+    fi
+
+    if [ -d $1/lib ]; then
+        export NIX_LDFLAGS+=" -L$1/lib"
+    fi
+}
+
+envHooks+=(addCVars)
+
+# Note: these come *after* $out in the PATH (see setup.sh).
+
+if [ -n "@gcc@" ]; then
+    addToSearchPath PATH @gcc@/bin
+fi
+
+if [ -n "@binutils@" ]; then
+    addToSearchPath PATH @binutils@/bin
+fi
+
+if [ -n "@libc@" ]; then
+    addToSearchPath PATH @libc@/bin
+fi
+
+if [ -n "@coreutils@" ]; then
+    addToSearchPath PATH @coreutils@/bin
+fi
+
+export CC=gcc
+export CXX=g++
diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix
new file mode 100644
index 00000000000..aca4e340e26
--- /dev/null
+++ b/pkgs/build-support/templaterpm/default.nix
@@ -0,0 +1,24 @@
+{stdenv, makeWrapper, python, toposort, rpm}:
+
+stdenv.mkDerivation rec {
+  name = "nix-template-rpm-${version}";
+  version = "0.1";
+
+  buildInputs = [ makeWrapper python toposort rpm ];
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${./nix-template-rpm.py} $out/bin/nix-template-rpm
+    wrapProgram $out/bin/nix-template-rpm \
+      --set PYTHONPATH "${rpm}/lib/${python.libPrefix}/site-packages":"${toposort}/lib/${python.libPrefix}/site-packages"
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Create templates of nix expressions from RPM .spec files";
+    maintainers = with maintainers; [ tstrobel ];
+    platforms = with stdenv.lib.platforms; unix;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/pkgs/build-support/templaterpm/nix-template-rpm.py
new file mode 100755
index 00000000000..42f8ee8a75f
--- /dev/null
+++ b/pkgs/build-support/templaterpm/nix-template-rpm.py
@@ -0,0 +1,274 @@
+#!/bin/env python
+
+import sys
+import os
+import subprocess
+import argparse
+import shutil
+import rpm
+import urlparse
+import traceback
+import toposort
+
+
+
+
+
+class NixTemplateRPM(object):
+  def __init__(self, specFilename, inputDir=None, maintainer="MAINTAINER"):
+    rpm.addMacro("buildroot","$out")
+    rpm.addMacro("_libdir","lib")
+    rpm.addMacro("_libexecdir","libexec")
+    rpm.addMacro("_sbindir","sbin")
+    rpm.addMacro("_sysconfdir","etc")
+    rpm.addMacro("_topdir","SPACER_DIR_FOR_REMOVAL")
+    rpm.addMacro("_sourcedir","SOURCE_DIR_SPACER")
+
+    ts = rpm.TransactionSet()
+
+    self.specFilename = specFilename
+    self.spec = ts.parseSpec(specFilename)
+
+    self.inputDir = inputDir
+    self.maintainer = maintainer
+
+    self.packageGroups = [ "ocaml", "python" ]
+
+
+
+  def rewriteCommands(self, string):
+    string = string.replace('SPACER_DIR_FOR_REMOVAL/','')
+    string = string.replace('SPACER_DIR_FOR_REMOVAL','')
+    string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/','${./')+'}' if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n')))
+    string = string.replace('\n','\n    ')
+    string = string.rstrip()
+    return string
+
+
+  def rewriteName(self, string):
+    parts = string.split('-')
+    parts = filter(lambda x: not x == "devel", parts)
+    parts = filter(lambda x: not x == "doc", parts)
+    if len(parts) > 1 and parts[0] in self.packageGroups:
+      return parts[0] + '-' + ''.join(parts[1:2] + map(lambda x: x.capitalize(), parts[2:]))
+    else:
+      return ''.join(parts[:1] + map(lambda x: x.capitalize(), parts[1:]))
+
+
+  def rewriteInputs(self,target,inputs):
+    camelcase = lambda l: l[:1] + map(lambda x: x.capitalize(), l[1:])
+    filterDevel = lambda l: filter(lambda x: not x == "devel", l)
+    filterDoc = lambda l: filter(lambda x: not x == "doc", l)
+    rewrite = lambda l: ''.join(camelcase(filterDoc(filterDevel(l))))
+
+    def filterPackageGroup(target):
+      if target == None:
+        return [ rewrite(x.split('-')) for x in inputs if (not x.split('-')[0] in self.packageGroups) or (len(x.split('-')) == 1) ]
+      elif target in self.packageGroups:
+        return [ target + '_' + rewrite(x.split('-')[1:]) for x in inputs if (x.split('-')[0] == target) and (len(x.split('-')) > 1)]
+      else:
+        raise Exception("Unknown target")
+        return []
+
+    if target == None:
+      packages = filterPackageGroup(None)
+      packages.sort()
+    elif target in self.packageGroups:
+      packages = filterPackageGroup(target)
+      packages.sort()
+    elif target == "ALL":
+      packages = []
+      for t in [None] + self.packageGroups:
+        tmp = filterPackageGroup(t)
+        tmp.sort()
+        packages += tmp
+    else:
+      raise Exception("Unknown target")
+      packages = []
+    return packages
+
+
+  def getBuildInputs(self,target=None):
+    return self.rewriteInputs(target,self.spec.sourceHeader['requires'])
+
+  def getSelf(self):
+    name = self.spec.sourceHeader['name']
+    if len(name.split('-')) > 1 and name.split('-')[0] in self.packageGroups:
+      return self.rewriteInputs(name.split('-')[0], [self.spec.sourceHeader['name']])[0]
+    else:
+      return self.rewriteInputs(None, [self.spec.sourceHeader['name']])[0]
+
+
+
+  def copyPatches(self, input_dir, output_dir):
+    patches = [source for (source, _, flag) in self.spec.sources if flag==2]
+    for filename in patches:
+      shutil.copyfile(os.path.join(input_dir, filename), os.path.join(output_dir, filename))
+
+
+  def copySources(self, input_dir, output_dir):
+    filenames = [source for (source, _, flag) in self.spec.sources if flag==1 if not urlparse.urlparse(source).scheme in ["http", "https"] ]
+    for filename in filenames:
+      shutil.copyfile(os.path.join(input_dir, filename), os.path.join(output_dir, filename))
+
+
+
+  @property
+  def name(self):
+    out = 'stdenv.mkDerivation {\n'
+    out += '  name = "' + self.rewriteName(self.spec.sourceHeader['name']) + '-' + self.spec.sourceHeader['version'] + '";\n'
+    out += '  version = "' + self.spec.sourceHeader['version'] + '";\n'
+    return out
+
+
+  @property
+  def src(self):
+    sources = [source for (source, _, flag) in self.spec.sources if flag==1 if urlparse.urlparse(source).scheme in ["http", "https"] ]
+    out = ''
+    for url in sources:
+      p = subprocess.Popen(['nix-prefetch-url', url], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+      output, err = p.communicate()
+      sha256 = output[:-1] #remove new line
+      out += '  src = fetchurl {\n'
+      out += '    url = "' + url + '";\n'
+      out += '    sha256 = "' + sha256 + '";\n'
+      out += '  };\n'
+    return out
+
+
+  @property
+  def patch(self):
+    patches = [source for (source, _, flag) in self.spec.sources if flag==2]
+    out = '  patches = [ ' + ' '.join(map(lambda x: './'+x, patches)) + ' ];\n'
+    return out
+
+
+  @property
+  def buildInputs(self):
+    out = '  buildInputs = [ '
+    out += ' '.join(self.getBuildInputs("ALL"))
+    out += ' ];\n'
+    return out
+
+
+  @property
+  def configure(self):
+    out = '  configurePhase = \'\'\n    ' + self.rewriteCommands(self.spec.prep) + '\n    \'\';\n';
+    return out
+
+
+  @property
+  def build(self):
+    out = '  buildPhase = \'\'\n    ' + self.rewriteCommands(self.spec.build) + '\n    \'\';\n';
+    return out
+
+
+  @property
+  def install(self):
+    out = '  installPhase = \'\'\n    ' + self.rewriteCommands(self.spec.install) + '\n    \'\';\n';
+    return out
+
+  @property
+  def ocamlExtra(self):
+    if "ocaml" in self.getBuildInputs("ALL"):
+      return '  createFindlibDestdir = true;\n'
+    else:
+      return ''
+
+
+  @property
+  def meta(self):
+    out = '  meta = {\n'
+    out += '    homepage = ' + self.spec.sourceHeader['url'] + ';\n'
+    out += '    description = "' + self.spec.sourceHeader['summary'] + '";\n'
+    out += '    license = stdenv.lib.licenses.' + self.spec.sourceHeader['license'] + ';\n'
+    out += '    platforms = [ "i686-linux" "x86_64-linux" ];\n'
+    out += '    maintainers = with stdenv.lib.maintainers; [ ' + self.maintainer + ' ];\n'
+    out += '  };\n'
+    out += '}\n'
+    return out
+
+
+
+  def __str__(self):
+     head = '{stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
+     body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ]
+     return head + '\n'.join(body)
+
+
+  def __cmp__(self,other):
+    if self.getSelf() in other.getBuildInputs("ALL"):
+      return 1
+    else:
+      return -1
+
+
+  def callPackage(self, output_dir):
+    callPackage = '  ' + self.getSelf() + ' = callPackage ' + os.path.relpath(output_dir) + ' {'
+    newline = False;
+    for target in self.packageGroups:
+      tmp = self.getBuildInputs(target)
+      if len(tmp) > 0:
+        newline = True;
+        callPackage += '\n    ' + 'inherit (' + target + 'Packages) ' + ' '.join(tmp) + ';'
+    if newline:
+      callPackage += '\n  };'
+    else:
+      callPackage += ' };'
+    return callPackage
+
+
+
+  def generateTemplate(self, outputDir):
+    output_dir = os.path.normpath( os.path.join(outputDir, self.rewriteName(self.spec.sourceHeader['name'])) )
+    if not os.path.exists(output_dir):
+      os.makedirs(output_dir)
+
+    if self.inputDir != None:
+      self.copySources(self.inputDir, output_dir)
+      self.copyPatches(self.inputDir, output_dir)
+
+    nixfile = open(os.path.join(output_dir,'default.nix'), 'w')
+    nixfile.write(str(self))
+    nixfile.close()
+
+    shutil.copyfile(self.specFilename, os.path.join(output_dir, os.path.basename(self.specFilename)))
+
+    self.pkgCall = self.callPackage(output_dir)
+
+
+
+
+
+
+
+if __name__ == "__main__":
+    #Parse command line options
+    parser = argparse.ArgumentParser(description="Generate .nix templates from RPM spec files")
+    parser.add_argument("specs", metavar="SPEC", nargs="+", help="spec file")
+    parser.add_argument("-o", "--output", metavar="OUT_DIR", required=True, help="output directory")
+    parser.add_argument("-i", "--input", metavar="IN_DIR", default=None, help="input directory")
+    parser.add_argument("-m", "--maintainer", metavar="MAINTAINER", required=True, help="package maintainer")
+    args = parser.parse_args()
+
+
+    nameMap = {}
+
+    for specPath in args.specs:
+      try:
+        sys.stderr.write("INFO: generate nix file from: %s\n" % specPath)
+        spec = NixTemplateRPM(specPath, args.input, args.maintainer)
+        spec.generateTemplate(args.output)
+        nameMap[spec.getSelf()] = spec
+
+      except Exception, e:
+        sys.stderr.write("ERROR: %s failed with:\n%s\n%s\n" % (specPath,e.message,traceback.format_exc()))
+
+    graph = {}
+    for k, v in nameMap.items():
+      graph[k] = set(v.getBuildInputs("ALL"))
+
+    sortedSpecs = toposort.toposort_flatten(graph)
+    sortedSpecs = filter( lambda x: x in nameMap.keys(), sortedSpecs)
+
+    print '\n\n'.join(map(lambda x: x.pkgCall, map(lambda x: nameMap[x], sortedSpecs)))
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 603ae5c684b..f339be3954b 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.75";
+  name = "man-pages-3.78";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1xnja13a3zb7gzcsdn7sx962lk6mj8m3rz1w7fpgvhsq745cmah6";
+    sha256 = "0zm3sc0zbfng440jjqha8qnzivvg5nqpwgi7zv9h8qxwgyhrfa65";
   };
 
   preBuild =
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
new file mode 100644
index 00000000000..5489d1ef1b1
--- /dev/null
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive }:
+
+stdenv.mkDerivation rec {
+  version = "20141123";
+  name = "zeal-${version}";
+
+  src = fetchFromGitHub {
+    owner = "zealdocs";
+    repo = "zeal";
+    rev = "76405f8387d6a82697faab9630c78f31417d8450";
+    sha256 = "1057py3j2flzxyiks031s0mwm9h82v033iqn5cq8sycmrb3ihj2s";
+  };
+
+  buildInputs = [ pkgconfig qt5 libarchive ];
+
+  patchPhase = ''
+    substituteInPlace src/main.cpp \
+      --replace /usr/share/pixmaps/zeal $out/share/pixmaps/zeal
+  '';
+
+  buildPhase = ''
+    qmake PREFIX=$out
+    make
+  '';
+
+  installPhase = ''
+    make INSTALL_ROOT=$out install
+  '';
+
+  preFixup = ''
+    mv $out/usr/bin $out/bin
+    mv $out/usr/share $out/share
+    rmdir $out/usr
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Zeal is a simple offline API documentation browser";
+    longDescription = ''
+      Zeal is a simple offline API documentation browser inspired by Dash (OS X
+      app), available for Linux and Windows.
+    '';
+    homepage = "http://zealdocs.org/";
+    licenses = with stdenv.lib.licenses; [ gpl3 ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ skeidel ];
+  };
+}
+
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 893659bc763..6b2a4ffe960 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -1,37 +1,40 @@
-{ stdenv, fetchurl, mkfontscale, mkfontdir, bdftopcf, fontutil }:
+{ stdenv, fetchurl, mkfontscale, mkfontdir }:
 
-let
+stdenv.mkDerivation rec {
+  name = "unifont-${version}";
+  version = "7.0.06";
 
   ttf = fetchurl {
-    url = http://unifoundry.com/unifont-5.1.20080907.ttf.gz;
-    sha256 = "03ssxsfhnayarzx15mn6khry2kgdxhkkc1bqzgr0c85ab5xm9jxw";
+    url = "http://unifoundry.com/pub/${name}/font-builds/${name}.ttf";
+    sha256 = "0qmk06rwhxs43n1xbwj14fanbih60zqli002qhy0609da24r3957";
   };
 
   pcf = fetchurl {
-    url = http://unifoundry.com/unifont-5.1.20080820.pcf.gz;
-    sha256 = "0qwsgaplb2a79w14rrvazby3kwx7vyk08x70n0ih5dr91x3rqaqj";
+    url = "http://unifoundry.com/pub/${name}/font-builds/${name}.pcf.gz";
+    sha256 = "1wplig57wpc79mlqamhknn39cibg5z8dvbyibp1490ljcjs1dxdc";
   };
 
-in
+  buildInputs = [ mkfontscale mkfontdir ];
 
-stdenv.mkDerivation {
-  name = "unifont-5.1-20080907";
+  phases = "installPhase";
 
-  buildInputs = [ mkfontscale mkfontdir bdftopcf fontutil ];
-
-  unpackPhase = "true";
-  
   installPhase =
     ''
       mkdir -p $out/share/fonts $out/share/fonts/truetype
-      cp ${pcf} $out/share/fonts/unifont.pcf.gz
-      gunzip < ${ttf} > $out/share/fonts/truetype/unifont.ttf
+      cp -v ${pcf} $out/share/fonts/unifont.pcf.gz
+      cp -v ${ttf} $out/share/fonts/truetype/unifont.ttf
       cd $out/share/fonts
-      mkfontdir 
+      mkfontdir
       mkfontscale
     '';
-    
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "Unicode font for Base Multilingual Plane";
+    homepage = http://unifoundry.com/unifont.html;
+
+    # Basically GPL2+ with font exception.
+    license = http://unifoundry.com/LICENSE.txt;
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/desktops/plasma-5.1/default.nix b/pkgs/desktops/plasma-5.1/default.nix
new file mode 100644
index 00000000000..4c6c37a152a
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/default.nix
@@ -0,0 +1,143 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ autonix, kf55, pkgs, stdenv, debug ? false }:
+
+with stdenv.lib; with autonix;
+
+let
+
+  kf5 = kf55.override { inherit debug; };
+
+  mirror = "mirror://kde";
+
+  renames =
+    builtins.removeAttrs
+      (import ./renames.nix {})
+      ["Backend" "CTest" "KF5Wayland"];
+
+  scope =
+    # packages in this collection
+    (mapAttrs (dep: name: plasma5."${name}") renames) //
+    # packages from KDE Frameworks 5
+    kf5.scope //
+    # packages pinned to this version of Qt 5
+    {
+      PopplerQt5 = (pkgs.poppler.override { inherit (kf5) qt5; }).poppler_qt5;
+    } //
+    # packages from nixpkgs
+    (with pkgs;
+      {
+        inherit epoxy;
+        Epub = ebook_tools;
+        Exiv2 = exiv2;
+        FFmpeg = ffmpeg;
+        FONTFORGE_EXECUTABLE = fontforge;
+        Freetype = freetype;
+        LibSSH = libssh;
+        ModemManager = modemmanager;
+        NetworkManager = networkmanager;
+        PulseAudio = pulseaudio;
+        Taglib = taglib;
+        Xapian = xapian;
+      }
+    );
+
+  preResolve = super:
+    fold (f: x: f x) super
+      [
+        (userEnvPkg "SharedMimeInfo")
+        (userEnvPkg "SharedDesktopOntologies")
+        (blacklist ["kwayland"])
+      ];
+
+  postResolve = super:
+    (builtins.removeAttrs super ["breeze"]) // {
+
+      breeze-qt4 = with pkgs; super.breeze // {
+        name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
+        buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
+        nativeBuildInputs = [ cmake pkgconfig ];
+        cmakeFlags =
+          [
+            "-DUSE_KDE4=ON"
+            "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
+          ];
+      };
+
+      breeze-qt5 = with pkgs; super.breeze // {
+        name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version;
+        buildInputs = with kf5;
+          [
+            kcompletion kconfig kconfigwidgets kcoreaddons frameworkintegration
+            ki18n kwindowsystem qt5
+          ];
+        nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
+        cmakeFlags = [ "-DUSE_KDE4=OFF" ];
+      };
+
+      kwin = with pkgs; super.kwin // {
+        buildInputs = with xlibs;
+          super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
+        patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
+      };
+
+      libkscreen = with pkgs; super.libkscreen // {
+        buildInputs = with xlibs;
+          super.libkscreen.buildInputs ++ [libXrandr];
+        patches = [ ./libkscreen/libkscreen-backend-path.patch ];
+      };
+
+      plasma-desktop = with pkgs; super.plasma-desktop // {
+        buildInputs = with xlibs;
+          super.plasma-desktop.buildInputs ++
+          [ pkgs.libcanberra libxkbfile libXcursor ];
+        patches = [
+          ./plasma-desktop/plasma-desktop-hwclock.patch
+          ./plasma-desktop/plasma-desktop-zoneinfo.patch
+        ];
+        preConfigure = ''
+          substituteInPlace kcms/dateandtime/helper.cpp \
+            --subst-var-by hwclock "${utillinux}/sbin/hwclock"
+        '';
+      };
+
+      plasma-workspace = with pkgs; super.plasma-workspace // {
+        buildInputs = with xlibs;
+          super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
+        postInstall = ''
+          # We use a custom startkde script
+          rm $out/bin/startkde
+        '';
+      };
+
+      powerdevil = with pkgs; super.powerdevil // {
+        buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr];
+      };
+
+    };
+
+  plasma5 = generateCollection ./. {
+    inherit (kf5) mkDerivation;
+    inherit mirror preResolve postResolve renames scope;
+  };
+
+in
+  plasma5 // {
+    inherit scope;
+    startkde = pkgs.callPackage ./startkde {
+      inherit (kf5) kconfig kinit kservice;
+      inherit (plasma5) plasma-desktop plasma-workspace;
+    };
+  }
diff --git a/pkgs/desktops/plasma-5.1/dependencies.nix b/pkgs/desktops/plasma-5.1/dependencies.nix
new file mode 100644
index 00000000000..9402857e248
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/dependencies.nix
@@ -0,0 +1,220 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+  baloo = {
+    buildInputs = [ "ECM" "KF5" "KF5Abc" "KF5Akonadi" "KF5AkonadiMime" "KF5AkonadiServer" "KF5Auth" "KF5CalendarCore" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Mime" "KF5PimUtils" "KF5Solid" "Qt5" "Qt5Test" "Xapian" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  breeze = {
+    buildInputs = [ "ECM" "KDE4" "KDecorations" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-cli-tools = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDE4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeplasma-addons = {
+    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "SCIM" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kfilemetadata = {
+    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Taglib" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khelpcenter = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDE4Support" "KF5KHtml" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khotkeys = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDE4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kinfocenter = {
+    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "RAW1394" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kio-extras = {
+    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KDE4Support" "KF5KHtml" "KF5KIO" "KF5Solid" "LibSSH" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5Test" "SLP" "Samba" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kmenuedit = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksysguard = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDE4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Sensors" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwayland = {
+    buildInputs = [ "ECM" "Qt5" "Wayland" ];
+    nativeBuildInputs = [ "WAYLAND_SCANNER_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwin = {
+    buildInputs = [ "ECM" "EGL" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenGL" "OpenGLES" "Qt5" "Qt5Multimedia" "Qt5Test" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5Service" "KF5WindowSystem" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwrited = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5KDE4Support" "KF5Pty" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkscreen = {
+    buildInputs = [ "Doxygen" "ECM" "Qt5" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libksysguard = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5KDE4Support" "KF5Plasma" "Qt5" "Qt5X11Extras" "X11" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5DBus" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libmm-qt = {
+    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libnm-qt = {
+    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  milou = {
+    buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  oxygen = {
+    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KDecorations" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  oxygen-fonts = {
+    buildInputs = [ "ECM" ];
+    nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-desktop = {
+    buildInputs = [ "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KDecorations" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-nm = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-workspace = {
+    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-workspace-wallpapers = {
+    buildInputs = [ "ECM" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  powerdevil = {
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  systemsettings = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+}
diff --git a/pkgs/desktops/plasma-5.1/dependencies.sh b/pkgs/desktops/plasma-5.1/dependencies.sh
new file mode 100755
index 00000000000..e614efc5475
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/dependencies.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script rebuilds dependencies.nix.
+# You must run manifest.sh first to download the packages.
+
+# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
+# If you are working on the packages, this is probably what you want.
+
+# You can also pass the path to a source tree where you have built
+# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
+# probably what you want.
+
+manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch
new file mode 100644
index 00000000000..fd1f35d717e
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
+index 26b44a9..d14e226 100644
+--- a/clients/aurorae/src/aurorae.cpp
++++ b/clients/aurorae/src/aurorae.cpp
+@@ -73,7 +73,7 @@ void AuroraeFactory::init()
+     // so let's try to locate our plugin:
+     QString pluginPath;
+     for (const QString &path : m_engine->importPathList()) {
+-        QDirIterator it(path, QDirIterator::Subdirectories);
++        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             it.next();
+             QFileInfo fileInfo = it.fileInfo();
diff --git a/pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch
new file mode 100644
index 00000000000..d5797924d23
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch
@@ -0,0 +1,130 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 460022f..422a708 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
+ 
++configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
++
+ set(libkscreen_SRCS
+     backendloader.cpp
+     config.cpp
+diff --git a/src/backendloader.cpp b/src/backendloader.cpp
+index b93e469..8aebc14 100644
+--- a/src/backendloader.cpp
++++ b/src/backendloader.cpp
+@@ -16,6 +16,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA       *
+  *************************************************************************************/
+ 
++#include "config-libkscreen.h"
+ #include "backendloader.h"
+ #include "debug_p.h"
+ #include "backends/abstractbackend.h"
+@@ -40,55 +41,54 @@ bool BackendLoader::init()
+     const QString backend = qgetenv("KSCREEN_BACKEND").constData();
+     const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
+ 
+-    const QStringList paths = QCoreApplication::libraryPaths();
+-    Q_FOREACH (const QString &path, paths) {
+-        const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
+-                       backendFilter,
+-                       QDir::SortFlags(QDir::QDir::NoSort),
+-                       QDir::NoDotAndDotDot | QDir::Files);
+-        const QFileInfoList finfos = dir.entryInfoList();
+-        Q_FOREACH (const QFileInfo &finfo, finfos) {
+-            // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
+-            if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
+-                continue;
+-            }
++    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
+ 
+-            // When on X11, skip the QScreen backend, instead use the XRandR backend,
+-            // if not specified in KSCREEN_BACKEND
+-            if (backend.isEmpty() &&
+-                    finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
+-                    QX11Info::isPlatformX11()) {
+-                continue;
+-            }
++    const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
++                   backendFilter,
++                   QDir::SortFlags(QDir::QDir::NoSort),
++                   QDir::NoDotAndDotDot | QDir::Files);
++    const QFileInfoList finfos = dir.entryInfoList();
++    Q_FOREACH (const QFileInfo &finfo, finfos) {
++        // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
++        if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
++            continue;
++        }
+ 
+-            // When not on X11, skip the XRandR backend, and fall back to QSCreen
+-            // if not specified in KSCREEN_BACKEND
+-            if (backend.isEmpty() &&
+-                    finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
+-                    !QX11Info::isPlatformX11()) {
+-                continue;
+-            }
++        // When on X11, skip the QScreen backend, instead use the XRandR backend,
++        // if not specified in KSCREEN_BACKEND
++        if (backend.isEmpty() &&
++                finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
++                QX11Info::isPlatformX11()) {
++            continue;
++        }
++
++        // When not on X11, skip the XRandR backend, and fall back to QSCreen
++        // if not specified in KSCREEN_BACKEND
++        if (backend.isEmpty() &&
++                finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
++                !QX11Info::isPlatformX11()) {
++            continue;
++        }
+ 
+-            QPluginLoader loader(finfo.filePath());
+-            loader.load();
+-            QObject *instance = loader.instance();
+-            if (!instance) {
++        QPluginLoader loader(finfo.filePath());
++        loader.load();
++        QObject *instance = loader.instance();
++        if (!instance) {
++            loader.unload();
++            continue;
++        }
++
++        s_backend = qobject_cast< AbstractBackend* >(instance);
++        if (s_backend) {
++            if (!s_backend->isValid()) {
++                qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
++                delete s_backend;
++                s_backend = 0;
+                 loader.unload();
+                 continue;
+             }
+-
+-            s_backend = qobject_cast< AbstractBackend* >(instance);
+-            if (s_backend) {
+-                if (!s_backend->isValid()) {
+-                    qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
+-                    delete s_backend;
+-                    s_backend = 0;
+-                    loader.unload();
+-                    continue;
+-                }
+-                qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
+-                return true;
+-            }
++            qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
++            return true;
+         }
+     }
+ 
+diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
+new file mode 100644
+index 0000000..a99f3d1
+--- /dev/null
++++ b/src/config-libkscreen.h.cmake
+@@ -0,0 +1,2 @@
++#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
++#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
diff --git a/pkgs/desktops/plasma-5.1/manifest.nix b/pkgs/desktops/plasma-5.1/manifest.nix
new file mode 100644
index 00000000000..20290d0bd07
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/manifest.nix
@@ -0,0 +1,166 @@
+# This file is generated automatically. DO NOT EDIT!
+{ mirror }:
+[
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kwayland-5.1.2.tar.xz";
+    sha256 = "0v57gdbhbqq9nm8y6f8xlwwsfib8v8wbh32bb38aa22wkcqbnqh5";
+    name = "kwayland-5.1.2.tar.xz";
+    store = "/nix/store/r4bjs61x7ad3ff1iy4j111japxzn8gdm-kwayland-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/milou-5.1.2.tar.xz";
+    sha256 = "0dawmwzdxb289gblnbxw4ryqj45c1rmws7mm0cmqlnxh2ykysska";
+    name = "milou-5.1.2.tar.xz";
+    store = "/nix/store/d90rryiyw3haw0mlcxzs57b0vsmq2c3g-milou-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/plasma-workspace-5.1.2.tar.xz";
+    sha256 = "03gwkikxmmbiglyf2cbhm79wri1vfsibpr0qsyydcnqf2bja4adk";
+    name = "plasma-workspace-5.1.2.tar.xz";
+    store = "/nix/store/9b2pcs64kvdnb0mf7g1gyjgygi8pfrk1-plasma-workspace-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kdeplasma-addons-5.1.2.tar.xz";
+    sha256 = "0jfrnvrn4x5cjd3yp21sr53rddcaxw3l05xkcq99lb29jx7x831f";
+    name = "kdeplasma-addons-5.1.2.tar.xz";
+    store = "/nix/store/9f7154m5aq35lfwj6rfq7ra4c2b0xs4r-kdeplasma-addons-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/khotkeys-5.1.2.tar.xz";
+    sha256 = "0kyjvrfpf8zqv8milbzdj0y6i37413qmvdhkxy2phqwrnwj4x69q";
+    name = "khotkeys-5.1.2.tar.xz";
+    store = "/nix/store/lq1v4haiag93w5g6pqwp5r9w8n3xvh1n-khotkeys-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kde-cli-tools-5.1.2.tar.xz";
+    sha256 = "1akgj042i52b6mzd0lq8xgrqnwi63wc7k82g8r4kfy8611vxw6wb";
+    name = "kde-cli-tools-5.1.2.tar.xz";
+    store = "/nix/store/byjdh6cmqimk3i314h3y57s2z3nvpfnw-kde-cli-tools-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/libnm-qt-5.1.2.tar.xz";
+    sha256 = "1gm3yjlb5iq2l0rm8wqg0hs1f66ca5j8zvw6rrn3z4f2hsw9b8vm";
+    name = "libnm-qt-5.1.2.tar.xz";
+    store = "/nix/store/yx6jhazzb32580ax7dw4jdzncj1lpx4a-libnm-qt-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/oxygen-fonts-5.1.2.tar.xz";
+    sha256 = "05f06fsgp6xjv5azs546cq5653k3cyyidbdkggf20yrwlybypg2w";
+    name = "oxygen-fonts-5.1.2.tar.xz";
+    store = "/nix/store/ppzbxx7vkpymjgvi3skrch2dlx3mwhjg-oxygen-fonts-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/khelpcenter-5.1.2.tar.xz";
+    sha256 = "0fgwabsvbg4xzzli8k28hqw6rw5wzmp77fpb7qxiaks2qxd6xfvl";
+    name = "khelpcenter-5.1.2.tar.xz";
+    store = "/nix/store/nq86gdfz5fgkxcndk4knnb3n59y9b17x-khelpcenter-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kmenuedit-5.1.2.tar.xz";
+    sha256 = "1f09m8ki1qib0rfvbkd1nqszq5mglc802rz9b7s9hfi0n5la05cj";
+    name = "kmenuedit-5.1.2.tar.xz";
+    store = "/nix/store/8l7agrg12ghva4103iwm1xdzhqk3iwxp-kmenuedit-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kinfocenter-5.1.2.tar.xz";
+    sha256 = "1yp08z0sirm1i21ix27c72l1pygndrh4gnb5rl4r6rj0rymy4xn0";
+    name = "kinfocenter-5.1.2.tar.xz";
+    store = "/nix/store/jl3s4kimn0xamxc4yhc1jsrz9j0cmws1-kinfocenter-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kwrited-5.1.2.tar.xz";
+    sha256 = "0bsm3dkl1zi1h16cd1pc9qcbv2jpjpzcw7m6cg9gbk7icjymn065";
+    name = "kwrited-5.1.2.tar.xz";
+    store = "/nix/store/ishi0y744yapvf2yf0hm5gam3z5j2687-kwrited-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kio-extras-5.1.2.tar.xz";
+    sha256 = "0d4yyssiddcabrfr94ylf4p2f7l5mpg353m67w2x4rdlc7bgc00z";
+    name = "kio-extras-5.1.2.tar.xz";
+    store = "/nix/store/6pqx9daq9bx7in8dghy041vfn5x829g2-kio-extras-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/systemsettings-5.1.2.tar.xz";
+    sha256 = "102s7l1xaxqzsswzcsr6qx2mizi1fw85ickj8sm4ql493m3iy0vy";
+    name = "systemsettings-5.1.2.tar.xz";
+    store = "/nix/store/c56khxzyh8gzi5nxy8i3n2vlwbsmblsz-systemsettings-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/powerdevil-5.1.2.tar.xz";
+    sha256 = "0bq042phd1rv42qf21672l74mlygzvqknqd0vhfay7lz5hihd3np";
+    name = "powerdevil-5.1.2.tar.xz";
+    store = "/nix/store/5p6j6949gv1s03cm1yn1v0i18clma3cw-powerdevil-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/plasma-desktop-5.1.2.tar.xz";
+    sha256 = "0nn1fcb8b4cmh6wzfar7dzmc6r830n6nq78icsbqkl2yi631vmv7";
+    name = "plasma-desktop-5.1.2.tar.xz";
+    store = "/nix/store/nnk00ddkr0rqbmk6i1q17wimvb6n79m6-plasma-desktop-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/libmm-qt-5.1.2.tar.xz";
+    sha256 = "1jx3zq5j7dm27k74ayibg0d82f7nm7r40mj92sk0drgzaj0q2wv4";
+    name = "libmm-qt-5.1.2.tar.xz";
+    store = "/nix/store/z3f23bansr6yqvc8pwcavwy828ykf85z-libmm-qt-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/breeze-5.1.2.tar.xz";
+    sha256 = "1c7bfr2zdhh84bik5ksyfxvng8c23slasf6lbr86f0mmvwssqhc4";
+    name = "breeze-5.1.2.tar.xz";
+    store = "/nix/store/h0ra9f62jj3lqsg5hhqsb8cq05fqaq0c-breeze-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/ksysguard-5.1.2.tar.xz";
+    sha256 = "03bngwq0dpgffcr7dkzk44n995kcawk1fgxf38zkik4qrr2m8xmz";
+    name = "ksysguard-5.1.2.tar.xz";
+    store = "/nix/store/vrgl460m4h0bzwhakgkj9sddn2pr6057-ksysguard-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kwin-5.1.2.tar.xz";
+    sha256 = "1sjb9w8yaicypjdlcnn6a8zaa03fmgn9bsbbr1xfh3kcjm0p2hjf";
+    name = "kwin-5.1.2.tar.xz";
+    store = "/nix/store/0lcmq4bl3kc48gcps703bby99z0zdl7q-kwin-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/oxygen-5.1.2.tar.xz";
+    sha256 = "0dwlqc57qwp09bbmknakjndqgajfp948kri8ysakj50qbfzq22ly";
+    name = "oxygen-5.1.2.tar.xz";
+    store = "/nix/store/al4whqd4gdnyym26kd2yp3c1slyll0bw-oxygen-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/libkscreen-5.1.2.tar.xz";
+    sha256 = "1kbs042anmc8mifmbxwi7sw0n74kcpf5hpbld5a7nclhm0xpyzb9";
+    name = "libkscreen-5.1.2.tar.xz";
+    store = "/nix/store/rkmydih2fss2gm84j8rgpd3ybz7pyz5p-libkscreen-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/libksysguard-5.1.2.tar.xz";
+    sha256 = "061jjqh6i70g5f8qh47znk295wh1j7z3i9imppdlxhymm2sdix5k";
+    name = "libksysguard-5.1.2.tar.xz";
+    store = "/nix/store/dyipim22aisn9cnk3d9431bi393qsi38-libksysguard-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/plasma-workspace-wallpapers-5.1.2.tar.xz";
+    sha256 = "18my7r17b6c0wm545knpy68bcgawmr6x1h383br1a3jrahb9smfx";
+    name = "plasma-workspace-wallpapers-5.1.2.tar.xz";
+    store = "/nix/store/inqv621x6l2yz1kj71d824kc0labpss7-plasma-workspace-wallpapers-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/kfilemetadata-5.1.2.tar.xz";
+    sha256 = "0ssz2v9dm09ig20m5c2gcgi0dhkbijs7580j75kyabcyxyq33gdi";
+    name = "kfilemetadata-5.1.2.tar.xz";
+    store = "/nix/store/84jqp15fclxia88dmbr2zpq50m6xzwib-kfilemetadata-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/plasma-nm-5.1.2.tar.xz";
+    sha256 = "1ifwjbzdjsfcq2vbq58fnx1r8m11wbmcwchnn7ihabbcgj5admp7";
+    name = "plasma-nm-5.1.2.tar.xz";
+    store = "/nix/store/2czga7b7i36841rs4mnfzd7j7s3rfanv-plasma-nm-5.1.2.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.1.2/baloo-5.1.2.tar.xz";
+    sha256 = "1ynd3amry3wjk8sjlb5knpvjshn0gvs2m1gpbr7r7528ckkv0gpv";
+    name = "baloo-5.1.2.tar.xz";
+    store = "/nix/store/lcrrxz5yjf88cgifz3zjcq5skdp4jxkk-baloo-5.1.2.tar.xz";
+  }
+]
diff --git a/pkgs/desktops/plasma-5.1/manifest.sh b/pkgs/desktops/plasma-5.1/manifest.sh
new file mode 100755
index 00000000000..5191f4f7d87
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/manifest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]; then
+
+  # The extra slash at the end of the URL is necessary to stop wget
+  # from recursing over the whole server! (No, it's not a bug.)
+  $(nix-build ../../.. -A autonix.manifest) \
+      http://download.kde.org/stable/plasma/5.1.2/ \
+      -A '*.tar.xz'
+
+else
+
+  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
+
+fi
diff --git a/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch b/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch
new file mode 100644
index 00000000000..53bd43d38e2
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch
@@ -0,0 +1,24 @@
+diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
+index cec5ab8..fc4a6b9 100644
+--- a/kcms/dateandtime/helper.cpp
++++ b/kcms/dateandtime/helper.cpp
+@@ -48,10 +48,6 @@
+ #include <sys/stat.h>
+ #endif
+ 
+-// We cannot rely on the $PATH environment variable, because D-Bus activation
+-// clears it. So we have to use a reasonable default.
+-static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
+-
+ int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
+ {
+     int ret = 0;
+@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
+ 
+ void ClockHelper::toHwclock()
+ {
+-    QString hwclock = KStandardDirs::findExe("hwclock", exePath);
++    QString hwclock = "@hwclock@";
+     if (!hwclock.isEmpty()) {
+         KProcess::execute(hwclock, QStringList() << "--systohc");
+     }
diff --git a/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch b/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch
new file mode 100644
index 00000000000..e924207054d
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch
@@ -0,0 +1,18 @@
+diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
+index fc4a6b9..7b64d05 100644
+--- a/kcms/dateandtime/helper.cpp
++++ b/kcms/dateandtime/helper.cpp
+@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
+ 
+     val = selectedzone;
+ #else
+-    QString tz = "/usr/share/zoneinfo/" + selectedzone;
++    // NixOS-specific path
++    QString tz = "/etc/zoneinfo/" + selectedzone;
++    if (!QFile::exists(tz)) {
++      // Standard Linux path
++      tz = "/usr/share/zoneinfo/" + selectedzone;
++    }
+ 
+     if (QFile::exists(tz)) { // make sure the new TZ really exists
+         QFile::remove("/etc/localtime");
diff --git a/pkgs/desktops/plasma-5.1/renames.nix b/pkgs/desktops/plasma-5.1/renames.nix
new file mode 100644
index 00000000000..be50cacdc18
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/renames.nix
@@ -0,0 +1,24 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+"Backend" = "powerdevil";
+"CTest" = "kdeplasma-addons";
+"ECM" = "extra-cmake-modules";
+"KDecorations" = "kwin";
+"KF5Baloo" = "baloo";
+"KF5FileMetaData" = "kfilemetadata";
+"KF5ModemManagerQt" = "libmm-qt";
+"KF5NetworkManagerQt" = "libnm-qt";
+"KF5Screen" = "libkscreen";
+"KF5SysGuard" = "libksysguard";
+"KF5Wayland" = "kwayland";
+"KF5XmlRpcClientPrivate" = "plasma-workspace";
+"KHotKeysDBusInterface" = "khotkeys";
+"KRunnerAppDBusInterface" = "plasma-workspace";
+"KSMServerDBusInterface" = "plasma-workspace";
+"KWinDBusInterface" = "kwin";
+"LibKWorkspace" = "plasma-workspace";
+"LibTaskManager" = "plasma-workspace";
+"OxygenFont" = "oxygen-fonts";
+"ScreenSaverDBusInterface" = "plasma-workspace";
+}
diff --git a/pkgs/desktops/plasma-5.1/setup-hook.sh b/pkgs/desktops/plasma-5.1/setup-hook.sh
new file mode 100644
index 00000000000..a8d9b7e0e36
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/desktops/plasma-5.1/startkde/default.nix b/pkgs/desktops/plasma-5.1/startkde/default.nix
new file mode 100644
index 00000000000..6337769e1aa
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/startkde/default.nix
@@ -0,0 +1,33 @@
+# We provide our own version of the startkde script in its entirety, rather than
+# patching the version provided by kde-workspace, because it requires such
+# extensive patching.
+
+{ stdenv, bash, dbus, gnused, gnugrep, kconfig, kinit, kservice, plasma-desktop
+, plasma-workspace, qt5, socat, xorg }:
+
+let startkde = ./startkde.in; in
+
+stdenv.mkDerivation {
+  name = "startkde-0.1";
+  phases = "installPhase";
+
+  inherit bash gnused gnugrep kconfig kinit kservice qt5 socat;
+  inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+  dbus_tools = dbus.tools;
+  plasmaWorkspace = plasma-workspace;
+  plasmaDesktop = plasma-desktop;
+  startupconfigkeys = ./startupconfigkeys;
+  kdeglobals = ./kdeglobals;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    substituteAll ${startkde} $out/bin/startkde
+    chmod +x $out/bin/startkde
+  '';
+
+  meta = {
+    description = "Custom startkde script for Nixpkgs";
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    license = with stdenv.lib.licenses; [ gpl2Plus ];
+  };
+}
diff --git a/pkgs/desktops/plasma-5.1/startkde/kdeglobals b/pkgs/desktops/plasma-5.1/startkde/kdeglobals
new file mode 100644
index 00000000000..bfa610712ed
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/startkde/kdeglobals
@@ -0,0 +1,11 @@
+[General]
+XftAntialias=true
+XftHintStyle=hintmedium
+XftSubPixel=none
+desktopFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+fixed=Oxygen Mono,9,-1,5,50,0,0,0,0,0
+font=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+menuFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+smallestReadableFont=Oxygen-Sans,8,-1,5,50,0,0,0,0,0
+taskbarFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
\ No newline at end of file
diff --git a/pkgs/desktops/plasma-5.1/startkde/startkde.in b/pkgs/desktops/plasma-5.1/startkde/startkde.in
new file mode 100644
index 00000000000..ff67ed769e2
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/startkde/startkde.in
@@ -0,0 +1,382 @@
+#!@bash@/bin/bash -x
+#
+#  NIXOS KDE STARTUP SCRIPT
+#
+
+# The KDE icon cache is supposed to update itself
+# automatically, but it uses the timestamp on the icon
+# theme directory as a trigger.  Since in Nix the
+# timestamp is always the same, this doesn't work.  So as
+# a workaround, nuke the icon cache on login.  This isn't
+# perfect, since it may require logging out after
+# installing new applications to update the cache.
+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
+rm -fv $HOME/.cache/icon-cache.kcache
+
+# Qt writes a weird ‘libraryPath’ line to
+# ~/.config/Trolltech.conf that causes the KDE plugin
+# paths of previous KDE invocations to be searched.
+# Obviously using mismatching KDE libraries is potentially
+# disastrous, so here we nuke references to the Nix store
+# in Trolltech.conf.  A better solution would be to stop
+# Qt from doing this wackiness in the first place.
+if [ -e $HOME/.config/Trolltech.conf ]; then
+    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+fi
+
+if test "x$1" = x--failsafe; then
+    KDE_FAILSAFE=1 # General failsafe flag
+    KWIN_COMPOSE=N # Disable KWin's compositing
+    export KWIN_COMPOSE KDE_FAILSAFE
+fi
+
+# When the X server dies we get a HUP signal from xinit. We must ignore it
+# because we still need to do some cleanup.
+trap 'echo GOT SIGHUP' HUP
+
+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+unset DYLD_FORCE_FLAT_NAMESPACE
+
+# Check if a KDE session already is running and whether it's possible to connect to X
+@plasmaWorkspace@/bin/kcheckrunning
+kcheckrunning_result=$?
+if test $kcheckrunning_result -eq 0 ; then
+  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
+	exit 1
+elif test $kcheckrunning_result -eq 2 ; then
+	echo "\$DISPLAY is not set or cannot connect to the X server."
+  exit 1
+fi
+
+# Boot sequence:
+#
+# kdeinit is used to fork off processes which improves memory usage
+# and startup time.
+#
+# * kdeinit starts klauncher first.
+# * Then kded is started. kded is responsible for keeping the sycoca
+#   database up to date. When an up to date database is present it goes
+#   into the background and the startup continues.
+# * Then kdeinit starts kcminit. kcminit performs initialisation of
+#   certain devices according to the user's settings
+#
+# * Then ksmserver is started which takes control of the rest of the startup sequence
+
+# We need to create config folder so we can write startupconfigkeys
+if [  ${XDG_CONFIG_HOME} ]; then
+  configDir=$XDG_CONFIG_HOME;
+else
+  # This is the default
+  # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+  configDir=${HOME}/.config;
+fi
+
+mkdir -p $configDir
+
+# This is basically setting defaults so we can use them with kstartupconfig5
+cat @startupconfigkeys@ >$configDir/startupconfigkeys
+
+# preload the user's locale on first start
+plasmalocalerc=$configDir/plasma-localerc
+test -f $plasmalocalerc || {
+cat >$plasmalocalerc <<EOF
+[Formats]
+LANG=$LANG
+EOF
+}
+
+# export LC_* variables set by kcmshell5 formats into environment
+# so it can be picked up by QLocale and friends.
+exportformatssettings=$configDir/plasma-locale-settings.sh
+[ -f $exportformatssettings ] && . $exportformatssettings
+
+# Write a default kdeglobals file to set up the font
+kdeglobalsfile=$configDir/kdeglobals
+[ -f $kdeglobalsfile ] || cat @kdeglobals@ >$kdeglobalsfile
+
+@plasmaWorkspace@/bin/kstartupconfig5
+returncode=$?
+if test $returncode -ne 0; then
+    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 exited with $returncode"
+    exit 1
+fi
+[ -r $configDir/startupconfig ] && . $configDir/startupconfig
+
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
+export XCURSOR_PATH
+
+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+
+    @plasmaDesktop@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+    if test $? -eq 10; then
+        XCURSOR_THEME=default
+        export XCURSOR_THEME
+    elif test -n "$kcminputrc_mouse_cursortheme"; then
+        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
+        export XCURSOR_THEME
+    fi
+    if test -n "$kcminputrc_mouse_cursorsize"; then
+        XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
+        export XCURSOR_SIZE
+    fi
+fi
+
+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+# from some users that they're confused and don't know what to do. This is
+# especially necessary on slow machines, where starting KDE takes one or two
+# minutes until anything appears on the screen.
+#
+# If the user has overwritten fonts, the cursor font may be different now
+# so don't move this up.
+#
+@xsetroot@/bin/xsetroot -cursor_name left_ptr
+
+dl=$DESKTOP_LOCKED
+unset DESKTOP_LOCKED # Don't want it in the environment
+
+# Make sure that D-Bus is running
+# D-Bus autolaunch is broken
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
+fi
+if @qt5@/bin/qdbus >/dev/null 2>/dev/null; then
+    : # ok
+else
+    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+    exit 1
+fi
+
+ksplash_pid=
+if test -z "$dl"; then
+  # the splashscreen and progress indicator
+  case "$ksplashrc_ksplash_engine" in
+    KSplashQML)
+      ksplash_pid=`@plasmaWorkspace@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+      ;;
+    None)
+      ;;
+    *)
+      ;;
+  esac
+fi
+
+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
+# (where <config locations> correspond to the system and user's configuration
+# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
+# and /etc/xdg/ on Linux)
+#
+# This is where you can define environment variables that will be available to
+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
+# or eval `gpg-agent --daemon`.
+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
+#
+# (see end of this file).
+# For anything else (that doesn't set env vars, or that needs a window manager),
+# better use the Autostart folder.
+
+# TODO: Use GenericConfigLocation once we depend on Qt 5.4
+scriptpath=`@qt5@/bin/qtpaths --paths ConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g'`
+
+# Add /env/ to the directory to locate the scripts to be sourced
+for prefix in `echo $scriptpath`; do
+  for file in "$prefix"/env/*.sh; do
+    test -r "$file" && . "$file"
+  done
+done
+
+# Set the path for Qt plugins provided by KDE
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5@/bin/qtpaths --plugin-dir`
+# TODO: Do we really need this?
+QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+export QT_PLUGIN_PATH
+
+# Activate the kde font directories.
+#
+# There are 4 directories that may be used for supplying fonts for KDE.
+#
+# There are two system directories. These belong to the administrator.
+# There are two user directories, where the user may add her own fonts.
+#
+# The 'override' versions are for fonts that should come first in the list,
+# i.e. if you have a font in your 'override' directory, it will be used in
+# preference to any other.
+#
+# The preference order looks like this:
+# user override, system override, X, user, system
+#
+# Where X is the original font database that was set up before this script
+# runs.
+
+usr_odir=$HOME/.fonts/kde-override
+usr_fdir=$HOME/.fonts
+
+if test -n "$KDEDIRS"; then
+  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
+  sys_odir=$kdedirs_first/share/fonts/override
+  sys_fdir=$kdedirs_first/share/fonts
+else
+  sys_odir=$KDEDIR/share/fonts/override
+  sys_fdir=$KDEDIR/share/fonts
+fi
+
+# We run mkfontdir on the user's font dirs (if we have permission) to pick
+# up any new fonts they may have installed. If mkfontdir fails, we still
+# add the user's dirs to the font path, as they might simply have been made
+# read-only by the administrator, for whatever reason.
+
+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
+
+# Ask X11 to rebuild its font list.
+@xset@/bin/xset fp rehash
+
+# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+if test -n "$GS_LIB" ; then
+    GS_LIB=$usr_fdir:$GS_LIB
+    export GS_LIB
+else
+    GS_LIB=$usr_fdir
+    export GS_LIB
+fi
+
+echo 'startkde: Starting up...'  1>&2
+
+
+# Mark that full KDE session is running (e.g. Konqueror preloading works only
+# with full KDE running). The KDE_FULL_SESSION property can be detected by
+# any X client connected to the same X session, even if not launched
+# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
+# however guarantees that the application is launched in the same environment
+# like the KDE session and that e.g. KDE utilities/libraries are available.
+# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
+# The matching tests are:
+#   For $KDE_FULL_SESSION:
+#     if test -n "$KDE_FULL_SESSION"; then ... whatever
+#   For KDE_FULL_SESSION property:
+#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+#     if test $? -eq 0; then ... whatever
+#
+# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
+# of the user running the KDE session. It should be rarely needed (e.g.
+# after sudo to prevent desktop-wide functionality in the new user's kded).
+#
+# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number.
+# Note that this didn't exist in KDE3, which can be detected by its absense and
+# the presence of KDE_FULL_SESSION.
+#
+KDE_FULL_SESSION=true
+export KDE_FULL_SESSION
+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+
+KDE_SESSION_VERSION=5
+export KDE_SESSION_VERSION
+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+
+KDE_SESSION_UID=`id -ru`
+export KDE_SESSION_UID
+
+XDG_CURRENT_DESKTOP=KDE
+export XDG_CURRENT_DESKTOP
+
+# At this point all the environment is ready, let's send it to kwalletd if running
+if test -n "$PAM_KWALLET_LOGIN" ; then
+    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+fi
+
+# At this point all environment variables are set, let's send it to the DBus
+# session server to update the activation environment
+@plasmaWorkspace@/lib/libexec/ksyncdbusenv
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not sync environment to dbus.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
+  exit 1
+fi
+
+# We set LD_BIND_NOW to increase the efficiency of kdeinit.
+# kdeinit unsets this variable before loading applications.
+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not start kdeinit5.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5."
+  exit 1
+fi
+
+# (NixOS) We run kbuildsycoca5 before starting the user session because things
+# may be missing or moved if they have run nixos-rebuild and it may not be
+# possible for them to start Konsole to run it manually!
+@kservice@/bin/kbuildsycoca5
+
+# finally, give the session control to the session manager
+# see kdebase/ksmserver for the description of the rest of the startup sequence
+# if the KDEWM environment variable has been set, then it will be used as KDE's
+# window manager instead of kwin.
+# if KDEWM is not set, ksmserver will ensure kwin is started.
+# kwrapper5 is used to reduce startup time and memory usage
+# kwrapper5 does not return useful error codes such as the exit code of ksmserver.
+# We only check for 255 which means that the ksmserver process could not be
+# started, any problems thereafter, e.g. ksmserver failing to initialize,
+# will remain undetected.
+test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+# If the session should be locked from the start (locked autologin),
+# lock now and do the rest of the KDE startup underneath the locker.
+KSMSERVEROPTIONS=""
+test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+@kinit@/bin/kwrapper5 @plasmaWorkspace@/bin/ksmserver $KDEWM $KSMSERVEROPTIONS
+if test $? -eq 255; then
+  # Startup error
+  echo 'startkde: Could not start ksmserver.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver."
+fi
+
+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+
+if test x"$wait_drkonqi"x = x"true"x ; then
+    # wait for remaining drkonqi instances with timeout (in seconds)
+    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+    wait_drkonqi_counter=0
+    while @qt5@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+        sleep 5
+        wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+        if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+            # ask remaining drkonqis to die in a graceful way
+            @qt5@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
+                @qt5@/bin/qdbus "$address" "/MainApplication" "quit"
+            done
+            break
+        fi
+    done
+fi
+
+echo 'startkde: Shutting down...'  1>&2
+# just in case
+test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+
+# Clean up
+@kinit@/bin/kdeinit5_shutdown
+
+echo 'startkde: Running shutdown scripts...'  1>&2
+
+# Run scripts found in <config locations>/plasma-workspace/shutdown
+for prefix in `echo "$scriptpath"`; do
+  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
+    test -x "$prefix$file" && "$prefix$file"
+  done
+done
+
+unset KDE_FULL_SESSION
+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
+unset KDE_SESSION_VERSION
+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
+unset KDE_SESSION_UID
+
+echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/plasma-5.1/startkde/startupconfigkeys b/pkgs/desktops/plasma-5.1/startkde/startupconfigkeys
new file mode 100644
index 00000000000..0fc92cff8a5
--- /dev/null
+++ b/pkgs/desktops/plasma-5.1/startkde/startupconfigkeys
@@ -0,0 +1,5 @@
+kcminputrc Mouse cursorTheme 'breeze_cursors'
+kcminputrc Mouse cursorSize ''
+ksplashrc KSplash Theme Breeze
+ksplashrc KSplash Engine KSplashQML
+kcmfonts General forceFontDPI 0
diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix
new file mode 100644
index 00000000000..4646fda268d
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/default.nix
@@ -0,0 +1,163 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ autonix, kf56, pkgs, stdenv, debug ? false }:
+
+with stdenv.lib; with autonix;
+
+let
+
+  kf5 = kf56.override { inherit debug; };
+
+  inherit (kf5) qt5;
+
+  mirror = "mirror://kde";
+
+  renames =
+    builtins.removeAttrs
+      (import ./renames.nix {})
+      ["Backend" "CTest"];
+
+  scope =
+    # packages in this collection
+    (mapAttrs (dep: name: plasma5."${name}") renames) //
+    # packages from KDE Frameworks 5
+    kf5.scope //
+    # packages pinned to this version of Qt 5
+    {
+      LibBlueDevil = pkgs.libbluedevil;
+      PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
+      PopplerQt5 = (pkgs.poppler.override { inherit (kf5) qt5; }).poppler_qt5;
+    } //
+    # packages from nixpkgs
+    (with pkgs;
+      {
+        inherit epoxy;
+        Epub = ebook_tools;
+        Exiv2 = exiv2;
+        FFmpeg = ffmpeg;
+        FONTFORGE_EXECUTABLE = fontforge;
+        Freetype = freetype;
+        GTK2 = gtk2;
+        GTK3 = gtk3;
+        Libinput = libinput;
+        LibSSH = libssh;
+        ModemManager = modemmanager;
+        NetworkManager = networkmanager;
+        PulseAudio = pulseaudio;
+        Taglib = taglib;
+        USB = libusb;
+        Wayland = wayland;
+        Xapian = xapian;
+      }
+    );
+
+  preResolve = super:
+    fold (f: x: f x) super
+      [
+        (userEnvPkg "SharedMimeInfo")
+        (userEnvPkg "SharedDesktopOntologies")
+        (blacklist ["bluedevil"])
+      ];
+
+  postResolve = super:
+    (builtins.removeAttrs super ["breeze"]) // {
+
+      breeze-qt4 = with pkgs; super.breeze // {
+        name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
+        buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
+        nativeBuildInputs = [ cmake pkgconfig ];
+        cmakeFlags =
+          [
+            "-DUSE_KDE4=ON"
+            "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
+          ];
+      };
+
+      breeze-qt5 = with pkgs; super.breeze // {
+        name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version;
+        buildInputs = with kf5; with plasma5;
+          [
+            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration
+            frameworkintegration ki18n kwindowsystem qt5
+          ];
+        nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
+        cmakeFlags = [ "-DUSE_KDE4=OFF" ];
+      };
+
+      kde-gtk-config = with pkgs; super.kde-gtk-config // {
+        NIX_CFLAGS_COMPILE =
+          (super.kde-gtk-config.NIX_CFLAGS_COMPILE or "")
+          + " -I${cairo}/include/cairo"
+          + " -I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include"
+          + " -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"
+          + " -I${pango}/include/pango-1.0";
+      };
+
+      kwin = with pkgs; super.kwin // {
+        buildInputs = with xlibs;
+          super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
+        patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
+      };
+
+      libkscreen = with pkgs; super.libkscreen // {
+        buildInputs = with xlibs; super.libkscreen.buildInputs ++ [libXrandr];
+      };
+
+      plasma-desktop = with pkgs; super.plasma-desktop // {
+        buildInputs = with xlibs;
+          super.plasma-desktop.buildInputs ++
+          [ pkgs.libcanberra libxkbfile libXcursor libXft ];
+        patches = [
+          ./plasma-desktop/plasma-desktop-hwclock.patch
+          ./plasma-desktop/plasma-desktop-zoneinfo.patch
+        ];
+        preConfigure = ''
+          substituteInPlace kcms/dateandtime/helper.cpp \
+            --subst-var-by hwclock "${utillinux}/sbin/hwclock"
+        '';
+      };
+
+      plasma-workspace = with pkgs; super.plasma-workspace // {
+        buildInputs = with xlibs;
+          super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
+        postInstall = ''
+          # We use a custom startkde script
+          rm $out/bin/startkde
+        '';
+      };
+
+      powerdevil = with pkgs; super.powerdevil // {
+        buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr];
+      };
+
+      sddm-kcm = with pkgs; super.sddm-kcm // {
+        buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor];
+      };
+
+    };
+
+  plasma5 = generateCollection ./. {
+    inherit (kf5) mkDerivation;
+    inherit mirror preResolve postResolve renames scope;
+  };
+
+in
+  plasma5 // {
+    inherit scope;
+    startkde = pkgs.callPackage ./startkde {
+      inherit (kf5) kconfig kinit kservice;
+      inherit (plasma5) plasma-desktop plasma-workspace;
+    };
+  }
diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.2/dependencies.nix
new file mode 100644
index 00000000000..74e519927d0
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/dependencies.nix
@@ -0,0 +1,284 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+  baloo = {
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Xapian" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  bluedevil = {
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5WidgetsAddons" "LibBlueDevil" "Qt5" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  breeze = {
+    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-cli-tools = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kde-gtk-config = {
+    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5KCMUtils" "KF5NewStuff" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdecoration = {
+    buildInputs = [ "ECM" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeplasma-addons = {
+    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kfilemetadata = {
+    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Taglib" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khelpcenter = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khotkeys = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kinfocenter = {
+    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "RAW1394" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kio-extras = {
+    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5Test" "SLP" "Samba" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kmenuedit = {
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kscreen = {
+    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksshaskpass = {
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ksysguard = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Sensors" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwayland = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Widgets" "Wayland" "WaylandScanner" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwin = {
+    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Multimedia" "Qt5Test" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwrited = {
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libbluedevil = {
+    buildInputs = [ "Doxygen" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libkscreen = {
+    buildInputs = [ "Doxygen" "ECM" "Qt5" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libksysguard = {
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5WebKitWidgets" "Qt5X11Extras" "X11" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "KF5IconThemes" "Qt5Core" "Qt5Network" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  libmm-qt = {
+    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  milou = {
+    buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  muon = {
+    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5KDELibs4Support" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "QtOAuth" "packagekitqt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  oxygen = {
+    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  oxygen-fonts = {
+    buildInputs = [ "ECM" ];
+    nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-desktop = {
+    buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-nm = {
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-workspace = {
+    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-workspace-wallpapers = {
+    buildInputs = [ "ECM" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  polkit-kde-agent = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  powerdevil = {
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  sddm-kcm = {
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  systemsettings = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+}
diff --git a/pkgs/desktops/plasma-5.2/dependencies.sh b/pkgs/desktops/plasma-5.2/dependencies.sh
new file mode 100755
index 00000000000..e614efc5475
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/dependencies.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script rebuilds dependencies.nix.
+# You must run manifest.sh first to download the packages.
+
+# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
+# If you are working on the packages, this is probably what you want.
+
+# You can also pass the path to a source tree where you have built
+# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
+# probably what you want.
+
+manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch
new file mode 100644
index 00000000000..fd1f35d717e
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
+index 26b44a9..d14e226 100644
+--- a/clients/aurorae/src/aurorae.cpp
++++ b/clients/aurorae/src/aurorae.cpp
+@@ -73,7 +73,7 @@ void AuroraeFactory::init()
+     // so let's try to locate our plugin:
+     QString pluginPath;
+     for (const QString &path : m_engine->importPathList()) {
+-        QDirIterator it(path, QDirIterator::Subdirectories);
++        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             it.next();
+             QFileInfo fileInfo = it.fileInfo();
diff --git a/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch
new file mode 100644
index 00000000000..d5797924d23
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch
@@ -0,0 +1,130 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 460022f..422a708 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
+ 
++configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
++
+ set(libkscreen_SRCS
+     backendloader.cpp
+     config.cpp
+diff --git a/src/backendloader.cpp b/src/backendloader.cpp
+index b93e469..8aebc14 100644
+--- a/src/backendloader.cpp
++++ b/src/backendloader.cpp
+@@ -16,6 +16,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA       *
+  *************************************************************************************/
+ 
++#include "config-libkscreen.h"
+ #include "backendloader.h"
+ #include "debug_p.h"
+ #include "backends/abstractbackend.h"
+@@ -40,55 +41,54 @@ bool BackendLoader::init()
+     const QString backend = qgetenv("KSCREEN_BACKEND").constData();
+     const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
+ 
+-    const QStringList paths = QCoreApplication::libraryPaths();
+-    Q_FOREACH (const QString &path, paths) {
+-        const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
+-                       backendFilter,
+-                       QDir::SortFlags(QDir::QDir::NoSort),
+-                       QDir::NoDotAndDotDot | QDir::Files);
+-        const QFileInfoList finfos = dir.entryInfoList();
+-        Q_FOREACH (const QFileInfo &finfo, finfos) {
+-            // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
+-            if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
+-                continue;
+-            }
++    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
+ 
+-            // When on X11, skip the QScreen backend, instead use the XRandR backend,
+-            // if not specified in KSCREEN_BACKEND
+-            if (backend.isEmpty() &&
+-                    finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
+-                    QX11Info::isPlatformX11()) {
+-                continue;
+-            }
++    const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
++                   backendFilter,
++                   QDir::SortFlags(QDir::QDir::NoSort),
++                   QDir::NoDotAndDotDot | QDir::Files);
++    const QFileInfoList finfos = dir.entryInfoList();
++    Q_FOREACH (const QFileInfo &finfo, finfos) {
++        // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
++        if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
++            continue;
++        }
+ 
+-            // When not on X11, skip the XRandR backend, and fall back to QSCreen
+-            // if not specified in KSCREEN_BACKEND
+-            if (backend.isEmpty() &&
+-                    finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
+-                    !QX11Info::isPlatformX11()) {
+-                continue;
+-            }
++        // When on X11, skip the QScreen backend, instead use the XRandR backend,
++        // if not specified in KSCREEN_BACKEND
++        if (backend.isEmpty() &&
++                finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
++                QX11Info::isPlatformX11()) {
++            continue;
++        }
++
++        // When not on X11, skip the XRandR backend, and fall back to QSCreen
++        // if not specified in KSCREEN_BACKEND
++        if (backend.isEmpty() &&
++                finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
++                !QX11Info::isPlatformX11()) {
++            continue;
++        }
+ 
+-            QPluginLoader loader(finfo.filePath());
+-            loader.load();
+-            QObject *instance = loader.instance();
+-            if (!instance) {
++        QPluginLoader loader(finfo.filePath());
++        loader.load();
++        QObject *instance = loader.instance();
++        if (!instance) {
++            loader.unload();
++            continue;
++        }
++
++        s_backend = qobject_cast< AbstractBackend* >(instance);
++        if (s_backend) {
++            if (!s_backend->isValid()) {
++                qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
++                delete s_backend;
++                s_backend = 0;
+                 loader.unload();
+                 continue;
+             }
+-
+-            s_backend = qobject_cast< AbstractBackend* >(instance);
+-            if (s_backend) {
+-                if (!s_backend->isValid()) {
+-                    qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
+-                    delete s_backend;
+-                    s_backend = 0;
+-                    loader.unload();
+-                    continue;
+-                }
+-                qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
+-                return true;
+-            }
++            qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
++            return true;
+         }
+     }
+ 
+diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
+new file mode 100644
+index 0000000..a99f3d1
+--- /dev/null
++++ b/src/config-libkscreen.h.cmake
+@@ -0,0 +1,2 @@
++#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
++#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix
new file mode 100644
index 00000000000..5eb5d3ff78f
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/manifest.nix
@@ -0,0 +1,214 @@
+# This file is generated automatically. DO NOT EDIT!
+{ mirror }:
+[
+  {
+    url = "${mirror}/stable/plasma/5.2.0/ksshaskpass-5.2.0.tar.xz";
+    sha256 = "17xjlb1gwxcdxzfadv0brr6ainnw25m681p013na182zigx9f9bv";
+    name = "ksshaskpass-5.2.0.tar.xz";
+    store = "/nix/store/gv341fwlrzw3svd2vr5b8wxcjk93r64v-ksshaskpass-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kio-extras-5.2.0.tar.xz";
+    sha256 = "1c5qhp6axzbn5mla9q6qk0aalm0n4hvs6c4d9pclbcv58ysv3vw5";
+    name = "kio-extras-5.2.0.tar.xz";
+    store = "/nix/store/iilra8kczb0waqigff390x2j2svkv5ba-kio-extras-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kmenuedit-5.2.0.tar.xz";
+    sha256 = "1qg7dh42lyp6mrckxjz07mmhk589d3wr080vljbm6hkgqm3aq7zr";
+    name = "kmenuedit-5.2.0.tar.xz";
+    store = "/nix/store/4qcwcvnyqnpa6b7my8aqrp6v2zadz91m-kmenuedit-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/libbluedevil-5.2.0.tar.xz";
+    sha256 = "0s06kn9aqkyyfj1n6cb2hhnnqymwzljavfwj0f88mrkjrdf65bq9";
+    name = "libbluedevil-5.2.0.tar.xz";
+    store = "/nix/store/d7nkh5p51ab5ag94yi3ggxjpbwn2k6g3-libbluedevil-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/libkscreen-5.2.0.tar.xz";
+    sha256 = "1v75qi7b0m8fqdj5b38ypwgp1djkg408a4csn57y3pjgp7k69k53";
+    name = "libkscreen-5.2.0.tar.xz";
+    store = "/nix/store/49pgxmxbn2qs5dzgf3iiwcaazj9ipiy3-libkscreen-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kde-gtk-config-5.2.0.tar.xz";
+    sha256 = "1gafqrb5sg6jm4g3kivnwax05lq6gilzg8pc8k6dsnchyqzilbki";
+    name = "kde-gtk-config-5.2.0.tar.xz";
+    store = "/nix/store/vf2cvrr4p7ydz36ir0cjd3p0yqa3cwpj-kde-gtk-config-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kdeplasma-addons-5.2.0.tar.xz";
+    sha256 = "168bl9g1s9piy0bwrx7f8pbvn3jamw1rp90rihydamm3s54p1ykw";
+    name = "kdeplasma-addons-5.2.0.tar.xz";
+    store = "/nix/store/4qgb1w08k6ffyipfwbrj19pgpihg3pk7-kdeplasma-addons-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/plasma-desktop-5.2.0.tar.xz";
+    sha256 = "0xld7kxa8p78kw5f1a75nc0n69jn6vfp8nm40qqdhy2y3m5cc8p9";
+    name = "plasma-desktop-5.2.0.tar.xz";
+    store = "/nix/store/sjqqnbp8s802rz6ydn3if77hr57njwpk-plasma-desktop-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/systemsettings-5.2.0.tar.xz";
+    sha256 = "0yk1zn0kkjb9rcmqa2n10igcnk2fm06gfn7fgb4mcb2vjvv7a8y0";
+    name = "systemsettings-5.2.0.tar.xz";
+    store = "/nix/store/b0pjfkpqsvfywawinn6a3q42r675q0gw-systemsettings-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/polkit-kde-agent-1-5.2.0.tar.xz";
+    sha256 = "14b5z2ijlrv7h2bh6dxyd6r4qschzh1l2iqix63nbfa5nxyfc67q";
+    name = "polkit-kde-agent-1-5.2.0.tar.xz";
+    store = "/nix/store/ri0bgnblm2s7jsyvarvn0nrmnsgbv9wv-polkit-kde-agent-1-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/milou-5.2.0.tar.xz";
+    sha256 = "02gd7012zbiaxhb6wliapfcb4spjrdgnhvhl3y64ixqrx2b032a5";
+    name = "milou-5.2.0.tar.xz";
+    store = "/nix/store/gsmn9sv15f7iwk8hbh074rnm03ig5yhi-milou-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kinfocenter-5.2.0.tar.xz";
+    sha256 = "151flq4w6m94jgfrzbf3w3v11xybx92xd0nv0bdh5vvaxg97dac9";
+    name = "kinfocenter-5.2.0.tar.xz";
+    store = "/nix/store/xfnj3gy03ynfaazy82gkxijm9fykwk4x-kinfocenter-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kdecoration-5.2.0.tar.xz";
+    sha256 = "135i1maqp0q9aa312l0dqfkmxjq12mri2zjwg03wzgmmy5b9wm52";
+    name = "kdecoration-5.2.0.tar.xz";
+    store = "/nix/store/dqqb6cvwcd43yanifka0kmx1pdhryjcj-kdecoration-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kde-cli-tools-5.2.0.tar.xz";
+    sha256 = "0lr3ir8kfq1x0yn0ahhlks0ikxxqbyj6jdmkdlr8hz5ivcpr64mq";
+    name = "kde-cli-tools-5.2.0.tar.xz";
+    store = "/nix/store/zfnbl0kbh4x3lpalc7irjgynl53mcf52-kde-cli-tools-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kscreen-5.2.0.tar.xz";
+    sha256 = "09f77vszpni93ahm31gsb7lg4lidchppa1kd9s8q98yf2rb9hl55";
+    name = "kscreen-5.2.0.tar.xz";
+    store = "/nix/store/w2gq2s7lgf637qn0f5a0dh06i7mkjhki-kscreen-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-wallpapers-5.2.0.tar.xz";
+    sha256 = "1xb500w5y9jn6xyayw5v28qsy6xp0pfb3ydciga77h1xd59wp0ym";
+    name = "plasma-workspace-wallpapers-5.2.0.tar.xz";
+    store = "/nix/store/3rzwgwlzbmin9sjpp614bavjmrqqwk9x-plasma-workspace-wallpapers-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/sddm-kcm-5.2.0.tar.xz";
+    sha256 = "0ds4qlgwzbpa32w3mlhf64p64n1jifm6797v6jb5v3qjnamlpk96";
+    name = "sddm-kcm-5.2.0.tar.xz";
+    store = "/nix/store/q3wbyymqnxwcv9c58fxc4fg2c6pc2d5r-sddm-kcm-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/libksysguard-5.2.0.tar.xz";
+    sha256 = "0jfyy90zdajpxy5yy9w14n8r8jx7d6bdwss7h8rrkp5zljp9nzwp";
+    name = "libksysguard-5.2.0.tar.xz";
+    store = "/nix/store/n50iq06yz6z2n2n7wh10ww7cks22zz4z-libksysguard-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/oxygen-5.2.0.tar.xz";
+    sha256 = "1wad5m36h31y99v4gwx19n3k14xxc0hvp9c4n3g67fyy8pjnr0ax";
+    name = "oxygen-5.2.0.tar.xz";
+    store = "/nix/store/60kb2hhwlmykfx5mc2s8hyd8zh6ngrpv-oxygen-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/khelpcenter-5.2.0.tar.xz";
+    sha256 = "1a5z2bvxjdwp81jnyrdf7q591k6ql504argl7lg3pbvph08rc0rs";
+    name = "khelpcenter-5.2.0.tar.xz";
+    store = "/nix/store/dfi8w8dsk5cxbyhm5kznja6kxda23n8j-khelpcenter-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/baloo-5.6.0.tar.xz";
+    sha256 = "1py0npkf8s46zwbg23cn49f777fc9cid1njg8crc8h71md71j614";
+    name = "baloo-5.6.0.tar.xz";
+    store = "/nix/store/sgm5dcgmw5cwz60hhhqnlgxq1ck1cffh-baloo-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-5.2.0.tar.xz";
+    sha256 = "1swii172mv32837kgcxnmafs1blpgpdn6hda07f1aanaz4scxvj3";
+    name = "plasma-workspace-5.2.0.tar.xz";
+    store = "/nix/store/g2ar4zpsc36zalpd5frzdpxscgzg727b-plasma-workspace-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kwrited-5.2.0.tar.xz";
+    sha256 = "0rg1ml7m6f2kql4qi9pg8dd66hr7rxqgyjg3rs66diibz383cjzb";
+    name = "kwrited-5.2.0.tar.xz";
+    store = "/nix/store/r5qz9f2s7q0i00lsp86fv1b500cr2x0n-kwrited-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/libmm-qt-5.2.0.tar.xz";
+    sha256 = "07flvspy3qs2mhjxnwy3l8giw296p3501ad1hr3bnjidm2iykc6s";
+    name = "libmm-qt-5.2.0.tar.xz";
+    store = "/nix/store/6fzkxwzqysgwjzmiyg16fdasp64gik52-libmm-qt-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/plasma-nm-5.2.0.tar.xz";
+    sha256 = "0br2mqx8g660jcs1hiwssg6fdiddn4zk78kdmcgkpq93y5ysdf5c";
+    name = "plasma-nm-5.2.0.tar.xz";
+    store = "/nix/store/9n79gfai09ydrjf12ckqviqaf5jkwar8-plasma-nm-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kwayland-5.2.0.tar.xz";
+    sha256 = "1w872ask0w9gbw46dx3si124gmzkapj7naysgrb5zdcdf8avcgqy";
+    name = "kwayland-5.2.0.tar.xz";
+    store = "/nix/store/jidv4bi8f2iyg3zhdqip5f7lkwmgav94-kwayland-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/ksysguard-5.2.0.tar.xz";
+    sha256 = "0kd103kzxgsgrrhfjacy50gg6wsvqa9ix9xk5nb59bbdzj0b4km1";
+    name = "ksysguard-5.2.0.tar.xz";
+    store = "/nix/store/s4xb576g8hjpl39ysbmzlsw19a99zssy-ksysguard-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kfilemetadata-5.6.0.tar.xz";
+    sha256 = "0vg9lc6d2q6bx53lixcmdhfgwqqr3hfl6g3pvgss237kd3fbb94n";
+    name = "kfilemetadata-5.6.0.tar.xz";
+    store = "/nix/store/rvjxs89p415z52nhzrmci6s91nb0fy5a-kfilemetadata-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/bluedevil-5.2.0.tar.xz";
+    sha256 = "01a3h0jp9nq9fs1zv4wp7jgmpv4nscflb3nkz93dg0g1bis1kgnh";
+    name = "bluedevil-5.2.0.tar.xz";
+    store = "/nix/store/w4s1zfgmallmqq400pvh6zy9qrss6206-bluedevil-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/breeze-5.2.0.tar.xz";
+    sha256 = "1s8381nhszb2d7b0r6rmngnkgw28xxsfhnginbcb6zkljgprnkkh";
+    name = "breeze-5.2.0.tar.xz";
+    store = "/nix/store/yyq50zwlb2xxahkb6w0zvz41rz2gg4k1-breeze-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/oxygen-fonts-5.2.0.tar.xz";
+    sha256 = "102hycnk4naysmyj87mv1sm41aq214f3wjzzi429r0i135wdblki";
+    name = "oxygen-fonts-5.2.0.tar.xz";
+    store = "/nix/store/96is0p4rp0nqv9yllqrk9xhv4fa86gan-oxygen-fonts-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/powerdevil-5.2.0.tar.xz";
+    sha256 = "1mi60xn4pgwrq4w3i45gxqjqqfwjxzkkyx89fkwwj1xv68bkwshs";
+    name = "powerdevil-5.2.0.tar.xz";
+    store = "/nix/store/lqny6rqbrgpadkm6d1s52i9959zwhjh8-powerdevil-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/muon-5.2.0.tar.xz";
+    sha256 = "15vcrm7y5khpc0rngzqbhizg2w0rz6adf5v3cpwafmqaq3iqlcb7";
+    name = "muon-5.2.0.tar.xz";
+    store = "/nix/store/f7i8c6ig71506aqcmj3mp8yapyid5zki-muon-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/khotkeys-5.2.0.tar.xz";
+    sha256 = "187757g70wjq1v9r7nf3fxc6233sb5m28s4aswlm7rjvys5lmkch";
+    name = "khotkeys-5.2.0.tar.xz";
+    store = "/nix/store/6sqh6vy8i8xg5xqh0b2ic1a3wb1nv2p8-khotkeys-5.2.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.tar.xz";
+    sha256 = "0ys76xllgr2034bxpr5m1qm5v8qp8wnzn09f6gghcvnm3lqki79q";
+    name = "kwin-5.2.0.tar.xz";
+    store = "/nix/store/hrv9ikwphl3mg8sk6i8b9q3wj5ca24ni-kwin-5.2.0.tar.xz";
+  }
+]
diff --git a/pkgs/desktops/plasma-5.2/manifest.sh b/pkgs/desktops/plasma-5.2/manifest.sh
new file mode 100755
index 00000000000..6d0b6ef1452
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/manifest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]; then
+
+  # The extra slash at the end of the URL is necessary to stop wget
+  # from recursing over the whole server! (No, it's not a bug.)
+  $(nix-build ../../.. -A autonix.manifest) \
+      http://download.kde.org/stable/plasma/5.2.0/ \
+      -A '*.tar.xz'
+
+else
+
+  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
+
+fi
diff --git a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch
new file mode 100644
index 00000000000..53bd43d38e2
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch
@@ -0,0 +1,24 @@
+diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
+index cec5ab8..fc4a6b9 100644
+--- a/kcms/dateandtime/helper.cpp
++++ b/kcms/dateandtime/helper.cpp
+@@ -48,10 +48,6 @@
+ #include <sys/stat.h>
+ #endif
+ 
+-// We cannot rely on the $PATH environment variable, because D-Bus activation
+-// clears it. So we have to use a reasonable default.
+-static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
+-
+ int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
+ {
+     int ret = 0;
+@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
+ 
+ void ClockHelper::toHwclock()
+ {
+-    QString hwclock = KStandardDirs::findExe("hwclock", exePath);
++    QString hwclock = "@hwclock@";
+     if (!hwclock.isEmpty()) {
+         KProcess::execute(hwclock, QStringList() << "--systohc");
+     }
diff --git a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch
new file mode 100644
index 00000000000..e924207054d
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch
@@ -0,0 +1,18 @@
+diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
+index fc4a6b9..7b64d05 100644
+--- a/kcms/dateandtime/helper.cpp
++++ b/kcms/dateandtime/helper.cpp
+@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
+ 
+     val = selectedzone;
+ #else
+-    QString tz = "/usr/share/zoneinfo/" + selectedzone;
++    // NixOS-specific path
++    QString tz = "/etc/zoneinfo/" + selectedzone;
++    if (!QFile::exists(tz)) {
++      // Standard Linux path
++      tz = "/usr/share/zoneinfo/" + selectedzone;
++    }
+ 
+     if (QFile::exists(tz)) { // make sure the new TZ really exists
+         QFile::remove("/etc/localtime");
diff --git a/pkgs/desktops/plasma-5.2/renames.nix b/pkgs/desktops/plasma-5.2/renames.nix
new file mode 100644
index 00000000000..5778a2bc819
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/renames.nix
@@ -0,0 +1,23 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+"Backend" = "powerdevil";
+"CTest" = "kdeplasma-addons";
+"ECM" = "extra-cmake-modules";
+"KDecoration2" = "kdecoration";
+"KF5Baloo" = "baloo";
+"KF5FileMetaData" = "kfilemetadata";
+"KF5ModemManagerQt" = "libmm-qt";
+"KF5Screen" = "libkscreen";
+"KF5SysGuard" = "libksysguard";
+"KF5Wayland" = "kwayland";
+"KF5XmlRpcClientPrivate" = "plasma-workspace";
+"KHotKeysDBusInterface" = "khotkeys";
+"KRunnerAppDBusInterface" = "plasma-workspace";
+"KSMServerDBusInterface" = "plasma-workspace";
+"KWinDBusInterface" = "kwin";
+"LibKWorkspace" = "plasma-workspace";
+"LibTaskManager" = "plasma-workspace";
+"OxygenFont" = "oxygen-fonts";
+"ScreenSaverDBusInterface" = "plasma-workspace";
+}
diff --git a/pkgs/desktops/plasma-5.2/setup-hook.sh b/pkgs/desktops/plasma-5.2/setup-hook.sh
new file mode 100644
index 00000000000..a8d9b7e0e36
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/desktops/plasma-5.2/startkde/default.nix b/pkgs/desktops/plasma-5.2/startkde/default.nix
new file mode 100644
index 00000000000..6337769e1aa
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/startkde/default.nix
@@ -0,0 +1,33 @@
+# We provide our own version of the startkde script in its entirety, rather than
+# patching the version provided by kde-workspace, because it requires such
+# extensive patching.
+
+{ stdenv, bash, dbus, gnused, gnugrep, kconfig, kinit, kservice, plasma-desktop
+, plasma-workspace, qt5, socat, xorg }:
+
+let startkde = ./startkde.in; in
+
+stdenv.mkDerivation {
+  name = "startkde-0.1";
+  phases = "installPhase";
+
+  inherit bash gnused gnugrep kconfig kinit kservice qt5 socat;
+  inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+  dbus_tools = dbus.tools;
+  plasmaWorkspace = plasma-workspace;
+  plasmaDesktop = plasma-desktop;
+  startupconfigkeys = ./startupconfigkeys;
+  kdeglobals = ./kdeglobals;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    substituteAll ${startkde} $out/bin/startkde
+    chmod +x $out/bin/startkde
+  '';
+
+  meta = {
+    description = "Custom startkde script for Nixpkgs";
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    license = with stdenv.lib.licenses; [ gpl2Plus ];
+  };
+}
diff --git a/pkgs/desktops/plasma-5.2/startkde/kdeglobals b/pkgs/desktops/plasma-5.2/startkde/kdeglobals
new file mode 100644
index 00000000000..bfa610712ed
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/startkde/kdeglobals
@@ -0,0 +1,11 @@
+[General]
+XftAntialias=true
+XftHintStyle=hintmedium
+XftSubPixel=none
+desktopFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+fixed=Oxygen Mono,9,-1,5,50,0,0,0,0,0
+font=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+menuFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+smallestReadableFont=Oxygen-Sans,8,-1,5,50,0,0,0,0,0
+taskbarFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
+toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
\ No newline at end of file
diff --git a/pkgs/desktops/plasma-5.2/startkde/startkde.in b/pkgs/desktops/plasma-5.2/startkde/startkde.in
new file mode 100644
index 00000000000..ff67ed769e2
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/startkde/startkde.in
@@ -0,0 +1,382 @@
+#!@bash@/bin/bash -x
+#
+#  NIXOS KDE STARTUP SCRIPT
+#
+
+# The KDE icon cache is supposed to update itself
+# automatically, but it uses the timestamp on the icon
+# theme directory as a trigger.  Since in Nix the
+# timestamp is always the same, this doesn't work.  So as
+# a workaround, nuke the icon cache on login.  This isn't
+# perfect, since it may require logging out after
+# installing new applications to update the cache.
+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
+rm -fv $HOME/.cache/icon-cache.kcache
+
+# Qt writes a weird ‘libraryPath’ line to
+# ~/.config/Trolltech.conf that causes the KDE plugin
+# paths of previous KDE invocations to be searched.
+# Obviously using mismatching KDE libraries is potentially
+# disastrous, so here we nuke references to the Nix store
+# in Trolltech.conf.  A better solution would be to stop
+# Qt from doing this wackiness in the first place.
+if [ -e $HOME/.config/Trolltech.conf ]; then
+    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+fi
+
+if test "x$1" = x--failsafe; then
+    KDE_FAILSAFE=1 # General failsafe flag
+    KWIN_COMPOSE=N # Disable KWin's compositing
+    export KWIN_COMPOSE KDE_FAILSAFE
+fi
+
+# When the X server dies we get a HUP signal from xinit. We must ignore it
+# because we still need to do some cleanup.
+trap 'echo GOT SIGHUP' HUP
+
+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+unset DYLD_FORCE_FLAT_NAMESPACE
+
+# Check if a KDE session already is running and whether it's possible to connect to X
+@plasmaWorkspace@/bin/kcheckrunning
+kcheckrunning_result=$?
+if test $kcheckrunning_result -eq 0 ; then
+  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
+	exit 1
+elif test $kcheckrunning_result -eq 2 ; then
+	echo "\$DISPLAY is not set or cannot connect to the X server."
+  exit 1
+fi
+
+# Boot sequence:
+#
+# kdeinit is used to fork off processes which improves memory usage
+# and startup time.
+#
+# * kdeinit starts klauncher first.
+# * Then kded is started. kded is responsible for keeping the sycoca
+#   database up to date. When an up to date database is present it goes
+#   into the background and the startup continues.
+# * Then kdeinit starts kcminit. kcminit performs initialisation of
+#   certain devices according to the user's settings
+#
+# * Then ksmserver is started which takes control of the rest of the startup sequence
+
+# We need to create config folder so we can write startupconfigkeys
+if [  ${XDG_CONFIG_HOME} ]; then
+  configDir=$XDG_CONFIG_HOME;
+else
+  # This is the default
+  # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+  configDir=${HOME}/.config;
+fi
+
+mkdir -p $configDir
+
+# This is basically setting defaults so we can use them with kstartupconfig5
+cat @startupconfigkeys@ >$configDir/startupconfigkeys
+
+# preload the user's locale on first start
+plasmalocalerc=$configDir/plasma-localerc
+test -f $plasmalocalerc || {
+cat >$plasmalocalerc <<EOF
+[Formats]
+LANG=$LANG
+EOF
+}
+
+# export LC_* variables set by kcmshell5 formats into environment
+# so it can be picked up by QLocale and friends.
+exportformatssettings=$configDir/plasma-locale-settings.sh
+[ -f $exportformatssettings ] && . $exportformatssettings
+
+# Write a default kdeglobals file to set up the font
+kdeglobalsfile=$configDir/kdeglobals
+[ -f $kdeglobalsfile ] || cat @kdeglobals@ >$kdeglobalsfile
+
+@plasmaWorkspace@/bin/kstartupconfig5
+returncode=$?
+if test $returncode -ne 0; then
+    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 exited with $returncode"
+    exit 1
+fi
+[ -r $configDir/startupconfig ] && . $configDir/startupconfig
+
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
+export XCURSOR_PATH
+
+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+
+    @plasmaDesktop@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+    if test $? -eq 10; then
+        XCURSOR_THEME=default
+        export XCURSOR_THEME
+    elif test -n "$kcminputrc_mouse_cursortheme"; then
+        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
+        export XCURSOR_THEME
+    fi
+    if test -n "$kcminputrc_mouse_cursorsize"; then
+        XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
+        export XCURSOR_SIZE
+    fi
+fi
+
+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+# from some users that they're confused and don't know what to do. This is
+# especially necessary on slow machines, where starting KDE takes one or two
+# minutes until anything appears on the screen.
+#
+# If the user has overwritten fonts, the cursor font may be different now
+# so don't move this up.
+#
+@xsetroot@/bin/xsetroot -cursor_name left_ptr
+
+dl=$DESKTOP_LOCKED
+unset DESKTOP_LOCKED # Don't want it in the environment
+
+# Make sure that D-Bus is running
+# D-Bus autolaunch is broken
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
+fi
+if @qt5@/bin/qdbus >/dev/null 2>/dev/null; then
+    : # ok
+else
+    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+    exit 1
+fi
+
+ksplash_pid=
+if test -z "$dl"; then
+  # the splashscreen and progress indicator
+  case "$ksplashrc_ksplash_engine" in
+    KSplashQML)
+      ksplash_pid=`@plasmaWorkspace@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+      ;;
+    None)
+      ;;
+    *)
+      ;;
+  esac
+fi
+
+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
+# (where <config locations> correspond to the system and user's configuration
+# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
+# and /etc/xdg/ on Linux)
+#
+# This is where you can define environment variables that will be available to
+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
+# or eval `gpg-agent --daemon`.
+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
+#
+# (see end of this file).
+# For anything else (that doesn't set env vars, or that needs a window manager),
+# better use the Autostart folder.
+
+# TODO: Use GenericConfigLocation once we depend on Qt 5.4
+scriptpath=`@qt5@/bin/qtpaths --paths ConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g'`
+
+# Add /env/ to the directory to locate the scripts to be sourced
+for prefix in `echo $scriptpath`; do
+  for file in "$prefix"/env/*.sh; do
+    test -r "$file" && . "$file"
+  done
+done
+
+# Set the path for Qt plugins provided by KDE
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5@/bin/qtpaths --plugin-dir`
+# TODO: Do we really need this?
+QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+export QT_PLUGIN_PATH
+
+# Activate the kde font directories.
+#
+# There are 4 directories that may be used for supplying fonts for KDE.
+#
+# There are two system directories. These belong to the administrator.
+# There are two user directories, where the user may add her own fonts.
+#
+# The 'override' versions are for fonts that should come first in the list,
+# i.e. if you have a font in your 'override' directory, it will be used in
+# preference to any other.
+#
+# The preference order looks like this:
+# user override, system override, X, user, system
+#
+# Where X is the original font database that was set up before this script
+# runs.
+
+usr_odir=$HOME/.fonts/kde-override
+usr_fdir=$HOME/.fonts
+
+if test -n "$KDEDIRS"; then
+  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
+  sys_odir=$kdedirs_first/share/fonts/override
+  sys_fdir=$kdedirs_first/share/fonts
+else
+  sys_odir=$KDEDIR/share/fonts/override
+  sys_fdir=$KDEDIR/share/fonts
+fi
+
+# We run mkfontdir on the user's font dirs (if we have permission) to pick
+# up any new fonts they may have installed. If mkfontdir fails, we still
+# add the user's dirs to the font path, as they might simply have been made
+# read-only by the administrator, for whatever reason.
+
+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
+
+# Ask X11 to rebuild its font list.
+@xset@/bin/xset fp rehash
+
+# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+if test -n "$GS_LIB" ; then
+    GS_LIB=$usr_fdir:$GS_LIB
+    export GS_LIB
+else
+    GS_LIB=$usr_fdir
+    export GS_LIB
+fi
+
+echo 'startkde: Starting up...'  1>&2
+
+
+# Mark that full KDE session is running (e.g. Konqueror preloading works only
+# with full KDE running). The KDE_FULL_SESSION property can be detected by
+# any X client connected to the same X session, even if not launched
+# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
+# however guarantees that the application is launched in the same environment
+# like the KDE session and that e.g. KDE utilities/libraries are available.
+# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
+# The matching tests are:
+#   For $KDE_FULL_SESSION:
+#     if test -n "$KDE_FULL_SESSION"; then ... whatever
+#   For KDE_FULL_SESSION property:
+#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+#     if test $? -eq 0; then ... whatever
+#
+# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
+# of the user running the KDE session. It should be rarely needed (e.g.
+# after sudo to prevent desktop-wide functionality in the new user's kded).
+#
+# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number.
+# Note that this didn't exist in KDE3, which can be detected by its absense and
+# the presence of KDE_FULL_SESSION.
+#
+KDE_FULL_SESSION=true
+export KDE_FULL_SESSION
+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+
+KDE_SESSION_VERSION=5
+export KDE_SESSION_VERSION
+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+
+KDE_SESSION_UID=`id -ru`
+export KDE_SESSION_UID
+
+XDG_CURRENT_DESKTOP=KDE
+export XDG_CURRENT_DESKTOP
+
+# At this point all the environment is ready, let's send it to kwalletd if running
+if test -n "$PAM_KWALLET_LOGIN" ; then
+    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+fi
+
+# At this point all environment variables are set, let's send it to the DBus
+# session server to update the activation environment
+@plasmaWorkspace@/lib/libexec/ksyncdbusenv
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not sync environment to dbus.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
+  exit 1
+fi
+
+# We set LD_BIND_NOW to increase the efficiency of kdeinit.
+# kdeinit unsets this variable before loading applications.
+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not start kdeinit5.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5."
+  exit 1
+fi
+
+# (NixOS) We run kbuildsycoca5 before starting the user session because things
+# may be missing or moved if they have run nixos-rebuild and it may not be
+# possible for them to start Konsole to run it manually!
+@kservice@/bin/kbuildsycoca5
+
+# finally, give the session control to the session manager
+# see kdebase/ksmserver for the description of the rest of the startup sequence
+# if the KDEWM environment variable has been set, then it will be used as KDE's
+# window manager instead of kwin.
+# if KDEWM is not set, ksmserver will ensure kwin is started.
+# kwrapper5 is used to reduce startup time and memory usage
+# kwrapper5 does not return useful error codes such as the exit code of ksmserver.
+# We only check for 255 which means that the ksmserver process could not be
+# started, any problems thereafter, e.g. ksmserver failing to initialize,
+# will remain undetected.
+test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+# If the session should be locked from the start (locked autologin),
+# lock now and do the rest of the KDE startup underneath the locker.
+KSMSERVEROPTIONS=""
+test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+@kinit@/bin/kwrapper5 @plasmaWorkspace@/bin/ksmserver $KDEWM $KSMSERVEROPTIONS
+if test $? -eq 255; then
+  # Startup error
+  echo 'startkde: Could not start ksmserver.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver."
+fi
+
+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+
+if test x"$wait_drkonqi"x = x"true"x ; then
+    # wait for remaining drkonqi instances with timeout (in seconds)
+    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+    wait_drkonqi_counter=0
+    while @qt5@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+        sleep 5
+        wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+        if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+            # ask remaining drkonqis to die in a graceful way
+            @qt5@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
+                @qt5@/bin/qdbus "$address" "/MainApplication" "quit"
+            done
+            break
+        fi
+    done
+fi
+
+echo 'startkde: Shutting down...'  1>&2
+# just in case
+test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+
+# Clean up
+@kinit@/bin/kdeinit5_shutdown
+
+echo 'startkde: Running shutdown scripts...'  1>&2
+
+# Run scripts found in <config locations>/plasma-workspace/shutdown
+for prefix in `echo "$scriptpath"`; do
+  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
+    test -x "$prefix$file" && "$prefix$file"
+  done
+done
+
+unset KDE_FULL_SESSION
+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
+unset KDE_SESSION_VERSION
+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
+unset KDE_SESSION_UID
+
+echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys b/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys
new file mode 100644
index 00000000000..0fc92cff8a5
--- /dev/null
+++ b/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys
@@ -0,0 +1,5 @@
+kcminputrc Mouse cursorTheme 'breeze_cursors'
+kcminputrc Mouse cursorSize ''
+ksplashrc KSplash Theme Breeze
+ksplashrc KSplash Engine KSplashQML
+kcmfonts General forceFontDPI 0
diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix
deleted file mode 100644
index b9a92d9a96f..00000000000
--- a/pkgs/development/compilers/cryptol/1.8.x.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{ stdenv, requireFile, gmp4, ncurses, zlib, clang_33, makeWrapper }:
-
-assert stdenv.isLinux;
-
-let
-  name    = "cryptol-${version}-${rev}";
-  version = "1.8.27";
-  rev     = "1";
-  lss-ver = "lss-0.2d";
-  jss-ver = "jss-0.4";
-
-  libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.libc
-      stdenv.cc.cc
-      gmp4
-      ncurses
-      zlib
-    ] + ":${stdenv.cc.cc}/lib64";
-
-  cryptol-bin =
-    if stdenv.system == "i686-linux"
-    then requireFile {
-      url    = "http://cryptol.net";
-      name   = "${name}-i386-centos6-linux.tar.gz";
-      sha256 = "131jkj3nh29rwwq5w5sfdf5jrb3c7ayjp4709v1zh84q4d6b35nf";
-    }
-    else requireFile {
-      url    = "http://cryptol.net";
-      name   = "${name}-x86_64-centos6-linux.tar.gz";
-      sha256 = "1dmkns8s6r2d6pvh176w8k3891frik6hmcr2ibghk4l6qr6gwarx";
-    };
-
-  lss-bin =
-    if stdenv.system == "i686-linux"
-    then requireFile {
-      url    = "http://cryptol.net";
-      name   = "${lss-ver}-centos6-32.tar.gz";
-      sha256 = "015ssw3v523wwzkma0qbpj3jnyzckab5q00ypdz0gr3kjcxn5rxg";
-    }
-    else requireFile {
-      url    = "http://cryptol.net";
-      name   = "${lss-ver}-centos6-64.tar.gz";
-      sha256 = "1zjy4xi8v3m6g8ydm9q6dgzg5xn0xc3a4zsll5plbhngprgwxcxm";
-    };
-
-  jss-bin =
-    if stdenv.system == "i686-linux"
-    then requireFile {
-      url    = "http://cryptol.net";
-      name   = "${jss-ver}-centos5-32.tar.gz";
-      sha256 = "1rlj14fbh9k3yvals8jsarczwl51fh6zjaic0pnhpc9s4p0pnjbr";
-    }
-    else requireFile {
-      url    = "http://cryptol.net";
-      name   = "${jss-ver}-centos5-64.tar.gz";
-      sha256 = "0smarm2pi3jz4c8jas9gwcbghc6vc375vrwxbdj1mqx4awlhnz1n";
-    };
-
-in
-stdenv.mkDerivation rec {
-  inherit name version cryptol-bin jss-bin lss-bin;
-
-  src = [ cryptol-bin lss-bin jss-bin ];
-  buildInputs = [ makeWrapper ];
-
-  unpackPhase = ''
-    tar xf ${cryptol-bin}
-    tar xf ${lss-bin}
-    tar xf ${jss-bin}
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share $out/libexec
-
-    # Move Cryptol
-    mv cryptol-${version}/bin $out
-    mv cryptol-${version}/lib $out
-    mv cryptol-${version}/man $out/share
-    rm -f $out/bin/cryptol-2
-
-    # Move JSS
-    # Create a wrapper for jss to keep the .jar out of the way
-    mv ${jss-ver}/bin/jss $out/libexec
-    mv ${jss-ver}/bin/galois.jar $out/libexec
-    makeWrapper $out/libexec/jss $out/bin/jss --run "cd $out/libexec"
-    mv ${jss-ver}/doc/jss.1 $out/share/man/man1
-
-    # Move LSS
-    mv ${lss-ver}/bin/lss $out/bin
-    mv ${lss-ver}/sym-api $out/include
-
-    # Create a convenient 'lss-clang' wrapper pointing to a valid Clang verison
-    ln -s ${clang_33}/bin/clang $out/bin/lss-clang
-
-    # Hack around lack of libtinfo in NixOS
-    ln -s ${ncurses}/lib/libncursesw.so.5.9 $out/lib/libtinfo.so.5
-    ln -s ${stdenv.cc.libc}/lib/libpthread-2.19.so $out/lib/libpthread.so.0
-  '';
-
-  fixupPhase = ''
-    for x in bin/cryptol bin/edif2verilog bin/copy-iverilog bin/symbolic_netlist bin/jaig bin/vvp-galois bin/lss libexec/jss; do
-      patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "$out/lib:${libPath}" $out/$x
-      patchelf --shrink-rpath $out/$x
-    done
-  '';
-
-  phases = "unpackPhase installPhase fixupPhase";
-
-  meta = {
-    description = "Cryptol: The Language of Cryptography";
-    homepage    = "https://cryptol.net";
-    license     = stdenv.lib.licenses.unfree;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-    hydraPlatforms = stdenv.lib.platforms.none;
-    broken = true;
-  };
-}
diff --git a/pkgs/development/compilers/cryptol/2.0.x.nix b/pkgs/development/compilers/cryptol/2.0.x.nix
deleted file mode 100644
index 753dfb4f318..00000000000
--- a/pkgs/development/compilers/cryptol/2.0.x.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ cabal, cabalInstall, Cabal, alex, ansiTerminal, deepseq, executablePath
-, filepath, graphSCC, happy, haskeline, monadLib, mtl, presburger, QuickCheck
-, random, smtLib, syb, text, transformers, utf8String, process, fetchgit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cryptol";
-  version = "2.0.0";
-  src = fetchgit {
-    url    = "https://github.com/GaloisInc/cryptol.git";
-    rev    = "refs/tags/v2.0.0";
-    sha256 = "6af3499d7c6f034446f6665660f7a66dd592e81281e34b0cee3e55bc03597e6b";
-  };
-  isLibrary = true;
-  isExecutable = true;
-
-  patches = [ ./fix-gitrev.patch ];
-  buildDepends = [
-    ansiTerminal deepseq executablePath filepath graphSCC haskeline
-    monadLib mtl presburger QuickCheck random smtLib syb text
-    transformers utf8String process Cabal
-  ];
-  buildTools = [ alex happy cabalInstall ];
-  meta = {
-    description = "Cryptol: The Language of Cryptography";
-    homepage    = "https://cryptol.net";
-    license     = self.stdenv.lib.licenses.bsd3;
-    platforms   = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.thoughtpolice ];
-  };
-})
diff --git a/pkgs/development/compilers/cryptol/fix-gitrev.patch b/pkgs/development/compilers/cryptol/fix-gitrev.patch
deleted file mode 100644
index ab9a789baf2..00000000000
--- a/pkgs/development/compilers/cryptol/fix-gitrev.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3ceec293f8e68314d872909b7de1d4a2c3ecba49 Mon Sep 17 00:00:00 2001
-From: Austin Seipp <aseipp@pobox.com>
-Date: Fri, 25 Apr 2014 00:24:39 -0500
-Subject: [PATCH] Add GitRev.hs to signify v2.0.0 release
-
-Signed-off-by: Austin Seipp <aseipp@pobox.com>
----
- cryptol.cabal |  2 +-
- src/GitRev.hs | 10 ++++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
- create mode 100644 src/GitRev.hs
-
-diff --git a/cryptol.cabal b/cryptol.cabal
-index 2ba6e56..9acd1ef 100644
---- a/cryptol.cabal
-+++ b/cryptol.cabal
-@@ -6,7 +6,7 @@ Author:              Galois, Inc.
- Maintainer:          cryptol@galois.com
- Copyright:           2013-2014 Galois Inc.
- Category:            Language
--Build-type:          Configure
-+Build-type:          Simple
- Cabal-version:       >= 1.18
- 
- data-files:          lib/Cryptol.cry
-diff --git a/src/GitRev.hs b/src/GitRev.hs
-new file mode 100644
-index 0000000..1c767dc
---- /dev/null
-+++ b/src/GitRev.hs
-@@ -0,0 +1,10 @@
-+module GitRev (hash, branch, dirty) where
-+
-+hash :: String
-+hash = "bd578915eaba8c56fadc29fe30f5dcd212c63374"
-+
-+branch :: String
-+branch = "Unknown"
-+
-+dirty :: Bool
-+dirty = False
--- 
-1.8.3.2
-
diff --git a/pkgs/development/compilers/elm/0001-remove-custom-build-step.patch b/pkgs/development/compilers/elm/0001-remove-custom-build-step.patch
deleted file mode 100644
index e229a0c239e..00000000000
--- a/pkgs/development/compilers/elm/0001-remove-custom-build-step.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a164f7a2b662831ba26f5cebce23f97f1b5afccd Mon Sep 17 00:00:00 2001
-From: Tom Hunger <tehunger@gmail.com>
-Date: Thu, 8 Jan 2015 14:07:17 +0000
-Subject: [PATCH] remove-custom-build-step
-
----
- Setup.hs | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/Setup.hs b/Setup.hs
-index 6f80fd8..a45ffc1 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -19,8 +19,6 @@ main =
- myPostBuild :: Args -> BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()
- myPostBuild args flags pd lbi =
-   do  putStrLn "Custom build step: compiling debuggerInterface.elm"
--      buildInterface
--      concatJS lbi
-       postBuild simpleUserHooks args flags pd lbi
- 
- 
--- 
-1.9.4
-
diff --git a/pkgs/development/compilers/elm/elm-compiler.nix b/pkgs/development/compilers/elm/elm-compiler.nix
index f686abbf353..87a0b660d2a 100644
--- a/pkgs/development/compilers/elm/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/elm-compiler.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "elm-compiler";
-  version = "0.14";
-  sha256 = "1vgbs3navs6dr36k408kc83gkn2ndhmc0b1015zk3jb0wkmvm73y";
+  version = "0.14.1";
+  sha256 = "0my04mipgia5qw02nzzrzc4kq3vl7bv75rzrsmd2bdb2wll1k94f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/compilers/elm/elm-make.nix b/pkgs/development/compilers/elm/elm-make.nix
index ff5646ddd06..f9693ab2d94 100644
--- a/pkgs/development/compilers/elm/elm-make.nix
+++ b/pkgs/development/compilers/elm/elm-make.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "elm-make";
-  version = "0.1";
-  sha256 = "1hrc8bzfqzrcmkzqcampxkn5m113blfp4095h6c2xnadiicbvwdy";
+  version = "0.1.1";
+  sha256 = "02mqr6v146piwrhycnmlxnky5bmsl7ap7781qmcwkfmc89wfa4zl";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/compilers/elm/elm-package.nix b/pkgs/development/compilers/elm/elm-package.nix
index 3cf2ded8ff5..4bcc4339b68 100644
--- a/pkgs/development/compilers/elm/elm-package.nix
+++ b/pkgs/development/compilers/elm/elm-package.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "elm-package";
-  version = "0.2.2";
-  sha256 = "0hkcy1mix2rng2k2zhzgb16nd0asfj9rm9ya2by67vjysiz8cmnr";
+  version = "0.4";
+  sha256 = "0vsq87imyvs1sa2n4z41b6qswy2cknxsg4prhwc9r7lvyljkmn03";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json b/pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json
new file mode 100644
index 00000000000..e9e2a77bc8b
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json
@@ -0,0 +1,6 @@
+{
+    "evancz/virtual-dom": "1.1.0",
+    "evancz/elm-markdown": "1.1.2",
+    "evancz/elm-html": "1.1.0",
+    "elm-lang/core": "1.1.0"
+}
\ No newline at end of file
diff --git a/pkgs/development/compilers/elm/elm-reactor.nix b/pkgs/development/compilers/elm/elm-reactor.nix
index 2c3da88d8bd..00efef6c1fe 100644
--- a/pkgs/development/compilers/elm/elm-reactor.nix
+++ b/pkgs/development/compilers/elm/elm-reactor.nix
@@ -1,16 +1,59 @@
-{ cabal, blazeHtml, blazeMarkup, cmdargs, elmCompiler, elmMake, filepath
+{ unzip, fetchurl, fetchFromGitHub, cabal, blazeHtml, blazeMarkup, cmdargs, elmCompiler, elmMake, filepath
 , fsnotify, HTTP, mtl, snapCore, snapServer, systemFilepath, text
 , time, transformers, unorderedContainers, websockets
 , websocketsSnap
 }:
 
-cabal.mkDerivation (self: {
+cabal.mkDerivation (self: rec {
   pname = "elm-reactor";
-  version = "0.2.0.1";
-  sha256 = "1qnrxr3wayhw92w6lghchz8avxbxg00w7p6d1vs7mq9q56876jgj";
+  version = "0.3";
   isLibrary = false;
   isExecutable = true;
-  patches = [ ./0001-remove-custom-build-step.patch ];
+  buildTools = [ unzip ];
+
+  src = fetchFromGitHub {
+    owner = "elm-lang";
+	repo = "elm-reactor";
+	rev = "176ff8e05e4bb7474752da1b3455c83d6181d594";
+	sha256 = "1marjqlmmq3a74g9f3ngk90h9mkhillcdwfsys6x0nqj6qirw4ph";
+  };
+  elmLangCore = fetchurl {
+    url = "https://github.com/elm-lang/core/archive/1.1.0.zip";
+    sha256 = "1fhvghjsay1p82k13039wbd02k439yplv2rh9zr77zvcbih6a31j";
+  };
+  elmHtml = fetchurl {
+	url = "https://github.com/evancz/elm-html/archive/1.1.0.zip";
+    sha256 = "01wshabxsdrxcxs2nn3dhk7n8720sp3prpkahhx36vvprdh05l4q";
+  };
+  elmMarkdown = fetchurl {
+	url = "https://github.com/evancz/elm-markdown/archive/1.1.2.zip";
+	sha256 = "14y1wp28za50zypdzyvl5d57hkm0v3rgnzm5klv3jcbd625kr9bg";
+  };
+  virtualDom = fetchurl {
+	url = "https://github.com/evancz/virtual-dom/archive/1.1.0.zip";
+	sha256 = "08dr7q0x1ycgj5b15s2kn1a45iw350gzq65c3lxp47xfffq1vz91";
+  };
+  elmStuff = ./elm-reactor-exact-dependencies.json;
+
+  preConfigure = ''
+	unzip -d $TEMPDIR -q ${elmLangCore}
+	mkdir -p elm-stuff/packages/elm-lang/core/1.1.0
+	cp -pr $TEMPDIR/core-1.1.0/* elm-stuff/packages/elm-lang/core/1.1.0/
+
+	unzip -d $TEMPDIR -q ${elmHtml}
+	mkdir -p elm-stuff/packages/evancz/elm-html/1.1.0
+	cp -pr $TEMPDIR/elm-html-1.1.0/* elm-stuff/packages/evancz/elm-html/1.1.0
+
+	unzip -d $TEMPDIR -q ${elmMarkdown}
+	mkdir -p elm-stuff/packages/evancz/elm-markdown/1.1.2
+	cp -pr $TEMPDIR/elm-markdown-1.1.2/* elm-stuff/packages/evancz/elm-markdown/1.1.2
+
+	unzip -d $TEMPDIR -q ${virtualDom}
+	mkdir -p elm-stuff/packages/evancz/virtual-dom/1.1.0
+	cp -pr $TEMPDIR/virtual-dom-1.1.0/* elm-stuff/packages/evancz/virtual-dom/1.1.0
+
+    cp ${elmStuff} elm-stuff/exact-dependencies.json
+  '';
   buildDepends = [
     blazeHtml blazeMarkup cmdargs elmCompiler filepath fsnotify HTTP
     mtl snapCore snapServer systemFilepath text time transformers
@@ -21,6 +64,5 @@ cabal.mkDerivation (self: {
     description = "Interactive development tool for Elm programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-#    broken = true;
   };
 })
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 179c70a5f47..f1161dd4dd1 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fsharp-${version}";
-  version = "3.1.1.26";
+  version = "3.1.1.31";
 
   src = fetchurl {
     url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
-    sha256 = "1yz3cq8ys6ryc6x3a0qyc100swrg2q3az8x8in1lp7c2c0l02zb2";
+    sha256 = "1c38jpisnh8slqaaw1bsccxgllpc6yivrpb86raw4xalcbsc6fcv";
   };
 
   buildInputs = [ mono pkgconfig autoconf automake which ];
diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix
index f09de480c5d..be838b41222 100644
--- a/pkgs/development/compilers/ghc/7.10.1.nix
+++ b/pkgs/development/compilers/ghc/7.10.1.nix
@@ -13,12 +13,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.10.0.20141222";
+  version = "7.10.0.20140123";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/7.10.1-rc1/ghc-7.10.0.20141222-src.tar.xz";
-    sha256 = "0nncvvwksqqz1d991jbag3b4174i275nn0psadriq5hi3px11dkl";
+    url = "https://downloads.haskell.org/~ghc/7.10.1-rc2/ghc-7.10.0.20150123-src.tar.xz";
+    sha256 = "0in5zsr2z545yln55c7mwi07x3za0874yxbpsj5xsb4vn3wrcrbn";
   };
 
   buildInputs = [ ghc perl ];
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index b1437da0e73..45fd8e117b2 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -6,8 +6,8 @@ let
   loaderArm = "${glibc}/lib/ld-linux.so.3";
   srcs = {
     golang = fetchurl {
-      url = https://storage.googleapis.com/golang/go1.4.src.tar.gz;
-      sha1 = "6a7d9bd90550ae1e164d7803b3e945dc8309252b";
+      url = https://github.com/golang/go/archive/go1.4.1.tar.gz;
+      sha256 = "1q21i08nymy30vszbcah8l8yjxm32x2wmjs44kn2x2r4556y1mgi";
     };
     tools = fetchgit {
       url = https://github.com/golang/tools.git;
@@ -18,7 +18,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.4";
+  name = "go-1.4.1";
 
   src = srcs.golang;
 
@@ -31,10 +31,6 @@ stdenv.mkDerivation {
     mkdir -p $out/share
     cd $out/share
   '';
-  postUnpack = ''
-    mkdir -p $out/share/go/src/golang.org/x
-    cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/golang.org/x/tools
-  '';
 
   prePatch = ''
     # Ensure that the source directory is named go
@@ -42,6 +38,10 @@ stdenv.mkDerivation {
     if [ ! -d go ]; then
       mv * go
     fi
+
+    mkdir -p $out/share/go/src/golang.org/x
+    cp -r --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/golang.org/x/tools
+
     cd go
     patchShebangs ./ # replace /bin/bash
 
diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix
index 2be55870ea7..12cd498042c 100644
--- a/pkgs/development/compilers/icedtea/sources.nix
+++ b/pkgs/development/compilers/icedtea/sources.nix
@@ -1,47 +1,47 @@
 # This file is autogenerated from update.py in the same directory.
 {
   icedtea7 = rec {
-    version = "2.5.3";
+    version = "2.5.4";
 
     url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz";
-    sha256 = "1w7i6j4wmg2ixv7d24mad6gphspnkb9w30azjdp4jqn2zqn95wpl";
+    sha256 = "1npz2p11i4xy4732rxs8wv209iap0m3m24w3vkh9kj0p4k2gal0v";
 
     common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}";
 
     bundles = {
       openjdk = rec {
         url = "${common_url}/openjdk.tar.bz2";
-        sha256 = "3ba1a30762f5d5890e8ee6af11f52213ab9c574c01f07c75a081c42034f5d5c9";
+        sha256 = "88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1";
       };
 
       corba = rec {
         url = "${common_url}/corba.tar.bz2";
-        sha256 = "8ceb2cd60782b7fc14b88e3d366f273873fa5436cf0e36b86406c0905b7dc43c";
+        sha256 = "7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b";
       };
 
       jaxp = rec {
         url = "${common_url}/jaxp.tar.bz2";
-        sha256 = "2d13a82078f3f2b8831d1e670e5e75719336a56490df64f16ab7647674a272ef";
+        sha256 = "84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3";
       };
 
       jaxws = rec {
         url = "${common_url}/jaxws.tar.bz2";
-        sha256 = "5a63d85307203f1aed1e31459ad5e32687909e0640d424ff6f540d9b1cceeb1e";
+        sha256 = "4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b";
       };
 
       jdk = rec {
         url = "${common_url}/jdk.tar.bz2";
-        sha256 = "40c4dda969be0ecd213e79269184e19cfc32100b83777dc529b3cf4b6aa3e12f";
+        sha256 = "e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09";
       };
 
       langtools = rec {
         url = "${common_url}/langtools.tar.bz2";
-        sha256 = "516f6c21719f4b5a2092847c147cde7890c5a30d4aed9425ff667c0164ef1dd0";
+        sha256 = "4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a";
       };
 
       hotspot = rec {
         url = "${common_url}/hotspot.tar.bz2";
-        sha256 = "8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28";
+        sha256 = "4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34";
       };
     };
   };
diff --git a/pkgs/development/compilers/julia/0.2.1.nix b/pkgs/development/compilers/julia/0.2.nix
index cc1be3db8a5..cc1be3db8a5 100644
--- a/pkgs/development/compilers/julia/0.2.1.nix
+++ b/pkgs/development/compilers/julia/0.2.nix
diff --git a/pkgs/development/compilers/julia/0.3.5.nix b/pkgs/development/compilers/julia/0.3.nix
index 62fe9844c69..fe685dae747 100644
--- a/pkgs/development/compilers/julia/0.3.5.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -140,6 +140,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = true;
+  checkTarget = "testall";
+
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "http://julialang.org/";
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index e098f48a24c..8137b2a3ab3 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -6,10 +6,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mono-${version}";
-  version = "3.2.8";
+  version = "3.8.0";
   src = fetchurl {
     url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
-    sha256 = "0h0s42pmgrhwqaym0b1401h70dcpr179ngcsp7f8i4hl4snqrd7x";
+    sha256 = "0jraxsjn7ra6z02n4wjpbj21mxm2w50iqviqvfl0ajikbxahvf3i";
   };
 
   buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
   #http://www.mono-project.com/Config_DllMap
   postBuild = ''
     find . -name 'config' -type f | while read i; do
-        sed -i "s@libMonoPosixHelper.so@$out/lib/libMonoPosixHelper.so@g" $i
         sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i
         sed -i "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" $i
     done
diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch b/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch
new file mode 100644
index 00000000000..2ff0fcc3d41
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch
@@ -0,0 +1,14 @@
+diff -Naur openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
+--- openjdk-7u65-b32-upstream/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java	2014-07-17 05:42:14.000000000 -0430
++++ openjdk-7u65-b32/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java	2014-12-30 10:15:50.327905933 -0430
+@@ -281,8 +281,8 @@
+             checkCurrencyCode(newCurrency);
+             String timeString = currencyInfo.substring(4, length - 4);
+             long time = format.parse(timeString).getTime();
+-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+-                throw new RuntimeException("time is more than 10 years from present: " + time);
++            if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
++                throw new RuntimeException("time is more than 20 years from present: " + time);
+             }
+             specialCaseCutOverTimes[specialCaseCount] = time;
+             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
new file mode 100644
index 00000000000..98bf5bbad2c
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -0,0 +1,142 @@
+{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl } :
+let
+  update = "25";
+  build = "18";
+  baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
+  repover = "jdk8u${update}-b${build}";
+  paxflags = if stdenv.isi686 then "msp" else "m";
+  jdk8 = fetchurl {
+             url = "${baseurl}/archive/${repover}.tar.gz";
+             sha256 = "90eb3f3cb7094e609686168ec52ba462ef0f9832a4264bd1575e5896a6dd85c3";
+          };
+  langtools = fetchurl {
+             url = "${baseurl}/langtools/archive/${repover}.tar.gz";
+             sha256 = "f292afe8540436090489841771259b274e3c36d42f11d0f58ba8082cd24fcc66";
+          };
+  hotspot = fetchurl {
+             url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
+             sha256 = "e574567b48f57c5cdeebae6fa22e2482c05446dbf9133e820f2d95e99459ddf2";
+          };
+  corba = fetchurl {
+             url = "${baseurl}/corba/archive/${repover}.tar.gz";
+             sha256 = "61d0bba710d6803b0368c93bc9182b0b40348eed81d578886a03904baf61ba6f";
+          };
+  jdk = fetchurl {
+             url = "${baseurl}/jdk/archive/${repover}.tar.gz";
+             sha256 = "8ef05535a0e03c4262d55cc67887e884f3fda8e4872cbc2941dcb216ef1460ca";
+          };
+  jaxws = fetchurl {
+             url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
+             sha256 = "afbdf119af2ffc0f9cd6eb93e6dac8e6a56a4ed4b68c7ff07f9b0c1a6bd56a8f";
+          };
+  jaxp = fetchurl {
+             url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
+             sha256 = "2e91c958024e6b64f7484b8225e07edce3bd3bcde43081fb73f32e4b73ef7b87";
+          };
+  nashorn = fetchurl {
+             url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
+             sha256 = "98b4fc2d448920b81404ce745d9c00e9a33b58e123176dec4074caf611c3f9c2";
+          };
+in
+stdenv.mkDerivation {
+  name = "openjdk-8u${update}b${build}";
+  srcs = [jdk8 langtools hotspot corba jdk jaxws jaxp nashorn];
+  outputs = [ "out" "jre" ];
+  buildInputs = [ cpio file which unzip zip
+                  xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
+                  xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
+                  cups freetype alsaLib openjdk perl ];
+  setSourceRoot = ''
+    sourceRoot="jdk8u-jdk8u${update}-b${build}";
+  '';
+  prePatch = ''
+    # despite --with-override-jdk the build still searchs here
+    ln -s "../jdk-${repover}" "jdk";
+    ln -s "../hotspot-${repover}" "hotspot";
+  '';
+  patches = [
+    ./fix-java-home.patch
+    ./read-truststore-from-env-jdk8.patch
+    ./currency-date-range-jdk8.patch
+  ];
+  preConfigure = ''
+    chmod +x configure
+    substituteInPlace configure --replace /bin/bash "$shell"
+    substituteInPlace ../hotspot-${repover}/make/linux/adlc_updater --replace /bin/sh "$shell"
+  '';
+  configureFlags = [
+    "--with-freetype=${freetype}"
+    "--with-override-langtools=../langtools-${repover}"
+    "--with-override-hotspot=../hotspot-${repover}"
+    "--with-override-corba=../corba-${repover}"
+    "--with-override-jdk=../jdk-${repover}"
+    "--with-override-jaxws=../jaxws-${repover}"
+    "--with-override-jaxp=../jaxp-${repover}"
+    "--with-override-nashorn=../nashorn-${repover}"
+    "--with-boot-jdk=${openjdk}/lib/openjdk/"
+    "--with-update-version=${update}"
+    "--with-build-number=b${build}"
+    "--with-milestone=fcs"
+  ];
+  buildFlags = "all";
+  installPhase = ''
+    mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+
+    cp -av build/*/images/j2sdk-image/* $out/lib/openjdk
+
+    # Move some stuff to top-level.
+    mv $out/lib/openjdk/include $out/include
+    mv $out/lib/openjdk/man $out/share/man
+
+    # jni.h expects jni_md.h to be in the header search path.
+    ln -s $out/include/linux/*_md.h $out/include/
+
+    # Remove some broken manpages.
+    rm -rf $out/share/man/ja*
+
+    # Remove crap from the installation.
+    rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
+
+    # Move the JRE to a separate output.
+    mv $out/lib/openjdk/jre $jre/lib/openjdk/
+    mkdir $out/lib/openjdk/jre
+    lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+
+    rm -rf $out/lib/openjdk/jre/bina
+    ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
+
+    # Set PaX markings
+    exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+    echo "to mark: *$exes*"
+    for file in $exes; do
+      echo "marking *$file*"
+      paxmark ${paxflags} "$file"
+    done
+
+    # Remove duplicate binaries.
+    for i in $(cd $out/lib/openjdk/bin && echo *); do
+      if [ "$i" = java ]; then continue; fi
+      if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
+        ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
+      fi
+    done
+
+    # Generate certificates.
+    pushd $jre/lib/openjdk/jre/lib/security
+    rm cacerts
+    perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt
+    popd
+
+    ln -s $out/lib/openjdk/bin $out/bin
+    ln -s $jre/lib/openjdk/jre/bin $jre/bin
+  '';
+
+  meta = {
+    homepage = http://openjdk.java.net/;
+    license = stdenv.lib.licenses.gpl2;
+    description = "The open-source Java Development Kit";
+    maintainers = [ stdenv.lib.maintainers.cocreature ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
new file mode 100644
index 00000000000..4902b8e8401
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
@@ -0,0 +1,21 @@
+diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+--- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2014-07-17 12:12:14.000000000 +0200
++++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2014-12-09 13:31:27.821960372 +0100
+@@ -161,6 +161,7 @@
+         /*
+          * Try:
+          *      javax.net.ssl.trustStore  (if this variable exists, stop)
++         *      system environment variable JAVAX_NET_SSL_TRUSTSTORE
+          *      jssecacerts
+          *      cacerts
+          *
+@@ -169,6 +169,9 @@
+ 
+         try {
+             storeFileName = props.get("trustStore");
++            if (storeFileName == null) {
++                storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
++            }
+             if (!"NONE".equals(storeFileName)) {
+                 if (storeFileName != null) {
+                     storeFile = new File(storeFileName);
diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
index 9ba8eaea062..eb40cff689a 100644
--- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "7";
-  patchVersion = "71";
+  patchVersion = "75";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-  sha256_i686 = "d3c09a35abc0464d8ad70dfe17e02597eb4c5d489ff4d1bcd14088aeb5016424";
-  sha256_x86_64 = "80d5705fc37fc4eabe3cea480e0530ae0436c2c086eb8fc6f65bb21e8594baf8";
+  sha256_i686 = "173ppi5d90hllqgys90wlv596bpj2iw8gsbsr6pk7xvd4l1wdhrw";
+  sha256_x86_64 = "040n50nglr6rcli2pz5rd503c2qqdqqbqynp6hzc4kakkchmj2a6";
   jceName = "UnlimitedJCEPolicyJDK7.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
   sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
diff --git a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
index 8b71cb66610..929ff59717d 100644
--- a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "7";
-  patchVersion = "72";
+  patchVersion = "76";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-  sha256_i686 = "0376c8a0280752b4389b6cb193d463826c55c821587d0278b7fea665a140f407";
-  sha256_x86_64 = "dd1d438e1b7d4b9bb5ea4659f2103b577d1568da51b53f97b736b3232eeade8e";
+  sha256_i686 = "0558p5garc4b5g7h11dkzn161kpk84az5ad1q5hhsblbx02aqff3";
+  sha256_x86_64 = "130ckrv846amyfzbnnd6skljkznc457yky7d6ajaw5ndsbzg93yf";
   jceName = "UnlimitedJCEPolicyJDK7.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
   sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index f51cca0c478..fbb6ae30f51 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "25";
+  patchVersion = "31";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "17f396a541db09c732032185f10f9c6eb42ac7b5776814602342de9655b2e0e2";
-  sha256_x86_64 = "057f660799be2307d2eefa694da9d3fce8e165807948f5bcaa04f72845d2f529";
+  sha256_i686 = "1sr3q9y0cd42cqpf98gsv3hvip0r1vw3d0jh6yml6krzdm96zp8s";
+  sha256_x86_64 = "0dz4k3xds1ydqr77hmrjc1w0niqq3jm3h18nk3ibqr1083l1bq7g";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59";
diff --git a/pkgs/development/compilers/rustc/0.12.nix b/pkgs/development/compilers/rustc/1.0.0-alpha.nix
index dda9be1f128..fa80bcb5e02 100644
--- a/pkgs/development/compilers/rustc/0.12.nix
+++ b/pkgs/development/compilers/rustc/1.0.0-alpha.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}:
+{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper
+, tzdata, git, valgrind, procps, coreutils
+}:
 
 assert !stdenv.isFreeBSD;
 
@@ -16,19 +18,19 @@ assert !stdenv.isFreeBSD;
 
 */
 
-with ((import ./common.nix) {inherit stdenv; version = "0.12.0"; });
+with ((import ./common.nix) {inherit stdenv; version = "1.0.0-alpha"; });
 
 let snapshotHash = if stdenv.system == "i686-linux"
-      then "555aca74f9a268f80cab2df1147dc6406403e9e4"
+      then "d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4"
       else if stdenv.system == "x86_64-linux"
-      then "6a43c2f6c8ba2cbbcb9da1f7b58f748aef99f431"
+      then "697880d3640e981bbbf23284363e8e9a158b588d"
       else if stdenv.system == "i686-darwin"
-      then "331bd7ef519cbb424188c546273e8c7d738f0894"
+      then "a73b1fc03e8cac747aab0aa186292bb4332a7a98"
       else if stdenv.system == "x86_64-darwin"
-      then "2c83a79a9febfe1d326acb17c3af76ba053c6ca9"
+      then "e4ae2670ea4ba5c2e5b4245409c9cab45c9eeb5b"
       else abort "no-snapshot for platform ${stdenv.system}";
-    snapshotDate = "2014-10-04";
-    snapshotRev = "749ff5e";
+    snapshotDate = "2015-01-07";
+    snapshotRev = "9e4e524";
     snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
 
 in stdenv.mkDerivation {
@@ -37,8 +39,8 @@ in stdenv.mkDerivation {
   inherit meta;
 
   src = fetchurl {
-    url = "http://static.rust-lang.org/dist/rust-${version}.tar.gz";
-    sha256 = "1dv9wxh41230zknbwj34zgjnh1kgvvy6k12kbiy9bnch9nr6cgl8";
+    url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
+    sha256 = "0p62gx3s087n09d2v3l9iyfx5cmsa1x91n4ysixcb7w3drr8a8is";
   };
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -63,14 +65,26 @@ in stdenv.mkDerivation {
                 ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
 
   # The compiler requires cc, so we patch the source to tell it where to find it
-  patches = [ ./hardcode_paths.patch ./local_stage0.patch ];
+  patches = [ ./hardcode_paths.patch ./local_stage0.patch ]
+            ++ stdenv.lib.optional stdenv.needsPax ./grsec.patch;
+
   postPatch = ''
-    substituteInPlace src/librustc/back/link.rs \
+    substituteInPlace src/librustc_trans/back/link.rs \
       --subst-var-by "ccPath" "${stdenv.cc}/bin/cc"
     substituteInPlace src/librustc_back/archive.rs \
       --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
+
+    substituteInPlace src/rust-installer/gen-install-script.sh \
+      --replace /bin/echo "${coreutils}/bin/echo"
+    substituteInPlace src/rust-installer/gen-installer.sh \
+      --replace /bin/echo "${coreutils}/bin/echo"
   '';
 
-  buildInputs = [ which file perl curl python27 makeWrapper ];
-  enableParallelBuilding = true;
+  buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ];
+
+  enableParallelBuilding = false; # disabled due to rust-lang/rust#16305
+
+  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
+
+  doCheck = true;
 }
diff --git a/pkgs/development/compilers/rustc/grsec.patch b/pkgs/development/compilers/rustc/grsec.patch
new file mode 100644
index 00000000000..84582ab7d70
--- /dev/null
+++ b/pkgs/development/compilers/rustc/grsec.patch
@@ -0,0 +1,16 @@
+diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
+index 2fcdd32..2d9ddb0 100644
+--- a/src/test/run-make/relocation-model/Makefile
++++ b/src/test/run-make/relocation-model/Makefile
+@@ -5,9 +5,11 @@ all:
+ 	$(call RUN,foo)
+ 
+ 	$(RUSTC) -C relocation-model=default foo.rs
++	paxctl -czexm $(TMPDIR)/foo
+ 	$(call RUN,foo)
+ 
+ 	$(RUSTC) -C relocation-model=static foo.rs
++	paxctl -czexm $(TMPDIR)/foo
+ 	$(call RUN,foo)
+ 
+ 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
index ee258e1d408..2a9cb09dcbd 100644
--- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
+++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
@@ -1,21 +1,21 @@
 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index 0bd4265..bbdab9b 100644
+index 7ea192b..cd5d01b 100644
 --- a/src/librustc_back/archive.rs
 +++ b/src/librustc_back/archive.rs
 @@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
            paths: &[&Path]) -> ProcessOutput {
      let ar = match *maybe_ar_prog {
-         Some(ref ar) => ar[],
+         Some(ref ar) => &ar[],
 -        None => "ar"
 +        None => "@arPath@"
      };
      let mut cmd = Command::new(ar);
  
 diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index ec61d3a..8252939 100644
+index dacf620..815ce60 100644
 --- a/src/librustc_trans/back/link.rs
 +++ b/src/librustc_trans/back/link.rs
-@@ -346,8 +346,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
+@@ -348,8 +348,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
  
  pub fn get_cc_prog(sess: &Session) -> String {
      match sess.opts.cg.linker {
diff --git a/pkgs/development/compilers/rustc/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch
index 8701cd3c982..2a9cb09dcbd 100644
--- a/pkgs/development/compilers/rustc/hardcode_paths.patch
+++ b/pkgs/development/compilers/rustc/hardcode_paths.patch
@@ -1,37 +1,28 @@
-diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
-index 1cc60fc..2e94b99 100644
---- a/src/librustc/back/link.rs
-+++ b/src/librustc/back/link.rs
-@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
- 
- pub fn get_cc_prog(sess: &Session) -> String {
-     match sess.opts.cg.linker {
--        Some(ref linker) => return linker.to_string(),
--        None => {}
-+        Some(ref linker) => linker.to_string(),
-+        None => "@ccPath@".to_string()
-     }
--
--    // In the future, FreeBSD will use clang as default compiler.
--    // It would be flexible to use cc (system's default C compiler)
--    // instead of hard-coded gcc.
--    // For Windows, there is no cc command, so we add a condition to make it use gcc.
--    match sess.targ_cfg.os {
--        abi::OsWindows => "gcc",
--        _ => "cc",
--    }.to_string()
- }
- 
- pub fn remove(sess: &Session, path: &Path) {
 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index 060dda5..fecf76b 100644
+index 7ea192b..cd5d01b 100644
 --- a/src/librustc_back/archive.rs
 +++ b/src/librustc_back/archive.rs
-@@ -53,7 +53,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
+@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
            paths: &[&Path]) -> ProcessOutput {
      let ar = match *maybe_ar_prog {
-         Some(ref ar) => ar.as_slice(),
+         Some(ref ar) => &ar[],
 -        None => "ar"
 +        None => "@arPath@"
      };
      let mut cmd = Command::new(ar);
+ 
+diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
+index dacf620..815ce60 100644
+--- a/src/librustc_trans/back/link.rs
++++ b/src/librustc_trans/back/link.rs
+@@ -348,8 +348,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
+ 
+ pub fn get_cc_prog(sess: &Session) -> String {
+     match sess.opts.cg.linker {
+-        Some(ref linker) => return linker.to_string(),
+-        None => sess.target.target.options.linker.clone(),
++        Some(ref linker) => linker.to_string(),
++        None => "@ccPath@".to_string(),
+     }
+ }
+ 
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 760fcdd851a..dd73449d5fd 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -22,24 +22,24 @@ sure those derivations still compile. (racer, for example).
 
 */
 
-let shortVersion = "0.13-dev";
-    rev = "6539cb417f4a7c2d9d1afce44c196578d2b67f38";
+let shortVersion = "1.0.0-dev";
+    rev = "a833337943300db1c310a4cf9c84b7b4ef4e9468";
     revShort = builtins.substring 0 7 rev;
 in
 
 with ((import ./common.nix) {inherit stdenv; version = "${shortVersion}-g${revShort}"; });
 
 let snapshotHash = if stdenv.system == "i686-linux"
-      then "b880b98d832c9a049b8ef6a50df50061e363de5a"
+      then "0197ad7179d74eba06a8b46432548caf226aa03d"
       else if stdenv.system == "x86_64-linux"
-      then "82a09c162474b69d2d1e4e8399086f3f0f4e31c3"
+      then "03459f8b216e96ed8b9abe25a42a75859195103d"
       else if stdenv.system == "i686-darwin"
-      then "569055bb10d96ab25f78ecf2c80ffbccd5e69b8d"
+      then "b5c004883ddff84159f11a3329cde682e0b7f75b"
       else if stdenv.system == "x86_64-darwin"
-      then "cff1f9ebd63dae6890359b7d353bd9486d8ecdfc"
+      then "b69ea42e1c995682adf0390ed4ef8a762c001a4e"
       else abort "no snapshot for platform ${stdenv.system}";
-    snapshotDate = "2015-01-04";
-    snapshotRev = "b2085d9";
+    snapshotDate = "2015-01-15";
+    snapshotRev = "9ade482";
     snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
 in
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = https://github.com/rust-lang/rust;
     inherit rev;
-    sha256 = "14nc42j46hvlqms77245vil2wplmvci3ramxrmjyjqg0bql1w28m";
+    sha256 = "1b9rnx3j37ckxa3vf20g8amsbffzvk2m9lzv5x1m04ci54w85f56";
   };
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index dea7d3cd6e8..5bab88e9c41 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, readline, gmp, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "6.2.2";
+  version = "6.3.3";
   name = "yap-${version}";
 
   src = fetchurl {
     url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
-    sha256 = "0l6p0vy667wws64cvwf74ssl6h9gypjzrsl3b2d32hs422186pzi";
+    sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
   };
 
   buildInputs = [ readline gmp zlib ];
diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix
deleted file mode 100644
index 5c5681f6010..00000000000
--- a/pkgs/development/coq-modules/containers/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, coq}:
-
-stdenv.mkDerivation {
-
-  name = "coq-containers-${coq.coq-version}";
-
-  src = fetchurl {
-    url = http://coq.inria.fr/pylons/contribs/files/Containers/v8.4/Containers.tar.gz;
-    sha256 = "0z7yk0g7zkniwc73ka7wwb5jjg5a2wr1krrn3akr7kn5z3gvy2mc";
-  };
-
-  buildInputs = [ coq.ocaml coq.camlp5 ];
-  propagatedBuildInputs = [ coq ];
-
-  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
-
-  meta = with stdenv.lib; {
-    homepage = http://coq.inria.fr/pylons/pylons/contribs/view/Containers/v8.4;
-    description = "A typeclass-based Coq library of finite sets/maps";
-    maintainers = with maintainers; [ vbgl jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-}
diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix
new file mode 100644
index 00000000000..fe01fbf5891
--- /dev/null
+++ b/pkgs/development/coq-modules/contribs/all.nix
@@ -0,0 +1,163 @@
+{
+AACTactics = "0v18kf7xjys4g3z8m2sfiyipyn6mz75wxl2zgqk7nv1jr8i03min";
+ABP = "06cn70lbdivn1hxnlsqpiibq9nlwl6dggcn967q6n3nph37m4pdp";
+AILS = "1g0hc27kizrwm6x35j3w721cllfl4rvhiqifn3ljy868mwxwsiva";
+AMM11262 = "15rxr5bzyswxfznml4vij3pflqm3v2bl1xzg9m1p5gmd0385zh6l";
+ATBR = "1xfhc70m9qm51gwi7cls8znx37y5cp1m0wak1h0r51g1d2lxr7a6";
+Additions = "0bhl1wqbqigq0m6zj1yhdm5j0rsn75xy510kz9qy4dv5277wc7ab";
+Algebra = "061szlbg5zh5h0ksgmw34hqrvqy6794p3r1ijg0xi8mqa2wpbjd8";
+Angles = "1grqx88mibz4lg7k9ba89vpg4kwrm3s87wy0ls39i3d3wgx18n97";
+AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531";
+Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm";
+AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b";
+BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy";
+Bertrand = "1ih0zbk3phk0zwms0mwkcikmki25hgbp1l980gpydj5a0s9ildyg";
+Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94";
+CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97";
+CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m";
+CTLTCTL = "0il1hhizvd2zvh2bhjaa2f43q1qz5sjfdin00yx5l1a8867wjs05";
+CanonBDDs = "1l9yqj0dfqkq49acsy17cvz4rjj86wjbhsdbr4qw2qvn4shllc23";
+Cantor = "1ys81ivigsbsg5cfx9jvm0qprdwc3jm69xm3whq5v9b6skn958yp";
+CatsInZFC = "06rkhns5gz397mafxina52h9z35r0n5bpryk5yfja0kfiyjvp4cr";
+Checker = "0hvfmpy3w4jj4zi3bm9q2yy4361q0lg0znqa22n5l7hzvi28q796";
+Chinese = "191c1bcslxrjxcxvpcz0mzklrl1cwh0lzkd2nq5m0ch3vxar6rq4";
+Circuits = "1a091g5vvmg579mmbfbvhj0scv7zw4n5brmj8dmiwfayfscdh5vg";
+ClassicalRealizability = "1zgivy679rl3ay9mf5ahs0lzrwfg19pcmz5nqm9hq0dpfn9avd6a";
+CoLoR = "05x1drvvhrspj2wzh8v1abblmb9fxy0yx6gg9y4nldkc24widjr7";
+CoRN = "1wv8y67bm2072bd6i3gbvy4sc665sci5kzd1zwv9n2ffxzhy0l5j";
+Coalgebras = "1wzwadfii9mm11bifjbg6f23qbab1ix3valysgq2b4myxlnpwdfz";
+CoinductiveExamples = "1iw6jsxvshsmn52xac3dspkw8f95214f0dcx0y6gi13ln02h8njy";
+CoinductiveReals = "149nsygwlb80s2805qgn85a6mcp7rxifbicbr84l3nyzilfyr6lk";
+ConCaT = "0537r0lamfz657llarxjl030qw29dnya7rb73kx0bdbyphxszr71";
+ConstructiveGeometry = "0cfz64yciyma6jrskc37md4mnv2vbx9hw7y69vyxzy7xdax55j64";
+Containers = "07pjbnzhh418ypppvfkls2x0ycslgl274a913xwi3rb1wrg6q84g";
+Continuations = "0l35xl9kvmq8l9gx3rmcx11p22inw76m1s18y0dnhc6qnhhkq1qg";
+CoqInCoq = "0d5m71xq66rfaa6xr51bsv9hykzfv4dwpclxpnqc7a7ss1q9ccqz";
+Coqoban = "1xp6wblg31asbqbkvbha94lbzn6xnhl0v5y0f3qh4nbmv6hslc54";
+Counting = "150la62c1j4yg8myr7nrp1qwp4z15rfg788j9vraz5q6f2n8c8ph";
+CoursDeCoq = "1qgc03ngzyd138s2cmcwrwrmyq0lf3z3vwhiaq5p371al34fk0d9";
+#Dblib = "00704xi5348fbw9bc0cy5bqx5w4a7aqwpcwdd3740i15ihk60mrl";
+Demos = "0j5ndysvhsj57971yz7xz5mmnzwymgigr3b9mr6nh9iids98g9vy";
+DescenteInfinie = "0is6kclxhfd9n4sdpfkzm4kcc740ifkylg11b8z90frwq79a8yzb";
+Dictionaries = "13zhjvgl20f0hj2pp0zkczm9pwdgh174248jgbqj87rn5alyr2iy";
+DistributedReferenceCounting = "1kw6fb7rvkkrh5rz1839jwf9hrpnrsdnhjlpx3634d5a5kbbdj6a";
+DomainTheory = "1g39bgyxfj9r51vrmrxhrq1xqr36j5q8x0zgz2a12b0k3fj8bswn";
+Ergo = "0xkza35n3f05gkfywaisnis70zsrkh1kwq5idsb2k0rw8m4hq9ki";
+EuclideanGeometry = "11n8877zksgksdfcj7arjx0zcfhsrvg83lcp6yb2bynvfp80gyzb";
+EulerFormula = "1nhh49rf6wza2m5qmz5l5m24m299qn3v80wqzvf51lybadzll2h6";
+ExactRealArithmetic = "1p32g13sx2z5rj3q6390ym8902gvl5x16wdhgz5i75y44s6kmkb1";
+Exceptions = "0w2b16nr80f70dxllmhbqwfr1aw26rcfbak5bdyc0fna8hqp4q3p";
+#FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6";
+FSSecModel = "0fi78vqfrw4vrmdw215ic08rw8y6aia901wqs4f1s9z2idd6m8qy";
+FSets = "1n54s2vr6snh31jnvr79q951vyk0w0w6jrnwnlz9d3vyw47la9js";
+Fairisle = "0gg9x69qr0zflaryniqnl8d34kjdij0i55fcb1f1i5hmrwn2sqn6";
+Fermat4 = "0d5lkkrw3vqw6dip1mrgn8imq861xaipirzwpd35jgdkamds802v";
+FingerTree = "1kzfv97mc9sbprgg76lb5lk71gr4a5q10q8yaj57qw3m5hvmdhmw";
+FiringSquad = "0y2dy75j97x0592dxcbcd00ffwnf61f92yiap68xszv3dixl9i9x";
+Float = "1xmskkfd9w3j0bynlmadsrv997988k17bcs0r3zxaazm7vvw2sci";
+FreeGroups = "00pskmp0kfnnafldzcw8vak5v2n0nsjl9pfbw8qkj1xzzbvym2wk";
+FunctionsInZFC = "1vfs27m5f2cx0q2qjlxj3nim1bv53mk241pqz9mpj4plcj0g838l";
+FundamentalArithmetics = "1vvgl5c7rcg3bxizcjdix0fn20vdqy73ixcvm714llb8p986lan5";
+GC = "11kwn43nm58bv7v3p8xg2ih4x0gvgigz26gzh8l8w3lgmriqmzx0";
+GenericEnvironments = "1w05ysx0rl17fgxq3fc0p7p3h70c94qxa6yq88ppyhwm1cqqgihw";
+Goedel = "0b1dfmxp9q5z2l59yz5bn37m0zz4307kq94a7fs8s0lbbwrgyhrf";
+GraphBasics = "1f2bsfkhlyzjvy6ln62sf6hpy9dh8azrnlfpjq6jn667nfb7cbf6";
+Graphs = "0smhsas27llkmfkn4vs8ygb9w19ci2q4ps0f2q969xv8n8n0bj4z";
+GroupTheory = "141w3zbf7jczbk1lrpz6dnpk8yh1vr4f7kw55siawwaai11bh7c1";
+Groups = "00zmn1q9lz7dz8p5wk34svwki9xwn62xkgnhw4bcx8awlbx1pw3a";
+Hardware = "1bp9bnvlv54ksngmgzyxaqw1idxw5snmwrcifqcd6088w6hd9w1n";
+Hedges = "1abbf8v0i8akmhbi2hmb1l9wxvql275c9mxf0r5lzxigwmf0qrbv";
+HighSchoolGeometry = "09n70n0sb1dxnss9xz7xj2z1070gzxs4ap1h0kjcrfkiqss11fpy";
+HigmanCF = "05qg4ci8bvd6s9nmj80imj3b9kfwy4xzfy8ckr5870505mkzxyxv";
+HigmanNW = "0i3mmyh20iib7pglalf4l2p62qyqa6w0mz557n53aa2zx6l0dw18";
+HigmanS = "1c9db1jrpwzqw0arsiljskx3pcxpc1flkdql87fn55lgypbfz5gk";
+HistoricalExamples = "16alm4cv9hj59jyn1rnmb1dnbwp488wpzbnkq6hrnl5drr78gx08";
+HoareTut = "1mazqhb0hclknnzbr4ka1aafkk36hl6n4vixkf5kfvyymr094d0a";
+Huffman = "1h14qdbmawjn9hw813hsywxz0az80nx620rr35mb9wg8hy4xw7jj";
+IEEE754 = "06xrpzg2q9x2bzm7h16k0czm56sgsdn1rxpdgcl44743q3mvpi5p";
+IPC = "1xcgrln8nn2h98qyqz36d0zszjs33kcclv9vamz8mc163agk6jxy";
+IZF = "12inbpihh35hbrh4prs93r4avxlgsj5019n7bndi4fgn09m839bm";
+Icharate = "0giak87mv7g0312i05r7v06wb8wmfkrd2ai54r4c80497f72d17l";
+IdxAssoc = "0gdaxnwyw8phi97izx0wfbpccql73yjdzqqygc4i6nfw4lwanx38";
+IntMap = "1zmlcqv2mz488vpxa6iwbi6sqcljkmb55mywb5pabjjwjj745jhx";
+JProver = "0vz07sclzx0izwm5klwmd0amxhzqly6aknh876vvh3033jp62ik0";
+JordanCurveTheorem = "0varv6ib4f0l3jjq71rafb071ivzcnyxjb5ri8bf6vbjl4fqr335";
+Karatsuba = "02190l3dl0k6qxi3djr2imy4h31kcr5kj94l2ys3xqg1kjjajcmj";
+Kildall = "0lbby3gd3pwivkhr6v8c73915cswmvh50nj3ch10f0zix8lsxrpa";
+LTL = "0bk4232pa6mkbmxjazknfbnmzh2pcjccr68dkf8a2ndd06yfaii1";
+Lambda = "1wy9r95acwf7srs54y5kgmgl9d48j8b871n4z26xpbhdi2pvv9a4";
+Lambek = "0f6nd3fsxsaij9wypwd3cxmgn3larkxg4xww9c0yvjqxpgc5s552";
+LesniewskiMereology = "11wgw93fxwnbvwmpnscvgg9caakhr3wbvqwzqkk1p8wfslpvf7pj";
+LinAlg = "0gl081rx0iikhaghjny3g04aaqgiv0wq6r6c34qpcr5jc6i40mdr";
+MapleMode = "0a50dx473mmg7ksmghbjqs2rg4334dqdd2rkydicw8fl406z19ab";
+Markov = "06aacr8ghycjm68r36hip4rjhwfnbz7az2k8pa92pakjm0am78lq";
+MathClasses = "1gj6dznlc2ma5b5qn9mlinavlrl4xq18dilzd0l9j8jrxfdk1q7n";
+Maths = "15qbv7dxj4ygmw38gnmyf2kwdmy75a21yf991c8lw6fzx334b4dv";
+Matrices = "1q3683xvsgjqlav6kfxx7y05lvr5gp60hpbx4ypwa0hsl6w14mn0";
+#Micromega = "0h2ybdlbdvy30l5kzkfvp5kwsf236fxd3xi87pl4pl3dzylzsbh4";
+MiniC = "1gg9jinay9i3jbsi8bbwxzr9584wycdadf02c5al5yv281ywjar0";
+MiniCompiler = "0yq0k8c0rp120pfssdwfpmz017vq2w8s0rzk9gls476gywjmdvgf";
+MiniML = "1fd4k6rzn5cr24d11dnyy9jp2wf3n8d8l7q7bxk94lbrj6lhrzw2";
+ModRed = "1khg29cm83npasxqlm13bv2w2kfkn9hrvf5q2wch9l1l4ghys4rk";
+Multiplier = "07bj7j4agq2cvhfbkwgrvg39jlzlj1mzlm0ykqjwljd7hi4f6yv9";
+MutualExclusion = "1j3fmf0zvnxg0yzj956jfpjqccnk9l2393q6as80a5gfqhlb3rcr";
+Nfix = "1mpn1fbx15naa2d5lbcxl88xsgp1p88xx4g94f8cjzhg6kdnz7cc";
+OrbStab = "06gg3d2f9qybs2c49mm7srzqx5r9dxail92bcxdi6lr0k74y75ml";
+OtwayRees = "1d39yxppnpzpn5yxdk6rinrgxwgsnr348cggyhwjmgyjm8mr9gcp";
+PAutomata = "0hlzvdi9kb291g36lgyy3vlpn7i8rphpwjisy3wh19j4yqqc7ddf";
+PTS = "12y9niiks4rzpvzzvgfwc1z37480c4l9nvsmh4wx6gsvpnjqvyl3";
+PTSATR = "10jsfbsdaiqrdgp9vnc84wwkxjyfin35kr1qckbax6599xgyk7vj";
+PTSF = "0yz7sh2d4ldcqblnvb96yyimsb4351qqjl8di1cy785mnxa1zfla";
+Paradoxes = "03b22vhkra038z3nfbv9wpbr63x984qyrfvrg58lwqq87s5kgv1d";
+ParamPi = "1p64yj2pqqvyx5b5xm0pv0pm9lqp7hc5hb3wjnwvzi3qchqf7hwi";
+PersistentUnionFind = "1ljdnsm6h3zfn43vla13ibx42kfvgmy6n9qyfn7cgkcw5yv4fh6m";
+PiCalc = "1af8ws86mqs55dldcpm7x4qhk11k0f8l88z2bv6hylfvy6fpbpiy";
+Pocklington = "18zx1ca3pn3vn763smmrnfi395007ddzicrr0cydrph6g4agdw3g";
+Presburger = "1n3nqrplgx1r2vvpcbp91l02c7zc297fkpsqgx1x1msqrldnac9y";
+Prfx = "1nyh134hlh6cdxpys9kv0ngiiibgigh2mifwf8rdz6aj6xj7dgyv";
+ProjectiveGeometry = "01x409rbh3rqxyz53v0kdixnqqv7b890va04a21862g8bml7ls6k";
+QArith = "0xvkw3d3kgiyw6b255f6zbkali1023a9wmn12ga3bgak24jsa8lg";
+QArithSternBrocot = "1kvzww76nxgq7b3b3v2wrjxaxskfrzk55zpg6mj1jjcpgydfqwjr";
+QuicksortComplexity = "0c5gj65rxnxydspc4jqq20c8v9mjbnjrkjkk220yxymbv5n3nqd1";
+RSA = "0b56ipivbbdwc0w7bp4v4lwl0fhhb73k2b62ybmb3x7alc599mc0";
+RailroadCrossing = "0z5cnw1d8jbg30lc9p1hsgrnjwjc4yhpxl74m2pcjscrrnr01zsf";
+Ramsey = "0sd3cihzfx7mn7wcsng15y4jqvp1ql49fy1ch997wfbchp6515ld";
+Random = "0b7gwz38fbk9j5sfa76c2n4781kcb18r65v9vzz8qigx37gm89w4";
+Rational = "0v1zjcf22ij9daxharmaavwp2msgl77y5ad46lskshpypd1ysrsc";
+RecursiveDefinition = "1y4gy2ksxkvmz16zrnblwd1axi7gdjw171n8xfw4f8400my1qhm0";
+ReflexiveFirstOrder = "156a6kmds25kc645w6kkhn3a4bvryp307b76ghz5m5wv2wsajgrn";
+RegExp = "0gya2kckr6325hykd12vwpbwwf7cf04yyjrr2dvmcc81dkygrwxb";
+RelationAlgebra = "1nrhkvypkk7k48gb18c2q9cwbgy02ldfg6s3j74f5rgff1i6c9in";
+RelationExtraction = "1g6hvmsfal17pppqf9v8zh2i1dph0lj5a1r3xiszqr4biiig09ch";
+ReleasedSsreflect = "17wirznfsizmw6gjb54vk9bp97a3bc1l2sb4gdxfbzvxmabx1a9l";
+Rem = "03559q60ibf4dr1np82341xfrw134d27dx8dim84q9fszr4gy8sx";
+RulerCompassGeometry = "02vm80xvvw22pdxrag3pv5zrhqf8726i9jqsiv4bnjqavj5z2hdr";
+SMC = "0ca3ar1y9nyj5147r18babqsbg2q2ywws8fdi91xb5z9m3i97nv1";
+Schroeder = "0mfbjmw4a48758k88yv01494wnywcp5yamkl394axvvbbna9h8b6";
+SearchTrees = "1jyps6ddm8klmxjm50p2j9i014ij7imy3229pwz3dkzg54gxzzxb";
+#Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580";
+Shuffle = "14v1m4s9k49w30xrnyncjzgqjcckiga8wd2vnnzy8axrwr9zq7iq";
+SquareMatrices = "07dlykg3w59crc54qqdqxq6hf8rmzvwwfr1g8z8v2l8h4yvfnhfl";
+Ssreflect = "1capfvkdnsv95ik0yj9kpwj4smm7i7n2n98d6rlv68bdd2abw9f3";
+Stalmarck = "0vcbkzappq1si4hxbnb9bjkfk82j3jklb8g8ia83h1mdhzr7xdpz";
+Streams = "1spcqnvwayahk12fd13vzh922ypzrjkcmws9gcy12qdqp04h8bnc";
+String = "1wy7g66yq9y8m8y3gq29q7whfdm98g3cj9jxm5yibdzfahfdzzni";
+Subst = "1wxscjhz2y2jv5rdga80ldx2kc954sklip4jsbsd2fim5gwxzl23";
+Sudoku = "0f9h8gwzrdzk5j76nhvlnvpll81zar3pk84r2bf1xfav4yvj8sj7";
+SumOfTwoSquare = "1lxf9wdmvpi0vz4d21p6v9h2vvkk9v8113mvr2cdxd0j43l4ra18";
+Tait = "0bwxl894isndwadbbc3664j51haj3c0i57zmmycnxmhnmsx5pnjj";
+TarskiGeometry = "1vkznrjla943wcyddzyq0pqraiklgn62n1720msxp7cs13ckzpy0";
+ThreeGap = "01nj27xs348126ynsnva1jnvk0nin61xzyi6hwcybj5n46r7nlcv";
+Topology = "1kchddfiksjnkvwdr2ffpqcvmqkd6gf359r09yngf340sa15p5wk";
+TortoiseHareAlgorithm = "1ldm1z48j59lxz60szpy64d0928j4fmygp5npfksvwkvghijchq8";
+TreeAutomata = "0jzfa6rxv7lw1nzrqaxv08h9mpyvc2g4cbdc09ncyhazincrix0z";
+TreeDiameter = "0xdansrbmxrwicvqjjr9ivgs0255nd4ic6jkfv37m1c10vxcjq2n";
+WeakUpTo = "1baaapciaqhyjx8bqa4l04l1vwycyy1bvjr2arrc9myqacifmnpp";
+ZChinese = "0v7gffmcj9yazbbssb2i2iha1dr82b4bl8df9g021s40da49k09k";
+ZF = "0am15lgpn127pzx6ghm76axy75w7m9a8wqa26msgkczjk4x497ni";
+ZFC = "0s11g9rzacng2xg9ygx9lxyqv2apxyirnf7cg3iz95531n46ppn2";
+ZSearchTrees = "1lh6jlzm53jnsg91aa60f6gir6bsx77hg8xwl24771jg8a9b9mcl";
+ZornsLemma = "0dxizjfjx4qsdwc60k6k9fnq8hj4m13vi0llsv9xk3lj3izhpil1";
+lazyPCF = "0wzpv41nv3gdd07g9pr7wydfjv1wxz8kylzmyn07ab38kahhhzh9";
+lc = "05zr0y2ivznmf1ijszq249v4rw6kvdx6jz4s2hhnaiqvx35g4cqg";
+}
diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
new file mode 100644
index 00000000000..fb231bfdeac
--- /dev/null
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -0,0 +1,208 @@
+contribs:
+
+let
+  mkContrib = import ./mk-contrib.nix;
+  all = import ./all.nix;
+  overrides = {
+    BDDs = self: {
+      buildInputs = self.buildInputs ++ [ contribs.IntMap ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+        < -R ../../Cachan/IntMap IntMap
+        32d30
+        < extraction
+        EOF
+      '';
+      postInstall = ''
+        mkdir -p $out/bin
+        cp extraction/dyade $out/bin
+      '';
+    };
+    CanonBDDs = self: {
+      patchPhase = ''
+        patch Make <<EOF
+        17d16
+        < rauzy/algorithme1/extraction
+        EOF
+      '';
+      postInstall = ''
+        mkdir -p $out/bin
+        cp rauzy/algorithme1/extraction/suresnes $out/bin
+      '';
+    };
+    CoinductiveReals = self: {
+      buildInputs = self.buildInputs ++ [ contribs.QArithSternBrocot ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+        < -R ../QArithSternBrocot QArithSternBrocot
+        EOF
+      '';
+    };
+    CoRN = self: {
+      buildInputs = self.buildInputs ++ [ contribs.MathClasses ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+        < -R ../MathClasses/ MathClasses
+        EOF
+      '';
+      installFlags = self.installFlags + " -f Makefile.coq";
+    };
+    Counting = self: {
+      postInstall = ''
+        for ext in cma cmxs
+        do
+          cp src/counting_plugin.$ext $out/lib/coq/8.4/user-contrib/Counting/
+        done
+      '';
+    };
+    Ergo = self: {
+      buildInputs = self.buildInputs ++ (with contribs; [ Containers Counting Nfix ]);
+      patchPhase = ''
+        patch Make <<EOF
+        4,9d3
+        < -I ../Containers/src
+        < -R ../Containers/theories Containers
+        < -I ../Nfix/src
+        < -R ../Nfix/theories Nfix
+        < -I ../Counting/src
+        < -R ../Counting/theories Counting
+        EOF
+      '';
+    };
+    FingerTree = self: {
+      patchPhase = ''
+        patch Make <<EOF
+        21d20
+        < extraction
+        EOF
+      '';
+    };
+    Goedel = self: {
+      buildInputs = self.buildInputs ++ [ contribs.Pocklington ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+	< -R ../../Eindhoven/Pocklington Pocklington
+        EOF
+      '';
+    };
+    Graphs = self: {
+      buildInputs = self.buildInputs ++ [ contribs.IntMap ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+        < -R ../../Cachan/IntMap IntMap
+        EOF
+      '';
+      postInstall = ''
+        mkdir -p $out/bin
+        cp checker $out/bin/
+      '';
+    };
+    IntMap = self: { configurePhase = "coq_makefile -f Make -o Makefile"; };
+    LinAlg = self: {
+      buildInputs = self.buildInputs ++ [ contribs.Algebra ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+        < -R ../../Sophia-Antipolis/Algebra/ Algebra
+        EOF
+      '';
+    };
+    Markov = self: { configurePhase = "coq_makefile -o Makefile -R . Markov markov.v"; };
+    Nfix = self: {
+      postInstall = ''
+        for ext in cma cmxs
+        do
+          cp src/nfix_plugin.$ext $out/lib/coq/8.4/user-contrib/Nfix/
+        done
+      '';
+    };
+    OrbStab = self: {
+      buildInputs = self.buildInputs ++ (with contribs; [ LinAlg Algebra ]);
+      patchPhase = ''
+        patch Make <<EOF
+        2,3d1
+        < -R ../../Sophia-Antipolis/Algebra Algebra
+        < -R ../../Nijmegen/LinAlg LinAlg
+        EOF
+      '';
+    };
+    PTSF = self: {
+      buildInputs = self.buildInputs ++ [ contribs.PTSATR ];
+      patchPhase = ''
+        patch Make <<EOF
+        1d0
+        < -R ../../Paris/PTSATR/ PTSATR
+        EOF
+      '';
+    };
+    RelationExtraction = self: {
+      patchPhase = ''
+        patch Make <<EOF
+        31d30
+        < test
+        EOF
+      '';
+    };
+    SMC = self: {
+      buildInputs = self.buildInputs ++ [ contribs.IntMap ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+        < -R ../../Cachan/IntMap IntMap
+        EOF
+      '';
+    };
+    Ssreflect = self: {
+      patchPhase = ''
+        substituteInPlace Makefile \
+	--replace "/bin/mkdir" "mkdir"
+      '';
+    };
+    Stalmarck = self: {
+      configurePhase = "coq_makefile -R . Stalmarck *.v staltac.ml4 > Makefile";
+    };
+    Topology = self: {
+      buildInputs = self.buildInputs ++ [ contribs.ZornsLemma ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+        < -R ../ZornsLemma ZornsLemma
+        EOF
+      '';
+    };
+    TreeAutomata = self: {
+      buildInputs = self.buildInputs ++ [ contribs.IntMap ];
+      patchPhase = ''
+        patch Make <<EOF
+        2d1
+        < -R ../../Cachan/IntMap IntMap
+        EOF
+      '';
+    };
+  };
+in
+
+callPackage: extra:
+
+builtins.listToAttrs (
+map
+(name:
+  let
+    sha256 = builtins.getAttr name all;
+    override =
+      if builtins.hasAttr name overrides
+      then builtins.getAttr name overrides
+      else x: { };
+  in
+  {
+    inherit name;
+    value = callPackage (mkContrib { inherit name sha256 override; }) extra;
+  }
+)
+(builtins.attrNames all)
+)
diff --git a/pkgs/development/coq-modules/contribs/mk-contrib.nix b/pkgs/development/coq-modules/contribs/mk-contrib.nix
new file mode 100644
index 00000000000..12dd700a631
--- /dev/null
+++ b/pkgs/development/coq-modules/contribs/mk-contrib.nix
@@ -0,0 +1,30 @@
+{ name, sha256, override }:
+
+{ stdenv, fetchzip, coq }:
+
+let
+  self = {
+
+  name = "coq-contribs-${name}-${coq.coq-version}";
+
+  src = fetchzip {
+    url = "http://www.lix.polytechnique.fr/coq/pylons/contribs/files/${name}/v${coq.coq-version}/${name}.tar.gz";
+    inherit sha256;
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 ];
+  propagatedBuildInputs = [ coq ];
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.lix.polytechnique.fr/coq/pylons/contribs/view/${name}/v${coq.coq-version}";
+    maintainers = with maintainers; [ vbgl ];
+    platforms = coq.meta.platforms;
+  };
+
+};
+
+in
+
+stdenv.mkDerivation (self // override self)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5d928851a74..deccb4c40a9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -16,7 +16,6 @@ self: super: {
   hasql-postgres = dontCheck super.hasql-postgres;
   hspec-expectations = dontCheck super.hspec-expectations;
   HTTP = dontCheck super.HTTP;
-  matlab = super.matlab.override { matlab = null; };
   mwc-random = dontCheck super.mwc-random;
   nanospec = dontCheck super.nanospec;
   options = dontCheck super.options;
@@ -55,21 +54,23 @@ self: super: {
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 
+  # Foreign dependency name clashes with another Haskell package.
+  libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };
+
   # https://github.com/haskell/time/issues/23
   time_1_5_0_1 = dontCheck super.time_1_5_0_1;
 
-  # Doesn't accept modern versions of hashtable.
-  Agda = dontHaddock super.Agda;
-
   # Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10.
   network-uri = dontCheck super.network-uri;
 
   # The Haddock phase fails for one reason or another.
+  Agda = dontHaddock super.Agda;
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
   blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;
   bytestring-progress = dontHaddock super.bytestring-progress;
   comonads-fd = dontHaddock super.comonads-fd;
   comonad-transformers = dontHaddock super.comonad-transformers;
+  deepseq-magic = dontHaddock super.deepseq-magic;
   diagrams = dontHaddock super.diagrams;
   either = dontHaddock super.either;
   gl = dontHaddock super.gl;
@@ -83,12 +84,14 @@ self: super: {
   hspec-discover = dontHaddock super.hspec-discover;
   http-client-conduit = dontHaddock super.http-client-conduit;
   http-client-multipart = dontHaddock super.http-client-multipart;
+  hxt = dontHaddock super.hxt;                                  # https://github.com/UweSchmidt/hxt/issues/38
   markdown-unlit = dontHaddock super.markdown-unlit;
   network-conduit = dontHaddock super.network-conduit;
   shakespeare-text = dontHaddock super.shakespeare-text;
 
   # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
   darcs = overrideCabal super.darcs (drv: {
+    doCheck = false;            # The test suite won't even start.
     patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal";
   });
 
@@ -99,20 +102,13 @@ self: super: {
   # https://github.com/techtangents/ablist/issues/1
   ABList = dontCheck super.ABList;
 
-  # Depends on broken NewBinary package.
-  ASN1 = markBroken super.ASN1;
-
-  # Depends on broken Hails package.
-  hails-bin = markBroken super.hails-bin;
-
-  # Depends on broken frame package.
-  frame-markdown = markBroken super.frame-markdown;
-
-  # Depends on broken lss package.
-  snaplet-lss = markBroken super.snaplet-lss;
-
-  # depends on broken hbro package.
-  hbro-contrib = markBroken super.hbro-contrib;
+  # These packages have broken dependencies.
+  ASN1 = dontDistribute super.ASN1;                             # NewBinary
+  frame-markdown = dontDistribute super.frame-markdown;         # frame
+  hails-bin = dontDistribute super.hails-bin;                   # Hails
+  hbro-contrib = dontDistribute super.hbro-contrib;             # hbro
+  lss = markBrokenVersion "0.1.0.0" super.lss;                  # https://github.com/dbp/lss/issues/2
+  snaplet-lss = markBrokenVersion "0.1.0.0" super.snaplet-lss;  # https://github.com/dbp/lss/issues/2
 
   # https://github.com/haskell/vector/issues/47
   vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;
@@ -121,11 +117,13 @@ self: super: {
   base_4_7_0_2 = markBroken super.base_4_7_0_2;
 
   # Obsolete: https://github.com/massysett/prednote/issues/1.
-  prednote-test = markBroken super.prednote-test;
+  prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test;
 
   # Doesn't compile: <http://hydra.cryp.to/build/465891/nixlog/1/raw>.
   integer-gmp_0_5_1_0 = markBroken super.integer-gmp_0_5_1_0;
 
+  lushtags = markBrokenVersion "0.0.1" super.lushtags;
+
   # https://github.com/haskell/bytestring/issues/41
   bytestring_0_10_4_1 = dontCheck super.bytestring_0_10_4_1;
 
@@ -134,16 +132,285 @@ self: super: {
 
   # tests don't compile for some odd reason
   jwt = dontCheck super.jwt;
-}
-// {
-  # Not on Hackage yet.
+
+  # https://github.com/liamoc/wizards/issues/5
+  wizards = doJailbreak super.wizards;
+
+  # https://github.com/ekmett/trifecta/issues/41
+  trifecta = appendPatch super.trifecta (pkgs.fetchpatch {
+    url = "https://github.com/ekmett/trifecta/pull/40.patch";
+    sha256 = "0qwz83fp0karf6164jykdwsrafq08l6zsdmcdm83xnkcxabgplxv";
+  });
+
+  # https://github.com/NixOS/cabal2nix/issues/136
+  gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
+  glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
+
+  # https://github.com/jgm/zip-archive/issues/21
+  zip-archive = addBuildTool super.zip-archive pkgs.zip;
+
+  # https://github.com/mvoidex/hsdev/issues/11
+  hsdev = dontHaddock super.hsdev;
+
+  # Upstream notified by e-mail.
+  permutation = dontCheck super.permutation;
+
+  # https://github.com/jputcu/serialport/issues/25
+  serialport = dontCheck super.serialport;
+
+  # https://github.com/kazu-yamamoto/simple-sendfile/issues/17
+  simple-sendfile = dontCheck super.simple-sendfile;
+
+  # Fails no apparent reason. Upstream has been notified by e-mail.
+  assertions = dontCheck super.assertions;
+
+  # https://github.com/vincenthz/tasty-kat/issues/1
+  tasty-kat = dontCheck super.tasty-kat;
+
+  # These packages try to execute non-existent external programs.
+  cmaes = dontCheck super.cmaes;                        # http://hydra.cryp.to/build/498725/log/raw
+  filestore = dontCheck super.filestore;
+  graceful = dontCheck super.graceful;
+  hakyll = dontCheck super.hakyll;
+  Hclip = dontCheck super.Hclip;
+  HList = dontCheck super.HList;
+  memcached-binary = dontCheck super.memcached-binary;
+  postgresql-simple = dontCheck super.postgresql-simple;
+  snowball = dontCheck super.snowball;
+  wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
+  xmlgen = dontCheck super.xmlgen;
+
+  # These packages try to access the network.
+  concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
+  dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
+  hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
+  holy-project = dontCheck super.holy-project;          # http://hydra.cryp.to/build/502002/nixlog/1/raw
+  http-client = dontCheck super.http-client;            # http://hydra.cryp.to/build/501430/nixlog/1/raw
+  http-conduit = dontCheck super.http-conduit;          # http://hydra.cryp.to/build/501966/nixlog/1/raw
+  js-jquery = dontCheck super.js-jquery;
+  marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
+  network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
+  network-transport-tcp = dontCheck super.network-transport-tcp;
+  raven-haskell = dontCheck super.raven-haskell;        # http://hydra.cryp.to/build/502053/log/raw
+  riak = dontCheck super.riak;                          # http://hydra.cryp.to/build/498763/log/raw
+  stackage = dontCheck super.stackage;                  # http://hydra.cryp.to/build/501867/nixlog/1/raw
+  warp = dontCheck super.warp;                          # http://hydra.cryp.to/build/501073/nixlog/5/raw
+  wreq = dontCheck super.wreq;                          # http://hydra.cryp.to/build/501895/nixlog/1/raw
+
+  # https://github.com/NICTA/digit/issues/3
+  digit = dontCheck super.digit;
+
+  # Fails for non-obvious reasons while attempting to use doctest.
+  search = dontCheck super.search;
+
+  # https://github.com/ekmett/structures/issues/3
+  structures = dontCheck super.structures;
+
+  # Tries to mess with extended POSIX attributes, but can't in our chroot environment.
+  xattr = dontCheck super.xattr;
+
+  # Disable test suites to fix the build.
+  acme-year = dontCheck super.acme-year;                # http://hydra.cryp.to/build/497858/log/raw
+  aeson-lens = dontCheck super.aeson-lens;              # http://hydra.cryp.to/build/496769/log/raw
+  apache-md5 = dontCheck super.apache-md5;              # http://hydra.cryp.to/build/498709/nixlog/1/raw
+  app-settings = dontCheck super.app-settings;          # http://hydra.cryp.to/build/497327/log/raw
+  aws = dontCheck super.aws;                            # needs aws credentials
+  aws-kinesis = dontCheck super.aws-kinesis;            # needs aws credentials for testing
+  binary-protocol = dontCheck super.binary-protocol;    # http://hydra.cryp.to/build/499749/log/raw
+  bindings-GLFW = dontCheck super.bindings-GLFW;        # http://hydra.cryp.to/build/497379/log/raw
+  bits = dontCheck super.bits;                          # http://hydra.cryp.to/build/500239/log/raw
+  bloodhound = dontCheck super.bloodhound;
+  boundingboxes = dontCheck super.boundingboxes;        # https://github.com/fumieval/boundingboxes/issues/1
+  buildwrapper = dontCheck super.buildwrapper;
+  burst-detection = dontCheck super.burst-detection;    # http://hydra.cryp.to/build/496948/log/raw
+  cabal-bounds = dontCheck super.cabal-bounds;          # http://hydra.cryp.to/build/496935/nixlog/1/raw
+  cabal-meta = dontCheck super.cabal-meta;              # http://hydra.cryp.to/build/497892/log/raw
+  cautious-file = dontCheck super.cautious-file;        # http://hydra.cryp.to/build/499730/log/raw
+  cjk = dontCheck super.cjk;
+  command-qq = dontCheck super.command-qq;              # http://hydra.cryp.to/build/499042/log/raw
+  conduit-connection = dontCheck super.conduit-connection;
+  craftwerk = dontCheck super.craftwerk;
+  damnpacket = dontCheck super.damnpacket;              # http://hydra.cryp.to/build/496923/log
+  Deadpan-DDP = dontCheck super.Deadpan-DDP;            # http://hydra.cryp.to/build/496418/log/raw
+  DigitalOcean = dontCheck super.DigitalOcean;
+  directory-layout = dontCheck super.directory-layout;
+  docopt = dontCheck super.docopt;                      # http://hydra.cryp.to/build/499172/log/raw
+  dom-selector = dontCheck super.dom-selector;          # http://hydra.cryp.to/build/497670/log/raw
+  dotfs = dontCheck super.dotfs;                        # http://hydra.cryp.to/build/498599/log/raw
+  DRBG = dontCheck super.DRBG;                          # http://hydra.cryp.to/build/498245/nixlog/1/raw
+  either-unwrap = dontCheck super.either-unwrap;        # http://hydra.cryp.to/build/498782/log/raw
+  elm-repl = dontCheck super.elm-repl;                  # http://hydra.cryp.to/build/501878/nixlog/1/raw
+  etcd = dontCheck super.etcd;
+  fb = dontCheck super.fb;                              # needs credentials for Facebook
+  fptest = dontCheck super.fptest;                      # http://hydra.cryp.to/build/499124/log/raw
+  ghc-events = dontCheck super.ghc-events;              # http://hydra.cryp.to/build/498226/log/raw
+  ghc-events-parallel = dontCheck super.ghc-events-parallel;    # http://hydra.cryp.to/build/496828/log/raw
+  ghcid = dontCheck super.ghcid;
+  ghc-imported-from = dontCheck super.ghc-imported-from;
+  ghc-mod = dontCheck super.ghc-mod;                    # http://hydra.cryp.to/build/499674/log/raw
+  ghc-parmake = dontCheck super.ghc-parmake;
+  gitlib-cmdline = dontCheck super.gitlib-cmdline;
+  git-vogue = dontCheck super.git-vogue;
+  GLFW-b = dontCheck super.GLFW-b;
+  hackport = dontCheck super.hackport;
+  hadoop-formats = dontCheck super.hadoop-formats;
+  haeredes = dontCheck super.haeredes;
+  hashed-storage = dontCheck super.hashed-storage;
+  hashring = dontCheck super.hashring;
+  hath = dontCheck super.hath;
+  haxl-facebook = dontCheck super.haxl-facebook;        # needs facebook credentials for testing
+  hdbi-postgresql = dontCheck super.hdbi-postgresql;
+  hedis = dontCheck super.hedis;
+  hedis-pile = dontCheck super.hedis-pile;
+  hedis-tags = dontCheck super.hedis-tags;
+  hedn = dontCheck super.hedn;
+  hgdbmi = dontCheck super.hgdbmi;
+  hi = dontCheck super.hi;
+  hmatrix-tests = dontCheck super.hmatrix-tests;
+  hPDB-examples = dontCheck super.hPDB-examples;
+  hquery = dontCheck super.hquery;
+  hs2048 = dontCheck super.hs2048;
+  hsbencher = dontCheck super.hsbencher;
+  hsexif = dontCheck super.hsexif;
+  hspec-server = dontCheck super.hspec-server;
+  HTF = dontCheck super.HTF;
+  htsn = dontCheck super.htsn;
+  htsn-import = dontCheck super.htsn-import;
+  http2 = dontCheck super.http2;
+  http-client-openssl = dontCheck super.http-client-openssl;
+  http-client-tls = dontCheck super.http-client-tls;
+  ihaskell = dontCheck super.ihaskell;
+  influxdb = dontCheck super.influxdb;
+  itanium-abi = dontCheck super.itanium-abi;
+  katt = dontCheck super.katt;
+  language-slice = dontCheck super.language-slice;
+  lensref = dontCheck super.lensref;
+  liquidhaskell = dontCheck super.liquidhaskell;
+  lvmrun = dontCheck super.lvmrun;
+  memcache = dontCheck super.memcache;
+  milena = dontCheck super.milena;
+  nats-queue = dontCheck super.nats-queue;
+  netpbm = dontCheck super.netpbm;
+  network-dbus = dontCheck super.network-dbus;
+  notcpp = dontCheck super.notcpp;
+  ntp-control = dontCheck super.ntp-control;
+  numerals = dontCheck super.numerals;
+  opaleye = dontCheck super.opaleye;
+  openpgp = dontCheck super.openpgp;
+  optional = dontCheck super.optional;
+  os-release = dontCheck super.os-release;
+  pandoc-citeproc = dontCheck super.pandoc-citeproc;
+  persistent-redis = dontCheck super.persistent-redis;
+  pipes-extra = dontCheck super.pipes-extra;
+  pipes-websockets = dontCheck super.pipes-websockets;
+  postgresql-binary = dontCheck super.postgresql-binary;# needs a running postgresql server
+  postgresql-simple-migration = dontCheck super.postgresql-simple-migration;
+  process-streaming = dontCheck super.process-streaming;
+  punycode = dontCheck super.punycode;
+  pwstore-cli = dontCheck super.pwstore-cli;
+  quantities = dontCheck super.quantities;
+  redis-io = dontCheck super.redis-io;
+  rethinkdb = dontCheck super.rethinkdb;
+  Rlang-QQ = dontCheck super.Rlang-QQ;
+  sai-shape-syb = dontCheck super.sai-shape-syb;
+  scp-streams = dontCheck super.scp-streams;
+  separated = dontCheck super.separated;
+  shadowsocks = dontCheck super.shadowsocks;
+  shake-language-c = dontCheck super.shake-language-c;
+  static-resources = dontCheck super.static-resources;
+  strive = dontCheck super.strive;                      # fails its own hlint test with tons of warnings
+  svndump = dontCheck super.svndump;
+  thumbnail-plus = dontCheck super.thumbnail-plus;
+  tickle = dontCheck super.tickle;
+  tpdb = dontCheck super.tpdb;
+  translatable-intset = dontCheck super.translatable-intset;
+  ua-parser = dontCheck super.ua-parser;
+  unagi-chan = dontCheck super.unagi-chan;
+  wai-app-file-cgi = dontCheck super.wai-app-file-cgi;
+  wai-logger = dontCheck super.wai-logger;
+  WebBits = dontCheck super.WebBits;                    # http://hydra.cryp.to/build/499604/log/raw
+  webdriver-angular = dontCheck super.webdriver-angular;
+  webdriver = dontCheck super.webdriver;
+  xcffib = dontCheck super.xcffib;
+  xsd = dontCheck super.xsd;
+
+  # The build fails with the most recent version of c2hs.
+  ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; };
+
+  # Needs access to locale data, but looks for it in the wrong place.
+  scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
+
+  # These test suites run for ages, even on a fast machine. This is nuts.
+  Random123 = dontCheck super.Random123;
+  systemd = dontCheck super.systemd;
+
+  # https://github.com/eli-frey/cmdtheline/issues/28
+  cmdtheline = dontCheck super.cmdtheline;
+
+  # https://github.com/bos/snappy/issues/1
+  snappy = dontCheck super.snappy;
+
+  # Needs llvm to compile.
+  bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm;
+
+  # https://github.com/chrisdone/hindent/issues/83
+  hindent = dontCheck super.hindent;
+
+  # https://github.com/begriffs/postgrest/issues/127
+  postgrest = dontDistribute super.postgrest;
+
+  # Needs older versions of its dependencies.
+  structured-haskell-mode = (dontJailbreak super.structured-haskell-mode).override {
+    haskell-src-exts = self.haskell-src-exts_1_15_0_1;  # https://github.com/chrisdone/structured-haskell-mode/issues/90
+  };
+
+  # Expect to find sendmail(1) in $PATH.
+  mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\"";
+
+  # Help the test suite find system timezone data.
+  tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; });
+
+  # https://ghc.haskell.org/trac/ghc/ticket/9625
+  vty = dontCheck super.vty;
+
+  # https://github.com/vincenthz/hs-crypto-pubkey/issues/20
+  crypto-pubkey = dontCheck super.crypto-pubkey;
+
+  # https://github.com/rrnewton/haskell-lockfree/issues/44
+  chaselev-deque = markBrokenVersion "0.5.0.3" super.chaselev-deque;
+
+  # https://github.com/zouppen/stratum-tool/issues/14
+  stratum-tool = markBrokenVersion "0.0.4" super.stratum-tool;
+
+  # https://github.com/Gabriel439/Haskell-Turtle-Library/issues/1
+  turtle = dontCheck super.turtle;
+
+  # https://github.com/Philonous/xml-picklers/issues/5
+  xml-picklers = dontCheck super.xml-picklers;
+
+  # https://github.com/blamario/monoid-subclasses/issues/4
+  monoid-subclasses = dontCheck super.monoid-subclasses;
+
+  # https://github.com/joeyadams/haskell-stm-delay/issues/3
+  stm-delay = dontCheck super.stm-delay;
+
+  # https://github.com/JPMoresmau/HGraphStorage/issues/2
+  HGraphStorage = dontHaddock super.HGraphStorage;
+
+  # https://github.com/fumieval/call/issues/3
+  call = markBrokenVersion "0.1.2" super.call;
+  rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;     # depends on call
+
+} // {
+
+  # Not on Hackage.
   cabal2nix = self.mkDerivation {
     pname = "cabal2nix";
     version = "2.0";
     src = pkgs.fetchgit {
       url = "http://github.com/NixOS/cabal2nix.git";
-      sha256 = "8e1943affa70bf664d6b306f6331bad9332ca74816078f298d4acff0921c8520";
-      rev = "a5db30dbd55d7b4ec5df8fa116083b786bcf81c4";
+      sha256 = "5cc98f530303a82885e2f23d2c83f67f1a3767bfdd5ed3340e45858f1a0f04e1";
+      rev = "6a445468030b064e4f71b43c269ba506e7e2f779";
     };
     isLibrary = false;
     isExecutable = true;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 6641b27f0fd..bc558a7821e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -38,10 +38,11 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_2_3;
+  binary = self.binary_0_7_3_0;
 
   # deepseq is not a core library for this compiler.
-  deepseq = self.deepseq_1_4_0_0;
+  deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
+  deepseq = self.deepseq_1_3_0_1;
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_2_0;
@@ -59,7 +60,22 @@ self: super: {
 
   # https://github.com/glguy/utf8-string/issues/9
   utf8-string = overrideCabal super.utf8-string (drv: {
-    patchPhase = "sed -ir -e 's|Extensions: | Extensions: UndecidableInstances, |' utf8-string.cabal";
+    configureFlags = drv.configureFlags or [] ++ ["-f-bytestring-in-base" "--ghc-option=-XUndecidableInstances"];
+    preConfigure = "sed -i -e 's|base >= .* < .*,|base,|' utf8-string.cabal";
   });
 
+  # https://github.com/haskell/HTTP/issues/80
+  HTTP = doJailbreak super.HTTP;
+
+  # 6.12.3 doesn't support the latest version.
+  primitive = self.primitive_0_5_1_0;
+  parallel = self.parallel_3_2_0_3;
+  vector = self.vector_0_10_9_3;
+
+  # These packages need more recent versions of core libraries to compile.
+  happy = addBuildTools super.happy [self.Cabal_1_18_1_6 self.containers_0_4_2_1];
+  network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_6;
+  stm = addBuildTool super.stm self.Cabal_1_18_1_6;
+  split = super.split_0_1_4_3;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index bd8b09d040d..dace434fda5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -32,7 +32,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_2_3;
+  binary = self.binary_0_7_3_0;
 
   # deepseq is not a core library for this compiler.
   deepseq = self.deepseq_1_4_0_0;
@@ -51,4 +51,13 @@ self: super: {
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
 
+  # https://github.com/haskell/containers/issues/134
+  containers_0_4_2_1 = doJailbreak super.containers_0_4_2_1;
+
+  # These packages need more recent versions of core libraries to compile.
+  happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1];
+
+  # Setup: Can't find transitive deps for haddock
+  doctest = dontHaddock super.doctest;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 4dfb4ab96b9..6d56fd3b84d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -63,6 +63,7 @@ self: super: {
   attoparsec = dontCheck super.attoparsec;
 
   # test suite hangs silently for at least 10 minutes
+  ChasingBottoms = dontCheck super.ChasingBottoms;
   split = dontCheck super.split;
 
   # Test suite fails with some (seemingly harmless) error.
@@ -82,4 +83,13 @@ self: super: {
   # https://github.com/ndmitchell/extra/issues/4
   extra = dontCheck super.extra;
 
+  # Test suite fails in "/tokens_bytestring_unicode.g.bin".
+  alex = dontCheck super.alex;
+
+  # Upstream was notified about the over-specified constraint on 'base'
+  # but refused to do anything about it because he "doesn't want to
+  # support a moving target". Go figure.
+  barecheck = doJailbreak super.barecheck;
+  cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; });
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index c5ec38c5194..67ac5f5a328 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -40,7 +40,7 @@ self: super: {
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_2_3; process = self.process_1_2_1_0; };
+  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_1_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
@@ -51,4 +51,13 @@ self: super: {
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
 
+  # The old containers version won't compile against newer versions of deepseq.
+  containers_0_4_2_1 = super.containers_0_4_2_1.override { deepseq = self.deepseq_1_3_0_1; };
+
+  # These packages need more recent versions of core libraries to compile.
+  happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1];
+
+  # Setup: Can't find transitive deps for haddock
+  doctest = dontHaddock super.doctest;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 6ad8564d89a..a7465f7744d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -37,7 +37,7 @@ self: super: {
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_2_3; };
+  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
@@ -54,4 +54,13 @@ self: super: {
   # https://github.com/tibbe/unordered-containers/issues/96
   unordered-containers = dontCheck super.unordered-containers;
 
+  # The test suite depends on time >=1.4.0.2.
+  cookie = dontCheck super.cookie ;
+
+  # Work around bytestring >=0.10.2.0 requirement.
+  streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;
+
+  # Choose appropriate flags for our version of 'bytestring'.
+  bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 820a44c6b4f..2a1f47c1a90 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -16,7 +16,6 @@ self: super: {
   directory = null;
   filepath = null;
   ghc-prim = null;
-  haskeline = null;
   haskell2010 = null;
   haskell98 = null;
   hoopl = null;
@@ -28,7 +27,6 @@ self: super: {
   process = null;
   rts = null;
   template-haskell = null;
-  terminfo = null;
   time = null;
   unix = null;
 
@@ -37,8 +35,12 @@ self: super: {
   mtl = self.mtl_2_2_1;
   transformers-compat = disableCabalFlag super.transformers-compat "three";
 
+  # haskeline and terminfo are not core libraries for this compiler.
+  haskeline = self.haskeline_0_7_1_3;
+  terminfo = self.terminfo_0_4_0_0;
+
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_2_3; };
+  Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
@@ -49,4 +51,42 @@ self: super: {
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
 
+  # Later versions require a newer version of bytestring than we have.
+  aeson = self.aeson_0_7_0_6;
+
+  # The test suite depends on time >=1.4.0.2.
+  cookie = dontCheck super.cookie;
+
+  # Work around bytestring >=0.10.2.0 requirement.
+  streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;
+
+  # Choose appropriate flags for our version of 'bytestring'.
+  bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";
+
+} // {
+
+  # Not on Hackage.
+  cryptol = self.mkDerivation rec {
+    pname = "cryptol";
+    version = "2.1.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "GaloisInc";
+      repo = "cryptol";
+      rev = "v${version}";
+      sha256 = "00bmad3qc7h47j26xp7hbrlb0qv0f7k9spxgsc1f6lsmpgq9axr3";
+    };
+    isLibrary = true;
+    isExecutable = true;
+    buildDepends = with self; [
+      ansi-terminal array async base containers deepseq directory
+      executable-path filepath GraphSCC haskeline monadLib mtl old-time
+      presburger pretty process QuickCheck random smtLib syb text
+      tf-random transformers utf8-string
+    ];
+    buildTools = with self; [ alex happy Cabal_1_22_0_0 ];
+    patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal";
+    description = "Cryptol: The Language of Cryptography";
+    license = pkgs.stdenv.lib.licenses.bsd3;
+  };
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 0ced8929c8f..7c729138ff5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -50,18 +50,38 @@ self: super: {
   });                           # warning: "Module ‘Control.Monad.Error’ is deprecated"
 
   # Depends on time == 0.1.5, which we don't have.
-  HStringTemplate_0_8 = dontDistribute super.HStringTemplate_0_8;
+  HStringTemplate_0_8_1 = dontDistribute super.HStringTemplate_0_8_1;
+
+  # This is part of bytestring in our compiler.
+  bytestring-builder = dontHaddock super.bytestring-builder;
+
+  # Won't compile against mtl 2.1.x.
+  imports = super.imports.override { mtl = self.mtl_2_2_1; };
+
+  # Newer versions require mtl 2.2.x.
+  mtl-prelude = self.mtl-prelude_1_0_2;
+
+  # The test suite pulls in mtl 2.2.x
+  command-qq = dontCheck super.command-qq;
+
+  # Doesn't support GHC < 7.10.x.
+  ghc-exactprint = dontDistribute super.ghc-exactprint;
+
+  # Newer versions require transformers 0.4.x.
+  seqid = super.seqid_0_1_0;
+  seqid-streams = super.seqid-streams_0_1_0;
 
 }
 
 // # packages relating to amazonka
 
 (let
-  amazonkaEnv = let self_ = self; in self: super: {
+  Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
+  amazonkaEnv = self: super: {
     mkDerivation = drv: super.mkDerivation (drv // {
       doCheck = false;
       hyperlinkSource = false;
-      extraLibraries = (drv.extraLibraries or []) ++ [ (
+      buildTools = (drv.buildTools or []) ++ [ (
         if pkgs.stdenv.lib.elem drv.pname [
           "Cabal"
           "time"
@@ -69,7 +89,7 @@ self: super: {
           "directory"
           "process"
           "jailbreak-cabal"
-        ] then null else self.Cabal_1_18_1_6
+        ] then null else Cabal
       ) ];
     });
     mtl = self.mtl_2_2_1;
@@ -82,18 +102,11 @@ self: super: {
     process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; });
     inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
   };
-  Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
-  amazonka-core =
-    overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: {
-      # https://github.com/brendanhay/amazonka/pull/57
-      prePatch = "sed -i 's|nats >= 0.1.3 && < 1|nats|' amazonka-core.cabal";
-      extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ];
-    });
-  useEnvCabal = p: overrideCabal (p.overrideScope amazonkaEnv) (drv: {
-    buildDepends = (drv.buildDepends or []) ++ [ Cabal ];
-  });
-  amazonka = useEnvCabal super.amazonka;
-  amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch;
+  amazonka = super.amazonka.overrideScope amazonkaEnv;
+  amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv;
+  amazonka-core = super.amazonka-core.overrideScope amazonkaEnv;
+  amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv;
 in {
-  inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
+  inherit amazonkaEnv;
+  inherit amazonka amazonka-cloudwatch amazonka-core amazonka-kms;
 })
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 9fe6c1a78ba..303a9d7859a 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -34,6 +34,7 @@
 , testDepends ? []
 , testTarget ? ""
 , broken ? false
+, preUnpack ? "", postUnpack ? ""
 , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
 , preConfigure ? "", postConfigure ? ""
 , preBuild ? "", postBuild ? ""
@@ -251,6 +252,8 @@ stdenv.mkDerivation ({
     env = stdenv.mkDerivation {
       name = "interactive-${optionalString hasActiveLibrary "haskell-"}${pname}-${version}-environment";
       nativeBuildInputs = [ ghcEnv systemBuildInputs ];
+      LANG = "en_US.UTF-8";
+      LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''
         export NIX_GHC="${ghcEnv}/bin/ghc"
         export NIX_GHCPKG="${ghcEnv}/bin/ghc"
@@ -275,6 +278,8 @@ stdenv.mkDerivation ({
          ;
 
 }
+// optionalAttrs (preUnpack != "")      { inherit preUnpack; }
+// optionalAttrs (postUnpack != "")     { inherit postUnpack; }
 // optionalAttrs (configureFlags != []) { inherit configureFlags; }
 // optionalAttrs (patches != [])        { inherit patches; }
 // optionalAttrs (patchPhase != "")     { inherit patchPhase; }
@@ -284,11 +289,12 @@ stdenv.mkDerivation ({
 // optionalAttrs (postConfigure != "")  { inherit postConfigure; }
 // optionalAttrs (preBuild != "")       { inherit preBuild; }
 // optionalAttrs (postBuild != "")      { inherit postBuild; }
-// optionalAttrs (preInstall != "")     { inherit preInstall; }
-// optionalAttrs (postInstall != "")    { inherit postInstall; }
+// optionalAttrs (doCheck)              { inherit doCheck; }
 // optionalAttrs (checkPhase != "")     { inherit checkPhase; }
 // optionalAttrs (preCheck != "")       { inherit preCheck; }
 // optionalAttrs (postCheck != "")      { inherit postCheck; }
+// optionalAttrs (preInstall != "")     { inherit preInstall; }
+// optionalAttrs (postInstall != "")    { inherit postInstall; }
 // optionalAttrs (preFixup != "")       { inherit preFixup; }
 // optionalAttrs (postFixup != "")      { inherit postFixup; }
 )
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 612dd54d469..a4cd44f5948 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -526,14 +526,13 @@ self: {
      }:
      mkDerivation {
        pname = "AbortT-transformers";
-       version = "1.0.1";
-       sha256 = "0mslnhnkc5ahwjlfhkbih3mbfzi19aaszy9hf2msbsg86mmvg3j6";
+       version = "1.0.1.1";
+       sha256 = "00q3c2pr9rl2110624rndn7j2843rl62vh5569q96l2vzfpccgbp";
        buildDepends = [ base transformers ];
        testDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-transformers";
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -733,7 +732,6 @@ self: {
        homepage = "http://allureofthestars.com";
        description = "Near-future Sci-Fi roguelike and tactical squad game";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -2208,7 +2206,6 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Utility functions for using the chart library with GTK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-simple" = callPackage
@@ -2226,7 +2223,6 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ChasingBottoms" = callPackage
@@ -2235,8 +2231,8 @@ self: {
      }:
      mkDerivation {
        pname = "ChasingBottoms";
-       version = "1.3.0.10";
-       sha256 = "1k67d22fwrb9whd26xvqd0hgq765cic5hkvq920525vpmcndvkck";
+       version = "1.3.0.11";
+       sha256 = "00z3h4qpy7n9khygwjzn5dziv4fgvgj72fkan3m7f27d2y3cbw4w";
        buildDepends = [ base containers mtl QuickCheck random syb ];
        testDepends = [ array base containers mtl QuickCheck random syb ];
        description = "For testing partial and infinite values";
@@ -3150,8 +3146,8 @@ self: {
      }:
      mkDerivation {
        pname = "Deadpan-DDP";
-       version = "0.9.1.0";
-       sha256 = "0kbr3742xklmhz7qw4wi3f753q3lcklnh9ypdxf5wnbb1z2415b2";
+       version = "0.9.3.0";
+       sha256 = "03vs4pvca80wwgfgm1a6hbincvsmlxyyz319ihk9pw22zqiq5qvs";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -3948,23 +3944,26 @@ self: {
      }) {};
 
   "EtaMOO" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, haskeline
-     , mtl, network, old-locale, parsec, pcre, pureMD5, random, stm
-     , text, time, transformers, unix, unordered-containers, vector
+    ({ mkDerivation, array, base, bytestring, case-insensitive
+     , containers, hashable, haskeline, mtl, network, old-locale, parsec
+     , pcre, pipes, pipes-bytestring, pipes-concurrency, pipes-network
+     , pureMD5, random, stm, stm-chans, text, time, transformers, unix
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "EtaMOO";
-       version = "0.1.0.0";
-       sha256 = "1c693ljwhhcvfdy0jrzsviv4ahl526jgc1r0hff6c9kk0k0cl2rk";
+       version = "0.2.0.0";
+       sha256 = "0v7qq4d6zd3nr0856q3crivqqfq5q0rdppzf48jgzc9fzas6jl9n";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         array base bytestring containers haskeline mtl network old-locale
-         parsec pureMD5 random stm text time transformers unix
-         unordered-containers vector
+         array base bytestring case-insensitive containers hashable
+         haskeline mtl network old-locale parsec pipes pipes-bytestring
+         pipes-concurrency pipes-network pureMD5 random stm stm-chans text
+         time transformers unix unordered-containers vector
        ];
        extraLibraries = [ pcre ];
-       homepage = "https://github.com/verement/etamoo";
+       homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) pcre;};
@@ -4549,10 +4548,9 @@ self: {
     ({ mkDerivation, base, monad-control, mtl, resourcet }:
      mkDerivation {
        pname = "ForkableT";
-       version = "0.1.0.1";
-       sha256 = "1qw4qyfpax8y3pmb0sx717a294aamjb2mgvqhrkbqx2yi5d8jl66";
+       version = "0.1.0.2";
+       sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj";
        buildDepends = [ base monad-control mtl resourcet ];
-       jailbreak = true;
        homepage = "https://github.com/exFalso/ForkableT/";
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -4581,6 +4579,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Foster" = callPackage
+    ({ mkDerivation, array, base, cmdtheline, containers, random
+     , strict
+     }:
+     mkDerivation {
+       pname = "Foster";
+       version = "1.1.2";
+       sha256 = "0w4jnxk32c0pvrh2k7y93fckvrkcj3q8w4yi12zsgj9k1ic7yb6a";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ array base cmdtheline containers random strict ];
+       jailbreak = true;
+       description = "Utilities to generate and solve puzzles";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "FpMLv53" = callPackage
     ({ mkDerivation, base, HaXml }:
      mkDerivation {
@@ -5479,7 +5493,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GtkTV";
        description = "Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GuiHaskell" = callPackage
@@ -6176,6 +6189,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "HGraphStorage" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-default
+     , directory, filepath, HUnit, lifted-base, monad-control
+     , monad-logger, QuickCheck, resourcet, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "HGraphStorage";
+       version = "0.0.2";
+       sha256 = "0gml8mmxmpk9si7vldaq46j4a3c2l1rsssgazc93jg31nli021a5";
+       buildDepends = [
+         base binary bytestring containers data-default directory filepath
+         lifted-base monad-control monad-logger resourcet text transformers
+         transformers-base
+       ];
+       testDepends = [
+         base bytestring containers data-default directory filepath HUnit
+         lifted-base monad-control monad-logger QuickCheck resourcet tasty
+         tasty-hunit tasty-quickcheck text transformers transformers-base
+       ];
+       homepage = "https://github.com/JPMoresmau/HGraphStorage";
+       description = "Graph database stored on disk";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "HHDL" = callPackage
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
@@ -6779,7 +6817,7 @@ self: {
        pname = "HStringTemplate";
        version = "0.7.3";
        sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8";
-       editedCabalFile = "ece4d19b1b67b3fe543c1db710d3322e67f46c041fcd072d5870d47f89afb027";
+       editedCabalFile = "f3b42ea4e5c29507d6d186ccd34c83425d2e16a55ca3af95fd8bb1a71e3f54cb";
        buildDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale old-time parsec pretty syb template-haskell
@@ -6789,19 +6827,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "HStringTemplate_0_8" = callPackage
+  "HStringTemplate_0_8_1" = callPackage
     ({ mkDerivation, array, base, blaze-builder, bytestring, containers
      , deepseq, directory, filepath, mtl, parsec, pretty, syb
-     , template-haskell, text, time, utf8-string, void
+     , template-haskell, text, time, void
      }:
      mkDerivation {
        pname = "HStringTemplate";
-       version = "0.8";
-       sha256 = "07wgnkv2ga0h277fr8z18lsvbrhww5bv5s4av6nzl4x4984x0b8y";
+       version = "0.8.1";
+       sha256 = "1ccdr1ihlm6m5nb04wkqhksj77hhghag47zkxbmdc1d1qf5z5vzy";
        buildDepends = [
          array base blaze-builder bytestring containers deepseq directory
-         filepath mtl parsec pretty syb template-haskell text time
-         utf8-string void
+         filepath mtl parsec pretty syb template-haskell text time void
        ];
        jailbreak = true;
        description = "StringTemplate implementation in Haskell";
@@ -7181,8 +7218,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaXml";
-       version = "1.25.2";
-       sha256 = "0n434pwkxbsw6amj1mllaxdjhzwlc2nzd61js4i7if1h6cj73qph";
+       version = "1.25.3";
+       sha256 = "1iq74dnxvannx9x1whqc3ixn93r4v5z7b4yv21n9q5963kpafj34";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -7881,8 +7918,8 @@ self: {
      }:
      mkDerivation {
        pname = "Hs2lib";
-       version = "0.6.1";
-       sha256 = "1wy3jjxgzgqnf64dh6zg1z7qszy91v07381by3d2wmrn2sc6fj39";
+       version = "0.6.3";
+       sha256 = "0yjkghshbdbajib35hy3qr8x608i9qi2pgffpi59118krcw6k8mn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -8332,6 +8369,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Irc" = callPackage
+    ({ mkDerivation, base, data-default, doctest, mtl, network
+     , transformers
+     }:
+     mkDerivation {
+       pname = "Irc";
+       version = "0.1.0.2";
+       sha256 = "0qh1j9zy0yfpzdjxn6mypsw555pq2gm5nzys08zj5ilqn5z2r2pi";
+       buildDepends = [ base data-default mtl network transformers ];
+       testDepends = [ base doctest ];
+       jailbreak = true;
+       homepage = "https://github.com/yunxing/Irc";
+       description = "DSL for IRC bots";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "IrrHaskell" = callPackage
     ({ mkDerivation, base, random, time }:
      mkDerivation {
@@ -8795,7 +8848,6 @@ self: {
        homepage = "http://www.entropia.de/wiki/L-seed";
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LDAP" = callPackage
@@ -8881,12 +8933,10 @@ self: {
          template-haskell text transformers unordered-containers vector
          vector-binary-instances zlib
        ];
-       pkgconfigDepends = [ gtk ];
        homepage = "http://github.com/LambdaHack/LambdaHack";
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;};
+     }) {};
 
   "LambdaINet" = callPackage
     ({ mkDerivation, base, containers, GLFW, GLFW-task, monad-task, mtl
@@ -11295,7 +11345,6 @@ self: {
        ];
        description = "Real-time line plotter for protobuf-like data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PlslTools" = callPackage
@@ -11903,9 +11952,8 @@ self: {
      }:
      mkDerivation {
        pname = "RSA";
-       version = "2.1.0";
-       sha256 = "0bhnnz7vp1942ac2vg0y6vsag9bm0pslnm4ix6lmw28hy6d1jk2a";
-       editedCabalFile = "a6367228c6ecf3abc4a43225058ed9e86dc291849e943ce1f1ef5527c1ecba07";
+       version = "2.1.0.1";
+       sha256 = "0m74683bm34zd5r46ndb1h8jx1xp8wypfqm0gi3zmrv1rmm0j0hv";
        buildDepends = [
          base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA
        ];
@@ -12945,18 +12993,16 @@ self: {
      }:
      mkDerivation {
        pname = "SimpleLog";
-       version = "0.1.0.2";
-       sha256 = "1ladrn5xrbysj36dz93yrnd182qyac0dcwhh71lc6205ys89j88a";
+       version = "0.1.0.3";
+       sha256 = "12fjdmaxcpgp13gr1s25ybb5fysvbcg40j9yb29wvpbmf67xrsbw";
        buildDepends = [
          ansi-terminal attoparsec base bytestring containers directory
          ForkableT monad-control mtl old-locale resourcet semigroups stm
          template-haskell text th-lift time transformers transformers-base
        ];
-       jailbreak = true;
        homepage = "https://github.com/exFalso/SimpleLog/";
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SizeCompare" = callPackage
@@ -13141,6 +13187,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SpinCounter" = callPackage
+    ({ mkDerivation, base, monad-loops, ref-mtl, stm }:
+     mkDerivation {
+       pname = "SpinCounter";
+       version = "0.0.1";
+       sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2";
+       buildDepends = [ base monad-loops ref-mtl stm ];
+       homepage = "https://github.com/Julek";
+       description = "Lock free Spin Counter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Spock" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, containers, directory, hashable, hspec
@@ -13341,8 +13399,8 @@ self: {
     ({ mkDerivation, base, directory, mtl, syb, transformers }:
      mkDerivation {
        pname = "Strafunski-StrategyLib";
-       version = "5.0.0.5";
-       sha256 = "13w3vj6nwky891rk3yi9977i2wg09zc0kvhyrx2219zdv2z6i0xg";
+       version = "5.0.0.7";
+       sha256 = "0dsa3zg24rk52zyyh2y13sb0fnh01vwq0y2yybyiy3vkc7pznjvq";
        buildDepends = [ base directory mtl syb transformers ];
        jailbreak = true;
        description = "Library for strategic programming";
@@ -13853,6 +13911,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "TreeCounter" = callPackage
+    ({ mkDerivation, base, ref-mtl, stm }:
+     mkDerivation {
+       pname = "TreeCounter";
+       version = "0.0.2";
+       sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal";
+       buildDepends = [ base ref-mtl stm ];
+       homepage = "https://github.com/Julek";
+       description = "Wait-free Tree Counter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "TreeStructures" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -13877,6 +13947,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "Treiber" = callPackage
+    ({ mkDerivation, base, ghc-prim, monad-loops, ref-mtl, stm }:
+     mkDerivation {
+       pname = "Treiber";
+       version = "0.0.3";
+       sha256 = "1mvf45jyi7x2bn185z73mx360xaq6w9fsgg4vvgf41d4nq274hgx";
+       buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
+       homepage = "https://github.com/Julek";
+       description = "Lock free Treiber stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "TrendGraph" = callPackage
     ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
      , mtl, optparse-applicative, time
@@ -14059,12 +14141,13 @@ self: {
      }) {};
 
   "Unique" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, hashable, unordered-containers
+     }:
      mkDerivation {
        pname = "Unique";
-       version = "0.3";
-       sha256 = "04z0krkrknmlgbjfcqjfxa9racdc0sc3z7nyg16ram2hciiblyx4";
-       buildDepends = [ base containers ];
+       version = "0.4";
+       sha256 = "0la9gxr7kl0s606kl5szb1sw3xwh9pnd1ak6iwlxi7b0bm9syik1";
+       buildDepends = [ base containers hashable unordered-containers ];
        description = "It provides the functionality like unix \"uniq\" utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15228,8 +15311,8 @@ self: {
      }:
      mkDerivation {
        pname = "abcBridge";
-       version = "0.11";
-       sha256 = "1wilwysn0rxlg5q971pa3njqmbmn8sdi4zsiqr8mc6aqlckws9b4";
+       version = "0.12";
+       sha256 = "1432hjaj0fccsd16if0wyiayp9wj66gam6c48fc1lgnqc5lvw5jj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ aig base containers directory vector ];
@@ -16300,6 +16383,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson_0_7_0_6" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
+     , old-locale, QuickCheck, scientific, syb, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "0.7.0.6";
+       sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
+       editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001";
+       buildDepends = [
+         attoparsec base blaze-builder bytestring containers deepseq dlist
+         ghc-prim hashable mtl old-locale scientific syb template-haskell
+         text time unordered-containers vector
+       ];
+       testDepends = [
+         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
+         template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text time unordered-containers vector
+       ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
@@ -16536,9 +16646,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-utils";
-       version = "0.2.2.1";
-       sha256 = "0sj4kdcxcj2wnf3s109yxq8gghz976hkiqs19bjcp6qkzdf5w6sd";
-       editedCabalFile = "f306a03acf8d68a087cdcf5fd1ddcf7672820cd303a494c892aa176f56d1332d";
+       version = "0.3";
+       sha256 = "12rb5dfhcr5rahk14nxc5ac416sxpzsihyciwk551kyyvahmrp3v";
        buildDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -16642,8 +16751,8 @@ self: {
     ({ mkDerivation, base, mtl, QuickCheck, vector }:
      mkDerivation {
        pname = "aig";
-       version = "0.2";
-       sha256 = "0gv9s6x3jgkwmmq77risxfkk6nx2474zrwszk7gd3ygp6n01s3ry";
+       version = "0.2.1";
+       sha256 = "0wcqw5scaw2ximhbv9pnpngdlr36adci7hpqwj9haa9ql5pwqqxk";
        buildDepends = [ base mtl QuickCheck vector ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -16733,8 +16842,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "3.0";
-       sha256 = "1qyya6bx0xhw09mshz6gysizdbbmpzcgx4b494lnmr9x6sb5fvz7";
+       version = "3.1";
+       sha256 = "0q9w4lwf2k6r36vb452z2ykkdz4z4xcc7x4kgjrjfcxfca7m0l50";
        buildDepends = [ array base containers mtl random vector ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
@@ -16743,15 +16852,15 @@ self: {
 
   "aivika-experiment" = callPackage
     ({ mkDerivation, aivika, base, containers, directory, filepath, mtl
-     , network-uri, parallel-io, split, utf8-string
+     , network-uri, parallel-io, split
      }:
      mkDerivation {
        pname = "aivika-experiment";
-       version = "3.0";
-       sha256 = "0xay16jjcdf2hg3qbmhmx915b2psxg2vrir0dmzr98hv4p4fbc3v";
+       version = "3.1";
+       sha256 = "19x4y060r9cgkfffyxdgilmrrjv4ycpxv6w8gclkfrxj1ywwkwx4";
        buildDepends = [
          aivika base containers directory filepath mtl network-uri
-         parallel-io split utf8-string
+         parallel-io split
        ];
        homepage = "http://github.com/dsorokin/aivika-experiment";
        description = "Simulation experiments for the Aivika library";
@@ -16764,8 +16873,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-cairo";
-       version = "3.0";
-       sha256 = "0cjlvm2bbm9sjixsknw88ki2fwrfjgx126jd6qxgrrkjrflqk11z";
+       version = "3.1";
+       sha256 = "0b4nwzrkpxhiwph93zvyk8bi9770bsdnhxkzhbri3l0zsm9250kz";
        buildDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-cairo
        ];
@@ -16781,8 +16890,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "3.0";
-       sha256 = "0mn9raj0wxmm4f5n99nr3i1dmdfmi90y4fb9fywh76dwg00kjh7d";
+       version = "3.1";
+       sha256 = "17bp7bp3x7z3xlzd6922mjm44v8jlkw1ak3zfr31146hlifgfhyw";
        buildDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
@@ -16798,8 +16907,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-diagrams";
-       version = "3.0";
-       sha256 = "1d56w3mpx8wm4fji72hbxzv3zb6h21ipw56y8ylbs8qr2l46f0cd";
+       version = "3.1";
+       sha256 = "1vjis6184cvw7jzg8a3nvs0d0sv30d6qx598phcq9ncs3bmh9h3f";
        buildDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-diagrams
          containers filepath
@@ -16864,8 +16973,8 @@ self: {
     ({ mkDerivation, argparser, base, containers, threefish }:
      mkDerivation {
        pname = "alea";
-       version = "0.3.1.0";
-       sha256 = "0fag57z6j1n86wxj2f38qdhklpff8iwx7pr7s30zv267w3hsp9as";
+       version = "0.3.3.0";
+       sha256 = "1c5bdbazlds419qgpdghrap5y20i59z57qk2dnj35bl2n5mvlapl";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ argparser base containers threefish ];
@@ -16932,6 +17041,7 @@ self: {
        pname = "algebra";
        version = "4.2";
        sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs";
+       editedCabalFile = "621c4b71305b0a6a926f055608b5ca76c4c2360a523bcdf88d80fd10d20f4210";
        buildDepends = [
          adjunctions array base containers distributive mtl nats
          semigroupoids semigroups tagged transformers void
@@ -17413,8 +17523,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "0.2.0";
-       sha256 = "0736n3pqydlv0xbp1xzk4ngw3lbh603046y9293bw679sch8hlyw";
+       version = "0.2.3";
+       sha256 = "0zdkpk08m6d4cg0x7z8wkf27x01d3qrpsp31p0mhzsgmdrvr998m";
        buildDepends = [
          amazonka-core base bytestring conduit exceptions http-conduit lens
          mmorph monad-control mtl resourcet retry text time transformers
@@ -17430,8 +17540,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "0.2.0";
-       sha256 = "1ffhngz23h4mc1cxbd6xkjzpkx3yncl5sm6b6idwwbi6f05k2f93";
+       version = "0.2.3";
+       sha256 = "13kpibj6c23lwj4gj401jdhq480hy8qhcphvasqmkh7xs7vabn81";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
@@ -17443,8 +17553,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "0.2.0";
-       sha256 = "0qsffvmlqrrk0dkb84dbgjla9hrsb9ivxs47jw4h5a2dnfsvclpj";
+       version = "0.2.3";
+       sha256 = "1i2b07swgq6i4szwl3y2jl8p7bc68hfcfpp338ghg970rvjps6ja";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
@@ -17456,8 +17566,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "0.2.0";
-       sha256 = "00bnm5zgzbndhmr0w1v2rranp05ldznb9zvy45m144m2bzn2bh1m";
+       version = "0.2.3";
+       sha256 = "1r6vs3xfph1i9b36s7kn5d70bls7fwwhrd94drv5f0rcm372ck9b";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
@@ -17465,12 +17575,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-cloudhsm" = callPackage
+    ({ mkDerivation, amazonka-core, base }:
+     mkDerivation {
+       pname = "amazonka-cloudhsm";
+       version = "0.2.3";
+       sha256 = "0rak82ahr6qvi4ahkrmxrbivnda06bw91z3zg1lgl6qxyas0601m";
+       buildDepends = [ amazonka-core base ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudHSM SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudsearch" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "0.2.0";
-       sha256 = "0gy6qvq0czin9bpy2bvfb0r6095k8jm8wxrgsr3x07kdpgy6vlpv";
+       version = "0.2.3";
+       sha256 = "18zrmr43045ql886fjz0911j80sdhj34xvxqbpx47xmwmwinqa58";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
@@ -17482,8 +17605,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "0.2.0";
-       sha256 = "06pk2s3pbc07crz27k789diycy3s2yy7f1z22fzf9j8x5qbsbyx8";
+       version = "0.2.3";
+       sha256 = "0xchvnqvjbl808yy08kh7zqkpl2wjn7yyqy0wjisw0az106smp1g";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
@@ -17495,8 +17618,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "0.2.0";
-       sha256 = "0gsva5kz7swpdx1vgs1q7w6fhsdbcxk4912fg6j6z4wh1v110j8v";
+       version = "0.2.3";
+       sha256 = "0i5z4p1qrn15g0khi66bcdp6m8nlac0r7lafgfqj5mndj3ml08bp";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
@@ -17508,8 +17631,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "0.2.0";
-       sha256 = "03csdz8q7ni0jkv1900mq78xz6d08qlpn8jrccvp6zkijc0mzskh";
+       version = "0.2.3";
+       sha256 = "0szdk7z4z2dzflzff46mjn627i9dlpqzvzwrv0rnhm2wcdz5i2i5";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
@@ -17520,8 +17643,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "0.2.0";
-       sha256 = "1079yaq0hl7w5gkimsnma7a6xyv7rycmaxvjnyjacc80li4pki9m";
+       version = "0.2.3";
+       sha256 = "16kjzpr70m0ag7ss7ijswhw6h25xikp280hd6ng4dwdplgzci1zl";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
@@ -17533,8 +17656,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "0.2.0";
-       sha256 = "0zsw08lpccyhsdd0sj3zfckbmkiwas5yzbb80xria8230b8r9fd9";
+       version = "0.2.3";
+       sha256 = "0dp1nhsand12fcv1z0p238i04ajylkqjb0wf8a0ksv0997zgzaw5";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
@@ -17546,8 +17669,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "0.2.0";
-       sha256 = "015l0daqciglmnim4i6f0i0ak1iz58d6d947m1f6as23l7cgw0f9";
+       version = "0.2.3";
+       sha256 = "0awhxx148rkla192pvk8qwiw87z7hy8z2nsa33aysbs47aasnsdj";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
@@ -17559,8 +17682,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "0.2.0";
-       sha256 = "0p3a9s6qh5snwvq3lk4zznk3ckykzvw8b1z48990v7wr7nc0mvvz";
+       version = "0.2.3";
+       sha256 = "09wvx1mp8vxx8hkwdgkrdhkfclb7v0g5q9lk4a42r70yf2qfq2fw";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
@@ -17572,8 +17695,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "0.2.0";
-       sha256 = "0vwbkbjmvvba5zma5iiy2h8pbr87778mbb5kwfw6d8j8yrhy2d5q";
+       version = "0.2.3";
+       sha256 = "0acs6gh9qkwdv9kcp9giyz021w0jzq47340shc44zwx5l0s0a1af";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
@@ -17592,8 +17715,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "0.2.0";
-       sha256 = "1775jzcq0705cj002f73sdi03hk64gink8yj5l4zli1f5wl6nhm6";
+       version = "0.2.3";
+       sha256 = "1s9mlkrql7vmm14nppx9ixlk3364rc50m4k1lgxiddmz2hhc74v0";
        buildDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bifunctors bytestring case-insensitive conduit conduit-extra
@@ -17615,8 +17738,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "0.2.0";
-       sha256 = "1d6x35fhcyhnb6fcr5jsgbqs9sxphxvl32iinv8ny5yq9scx5aga";
+       version = "0.2.3";
+       sha256 = "1b4pz5shyms8zb5d46z51rawj7pvajsbbgprkzw2jm522d0cmzvq";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
@@ -17628,8 +17751,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "0.2.0";
-       sha256 = "0wqz2r5cmzlh3m267jdy5mg7d7q7vlsv1hs8d8ndal7z0lmljskf";
+       version = "0.2.3";
+       sha256 = "0cn2rf2lddjvfcsznhpfirl8nj47pmrfdqxx4jp2kly5yxcwrivv";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
@@ -17641,8 +17764,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "0.2.0";
-       sha256 = "1d2r8rpbz71h8kaf2v7arlisyqs0kx21x7yrg5dkrf7px363k1d9";
+       version = "0.2.3";
+       sha256 = "02402hrqp8iwjq7mww8s3z5vx37fh2n3slv4fvz0bz38dgbgfpz2";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
@@ -17654,8 +17777,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "0.2.0";
-       sha256 = "0hjx6nmry3h7bbc6wmq9pfr5ddw8704sg0lcc34kmlyf4pwhcz3d";
+       version = "0.2.3";
+       sha256 = "0hcq8l4bilb8fd91k8nsv96xkrc2gqvy1ms95iycwhc8lm1g0wa0";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
@@ -17667,8 +17790,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "0.2.0";
-       sha256 = "0qygz71j8l1jzl9khljrw68xbs5mbs77qs7zgfy1822jsxg3lknk";
+       version = "0.2.3";
+       sha256 = "1vj3dmcfrql8r3m50ck7afilbv8knp9cd5g0x7l6c1qp3klnz9b9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
@@ -17680,8 +17803,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "0.2.0";
-       sha256 = "16p8cxn2wva7lk1pk9k5civh2qrhl4gaz97nm8haw1q3ihxcp35s";
+       version = "0.2.3";
+       sha256 = "0lrv91mx3bml3gc8cw9pjlb2klag9bnxajgjl44vxacnbs2qb4xz";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
@@ -17693,8 +17816,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "0.2.0";
-       sha256 = "0711pa4if4pz3k0jlan92gj6m4aiawwvkdf1zhplqyqlmnlbj98w";
+       version = "0.2.3";
+       sha256 = "1fm3hyg798zajrflp09wvmzs5ih2614xkbr8ylnwkzjfpspqi9s9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
@@ -17706,8 +17829,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "0.2.0";
-       sha256 = "1f98x8yznjky5gqdycvn3f4an3ac9dqq5i4a0a2b695ly9f0z5sw";
+       version = "0.2.3";
+       sha256 = "1m59zb62d80h6pbhc4azqnmalgn0hs60ij0q9dgr4igxlbwag5d8";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
@@ -17719,8 +17842,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "0.2.0";
-       sha256 = "1hjr1is0s3fbx25ih3sbndmpy272bk998llwpwy8m84wqwrymml2";
+       version = "0.2.3";
+       sha256 = "0khmhhhlwwfbb8h2f5djqvpy3c8lh18hy6wvwwxznc2raqlrpvgq";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
@@ -17732,8 +17855,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "0.2.0";
-       sha256 = "0fbabw20h8fdhfzlbkc9qwq95s9a51a0pvjxq66myn05z5m1glci";
+       version = "0.2.3";
+       sha256 = "1yayzjr8zjrcw8ynprw4737qg0zi580mcxc0r51g8dik19fg6rly";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
@@ -17745,8 +17868,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "0.2.0";
-       sha256 = "01nlsvq9i3mw7gikjsbb9w38sbd08g6mncbik4yhrn1ngx2fp1ag";
+       version = "0.2.3";
+       sha256 = "0874iyrq3lsk4b3hpxh491c5jic9y8ififqsxgxv70ywipvfr7d0";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
@@ -17758,8 +17881,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "0.2.0";
-       sha256 = "16fdapzi2ilrzwfj1qrgg225kqyr1gyx7v32v7a8abf8pwxb3ql5";
+       version = "0.2.3";
+       sha256 = "0i2bv484hhh0rg47669i51qizcm904cq74amf93a5c8pbla1b2fb";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
@@ -17771,8 +17894,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "0.2.0";
-       sha256 = "1v2bs1hp2niv78s7bznj48qn06gv2mqm8sam58dr39gpya9br8x4";
+       version = "0.2.3";
+       sha256 = "1xd27qfm08ygi3vlk35qma381p4dq6q357qm5jasfpcm9jj33rss";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
@@ -17783,8 +17906,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "0.2.0";
-       sha256 = "1v5yjchljc255cbn8ff5brwmqbk813wdnkbc8z1678g27rndakx4";
+       version = "0.2.3";
+       sha256 = "09hjb5qyvd4yairwxrpajksdrzqva350qnqh9azb9xzlsl6wfxry";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
@@ -17796,8 +17919,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "0.2.0";
-       sha256 = "18ks55r13v34wgh7wqb41k9q7h4zxqy2br98y64qdl3zq400ivmx";
+       version = "0.2.3";
+       sha256 = "09scxvk2jp8k4a7ggaphq0ywp3f4d5xy422sds55kfd0m32cqcpg";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
@@ -17809,8 +17932,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "0.2.0";
-       sha256 = "0qpn46xx2q3lqh0dra6f7i1s4s48zlv0v80jscvmr4y3dfi66mm0";
+       version = "0.2.3";
+       sha256 = "13hgkww38p1q79xzpd4gj9dv2rzhsba9z8lh5gb4iqyb34831c0i";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
@@ -17822,8 +17945,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "0.2.0";
-       sha256 = "0wk37jlx0xzajn8cqpr7g6nxcczqcr4x87l3l68fkb4xw78by8ll";
+       version = "0.2.3";
+       sha256 = "05pm2v1hqb5aha979mrx59d9qxqr3kn8f402m30lp0v0gfqlvxj0";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
@@ -17835,8 +17958,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "0.2.0";
-       sha256 = "137x7cix3nvdnb2yqh12qrdljb959bfp75k6q40rw3ryz9lacicb";
+       version = "0.2.3";
+       sha256 = "1qklx8iv7isasys02n5ga6ml83j86lmgi92dlwa5spqbvrq8cqbs";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
@@ -17848,8 +17971,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "0.2.0";
-       sha256 = "0722n7v7f0xlxvq7khfxy4rw1iwp1dl5d0dpvwc5vl8pbfdw5k55";
+       version = "0.2.3";
+       sha256 = "0gxjfjw82nhiza7gxpj2qbyli8jd45rbhgmx17vqj5f741b186d8";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
@@ -17861,8 +17984,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "0.2.0";
-       sha256 = "1zm9scqngski4sh00qx6b2jmgmzwcv5hc03g0a8yy5d6ylb633x6";
+       version = "0.2.3";
+       sha256 = "1mv8qz5i4bbiarfai4ryvwwbx52dc8hd4kfi75avglmji8cda315";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
@@ -17874,8 +17997,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "0.2.0";
-       sha256 = "1dzpxld8fh95blb5blmld6c88qyqk3yid043xic3mhpd6wyzgmna";
+       version = "0.2.3";
+       sha256 = "0bd3xr85vp8i6qkd3nqhcppc5vvzgqc1f1xjcbk3mp03vdxbpaal";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
@@ -17887,8 +18010,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "0.2.0";
-       sha256 = "08h9ddcwslp50lc1jzqx0m12097vy59may184psflnm05jn250s8";
+       version = "0.2.3";
+       sha256 = "0657j13v78laz8bv2lpmzr44bijifbx59g0fsv76m3jfirkgv1lj";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
@@ -17900,8 +18023,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "0.2.0";
-       sha256 = "1n2d3imbva7zjknx7jicjjccjgyq60cbcxbr61l70ldsaidrs9p7";
+       version = "0.2.3";
+       sha256 = "11xkzgcflz5smp0mpbbsl2l61g5qwzmrzfxvkq0rzavfaqpr6jzc";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
@@ -17913,8 +18036,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "0.2.0";
-       sha256 = "1l2f57j6mjrpcva02yba3dp6kvcf68c0bw1c6rx5865gq4m37n2h";
+       version = "0.2.3";
+       sha256 = "1gziq56fs5iggasggn4d2k7q6dvrg2shabnfgmk7c9pxsqbaj2c6";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
@@ -17926,8 +18049,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "0.2.0";
-       sha256 = "07f9nvimgf0pvlggb8r9h2gaq8kmhcflc30hm9wpn1ihm9hqn13n";
+       version = "0.2.3";
+       sha256 = "1pj0cnixbqwwxpwh46bcm96j0b686vwd6cdglb3rhg2nq76whjs1";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
@@ -17939,8 +18062,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "0.2.0";
-       sha256 = "0jiks2pywzkxc7av1f2fynqvcq0x7501hijdyxdw3wm3rhpz14wh";
+       version = "0.2.3";
+       sha256 = "13wisry1c0fig9vw6nr9pw7jwyq4p2gylb568al5s812hw2nisxg";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
@@ -17952,8 +18075,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "0.2.0";
-       sha256 = "0p57p7flfw5zzqypyyhj8l4xn42048lqvaz62l5r5s0q3yqpnqjz";
+       version = "0.2.3";
+       sha256 = "0sqsx03iw0cf9is491y0gwpaw1xv39nplmja1a2as3iw46vf3382";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
@@ -17965,8 +18088,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "0.2.0";
-       sha256 = "1a3vi2wvb0yz04py42pdwnimifslzq7w0mvy8qgf9cpvjs476g3k";
+       version = "0.2.3";
+       sha256 = "06a7mx44crgh3dwx8amvrqwprdrlhdhvmyw3jybzidm5c2lfjyay";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
@@ -18003,8 +18126,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.10.1";
-       sha256 = "1a2d17h1zhd2yv1zhd0vvr4g1v6nr188gwv12qwljs1v9y4jkbmc";
+       version = "0.11";
+       sha256 = "1brvr8qzkhv7c2j5zzqwfpzw5n2b1l1d92idn2bs4yjzn3c1ama7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -18014,8 +18137,8 @@ self: {
        ];
        testDepends = [
          base binary bytestring clock connection containers
-         data-binary-ieee754 hspec hspec-expectations network split text
-         vector
+         data-binary-ieee754 hspec hspec-expectations network network-uri
+         split text vector
        ];
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
@@ -18715,6 +18838,7 @@ self: {
          apiary base bytestring data-default-class filepath Glob parsec
          purescript text unordered-containers utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -19464,6 +19588,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ascii-progress" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, data-default, hspec
+     , MissingH, time
+     }:
+     mkDerivation {
+       pname = "ascii-progress";
+       version = "0.1.0.0";
+       sha256 = "08as7dlnqwxh9501jcg7ijics7ahdn8gph2578vdzz4cmk2fk2ma";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         ansi-terminal async base data-default MissingH time
+       ];
+       testDepends = [
+         ansi-terminal async base data-default hspec MissingH time
+       ];
+       homepage = "https://github.com/yamadapc/haskell-ascii-progress";
+       description = "A simple progress bar for the console";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "ascii-vector-avc" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq
      , deepseq-generics, HUnit, split, zlib
@@ -19891,8 +20036,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.3.0.0";
-       sha256 = "0kq3gkjg1jl6mbg7id0ff9pwymyqxr8d57w76j9qmcpz7n0p4j7w";
+       version = "0.3.0.1";
+       sha256 = "1j8x28d2n5ivyrxs35ka2sahnj9d94izr2sihhgppjcgsnm93c8m";
        buildDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -20337,19 +20482,18 @@ self: {
      }) {};
 
   "authenticate-oauth" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-builder
-     , blaze-builder-conduit, bytestring, crypto-pubkey-types
-     , data-default, http-client, http-types, random, RSA, SHA, time
-     , transformers
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
+     , crypto-pubkey-types, data-default, http-client, http-types
+     , random, RSA, SHA, time, transformers
      }:
      mkDerivation {
        pname = "authenticate-oauth";
-       version = "1.5.0.2";
-       sha256 = "0sq8acqwjqjz9nn1xqcr0hs73af1vddp6fv2lqhbr510x6i6rcap";
+       version = "1.5.0.3";
+       sha256 = "0202m3xyqqlgacf8yk0zyb8ainc47fdhf7hrqfy40qh4lkvxr9if";
        buildDepends = [
-         base base64-bytestring blaze-builder blaze-builder-conduit
-         bytestring crypto-pubkey-types data-default http-client http-types
-         random RSA SHA time transformers
+         base base64-bytestring blaze-builder bytestring crypto-pubkey-types
+         data-default http-client http-types random RSA SHA time
+         transformers
        ];
        homepage = "http://github.com/yesodweb/authenticate";
        description = "Library to authenticate with OAuth for Haskell web applications";
@@ -20407,8 +20551,8 @@ self: {
      }:
      mkDerivation {
        pname = "autonix-deps";
-       version = "0.1.0.1";
-       sha256 = "1639yhq3v506h67374mw63pkz15p52qqapc6bwi3dylyp4ilgimi";
+       version = "0.2.0.0";
+       sha256 = "067q10wdzzv2xv2yak15bxysc935ghgrsm5nq90pfmzmwcv3323a";
        buildDepends = [
          base bytestring conduit containers errors filepath lens
          libarchive-conduit mtl optparse-applicative process regex-tdfa
@@ -20425,8 +20569,8 @@ self: {
      }:
      mkDerivation {
        pname = "autonix-deps-kf5";
-       version = "0.1.0.0";
-       sha256 = "04lhp4gnzpa5r2wlbvm29ig87335b5ahnw19wkaychv54n0505xj";
+       version = "0.2.0.0";
+       sha256 = "11s723xz3n761kr1i09sd1cvbqg2rcm15dhfaxfs7qq4kka2ahhp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -20560,8 +20704,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.11";
-       sha256 = "19q7r74c5xw04vpwl2fwm675bvkp3vhlak63iqfl1927z2jsyva9";
+       version = "0.11.2";
+       sha256 = "15qn5fwaqzf6mqs6bahcddqhnhgbjbprw321yf2g68qq2h6dzqzi";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -20629,12 +20773,12 @@ self: {
      , conduit-extra, containers, cryptohash, http-conduit, http-types
      , mtl, optparse-applicative, resourcet, scientific
      , template-haskell, text, time, unordered-containers, vector
-     , xml-conduit
+     , xml-conduit, yaml
      }:
      mkDerivation {
        pname = "aws-ec2";
-       version = "0.2.2";
-       sha256 = "1jlm6a4mb3mzzvql8llnvci4qd8imf58m681iqhcw1qq6hy56srl";
+       version = "0.3.2";
+       sha256 = "0wgg05hnzjrlhzkc5giy5gdkiy4dg6hvgdq433ifld11vrpy152d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -20642,7 +20786,7 @@ self: {
          byteable bytestring conduit-extra containers cryptohash
          http-conduit http-types mtl optparse-applicative resourcet
          scientific template-haskell text time unordered-containers vector
-         xml-conduit
+         xml-conduit yaml
        ];
        homepage = "https://github.com/zalora/aws-ec2";
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
@@ -20682,8 +20826,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-general";
-       version = "0.1.1";
-       sha256 = "002ly4n3qlffhhplvhqqa4cwdi2qgnl0vdm9mr2y2pzi9rdd4ijp";
+       version = "0.2.0";
+       sha256 = "1cizkj7f8l57g95drhgnaylv0yzp7mblwh92z2syfqfkvg5m5fwa";
        buildDepends = [
          aeson attoparsec base base16-bytestring blaze-builder byteable
          bytestring case-insensitive cryptohash hashable http-types
@@ -20696,7 +20840,7 @@ self: {
          tagged tasty tasty-quickcheck text time transformers
        ];
        homepage = "https://github.com/alephcloud/hs-aws-general";
-       description = "Bindings for AWS General API Version 0.1";
+       description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -20709,8 +20853,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-kinesis";
-       version = "0.1.2";
-       sha256 = "18ki1hdynq7i3wlp4xb8cyr3qvlgmrmk76fhqljkfrwk5681bcwv";
+       version = "0.1.3";
+       sha256 = "0ka5hqrin7hhr1vavl1ky35gnhil2r6ajbxdl11dbdnhm11sllvq";
        buildDepends = [
          aeson aws aws-general base base64-bytestring blaze-builder
          bytestring conduit conduit-extra http-conduit http-types parsers
@@ -20736,8 +20880,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-kinesis-client";
-       version = "0.2.0.0";
-       sha256 = "0zyz84zwfqcwc95g8lwgzc5102wblc94f23sfgfgslk4w86489c9";
+       version = "0.2.0.2";
+       sha256 = "1zz9wxgcsnx28i9rg0sykjdmg0fhnv1ycgvzrxnpkph0j8zllsis";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -20756,21 +20900,20 @@ self: {
   "aws-kinesis-reshard" = callPackage
     ({ mkDerivation, aws, aws-general, aws-kinesis, aws-sdk, base
      , base-unicode-symbols, bytestring, conduit, either, hoist-error
-     , lens, lifted-async, lifted-base, monad-control, mtl
+     , lens, lens-action, lifted-async, lifted-base, monad-control, mtl
      , optparse-applicative, resourcet, text, time, transformers
      }:
      mkDerivation {
        pname = "aws-kinesis-reshard";
-       version = "0.1.0.0";
-       sha256 = "0g8zbga3v6h8b6dk3hqvhmlmn6kq0cqxbvxhj94qgqzy7qja1pj9";
-       editedCabalFile = "c64a7e40e0369963154c9d76f1b72f0577203a2a4b7e7c3e76e83d061fa2ec92";
+       version = "0.1.0.1";
+       sha256 = "1v7i39sd6rizrrgxpqp3pnc45sry4glkb7yi0jx8qcxf2d8bklnn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aws aws-general aws-kinesis aws-sdk base base-unicode-symbols
-         bytestring conduit either hoist-error lens lifted-async lifted-base
-         monad-control mtl optparse-applicative resourcet text time
-         transformers
+         bytestring conduit either hoist-error lens lens-action lifted-async
+         lifted-base monad-control mtl optparse-applicative resourcet text
+         time transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/alephcloud/hs-aws-kinesis-reshard";
@@ -21516,6 +21659,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base58-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, quickcheck-assertions
+     , quickcheck-instances, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "base58-bytestring";
+       version = "0.0.3";
+       sha256 = "1b0h6j8wnd4064kwa0h5fh04wzn40bxdxbw2bwvksz632k709w4q";
+       buildDepends = [ base bytestring ];
+       testDepends = [
+         base bytestring quickcheck-assertions quickcheck-instances tasty
+         tasty-quickcheck
+       ];
+       homepage = "https://bitbucket.org/s9gf4ult/base58-bytestring";
+       description = "Implementation of BASE58 transcoding for ByteStrings";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "base58address" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, cryptohash
      , QuickCheck, test-framework, test-framework-quickcheck2
@@ -21607,8 +21768,8 @@ self: {
      }:
      mkDerivation {
        pname = "basic-prelude";
-       version = "0.3.10";
-       sha256 = "10013ni7kpqlc6s3ryfvmklw3ic5h48rm4wsrb31pcp5xja0qk59";
+       version = "0.3.11";
+       sha256 = "05nbaba4ww24x326dd1x1r94yv9jl9r5hys2qg5qkyzldpzqndl6";
        buildDepends = [
          base bytestring containers hashable lifted-base ReadArgs safe
          system-filepath text transformers unordered-containers vector
@@ -22299,15 +22460,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "binary_0_7_2_3" = callPackage
+  "binary_0_7_3_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.7.2.3";
-       sha256 = "16f4lnl0kyx17z1iwr3p030lbyh3qkifdvr8vrl704xv5hq5jzzx";
+       version = "0.7.3.0";
+       sha256 = "0pv6zd1k3axn3dd7cva6pc1jrmkszgrzwqk6ck3gcl841fj4l4xz";
        buildDepends = [ array base bytestring containers ];
        testDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -22558,10 +22719,10 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers, mtl }:
      mkDerivation {
        pname = "binary-strict";
-       version = "0.4.8.1";
-       sha256 = "07mmh4x8qjpw7w35nxcq8wayy4bagjblbwkpvh3xd38rxpdnl6pi";
+       version = "0.4.8.2";
+       sha256 = "0cyrr45wpq5h4gg6qms54nmvhqpyj59d5bhlk316g4yjsf3484b7";
        buildDepends = [ array base bytestring containers mtl ];
-       homepage = "http://code.haskell.org/binary-low-level";
+       homepage = "https://github.com/idontgetoutmuch/binary-low-level";
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24155,8 +24316,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-html";
-       version = "0.7.0.3";
-       sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx";
+       version = "0.7.1.0";
+       sha256 = "0krvyik9hdizvyx3r499vah34b1jnnv4ivm9h1ij7rgh9xjw34ja";
        buildDepends = [ base blaze-builder blaze-markup bytestring text ];
        testDepends = [
          base blaze-builder blaze-markup bytestring containers HUnit
@@ -24222,8 +24383,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-markup";
-       version = "0.6.2.0";
-       sha256 = "034aqkvxw0g6ry4d82bkvxky7w6yx4q6bp1wn4ydj9rqw8yh6m08";
+       version = "0.6.3.0";
+       sha256 = "1x057jlp89js6xbbyp4ky7xf5wq1ckl516b8bzp4y3knz50jshll";
        buildDepends = [ base blaze-builder bytestring text ];
        testDepends = [
          base blaze-builder bytestring containers HUnit QuickCheck
@@ -24451,12 +24612,10 @@ self: {
          random regex-compat unix utf8-string X11 X11-xft xmonad
          xmonad-contrib
        ];
-       pkgconfigDepends = [ gtk ];
        homepage = "http://www.bluetile.org/";
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;};
+     }) {};
 
   "bluetileutils" = callPackage
     ({ mkDerivation, base, gtk }:
@@ -24470,7 +24629,6 @@ self: {
        jailbreak = true;
        description = "Utilities for Bluetile";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bmp" = callPackage
@@ -25067,8 +25225,8 @@ self: {
      }:
      mkDerivation {
        pname = "buildwrapper";
-       version = "0.9.0";
-       sha256 = "0hgl25rpcwhia3r8w34vxgi5llb87cmcpj5cxk58dh16nrx3mljw";
+       version = "0.9.1";
+       sha256 = "1icm2vqimza6lslav01d11xq4v0p6dpymvx4md48ch8qbhdrn8r3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -25228,11 +25386,10 @@ self: {
          hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
          test-framework-hunit text
        ];
-       pkgconfigDepends = [ glib ];
        description = "Draw pretty sequence diagrams of D-Bus traffic";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) glib;};
+     }) {};
 
   "bv" = callPackage
     ({ mkDerivation, base }:
@@ -25307,6 +25464,7 @@ self: {
        pname = "bytes";
        version = "0.14.1.3";
        sha256 = "18pbn7qz93hwkdlbdld2mh91hki1smbcz0gsn6d816gr7whf1fhx";
+       editedCabalFile = "320ebe39de8e091a9a043c59a0f7b44fdaf9b7306bbc299cc9552aa2a31093be";
        buildDepends = [
          base binary bytestring cereal containers mtl text time transformers
          transformers-compat void
@@ -25350,19 +25508,17 @@ self: {
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-builder" = callPackage
     ({ mkDerivation, base, bytestring, deepseq }:
      mkDerivation {
        pname = "bytestring-builder";
-       version = "0.10.4.0.1";
-       sha256 = "0iqh6k6dvl75z1m0i1grkr4w5ynxrd6qd7ynjl0bkd39nbwfay90";
+       version = "0.10.4.1.1";
+       sha256 = "13dajygfpqxl1w875lj9asyhbzz0psi4lk73wiwll41p8brlrjrn";
        buildDepends = [ base bytestring deepseq ];
        description = "The new bytestring builder, packaged outside of GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-class" = callPackage
@@ -25601,9 +25757,8 @@ self: {
     ({ mkDerivation, base, bytestring, bzip2 }:
      mkDerivation {
        pname = "bzlib";
-       version = "0.5.0.4";
-       sha256 = "1vf37y7wknrihf7hipd6lihkmn7sszbgfb325my52yzbjs3baccd";
-       editedCabalFile = "96e2a6fa6a6a13bdf9d0fe95d7fa1ca3bae0d211b608b250548d90e89f1a1ce2";
+       version = "0.5.0.5";
+       sha256 = "0zh130vw719a8d11q5qzc3ilzgv8cqyc2a7r1a131cv1fjnd1rwy";
        buildDepends = [ base bytestring ];
        extraLibraries = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
@@ -25660,8 +25815,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "c-storable-deriving";
-       version = "0.1";
-       sha256 = "0ym6wccjvdlnfl1i9fhy4rqd8sxbdwm8vx3z3y3ga8a2ackingwv";
+       version = "0.1.1";
+       sha256 = "19scaffyinyblc3vw3ga22j2z81gd7l2l3nnrsy3k9nsal1rbz3z";
        buildDepends = [ base ghc-prim ];
        homepage = "https://github.com/maurer/c-storable-deriving";
        description = "Generate C-like storable instances from datatypes";
@@ -25706,6 +25861,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "c2hs_0_20_1" = callPackage
+    ({ mkDerivation, array, base, containers, directory, dlist
+     , filepath, HUnit, language-c, pretty, process, shelly
+     , test-framework, test-framework-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "c2hs";
+       version = "0.20.1";
+       sha256 = "1w2w9zxirzjd5lniwqakq59glgsh4mw3565x2l9qrin0bfjxkn3h";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         array base containers directory dlist filepath language-c pretty
+         process
+       ];
+       testDepends = [
+         base filepath HUnit shelly test-framework test-framework-hunit text
+         transformers
+       ];
+       homepage = "https://github.com/haskell/c2hs";
+       description = "C->Haskell FFI tool that gives some cross-language type safety";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "c2hs" = callPackage
     ({ mkDerivation, array, base, containers, directory, dlist
      , filepath, HUnit, language-c, pretty, process, shelly
@@ -25713,8 +25892,8 @@ self: {
      }:
      mkDerivation {
        pname = "c2hs";
-       version = "0.21.1";
-       sha256 = "0p16r6hfkcbw0qkpa1dg3pllhsq5xw7hhr8m14cp2wkhizk8xv4n";
+       version = "0.22.1";
+       sha256 = "1dziid3xmhdz0sszs8nlilvjqj9qsd5nl6w3ckfbv5xqmywp9sap";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -26306,6 +26485,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cabal-test-bin" = callPackage
+    ({ mkDerivation, base, directory, filepath, unix }:
+     mkDerivation {
+       pname = "cabal-test-bin";
+       version = "0.1.3";
+       sha256 = "0lsxw122gznchlf0zvpdl874wwnc4x8yfgg2sq8vllk2951ckafr";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base directory filepath unix ];
+       description = "A program for finding temporary build file during cabal-test";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cabal-test-compat" = callPackage
     ({ mkDerivation, base, Cabal, QuickCheck }:
      mkDerivation {
@@ -26322,12 +26514,12 @@ self: {
     ({ mkDerivation, base, Cabal, QuickCheck }:
      mkDerivation {
        pname = "cabal-test-quickcheck";
-       version = "0.1.2";
-       sha256 = "1fs5fciplzrlxykn3kbxdyij9vjzs1vq2n5f72vadg9c33961agv";
+       version = "0.1.3";
+       sha256 = "1q1zl15xfr1id3w5ih5843fdxrmf595ri1hhxg2r9kwyy48hhh2r";
        buildDepends = [ base Cabal QuickCheck ];
        testDepends = [ base Cabal ];
        jailbreak = true;
-       homepage = "https://github.com/zimothy/cabal-test-quickcheck";
+       homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -26617,7 +26809,6 @@ self: {
        buildDepends = [ base cairo glib gtk ];
        description = "A template for building new GUI applications using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake" = callPackage
@@ -26647,8 +26838,8 @@ self: {
      }:
      mkDerivation {
        pname = "cake3";
-       version = "0.5.2.0";
-       sha256 = "0wr797r7sg8f48r2pjl2nw70vcdkiamqghz2zpfr6awy9018fhgw";
+       version = "0.6.0";
+       sha256 = "0k045qqnivhmsvxas0zlmp9qgkb16917s4wk67l7mscgpi99fhdq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -26738,8 +26929,8 @@ self: {
     ({ mkDerivation, base, haskeline, mtl, parsec, QuickCheck }:
      mkDerivation {
        pname = "calculator";
-       version = "0.1.3.0";
-       sha256 = "14ryw3555vvmz1yvrvwi5djpmpky80ib3siwbicijnvv6xns9jsf";
+       version = "0.1.4.0";
+       sha256 = "1sf1fljg65fvwrnxmpj1s66yqb7j6q9kwsn3rmc0bac23s7nrrjh";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base haskeline mtl parsec QuickCheck ];
@@ -26956,8 +27147,8 @@ self: {
      }:
      mkDerivation {
        pname = "caramia";
-       version = "0.7.1.0";
-       sha256 = "11pd61wi1ppa2vj4n7gpqa8d3zmm9k6lbrayyh6nm7zdqwa11xcb";
+       version = "0.7.1.1";
+       sha256 = "0xhfks6z4d308wkb6pnknn31nbpapnqc94n64yw450falhgy3k41";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -27032,8 +27223,8 @@ self: {
      }:
      mkDerivation {
        pname = "cartel";
-       version = "0.12.0.2";
-       sha256 = "0mhiwz68f0rp1261lp4zwdzj8142wvaw62jqdymsad6731xp3cs8";
+       version = "0.14.0.0";
+       sha256 = "00z0v7zybmk9lmm78lhcna8385dkrcixcak583bc4pzilhq5ykx5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath time transformers ];
@@ -27052,8 +27243,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.1.3.2";
-       sha256 = "1rfakjbn02wbm0d6pi7mpwd47sv2mwf7vvaswx6s0vbh612xkwyn";
+       version = "2.2.0.1";
+       sha256 = "1bymk75snh0rqswdn2mlaf43msid5bbn7g353m9864jxrl57d4b2";
        buildDepends = [
          base casadi-bindings-core casadi-bindings-internal containers
          linear vector
@@ -27076,39 +27267,38 @@ self: {
          base casadi-bindings-core casadi-bindings-internal vector
        ];
        pkgconfigDepends = [ casadi_control ];
+       jailbreak = true;
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
-    ({ mkDerivation, base, casadi-bindings-internal, casadi_core
-     , vector
-     }:
+    ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }:
      mkDerivation {
        pname = "casadi-bindings-core";
-       version = "2.1.3.0";
-       sha256 = "1fjqg9zlmjv0pd0hyyah2srv7wyxxffrgzpdl361ffbdwrmg4w2p";
+       version = "2.2.0.1";
+       sha256 = "0ndsipaw1vn90fwjm0qk10hi4rdi3i6n9h29196w0yz4j0xd0l61";
        buildDepends = [ base casadi-bindings-internal vector ];
-       pkgconfigDepends = [ casadi_core ];
-       description = "low level bindings to casadi-core";
+       pkgconfigDepends = [ casadi ];
+       description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi_core = null;};
+     }) { casadi = null;};
 
   "casadi-bindings-internal" = callPackage
-    ({ mkDerivation, base, casadi_core, vector }:
+    ({ mkDerivation, base, casadi, vector }:
      mkDerivation {
        pname = "casadi-bindings-internal";
-       version = "0.1.1";
-       sha256 = "0jcfkq3dfspfz2jfnmhp0dznr2vj975rcyynl6wnvf54n233vaym";
+       version = "0.1.2";
+       sha256 = "0c7q1wr64zhaafcny5lms7r1y7991lplw4dhj3h4f9b8cnhpfrc6";
        buildDepends = [ base vector ];
-       pkgconfigDepends = [ casadi_core ];
+       pkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi_core = null;};
+     }) { casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
     ({ mkDerivation, base, casadi-bindings-core
@@ -27597,12 +27787,10 @@ self: {
        sha256 = "05cdrq1mrrhfbsk1w1dg5qayan0h9m92r4gqgcpzfa9a073w78zw";
        buildDepends = [ base cairo glib gtk mtl ];
        buildTools = [ c2hs ];
-       pkgconfigDepends = [ gtk ];
        jailbreak = true;
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;};
+     }) {};
 
   "cereal" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim }:
@@ -27885,8 +28073,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.4.9";
-       sha256 = "1g5np8r5h8hxgyxr3m7595xh7fiq1b8h9w6vm0ly81949lbwclga";
+       version = "6.4.12";
+       sha256 = "1iaq554dx21zdphmry9iarakfispv16sa7fp7pf3n764q4jznq47";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -28747,22 +28935,23 @@ self: {
      }) {};
 
   "clafer" = callPackage
-    ({ mkDerivation, aeson, array, base, cmdargs, containers
-     , data-stringmap, directory, executable-path, filepath, ghc
-     , glpk-hs, HaXml, HUnit, json-builder, lens, MaybeT, mtl, parsec
-     , process, QuickCheck, split, string-conversions, tasty
-     , tasty-hunit, tasty-th, text, transformers
+    ({ mkDerivation, aeson, array, base, bytestring, cmdargs
+     , containers, data-stringmap, directory, executable-path, filepath
+     , ghc, glpk-hs, HaXml, HTTP, HUnit, json-builder, lens, MaybeT, mtl
+     , network, parsec, process, QuickCheck, split, string-conversions
+     , tasty, tasty-hunit, tasty-th, text, transformers
      }:
      mkDerivation {
        pname = "clafer";
-       version = "0.3.7";
-       sha256 = "1fz4bndxwyfch3bagyqgzqw46fichczj5gnkhqpvghfnlydv94a7";
+       version = "0.3.8";
+       sha256 = "1ws7mmfa3xq2vxcva55ib0d6biz9n50ri10jljv839kw8f9ilv36";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson array base cmdargs containers data-stringmap directory
-         executable-path filepath glpk-hs HaXml json-builder lens MaybeT mtl
-         parsec process split string-conversions text transformers
+         aeson array base bytestring cmdargs containers data-stringmap
+         directory executable-path filepath glpk-hs HaXml HTTP json-builder
+         lens MaybeT mtl network parsec process split string-conversions
+         text transformers
        ];
        testDepends = [
          base containers directory filepath ghc HaXml HUnit lens mtl
@@ -28783,8 +28972,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferIG";
-       version = "0.3.7";
-       sha256 = "1dnjg6w2v9ijm8rcgdsi5zm3zbj4cvyp165wgbxbmda9kl05w5am";
+       version = "0.3.8";
+       sha256 = "1c6dhjg9g59gvcy1hzq3by9qbrab2x4nm06k0d4n2kss15zpn4xf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -28809,13 +28998,12 @@ self: {
      }:
      mkDerivation {
        pname = "claferwiki";
-       version = "0.3.7";
-       sha256 = "170lp987dw5cfyfhqk8ak7m2z5mc0lnwzn3xlxniys47qn8ji3yx";
+       version = "0.3.8";
+       sha256 = "1qljiwzgq3cm6q9f35nd86am29crxvplbhd4y0zz4zfrq13yf0sd";
        buildDepends = [
          base clafer containers directory gitit MissingH mtl network process
          SHA split time transformers utf8-string
        ];
-       jailbreak = true;
        homepage = "http://github.com/gsdlab/claferwiki";
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
@@ -28823,14 +29011,14 @@ self: {
      }) {};
 
   "clanki" = callPackage
-    ({ mkDerivation, base, directory, safe, time }:
+    ({ mkDerivation, base, bytestring, directory, safe, strict, time }:
      mkDerivation {
        pname = "clanki";
-       version = "1.0.7";
-       sha256 = "1np5df8cx7djjknp4c9yy3pzqjqh8ra9mgkc9smybqzidlri60jk";
+       version = "1.2.5";
+       sha256 = "0s94zxgcxq230y80kfqgim9yci3wqbq85byyvp0f0kqadsn4wmv1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory safe time ];
+       buildDepends = [ base bytestring directory safe strict time ];
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -29664,12 +29852,11 @@ self: {
        sha256 = "0mcl6pc0qjyijyqqlf1wh3548gn71kv6xy0jaqgrjddf20qlc8xl";
        buildDepends = [ array base cairo glib gtk haskell98 mtl X11 ];
        buildTools = [ c2hs ];
-       pkgconfigDepends = [ clutter glib pango ];
+       pkgconfigDepends = [ clutter pango ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) clutter;  inherit (pkgs) glib;
-          inherit (pkgs.gnome) pango;};
+     }) { inherit (pkgs) clutter;  inherit (pkgs.gnome) pango;};
 
   "cmaes" = callPackage
     ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random
@@ -29791,7 +29978,6 @@ self: {
        homepage = "http://github.com/eli-frey/cmdtheline";
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cml" = callPackage
@@ -31177,8 +31363,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "0.3.0.5";
-       sha256 = "0iq5067ga8z018fk346qarv7rmswxavm2r7lkv20mlp7kx3z57m3";
+       version = "0.3.0.6";
+       sha256 = "0z2nzs89sw2wxrgvyd2bxyh9vs87r1g6rbjqiwcjvhjs25ppq22b";
        buildDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra monad-control mono-traversable mwc-random
@@ -31337,8 +31523,8 @@ self: {
      }:
      mkDerivation {
        pname = "configuration-tools";
-       version = "0.2.7";
-       sha256 = "0lx5cix1kf50kvsak75gwhbbrgp2d3ji0ja4x0jnrh5n1xv0n812";
+       version = "0.2.8";
+       sha256 = "1xg36kdzh80c1npk43g95pyy08rlldy736a78ihzdhsrqf45jasz";
        buildDepends = [
          aeson attoparsec base base-unicode-symbols bytestring Cabal
          case-insensitive directory dlist errors mtl network-uri
@@ -31437,6 +31623,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conlogger" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "conlogger";
+       version = "0.1.0.1";
+       sha256 = "1bxpn27spj4cq9cwg5b486xb35gmwb8hnrhq5g5dpmm7lxgijzh3";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base text ];
+       jailbreak = true;
+       homepage = "https://github.com/tattsun/conlogger";
+       description = "A logger for a concurrent program";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "connection" = callPackage
     ({ mkDerivation, base, byteable, bytestring, containers
      , crypto-random, data-default-class, network, securemem, socks, tls
@@ -31524,6 +31725,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "constrained-categories" = callPackage
+    ({ mkDerivation, base, tagged, void }:
+     mkDerivation {
+       pname = "constrained-categories";
+       version = "0.1.0.0";
+       sha256 = "02vsadayxch5dl77jl4dpk36zj4wpkgrpwlad3swk8dyfqyf4jfk";
+       buildDepends = [ base tagged void ];
+       homepage = "https://github.com/leftaroundabout/constrained-categories";
+       description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "constrained-normal" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -31584,6 +31797,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "containers_0_4_2_1" = callPackage
+    ({ mkDerivation, array, base, deepseq }:
+     mkDerivation {
+       pname = "containers";
+       version = "0.4.2.1";
+       sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm";
+       editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8";
+       buildDepends = [ array base deepseq ];
+       description = "Assorted concrete container types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "containers_0_5_6_3" = callPackage
     ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim
      , HUnit, QuickCheck, test-framework, test-framework-hunit
@@ -31885,6 +32110,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "control-monad-free_0_6_1" = callPackage
+    ({ mkDerivation, base, prelude-extras, transformers }:
+     mkDerivation {
+       pname = "control-monad-free";
+       version = "0.6.1";
+       sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy";
+       buildDepends = [ base prelude-extras transformers ];
+       homepage = "http://github.com/pepeiborra/control-monad-free";
+       description = "Free monads and monad transformers";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "control-monad-loop" = callPackage
     ({ mkDerivation, base, transformers, transformers-base }:
      mkDerivation {
@@ -32412,9 +32649,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "countable";
-       version = "0.1";
-       sha256 = "0qfgfsl9zvi7fkzdzh7n7v190w8jxvjb7dx1y3hxxg7cikflppz9";
+       version = "0.2";
+       sha256 = "1az6pk1is587ggys6v1qh3yabnc63vr0fcd5bmvwx20c137yflik";
        buildDepends = [ base ];
+       homepage = "https://github.com/AshleyYakeley/countable";
        description = "Countable, Searchable, Finite, Empty classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -32514,8 +32752,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpphs";
-       version = "1.18.7";
-       sha256 = "0w82v737w887krqlf61wjwa63fmdrjp1giiig8nvgga608qy03w5";
+       version = "1.18.8";
+       sha256 = "085v3vhf15zscf5lhk0vi50jdm0kvq6z5l5rsz9j6bh8j47pi953";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory old-locale old-time polyparse ];
@@ -32913,8 +33151,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.0";
-       sha256 = "10iqpj52jgcmwxisbfc0xxglfh6m8fw26a0gx25nn9mr0vq43sda";
+       version = "5.9.2";
+       sha256 = "0wr1nmaaz9hvfp8dk0yf3srw3x4zksr11g35nbsxw7pdpsyc1ghr";
        buildDepends = [
          array base bytestring cereal cond directory filepath gray-extended
          hdaemonize MonadRandom mtl old-locale process random split time
@@ -33352,8 +33590,8 @@ self: {
      }:
      mkDerivation {
        pname = "crypto-pubkey-openssh";
-       version = "0.2.6";
-       sha256 = "1q7gx8q0dpwv8xyjq5v2i1sdlbkh5xyf1gsw7q3xs1dj2bldqfpf";
+       version = "0.2.7";
+       sha256 = "0ndb1crjl3xbd18bfs3ipqbzn120mpqnn27jfi4vjqf5ak48b444";
        buildDepends = [
          asn1-encoding asn1-types attoparsec base base64-bytestring
          bytestring cereal crypto-pubkey-types pem
@@ -33363,11 +33601,9 @@ self: {
          bytestring cereal crypto-pubkey-types deepseq filepath pem process
          QuickCheck tasty tasty-quickcheck temporary
        ];
-       jailbreak = true;
        homepage = "https://github.com/knsd/crypto-pubkey-openssh";
        description = "OpenSSH keys decoder/encoder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-pubkey-types" = callPackage
@@ -33940,8 +34176,8 @@ self: {
      }:
      mkDerivation {
        pname = "cudd";
-       version = "0.1.0.0";
-       sha256 = "0dazyg752g2wbp6nkpcybjg3vph7nmrb1hxj9ai0jhb761mskci5";
+       version = "0.1.0.1";
+       sha256 = "0p6gf6wwz5fd9hn2bf1lnmyc43cyh1pvgzbypfr85hy8zsy6byla";
        buildDepends = [ array base mtl transformers ];
        buildTools = [ c2hs ];
        extraLibraries = [ cudd dddmp epd mtr st util ];
@@ -34242,6 +34478,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "dag" = callPackage
+    ({ mkDerivation, base, constraints, hspec, QuickCheck
+     , quickcheck-instances, singletons
+     }:
+     mkDerivation {
+       pname = "dag";
+       version = "0.1.0.2";
+       sha256 = "0khfyyzqzw7jj4n8p1k96wdrb2087jd380fzhlkmf0g7s4346pvp";
+       buildDepends = [ base constraints singletons ];
+       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       description = "Compile-time, type-safe directed acyclic graphs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "damnpacket" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
      , QuickCheck, text
@@ -34326,7 +34576,7 @@ self: {
          terminfo text unix utf8-string vector zlib
        ];
        extraLibraries = [ curl ];
-       configureFlags = [ "-flibrary" "-fforce-char8-encoding" ];
+       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
@@ -35821,9 +36071,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbus";
-       version = "0.10.9.1";
-       sha256 = "08p1688yb3gjal20szida2x99wv2j6gkmmhwpl3qkzswifrz51ar";
-       editedCabalFile = "a94be78b7288d04401d2734e451826fd064bcfa31a77252a2c2e15a883522f92";
+       version = "0.10.9.2";
+       sha256 = "0xz1iajg8rmv1n21b0iifp3c6gywm75m4x4bir991m9j7v88ij6l";
        buildDepends = [
          base bytestring cereal containers libxml-sax network parsec random
          text transformers unix vector xml-types
@@ -36281,17 +36530,17 @@ self: {
      }) {};
 
   "debian-build" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, process
+    ({ mkDerivation, base, Cabal, directory, filepath, process, split
      , transformers
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.4.0.1";
-       sha256 = "1y7328gggwbh6gzbni3b473w2smvwd9ky8h3v0a3qj4v81bzvcfl";
+       version = "0.5.0.0";
+       sha256 = "067snxyasryfdrbh67l0xrbg4lrk5m6m7fjsmb4gv2q9y63hbsxh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base Cabal directory filepath process transformers
+         base Cabal directory filepath process split transformers
        ];
        homepage = "http://twitter.com/khibino/";
        description = "Debian package build sequence tools";
@@ -36381,6 +36630,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "deepseq_1_3_0_1" = callPackage
+    ({ mkDerivation, array, base }:
+     mkDerivation {
+       pname = "deepseq";
+       version = "1.3.0.1";
+       sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp";
+       buildDepends = [ array base ];
+       jailbreak = true;
+       description = "Deep evaluation of data structures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "deepseq_1_4_0_0" = callPackage
     ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
      , test-framework-hunit
@@ -36398,17 +36659,23 @@ self: {
      }) {};
 
   "deepseq-bounded" = callPackage
-    ({ mkDerivation, array, base, deepseq, HUnit, parallel, random
-     , template-haskell
+    ({ mkDerivation, array, attoparsec, base, bytestring, cpphs
+     , deepseq, deepseq-generics, generics-sop, ghc-prim, HUnit, mtl
+     , parallel, random, syb, template-haskell, text
      }:
      mkDerivation {
        pname = "deepseq-bounded";
-       version = "0.5.5";
-       sha256 = "1qak7lzngb3pi39sri85dqr9vkvf2bjlxbxxp61n8f2j0kdr0g0r";
-       buildDepends = [ array base deepseq parallel random ];
+       version = "0.6.0.3";
+       sha256 = "13cyxhh0fjwqg5ys7dcgbvbnwm9p4x7zvk8jrkfwr0py9w6vfdz6";
+       buildDepends = [
+         array attoparsec base bytestring cpphs deepseq deepseq-generics
+         generics-sop mtl parallel random syb text
+       ];
        testDepends = [
-         base deepseq HUnit parallel random template-haskell
+         base cpphs deepseq deepseq-generics generics-sop ghc-prim HUnit
+         parallel random syb template-haskell
        ];
+       buildTools = [ cpphs ];
        homepage = "http://fremissant.net/deepseq-bounded";
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
@@ -36432,6 +36699,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deepseq-magic" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "deepseq-magic";
+       version = "1.0.0.3";
+       sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp";
+       buildDepends = [ base ];
+       homepage = "https://github.com/ezyang/deepseq-magic";
+       description = "Deep evaluation of data structures without NFData";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "deepseq-th" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell }:
      mkDerivation {
@@ -36956,16 +37235,33 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "descriptive_0_0_2" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, containers, mtl, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "descriptive";
+       version = "0.0.2";
+       sha256 = "0jh0l4assmqsmq9ajsbdl7vn8k6srl0z27kpxwzg1v0nmkkcl48p";
+       buildDepends = [
+         aeson base bifunctors containers mtl text transformers
+       ];
+       homepage = "https://github.com/chrisdone/descriptive";
+       description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "descriptive" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, hspec, HUnit
-     , mtl, text, transformers
+     , mtl, scientific, text, transformers, vector
      }:
      mkDerivation {
        pname = "descriptive";
-       version = "0.1.1";
-       sha256 = "1rly83jadbs1kqq0ax1kjhxwazpk8s2k6xyhdh88w733rdl1qz8q";
+       version = "0.8.0";
+       sha256 = "12hgidfvdqfi35abl66yz3sbsprq2ggnl22b0y85fsqd4bb5izrv";
        buildDepends = [
-         aeson base bifunctors containers mtl text transformers
+         aeson base bifunctors containers mtl scientific text transformers
+         vector
        ];
        testDepends = [
          aeson base bifunctors containers hspec HUnit mtl text transformers
@@ -37156,7 +37452,7 @@ self: {
          diagrams-postscript diagrams-svg directory exceptions filepath
          hashable haskell-src-exts hint lens mtl split transformers
        ];
-       configureFlags = [ "-fcairo" "-fsvg" "-fps" "-frasterific" ];
+       configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
@@ -37184,7 +37480,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-canvas" = callPackage
@@ -37262,7 +37557,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -37985,8 +38279,8 @@ self: {
      }:
      mkDerivation {
        pname = "direct-sqlite";
-       version = "2.3.14";
-       sha256 = "0xxvr2wln54snkvs2r46fkkn7yhm6i2afgww40vnfqamg8g81x5w";
+       version = "2.3.15";
+       sha256 = "0hlpc3j4crh9hnydcpp6fmiisq9ddn916bslm46x5q1ajvcw7v12";
        buildDepends = [ base bytestring text ];
        testDepends = [
          base base16-bytestring bytestring directory HUnit text
@@ -38400,8 +38694,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-p2p";
-       version = "0.1.3.0";
-       sha256 = "00lvi2x1s8r7lwfvsjnvzc9iwdk4ip8svw85p2h3ra4iqbzj70l2";
+       version = "0.1.3.1";
+       sha256 = "00dbw4p60lbfjfhi9xzyh1jjdndygw00xpirzcnl5f20370hdikh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -38662,8 +38956,8 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.3.4.1";
-       sha256 = "10ij12bf1bc6iifglh2w88rkyby8jjaadrip4d2wfs4djdpppxra";
+       version = "0.3.5.0";
+       sha256 = "1pi6vj6cxsp3kb9sd1qhvx9s09sa3vh7rm3czfssynnw9zanp99r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -39460,6 +39754,18 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "drifter" = callPackage
+    ({ mkDerivation, base, bytestring, postgresql-simple, text, time }:
+     mkDerivation {
+       pname = "drifter";
+       version = "0.1.0.0";
+       sha256 = "1myr310f0a7p602rwxly2382asnaywgavczkwdmqgaqyq70xv3l5";
+       buildDepends = [ base bytestring postgresql-simple text time ];
+       homepage = "https://github.com/AndrewRademacher/drifter";
+       description = "Simple schema management for arbitrary databases";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dropbox-sdk" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , certificate, conduit, HTTP, http-conduit, http-types, json
@@ -39922,7 +40228,6 @@ self: {
        homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-linker-template" = callPackage
@@ -39984,6 +40289,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dynamic-plot" = callPackage
+    ({ mkDerivation, async, base, colour, constrained-categories
+     , containers, deepseq, diagrams-cairo, diagrams-core, diagrams-gtk
+     , diagrams-lib, glib, gtk, lens, manifolds, MemoTrie, MonadRandom
+     , mtl, process, random, semigroups, time, transformers, vector
+     , vector-space
+     }:
+     mkDerivation {
+       pname = "dynamic-plot";
+       version = "0.1.0.0";
+       sha256 = "0v1q8f72hxpq8z7135p7714lljl2v7y7x1rwllyy2iwfikbiphwj";
+       buildDepends = [
+         async base colour constrained-categories containers deepseq
+         diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk
+         lens manifolds MemoTrie MonadRandom mtl process random semigroups
+         time transformers vector vector-space
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/leftaroundabout/dynamic-plot";
+       description = "Interactive diagram windows";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "dynamic-state" = callPackage
     ({ mkDerivation, base, binary, bytestring, concrete-typerep
      , hashable, unordered-containers
@@ -40272,9 +40600,8 @@ self: {
     ({ mkDerivation, base, edenmodules, parallel }:
      mkDerivation {
        pname = "edenskel";
-       version = "2.0.0.1";
-       sha256 = "0fmr2chrpp990lyjfk13s4d8h1hdw853wk54233mpmxlh0sd32ki";
-       editedCabalFile = "978022c24ce2326e9fabd18ce30d687b72034eae80cabc5ede83312d96a1d1df";
+       version = "2.0.0.2";
+       sha256 = "0dkvbdy04w4zbbc3q11hzzg3h5d8azka11yiiz3rvy1nkhp9wv5l";
        buildDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
@@ -40288,8 +40615,8 @@ self: {
      }:
      mkDerivation {
        pname = "edentv";
-       version = "4.9.2";
-       sha256 = "19d103r1xgad4169yjgl7llmaixyvzx8i1rn5wq528km445071wv";
+       version = "4.10.0";
+       sha256 = "0jkcva53vm8lm76z947xms8a2zkh9sn9951cwry8k7r132dmcn32";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -40299,7 +40626,6 @@ self: {
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edge" = callPackage
@@ -40372,7 +40698,6 @@ self: {
        homepage = "https://github.com/maxpow4h/editable";
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "editline" = callPackage
@@ -40503,8 +40828,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.5.3";
-       sha256 = "02j7y8nj11xa2w2lwdwz8cm6jkhxfl3ah2q1qkysavkpysrjpazl";
+       version = "3.5.5";
+       sha256 = "0wzjrvbccm93q3k2ais46hw9ff0y73d4xyqh18zfdl9f8vflr6av";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40541,8 +40866,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison-tutorial";
-       version = "3.3.6";
-       sha256 = "0v234hcmx7jr8xqdsmi0v4p0a80v09sdmgqpmvssr0vfj9gjk18x";
+       version = "3.5.0";
+       sha256 = "17r2864hghba3yhkrjfkr8x3kc4pjf4zpdbbzrjnnsfm0303mpar";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -40627,8 +40952,8 @@ self: {
      }:
      mkDerivation {
        pname = "either";
-       version = "4.3.2.1";
-       sha256 = "09c1xal7d6azw0cc8mwi0ry8blysg29cmyfipdhg1b7vzyjavv22";
+       version = "4.3.3";
+       sha256 = "0sgm9bk4ms7f6a5y2iykw206gi3v6i7kvxf94w0nmj39f3cy8vdl";
        buildDepends = [
          base bifunctors exceptions free monad-control MonadRandom mtl
          profunctors semigroupoids semigroups transformers transformers-base
@@ -40836,12 +41161,13 @@ self: {
      }) {};
 
   "elevator" = callPackage
-    ({ mkDerivation, base, clean-unions, transformers }:
+    ({ mkDerivation, base, extensible, transformers }:
      mkDerivation {
        pname = "elevator";
-       version = "0.1.3";
-       sha256 = "0z7rj70ilv4y95prfdj3fjlw4icr64d66lqgyr6jp28zxrxw1535";
-       buildDepends = [ base clean-unions transformers ];
+       version = "0.2";
+       sha256 = "008sxn0vsscfbipd859wjwb4a088jdgx8chl0c9kg4g313skx37g";
+       editedCabalFile = "5da5eb7c7368d25e9749670910a287b551a7e4dda75284394cb5a23353fd47a3";
+       buildDepends = [ base extensible transformers ];
        homepage = "https://github.com/fumieval/elevator";
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
@@ -41302,8 +41628,8 @@ self: {
     ({ mkDerivation, base, between, transformers }:
      mkDerivation {
        pname = "endo";
-       version = "0.1.0.1";
-       sha256 = "031608wws9bcgz1zywvkml68p4a6s8br7c0fhg5rdqyy7g4bympd";
+       version = "0.1.0.2";
+       sha256 = "1wqg0mcaf55wa70wjgd6n0gw56rghz6p76lc6kw4aki969h12xrl";
        buildDepends = [ base between transformers ];
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
@@ -41379,9 +41705,8 @@ self: {
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "entropy";
-       version = "0.3.4.1";
-       sha256 = "10myxs2a7838sywnlfggpsd7lmvzphl10zdh1vbbi18n3x79gyk0";
-       editedCabalFile = "a7770a86c27d5d48a82b519e9eed75d276ffc2ca942275d0b901299109b590bc";
+       version = "0.3.5";
+       sha256 = "0myv4r5cwmw4l990r1vmqp4sbgriaizai11477x27pw9ajy93fd2";
        buildDepends = [ base bytestring unix ];
        homepage = "https://github.com/TomMD/entropy";
        description = "A platform independent entropy source";
@@ -41510,8 +41835,8 @@ self: {
     ({ mkDerivation, base, containers, deepseq, template-haskell }:
      mkDerivation {
        pname = "enummapset-th";
-       version = "0.6.0.1";
-       sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8";
+       version = "0.6.0.2";
+       sha256 = "1g6z60qalyf8iv41xdl409kmcjm406zccljkgl658y1x9rdi08gr";
        buildDepends = [ base containers deepseq template-haskell ];
        homepage = "https://github.com/liyang/enummapset-th";
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
@@ -42333,8 +42658,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.5.0.1";
-       sha256 = "0npwpdlnwd5imprv77rv9wyi5ivfnzkb6gr4baj8z2fp6z28z6vd";
+       version = "0.6.0.1";
+       sha256 = "0g93ya46lbq9z7n88ixrn61rivcls3lwpi2xz2z4kx5aschgcvm4";
        buildDepends = [
          aeson async base bytestring cereal containers network protobuf
          random sodium text time uuid
@@ -42840,11 +43165,11 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "extensible";
-       version = "0.2.2";
-       sha256 = "1m29jd3g1zkhjzhd6i9inmw54r2jvdw6014ni399gnzpfzgnk2qy";
+       version = "0.2.6";
+       sha256 = "0cl997bkd4jmcaidivsfwzw8x7hmy66sfarzbjkqcqqp37pc1ml3";
        buildDepends = [ base template-haskell ];
        homepage = "https://github.com/fumieval/extensible";
-       description = "Poly-kinded, extensible ADTs";
+       description = "Extensible, efficient, lens-friendly data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -44018,8 +44343,8 @@ self: {
      }:
      mkDerivation {
        pname = "file-embed";
-       version = "0.0.7";
-       sha256 = "0mj8f70f9k78wjzcx59w68szajafmm119rcrsspmxsygglh8ji2g";
+       version = "0.0.7.1";
+       sha256 = "1nfqdlz6xyrn9y5vhibz3llc2c79f7wg8wdjmscv6n9x4qjcg8cb";
        buildDepends = [
          base bytestring directory filepath template-haskell
        ];
@@ -44084,8 +44409,8 @@ self: {
      }:
      mkDerivation {
        pname = "filemanip";
-       version = "0.3.6.2";
-       sha256 = "03l114rhb4f6nyzs9w14i79d7kyyq9ia542alsqpbmikm9gxm4rz";
+       version = "0.3.6.3";
+       sha256 = "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8";
        buildDepends = [
          base bytestring directory filepath mtl unix-compat
        ];
@@ -44849,6 +45174,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "floating-bits" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "floating-bits";
+       version = "0.2.0.0";
+       sha256 = "0b50pabkwvlj90vyld795k072am1w387215lz1cvm42pwb6m6ara";
+       buildDepends = [ base ];
+       testDepends = [ base ];
+       description = "Conversions between floating and integral values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "floatshow" = callPackage
     ({ mkDerivation, array, base, integer-gmp }:
      mkDerivation {
@@ -45349,8 +45686,8 @@ self: {
      }:
      mkDerivation {
        pname = "formatting";
-       version = "6.1.1";
-       sha256 = "0x435g148yac4jy4p7k5s3lwm6c48mvizh76ssgj7hmd0gd7bvyz";
+       version = "6.2.0";
+       sha256 = "13w2322djffajqdy48lwfngcrbh5pc9ivhy1w5zgxcjqc0amlv5v";
        buildDepends = [
          base clock old-locale scientific text text-format time
        ];
@@ -46007,6 +46344,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "frp-arduino" = callPackage
+    ({ mkDerivation, base, containers, mtl }:
+     mkDerivation {
+       pname = "frp-arduino";
+       version = "0.1.0.3";
+       sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5";
+       buildDepends = [ base containers mtl ];
+       homepage = "http://github.com/frp-arduino/frp-arduino";
+       description = "Arduino programming without the hassle of C";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "frquotes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -47303,16 +47652,15 @@ self: {
      }:
      mkDerivation {
        pname = "geodetics";
-       version = "0.0.2";
-       sha256 = "09abyh6xgfq6cgrkk16xq5djn9ikjx40vaz12hpi97xgkybk1nir";
+       version = "0.0.3";
+       sha256 = "15ax0cj6q2zhlxl0fjxb434v1npq6w7n8bdqsw3vz3s9ngsvbldg";
        buildDepends = [ array base dimensional ];
        testDepends = [
          array base dimensional HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/PaulJohnson/geodetics";
-       description = "Terrestrial coordinate systems and associated calculations";
+       description = "Terrestrial coordinate systems and geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -47552,6 +47900,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-exactprint" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, ghc
+     , ghc-paths, ghc-syb-utils, HUnit, mtl, random, syb
+     }:
+     mkDerivation {
+       pname = "ghc-exactprint";
+       version = "0.1.0.1";
+       sha256 = "0z6ff4pf3dnz8slg7sfmq86ygzxqn87idv5d63h4qyg8pwvv6zvx";
+       buildDepends = [ base containers ghc ghc-paths syb ];
+       testDepends = [
+         base containers directory filepath ghc ghc-paths ghc-syb-utils
+         HUnit mtl random syb
+       ];
+       description = "ExactPrint for GHC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-gc-tune" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -47886,7 +48251,6 @@ self: {
        homepage = "http://felsin9.de/nnis/ghc-vis";
        description = "Live visualization of data structures in GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghci-diagrams" = callPackage
@@ -48139,12 +48503,30 @@ self: {
        sha256 = "1g2nwllgrckgg8kcgmripx8wqc664601kv4r7h4qq3v6hghvhdja";
        buildDepends = [ array base bytestring containers glib mtl ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ glib ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GIO";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) glib;};
+     }) {};
+
+  "gipeda" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, containers
+     , directory, filepath, shake, split, text, unordered-containers
+     , vector, yaml
+     }:
+     mkDerivation {
+       pname = "gipeda";
+       version = "0.1.0.1";
+       sha256 = "1za5pgnkyq0lf7fj5fdajz326kjvribd719ba21nzn2ixfzp7lri";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring cassava containers directory filepath shake
+         split text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/nomeata/gipeda";
+       description = "Git Performance Dashboard";
+       license = stdenv.lib.licenses.mit;
+     }) {};
 
   "gist" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, http-conduit
@@ -48226,7 +48608,7 @@ self: {
        buildTools = [
          bup curl git gnupg1 lsof openssh perl rsync wget which
        ];
-       configureFlags = [ "-fAssistant" "-fProduction" ];
+       configureFlags = [ "-fassistant" "-fproduction" ];
        preConfigure = "export HOME=$TEMPDIR";
        checkPhase = ''
          cp dist/build/git-annex/git-annex git-annex
@@ -48425,27 +48807,26 @@ self: {
      }) {};
 
   "git-vogue" = callPackage
-    ({ mkDerivation, base, bifunctors, Cabal, cpphs, Diff, directory
-     , filepath, formatting, ghc-mod, haskell-src-exts, hlint, hscolour
-     , hspec, MissingH, mtl, optparse-applicative, process, split
-     , strict, stylish-haskell, text, transformers, transformers-base
-     , unix
+    ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff
+     , directory, filepath, formatting, ghc-mod, haskell-src-exts, hlint
+     , hscolour, hspec, mtl, optparse-applicative, process, split
+     , strict, stylish-haskell, temporary, text, transformers, unix
      }:
      mkDerivation {
        pname = "git-vogue";
-       version = "0.1.0.4";
-       sha256 = "0na03y5fi0h8b82mfhl2x1aq3q6qp7fh7kvkx2lg24sj9k8l9dbr";
+       version = "0.2.0.1";
+       sha256 = "1l1ly1wkfidpzxr68z0qyfyj0pq7wdn534m4ks0hvh45sp6v569c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bifunctors Cabal cpphs Diff directory filepath formatting
-         ghc-mod haskell-src-exts hlint hscolour MissingH mtl
+         base bifunctors Cabal containers cpphs Diff directory filepath
+         formatting ghc-mod haskell-src-exts hlint hscolour mtl
          optparse-applicative process split strict stylish-haskell text
          transformers unix
        ];
        testDepends = [
-         base directory filepath hspec process transformers
-         transformers-base unix
+         base containers directory filepath hspec process temporary
+         transformers unix
        ];
        homepage = "https://github.com/anchor/git-vogue";
        description = "A framework for pre-commit checks";
@@ -48796,8 +49177,8 @@ self: {
      }:
      mkDerivation {
        pname = "gl";
-       version = "0.7";
-       sha256 = "0s9xvsainfl1g40ifzzz4rl9mp5z3apw79sz80n7lidch30i2ccs";
+       version = "0.7.1";
+       sha256 = "07qqmsjy0yv6v0fjkf131inzlaa8sfhznd1a4s4w4kgdfjcwn1c0";
        buildDepends = [
          base containers directory filepath fixed half hxt split
          transformers
@@ -48831,7 +49212,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.gnome) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -49739,7 +50119,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-core" = callPackage
@@ -50223,13 +50602,12 @@ self: {
      }:
      mkDerivation {
        pname = "gray-extended";
-       version = "1.5";
-       sha256 = "19v7vazq1dxqj324m36ff88xp8w5jssbh8w50i2ba8c3h7s2x470";
+       version = "1.5.1";
+       sha256 = "1lami8ncp9d4k25vzb23gz9067ahp8vws378qb57hnkisfnn932q";
        buildDepends = [ base ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mhwombat/gray-extended";
        description = "Gray encoding schemes";
        license = stdenv.lib.licenses.bsd3;
@@ -50285,16 +50663,16 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.6.7";
-       sha256 = "1sdm47y9hbqn40bfi4fssnbrhksca7gdkgpqvz1gd2lqs729i1nf";
+       version = "7.7.1";
+       sha256 = "06xpfzqnsyrknfccqb748prvx3f87jzvmzfpp75x5s1psms7685b";
        buildDepends = [ base cereal containers ];
        testDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
+         base containers QuickCheck test-framework
+         test-framework-quickcheck2
        ];
        homepage = "https://github.com/mhwombat/grid";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grm" = callPackage
@@ -50694,12 +51072,11 @@ self: {
          array base bytestring cairo containers gio glib mtl pango text
        ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ glib gtk ];
+       pkgconfigDepends = [ gtk ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) glib;  inherit (pkgs.gnome) gtk;};
+     }) { inherit (pkgs.gnome) gtk;};
 
   "gtk-jsinput" = callPackage
     ({ mkDerivation, base, gtk, json, transformers }:
@@ -50711,7 +51088,6 @@ self: {
        homepage = "http://github.com/timthelion/gtk-jsinput";
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-largeTreeStore" = callPackage
@@ -50754,13 +51130,12 @@ self: {
        version = "0.12.0";
        sha256 = "0gh8kwd9758ws941xbxhrm3144pmnqln0md5r6vjbq7s1x54bsrf";
        buildDepends = [ array base containers glib gtk haskell98 mtl ];
-       pkgconfigDepends = [ gtk ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "GTK+ Serialized event";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;};
+     }) {};
 
   "gtk-simple-list-view" = callPackage
     ({ mkDerivation, base, gtk }:
@@ -50772,7 +51147,6 @@ self: {
        homepage = "http://github.com/timthelion/gtk-simple-list-view";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-toggle-button-list" = callPackage
@@ -50785,7 +51159,6 @@ self: {
        homepage = "http://github.com/timthelion/gtk-toggle-button-list";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-toy" = callPackage
@@ -50808,12 +51181,11 @@ self: {
        version = "0.1.5";
        sha256 = "0hzl9pa5vx04vslb2visx35wwjagzzi1j5gyk5acy8pym8ly50hm";
        buildDepends = [ base glib gtk ];
-       pkgconfigDepends = [ gtk x11 ];
+       pkgconfigDepends = [ x11 ];
        homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;  inherit (pkgs) x11;};
+     }) { inherit (pkgs) x11;};
 
   "gtk2hs-buildtools" = callPackage
     ({ mkDerivation, alex, array, base, containers, directory, filepath
@@ -50848,7 +51220,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: glade package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-glib" = callPackage
@@ -50924,7 +51295,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtksourceview2 package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-th" = callPackage
@@ -50982,12 +51352,12 @@ self: {
          transformers
        ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ glib gtk3 ];
+       pkgconfigDepends = [ gtk3 ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) glib;  gtk3 = null;};
+     }) { gtk3 = null;};
 
   "gtk3-mac-integration" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk-mac-integration
@@ -51076,7 +51446,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.gnome) gtksourceview;};
 
   "gtksourceview3" = callPackage
@@ -51134,7 +51503,6 @@ self: {
        homepage = "http://gitorious.org/maximus/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gutenberg-fibonaccis" = callPackage
@@ -51206,7 +51574,6 @@ self: {
        homepage = "https://github.com/Javran/h2048";
        description = "a haskell implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hArduino" = callPackage
@@ -52330,8 +52697,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddocset";
-       version = "0.3.1";
-       sha256 = "1jlgscidw0h70243r3032cgqwz8dpsjjndaci5wm4kq9qy63mbwj";
+       version = "0.3.2";
+       sha256 = "0ppbvmmiz07p8kyblkplzkki3kc4z8hlmxc9h18fj0xwr6dpfib7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -52694,6 +53061,7 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -53026,6 +53394,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "handsy" = callPackage
+    ({ mkDerivation, base, bytestring, free, process, process-extras
+     , transformers
+     }:
+     mkDerivation {
+       pname = "handsy";
+       version = "0.0.5";
+       sha256 = "0hwvs62sqcmj5kgahjj80dnb1daj73vcc246hiv0j8c0k3fjc4vv";
+       buildDepends = [
+         base bytestring free process process-extras transformers
+       ];
+       homepage = "https://github.com/utdemir/handsy";
+       description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hangman" = callPackage
     ({ mkDerivation, base, mtl, random, utility-ht }:
      mkDerivation {
@@ -53884,8 +54268,8 @@ self: {
      }:
      mkDerivation {
        pname = "haroonga";
-       version = "0.1.5.0";
-       sha256 = "16xmhsngpknlc3g3z4mxb9c4rllnsap1fvcj9nf4yr4mafx96b11";
+       version = "0.1.6.0";
+       sha256 = "06w79104ncs8qmcb1qhpsscjm1hb77v37l3gih1n1wp4kw2m788z";
        buildDepends = [
          base bindings-DSL monad-control resourcet transformers
        ];
@@ -54093,6 +54477,7 @@ self: {
        pname = "hashable-extras";
        version = "0.2.0.1";
        sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s";
+       editedCabalFile = "0797bee08c6190172fa48ce7f2821160efcd26f9fcf2afce08ea64737c1aef7d";
        buildDepends = [
          base bifunctors bytestring generic-deriving hashable transformers
        ];
@@ -54744,8 +55129,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-names";
-       version = "0.5.0";
-       sha256 = "07fwdnhiqz6w323iw4xspar8m6sc6mv85i5f2vzbb5y8mrv352zr";
+       version = "0.5.1";
+       sha256 = "1dlivxigd1brcz1il0kz7qm40v8sgn4vqk8w5xxllniqrmiycjma";
        buildDepends = [
          aeson base bytestring Cabal containers data-lens-light filepath
          haskell-packages haskell-src-exts hse-cpp mtl tagged transformers
@@ -54960,14 +55345,34 @@ self: {
     ({ mkDerivation, array, base, happy, pretty, syb }:
      mkDerivation {
        pname = "haskell-src";
-       version = "1.0.1.6";
-       sha256 = "1vscvbsly7k0zqb7fi6bm38dfacyl8qgmv0h25fqkn95c0v5dif7";
+       version = "1.0.2.0";
+       sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a";
        buildDepends = [ array base pretty syb ];
        buildTools = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-src-exts_1_15_0_1" = callPackage
+    ({ mkDerivation, array, base, containers, cpphs, directory
+     , filemanip, filepath, ghc-prim, happy, mtl, pretty, smallcheck
+     , syb, tasty, tasty-golden, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "haskell-src-exts";
+       version = "1.15.0.1";
+       sha256 = "0xp5i06c478vn5m504ax5dfa7p5zc0kflbdkm2ijdzc779lpbx45";
+       buildDepends = [ array base cpphs ghc-prim pretty ];
+       testDepends = [
+         base containers directory filemanip filepath mtl smallcheck syb
+         tasty tasty-golden tasty-smallcheck
+       ];
+       buildTools = [ happy ];
+       homepage = "https://github.com/haskell-suite/haskell-src-exts";
+       description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-src-exts" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, smallcheck, syb, tasty
@@ -56100,7 +56505,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A minimalistic general high level API for relational databases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend" = callPackage
@@ -56118,7 +56522,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-backend";
        description = "API for backends of \"hasql\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres" = callPackage
@@ -56148,7 +56551,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-postgres";
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres-options" = callPackage
@@ -56165,7 +56567,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-postgres-options";
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastache" = callPackage
@@ -57242,8 +57643,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "heap";
-       version = "1.0.1";
-       sha256 = "1fjnjbq88m32y80pwp3ly6nc21fnz0v54wvpkzdblrx92azlykz3";
+       version = "1.0.2";
+       sha256 = "1xwgdx4m558m2xqmqnskkbja9s1lqm131xphjgk0yclsk0sv8was";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base QuickCheck ];
@@ -57416,9 +57817,8 @@ self: {
      }:
      mkDerivation {
        pname = "heist";
-       version = "0.14.0.1";
-       sha256 = "1nhksdn95v35ymml3kgm70axjl4vkjfvj1wvlcm1a1frlnbk993w";
-       editedCabalFile = "6cc46649ab05899f5c784e81e2dcbda7b9c2f1da43cdefa7dc3462ae59c71eae";
+       version = "0.14.1";
+       sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist errors filepath hashable
@@ -58874,8 +59274,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "4.2.1";
-       sha256 = "1ycdssi0g52n1vdm9jhz2hfwjg24zk41g6aif173n3qr4bbn4xm2";
+       version = "4.3.5";
+       sha256 = "1pg3qx0pm34x5awcqdnkdiwxy5qldy1hqyqclxgsgixb9zidcknp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -58886,7 +59286,6 @@ self: {
          base data-default directory haskell-src-exts hspec monad-loops mtl
          text
        ];
-       jailbreak = true;
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59025,6 +59424,7 @@ self: {
        pname = "hint";
        version = "0.4.2.1";
        sha256 = "0nc545y1v3s1897f3ims7m37wnn288xyz1zb9sxqs6immdxyly0g";
+       editedCabalFile = "e8d9cdfd463c48cbaea0dc6fecfdeddb0a8a2076a8c127fc14cde6017aa64ac6";
        buildDepends = [
          base directory exceptions extensible-exceptions filepath ghc
          ghc-mtl ghc-paths mtl random unix utf8-string
@@ -59556,12 +59956,11 @@ self: {
     ({ mkDerivation, base, hledger-lib, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.1";
-       sha256 = "170snnncr8wgl8z0j7z6lq4cm748v0sch2i516xx08i260ra0zpp";
+       version = "0.2.0.2";
+       sha256 = "1bdskrg6rxnhf3jzhg5n933ynkkn6n2fyphpwz3svv4qs9sqnwl1";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base hledger-lib time ];
-       jailbreak = true;
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -59794,8 +60193,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmark";
-       version = "1.0.0";
-       sha256 = "0wk69qy1zq5wdmiw7pjrglcypqfm79fzl9yay67s0mvl2k5l0ms4";
+       version = "1.2";
+       sha256 = "1s4ichb5dchcimcq9pvdddv2ibbdk2cb2b7p0l7p9s5lxn53bxgg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -59825,8 +60224,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix";
-       version = "0.16.1.3";
-       sha256 = "0mv4ndz0ydrc6d1cngi03av59h1r8cvby3k1hp7hpyd6vjlwshz5";
+       version = "0.16.1.4";
+       sha256 = "1bxhps1imw3iik0wvwa4x95kqa1qsm5jqwz16nalaclg2cynaaws";
        buildDepends = [
          array base binary bytestring deepseq random split storable-complex
          vector
@@ -59882,8 +60281,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-gsl";
-       version = "0.16.0.2";
-       sha256 = "1l865v2vpjl7f5741z58m9gw1ksskgzfm5gzp9pxiqazsgb2h5ym";
+       version = "0.16.0.3";
+       sha256 = "07hg9rfrr1029n9q8xyicyh4rr9x4c02cqn1xxnks9p9qyccf4kg";
        buildDepends = [ array base hmatrix process random vector ];
        pkgconfigDepends = [ gsl ];
        homepage = "https://github.com/albertoruiz/hmatrix";
@@ -59934,11 +60333,10 @@ self: {
     ({ mkDerivation, base, hmatrix, QuadProgpp, vector }:
      mkDerivation {
        pname = "hmatrix-quadprogpp";
-       version = "0.2.0.1";
-       sha256 = "1r03svlxzk4r4fw5brrixjf3dlfdvr2b7f80075ynm9ajzzpfirr";
+       version = "0.2.0.2";
+       sha256 = "02ysxyy7ixpnrghl0ignfmjy6j358i5xbmklmpxykkg27jgzvic3";
        buildDepends = [ base hmatrix vector ];
        extraLibraries = [ QuadProgpp ];
-       jailbreak = true;
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60700,7 +61098,6 @@ self: {
        jailbreak = true;
        description = "A small, toy roguelike";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle" = callPackage
@@ -60888,8 +61285,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "4.2.37";
-       sha256 = "0yzm3k7gvpim0mhmc3x16yl00xa3iz8dvq8732nfyfh4i3scnqd4";
+       version = "4.2.38";
+       sha256 = "0ijd23chnkcmymn1yf4rb7jbsbdnjxjvld7wsikp85ar1l3s858a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -61528,8 +61925,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpc-coveralls";
-       version = "0.8.1";
-       sha256 = "1w0cq9s5x613i94341cn2maf3v2phwrg4sbq1d7kkxp5x6ix4rhy";
+       version = "0.8.3";
+       sha256 = "02nqp267dcqrl81p7pn0bwpi44lakwl6pi47n9i1cnr7abcadglb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -61635,8 +62032,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpqtypes";
-       version = "1.3.0";
-       sha256 = "0hv0vi3bjk1id1pxsfv5kdxky5q9lcp6bjlmhcd3ljzz78swvdmp";
+       version = "1.3.2";
+       sha256 = "10axgrdhfas2rgy56yzcdwr0bbi6kijkbn3b8cpi7jkxs7pnqp6x";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -62521,8 +62918,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsbencher-fusion";
-       version = "0.3.3";
-       sha256 = "0vp1biv5jwac3bhj7qxl8x3bw73436qn284fippmlr6f54c15yw8";
+       version = "0.3.4";
+       sha256 = "078jzxvlka273nlpfsl9l3sbga2qbnm9hqdprpaks1xrldzzg949";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -63037,22 +63434,22 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
      , bytestring, Cabal, containers, deepseq, directory, exceptions
      , filepath, ghc, ghc-mod, ghc-paths, haddock-api, haskell-src-exts
-     , hdocs, HTTP, monad-loops, mtl, network, process
+     , hdocs, HTTP, lens, monad-loops, mtl, network, process
      , regex-pcre-builtin, scientific, template-haskell, text, time
      , transformers, uniplate, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.3.2";
-       sha256 = "1gr24789vg05phps4141dfygdzlhy58v5r90bv35gp6gwnj2b0za";
+       version = "0.1.3.4";
+       sha256 = "1m21wwl93sba113qr733a9qpxc0ljrn6mpd17760gzxpa5vhfjqd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson aeson-pretty array attoparsec base bytestring Cabal
          containers deepseq directory exceptions filepath ghc ghc-mod
-         ghc-paths haddock-api haskell-src-exts hdocs HTTP monad-loops mtl
-         network process regex-pcre-builtin scientific template-haskell text
-         time transformers uniplate unix unordered-containers vector
+         ghc-paths haddock-api haskell-src-exts hdocs HTTP lens monad-loops
+         mtl network process regex-pcre-builtin scientific template-haskell
+         text time transformers uniplate unix unordered-containers vector
        ];
        testDepends = [ base ];
        homepage = "https://github.com/mvoidex/hsdev";
@@ -63803,8 +64200,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.1.2";
-       sha256 = "04n34g7gbmbkyqzp9by4qdcf87m1gasmc2hnm8i0dqpcnssv05py";
+       version = "2.1.3";
+       sha256 = "11m2piy7j4vb5y7rws9cj64nmjw89mj4nkgmdvprp1rrp3wijgf2";
        buildDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
@@ -63870,8 +64267,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.1.2";
-       sha256 = "1mvsfr175g5dbk1xz48d0p4lv4gvv4z3ss3n2s7d2h83i25bmjvh";
+       version = "2.1.3";
+       sha256 = "0l1z6m5ir4ky667hsdk4b3gfdxm08k19kgkqfsv9b382lnx93y5b";
        buildDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -63890,8 +64287,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.1.2";
-       sha256 = "0zv215br94agvg8dbz0f5az5cahgnw8gdx0z84zlrpjxkzf3rb19";
+       version = "2.1.3";
+       sha256 = "0778n76vhd5nk4bnh5bvhcfmyyk8q14p4yl00lspwc082hqkbyv0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath ];
@@ -64335,8 +64732,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsqml";
-       version = "0.3.2.1";
-       sha256 = "1hz9j592kj1jihsb7gahy3rj4zyma204hsikijwxqs6nr02vx3hr";
+       version = "0.3.3.0";
+       sha256 = "0m0g822182q45cvl3k7ir1c6g5wzwb1c9137g1c62f3npinb0kmz";
        buildDepends = [
          base containers filepath tagged text transformers
        ];
@@ -64388,8 +64785,8 @@ self: {
     ({ mkDerivation, base, hsqml, OpenGL, OpenGLRaw, text }:
      mkDerivation {
        pname = "hsqml-demo-samples";
-       version = "0.3.2.0";
-       sha256 = "017yqpk5kivcm070lqlmb5ml19hrghc22h5h2svk4mwszscf65fc";
+       version = "0.3.3.0";
+       sha256 = "072k2vc6wk8r2zn2isp37p9xhi8dbg15sy5hmpj868lzbq3mzyac";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base hsqml OpenGL OpenGLRaw text ];
@@ -64424,8 +64821,8 @@ self: {
     ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
      mkDerivation {
        pname = "hsshellscript";
-       version = "3.3.2";
-       sha256 = "0rc78yx82gy7a3dxl1mn9hrj1cqhq51zq6w4nf11rzgn6106zdln";
+       version = "3.3.3";
+       sha256 = "0g8qm1nx2dzsmkn2rp1vwqgvgqpxgjambnmq81qyky66d83mgbz1";
        buildDepends = [ base directory parsec random unix ];
        buildTools = [ c2hs ];
        homepage = "http://www.volker-wysk.de/hsshellscript/";
@@ -64632,7 +65029,6 @@ self: {
        homepage = "http://www.dcc.fc.up.pt/~pbv/stuff/hstzaar";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsubconvert" = callPackage
@@ -64793,17 +65189,16 @@ self: {
 
   "htar" = callPackage
     ({ mkDerivation, base, bytestring, bzlib, directory, filepath
-     , old-locale, old-time, tar, zlib
+     , old-locale, tar, time, zlib
      }:
      mkDerivation {
        pname = "htar";
-       version = "0.4";
-       sha256 = "1yxp3kql8viavx5vwxcm5gqilsq82bspx42c45n4ix13h0z2ww5m";
+       version = "0.4.0.1";
+       sha256 = "17zxk0fig5sh967zz33k8as132i2ghazpj5w93vl6hw8d1hrj2n6";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring bzlib directory filepath old-locale old-time tar
-         zlib
+         base bytestring bzlib directory filepath old-locale tar time zlib
        ];
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
@@ -64829,12 +65224,11 @@ self: {
     ({ mkDerivation, base, process, time }:
      mkDerivation {
        pname = "htime";
-       version = "0.3";
-       sha256 = "0pqk91iycqvy3iq86i0b54bpp9cd720z463q6cwbvc9yzk5bf7zz";
+       version = "0.3.1";
+       sha256 = "14y7ipbc6ic1qraxnrs4k0hrqh5c8ks1fsm8af6wm9x762bcfaxr";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base process time ];
-       jailbreak = true;
        description = "Timing utility for the command line";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65101,8 +65495,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.6.2";
-       sha256 = "1v8k9n23mcql3wpxjq9xy7ppmj8z1vga0ny681pqbdapyqnpfdjc";
+       version = "0.4.7";
+       sha256 = "1r00gp6s2m0bnjv4nl12r22m42627fhlkxwski5i2r8i14s98y4k";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -65330,8 +65724,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit-downloader";
-       version = "1.0.22";
-       sha256 = "0bvm8hbhs4vq9zy04wz6nawg0px398jv9by3cvj80lgyzwbaxgn3";
+       version = "1.0.23";
+       sha256 = "0x5yq66b1wp2id39355sajsxplm3wqz3171z3yfp4sjb3iym835x";
        buildDepends = [
          base bytestring conduit connection data-default HsOpenSSL
          http-client http-conduit http-types lifted-base mtl network
@@ -65448,7 +65842,6 @@ self: {
        homepage = "http://github.com/zmthy/http-media";
        description = "Processing HTTP Content-Type and Accept headers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-monad" = callPackage
@@ -65539,17 +65932,17 @@ self: {
      }) {};
 
   "http-server" = callPackage
-    ({ mkDerivation, base, HTTP, mime, network, text, unix, url
-     , utf8-string
+    ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix
+     , url, utf8-string
      }:
      mkDerivation {
        pname = "http-server";
-       version = "1.0.4";
-       sha256 = "1sillnp37njlkgvg4r4lxcc9m91v8xhar0f1mz7vnj8a97490l4q";
+       version = "1.0.5";
+       sha256 = "1mbdla50sxdi7fs1l2wrk42nyrb4s9ls86x695jch4zwg06q0gx3";
        buildDepends = [
-         base HTTP mime network text unix url utf8-string
+         base HTTP mime network network-uri text unix url utf8-string
        ];
-       homepage = "http://code.galois.com/";
+       homepage = "https://github.com/GaloisInc/http-server";
        description = "A library for writing Haskell web servers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65580,9 +65973,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-streams";
-       version = "0.7.2.4";
-       sha256 = "1hs2d5qiq5vq6qjxxx061w1iigr05chkv28xvlvxfz0wc7nlipzz";
-       editedCabalFile = "ba1a8d4829c9476c90135fadace2ec6eaa62539f5599c050a33936ef6d479fb1";
+       version = "0.7.2.5";
+       sha256 = "0dabn3d9al9lvfqk7fg3nbddbygygq4am3j7wibp48zhy3vg8m0y";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive directory HsOpenSSL http-common io-streams mtl
@@ -66179,8 +66571,8 @@ self: {
      }:
      mkDerivation {
        pname = "hxt";
-       version = "9.3.1.10";
-       sha256 = "0jmd13wh29i7rl8wvz2mrn4055r4pc8qaph5p0hkw8mbpkn93jcf";
+       version = "9.3.1.12";
+       sha256 = "132y82d9vc8vl9vy912s5nk9aqvsn3dpan5xjw6rrm5yigdpwbdg";
        buildDepends = [
          base binary bytestring containers deepseq directory filepath HUnit
          hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
@@ -66358,8 +66750,8 @@ self: {
      }:
      mkDerivation {
        pname = "hxt-relaxng";
-       version = "9.1.5.1";
-       sha256 = "16jzsk9gkrqnq1d1n5nm0w6b4viq7938zlis26mm975x6s12i1w6";
+       version = "9.1.5.3";
+       sha256 = "1170gpxx4pr9v5jkfy5c0kz5h10z7aildd6qgd02d5bqxnph5kil";
        buildDepends = [
          base containers hxt hxt-charproperties hxt-regex-xmlschema
          network-uri parsec
@@ -66555,7 +66947,6 @@ self: {
        homepage = "https://github.com/rrnewton/hydra-print";
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen" = callPackage
@@ -66858,8 +67249,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyphenation";
-       version = "0.4";
-       sha256 = "06na4y568v3plsyvgcqmra1crv10fcfal419fjjv300vkaafbyxb";
+       version = "0.4.1";
+       sha256 = "1hcpjjyid7a2kg42xgf6pskfvhz3gfj4iikwzngpmg1xib2ggv6v";
        buildDepends = [ base containers unordered-containers ];
        testDepends = [
          base containers directory doctest filepath unordered-containers
@@ -67137,7 +67528,7 @@ self: {
        ];
        buildTools = [ happy ];
        extraLibraries = [ boehmgc gmp ];
-       configureFlags = [ "-fgmp" "-fffi" ];
+       configureFlags = [ "-fffi" "-fgmp" ];
        jailbreak = true;
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
@@ -67183,8 +67574,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ieee754";
-       version = "0.7.5";
-       sha256 = "0109mhyk76xnbsbpnnz3skpvxjckcldlpq93dvfgy5zahmswl4r3";
+       version = "0.7.6";
+       sha256 = "03s56h82n7hcwcn2dhd646prcf9wxj5jq49xqsnl7cnvi9768h2q";
        buildDepends = [ base ];
        homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
@@ -67407,7 +67798,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-display" = callPackage
@@ -67736,8 +68126,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, mtl }:
      mkDerivation {
        pname = "imports";
-       version = "0.1.2.0";
-       sha256 = "1iv4vcp5amf49i1bj9cbarb5xgbxm7wym54wgaa9kvl3391dmy3q";
+       version = "0.1.2.1";
+       sha256 = "1hm4dg07mw8cihkqziz827kwa3qqvgjg1y45r2lg66crsaanprgz";
        buildDepends = [ base directory filepath mtl ];
        testDepends = [ base directory filepath mtl ];
        jailbreak = true;
@@ -67858,14 +68248,12 @@ self: {
     ({ mkDerivation, base, mtl, parsec, parsers, trifecta }:
      mkDerivation {
        pname = "indentation";
-       version = "0.2.0.0";
-       sha256 = "1gn6v6l2d3a6nilkr4zg9ci9z9wh5027k2cdkd8hg5w964cccgs1";
+       version = "0.2.0.2";
+       sha256 = "0iknqp0vk90hz4bgwdkmjgkaq4a3dnqlrgi1hh9bdn3ldm2404jd";
        buildDepends = [ base mtl parsec parsers trifecta ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/mdmkolbe/indentation";
-       description = "Indentation sensitive parsing combinators for Parsec";
+       description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentparser" = callPackage
@@ -67965,7 +68353,6 @@ self: {
        buildDepends = [ base gtk HDBC HDBC-sqlite3 ];
        description = "Indian Language Font Converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indices" = callPackage
@@ -68046,8 +68433,8 @@ self: {
      }:
      mkDerivation {
        pname = "inflections";
-       version = "0.1.0.7";
-       sha256 = "0hf0s23x5fp763lfq8a4q3jp4d9k886sz56lrav915sz13v8rddz";
+       version = "0.1.0.9";
+       sha256 = "10l7dnjc6h75bf61rp38w7pqm6yqvhssvjqmh01nwa2bxxayzl7m";
        buildDepends = [ base containers parsec ];
        testDepends = [
          base containers HUnit parsec QuickCheck test-framework
@@ -68334,10 +68721,9 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "interchangeable";
-       version = "0.0.1.0";
-       sha256 = "0j7jk7qnc74pl6fhwxy71v9i34s5ycgqxj2v9y9xig2i1n91isl7";
+       version = "0.2.0.0";
+       sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh";
        buildDepends = [ base containers ];
-       jailbreak = true;
        homepage = "https://github.com/arowM/interchangeable";
        description = "A type class for interchangeable data";
        license = stdenv.lib.licenses.mit;
@@ -68540,18 +68926,19 @@ self: {
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , cryptohash, directory, filepath, hscurses, mtl, network-fancy
-     , SDL, SDL-gfx, SDL-ttf, stm, time, transformers, vector
+     , random, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time, transformers
+     , vector
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.3.3";
-       sha256 = "1yvw2snkcmkllzdhpsxrhcw6i9401xwhhgvxq1zjlnammn0j3rpz";
+       version = "0.3.8";
+       sha256 = "1w4lawwd59zkfdvi8lkg7cmqnzr0mjrkcsgpibyr8p2x42zxskgm";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base binary bytestring containers cryptohash directory
-         filepath hscurses mtl network-fancy SDL SDL-gfx SDL-ttf stm time
-         transformers vector
+         filepath hscurses mtl network-fancy random SDL SDL-gfx SDL-mixer
+         SDL-ttf stm time transformers vector
        ];
        homepage = "http://mbays.freeshell.org/intricacy";
        description = "A game of competitive puzzle-design";
@@ -68689,9 +69076,8 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams";
-       version = "1.2.1.1";
-       sha256 = "1pvrscyw7wcv910p8d9j4a9jdm0vm7m74g5kgzpc5hnxdfibhqj1";
-       editedCabalFile = "3492f92c21c89afd37162a81f51eb75d30574c3cf74dd94ed4d82342a308bf6c";
+       version = "1.2.1.2";
+       sha256 = "03jwm9p4pmh6bra19lkgbkb08aghfylv4gjwg3mfcipw981dnzb8";
        buildDepends = [
          attoparsec base blaze-builder bytestring network primitive process
          text time transformers vector zlib-bindings
@@ -68702,7 +69088,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text time
          transformers vector zlib zlib-bindings
        ];
-       configureFlags = [ "-fNoInteractiveTests" ];
+       configureFlags = [ "-fnointeractivetests" ];
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68749,6 +69135,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "iothread" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "iothread";
+       version = "0.1.0.0";
+       sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0";
+       buildDepends = [ base ];
+       homepage = "https://github.com/tattsun/iothread";
+       description = "run IOs in a single thread";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "iotransaction" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -68762,18 +69160,17 @@ self: {
      }) {};
 
   "ip6addr" = callPackage
-    ({ mkDerivation, base, random }:
+    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
        pname = "ip6addr";
-       version = "0.3.3";
-       sha256 = "1kpyqrxg55h02x7dysr02g8z4sn9f60w8l46sgvcrj045507wagw";
+       version = "0.4.0.0";
+       sha256 = "1gj8spzfmvws5b3g18sdi1qsvapgl27a329l3340flj9d5hzns7s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random ];
-       homepage = "http://www.cybervisible.fr/ip6addr";
-       description = "Command-line tools to deal with IPv6 Addresses text representation";
+       buildDepends = [ base cmdargs IPv6Addr text ];
+       homepage = "https://github.com/MichelBoucey/ip6addr";
+       description = "commandline tool to generate IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipatch" = callPackage
@@ -69011,13 +69408,12 @@ self: {
      }:
      mkDerivation {
        pname = "ircbot";
-       version = "0.6.1";
-       sha256 = "0zmn2qplq08kg439afycrggd54szf6b6rajd6lhsgnvhwk356vhb";
+       version = "0.6.2";
+       sha256 = "0jl6sgm7bk4yi1l4s6j3yir3rpbxx8r4ri267xcw77b2vzbxq7l0";
        buildDepends = [
          base bytestring containers directory filepath irc mtl network
          old-locale parsec random SafeSemaphore stm time unix
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/stepcut/ircbot";
        description = "A library for writing irc bots";
        license = stdenv.lib.licenses.bsd3;
@@ -69176,8 +69572,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "iso639";
-       version = "0.1.0.2";
-       sha256 = "011k1k1g7ywk2y5b2sbaghw1mfainijbb3x6m7n5s040gy0kh9ar";
+       version = "0.1.0.3";
+       sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj";
        buildDepends = [ base ];
        homepage = "https://github.com/HugoDaniel/iso639";
        description = "ISO-639-1 language codes";
@@ -69851,9 +70247,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.3";
-       sha256 = "0qwnqnz3s4bmgmhmy05x58znxz7vdr1bjbkd5lb6pzbi11grjipg";
-       editedCabalFile = "b0420abe6a275a5a5c1feadde440a67fa2ebb7c03935837dbd27c4da14c013d0";
+       version = "0.3.2";
+       sha256 = "062w3m54my6v2lixlq1zgz7ajf6vdx7p1g0qzs6nc2h4jf0vnybm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -70230,19 +70625,20 @@ self: {
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, byteable
      , bytestring, cereal, cipher-aes, containers, cprng-aes
-     , crypto-cipher-types, crypto-numbers, crypto-pubkey, crypto-random
-     , cryptohash, doctest, either, errors, hspec, HUnit, mtl
-     , QuickCheck, text, time, unordered-containers, vector
+     , crypto-cipher-types, crypto-numbers, crypto-pubkey
+     , crypto-pubkey-types, crypto-random, cryptohash, doctest, either
+     , errors, hspec, HUnit, mtl, QuickCheck, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "jose-jwt";
-       version = "0.2";
-       sha256 = "1143sbniyzcpgxhjrb5nmmxynb9l446r5dyiyl5hnqlim129qwil";
+       version = "0.3";
+       sha256 = "15harxg4zdvm0ffwls74grjlf9942sy5hl37plamc7iriln4w1ic";
        buildDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
-         crypto-random cryptohash errors mtl text time unordered-containers
-         vector
+         crypto-pubkey-types crypto-random cryptohash errors mtl text time
+         unordered-containers vector
        ];
        testDepends = [
          aeson base base64-bytestring bytestring cipher-aes cprng-aes
@@ -70304,18 +70700,21 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, hslogger, lens, template-haskell, text
-     , transformers
+    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
+     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.2.0.2";
-       sha256 = "14lxxcl45bzj6g44vr0iq8ndjkxbv4sismamyafymb8hbb24ida3";
-       buildDepends = [ base lens template-haskell text transformers ];
+       version = "0.2.0.3";
+       sha256 = "0bldhn9bhhz07shcdcdc0p01ggxa8af43cf0bza9za8zywgq5i9x";
+       buildDepends = [
+         base lens template-haskell text transformers webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
        testDepends = [
-         base hslogger lens template-haskell text transformers
+         base glib gtk3 hslogger lens template-haskell text transformers
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70629,8 +71028,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-schema";
-       version = "0.7.3.0";
-       sha256 = "0jdhmzg1is8dnyz46r6w616xq0w1lypc9xz1c2mcimr9xb9r70zw";
+       version = "0.7.3.1";
+       sha256 = "07jvr0n6vakyvsqxl783fyqsgw83fvk5vk9p93v3hnpxlz0vrfnp";
        buildDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          tagged text time unordered-containers vector
@@ -70901,8 +71300,8 @@ self: {
      }:
      mkDerivation {
        pname = "jwt";
-       version = "0.5.2";
-       sha256 = "1ks2dsi26cqz9q78lj6man14a86zdlkqv00lq1ffn00q3l7zxgmn";
+       version = "0.5.3";
+       sha256 = "1225fa53gghfpgwhr4x269a6kygfj39fh2qdapdi9mrrvlg302i4";
        buildDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default http-types network network-uri scientific semigroups
@@ -70917,7 +71316,6 @@ self: {
        homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
        description = "JSON Web Token (JWT) decoding and encoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kafka-client" = callPackage
@@ -71336,6 +71734,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "keyword-args" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers, hspec
+     , parsec
+     }:
+     mkDerivation {
+       pname = "keyword-args";
+       version = "0.1.0.4";
+       sha256 = "0zq65y5xkma2b6wj71f5i0x39bpr8i0nljqnnnlzdz9z8ddr1l8r";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base bytestring cassava containers parsec ];
+       testDepends = [ base containers hspec parsec ];
+       description = "Extract data from a keyword-args config file format";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "kibro" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -71829,6 +72243,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "laika" = callPackage
+    ({ mkDerivation, attoparsec, base-prelude, either, record
+     , system-fileio, system-filepath, template-haskell, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "laika";
+       version = "0.1.1";
+       sha256 = "1ifs8brgbhzwl58ccnpyvfrkn1x27a38ylawik382n221sv28pj5";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         attoparsec base-prelude either record system-fileio system-filepath
+         template-haskell text transformers
+       ];
+       homepage = "https://github.com/nikita-volkov/laika";
+       description = "Minimalistic type-checked compile-time template engine";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lambda-ast" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -72380,8 +72814,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-inline";
-       version = "0.7.7.0";
-       sha256 = "10wj8dlsjimgln14y7b50pnnn865ln46v3xcqwr7ahjcl3icavg6";
+       version = "0.7.8.0";
+       sha256 = "0kzhprxw2lhk5s66nh7q2rfndjlch1ii7m3bn116dym4dc16b0cm";
        buildDepends = [
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
@@ -72642,8 +73076,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-javascript";
-       version = "0.5.13";
-       sha256 = "0h46wfh5xi3gbiaplx3ikmj7mfcwm1d37i5c9n3qfsmmkac29n2w";
+       version = "0.5.13.3";
+       sha256 = "069spax169v0qq5axwccgxdmiyjlnjg1bhzqh09dp5yx9w5fk47x";
        buildDepends = [
          array base blaze-builder bytestring containers mtl utf8-string
        ];
@@ -72659,12 +73093,18 @@ self: {
      }) {};
 
   "language-lua" = callPackage
-    ({ mkDerivation, array, base, mtl, parsec, safe }:
+    ({ mkDerivation, array, base, deepseq, directory, filepath, mtl
+     , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "language-lua";
-       version = "0.4.5";
-       sha256 = "1i0msb2hnv3r8bp444laczvv5315vilbygshn3x8nq7p9p7rsmq5";
-       buildDepends = [ array base mtl parsec safe ];
+       version = "0.6.2";
+       sha256 = "0zic1ahh5wzikiafvz8npnj6qamksfc5d23lqqbdf1jq8as363n8";
+       buildDepends = [ array base deepseq mtl parsec safe ];
+       testDepends = [
+         base deepseq directory filepath parsec QuickCheck tasty tasty-hunit
+         tasty-quickcheck
+       ];
        homepage = "http://github.com/osa1/language-lua";
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -73230,20 +73670,22 @@ self: {
      }) {};
 
   "leaky" = callPackage
-    ({ mkDerivation, base, deepseq-bounded, deepseq-generics
+    ({ mkDerivation, base, cpphs, deepseq-bounded, deepseq-generics
      , generics-sop, random, seqaid, template-haskell
      }:
      mkDerivation {
        pname = "leaky";
-       version = "0.1.7.0";
-       sha256 = "13rmxqj7ca3lp3wmbh8x37gwnm4b66mi6xcz2fsq9cmhsr92lf1i";
+       version = "0.2.1.0";
+       sha256 = "1byp6vrisb423cnlwbd211k8d85df8mwiqvl22w3wxv36dnvpah1";
+       editedCabalFile = "ffa60eac7cd683bbd27c5b8ec4ba9d9d2d1cc07e3b38bd6a2b062229200fc8e5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base deepseq-bounded deepseq-generics generics-sop random seqaid
-         template-haskell
+         base cpphs deepseq-bounded deepseq-generics generics-sop random
+         seqaid template-haskell
        ];
-       homepage = "http://www.fremissant.net/leaky";
+       buildTools = [ cpphs ];
+       homepage = "http://fremissant.net/leaky";
        description = "Robust space leak, and its strictification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73362,8 +73804,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.14.3.0";
-       sha256 = "066k2lnij26lamim3948hm2ck893pyg981zdiaqqn6y06n22imxq";
+       version = "0.14.4.0";
+       sha256 = "13p6fil3s8pgjgicxgkn1qfcdhvv5j0lilk85a66nz7vw4rg3x2v";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -73391,20 +73833,20 @@ self: {
     ({ mkDerivation, attoparsec, attoparsec-conduit, base, binary
      , binary-shared, bytestring, Cabal, conduit, conduit-extra
      , containers, deepseq, directory, executable-path, filepath, ghc
-     , haddock, hslogger, HTTP, HUnit, ltk, network, network-uri, parsec
-     , pretty, process, process-leksah, resourcet, strict, text, time
-     , transformers, unix
+     , haddock-api, hslogger, HTTP, HUnit, ltk, network, network-uri
+     , parsec, pretty, process, process-leksah, resourcet, strict, text
+     , time, transformers, unix
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.14.3.0";
-       sha256 = "0nw2cp5sff91grryizsm8ziv63075y0vfdmn29ksim2g5k81az0v";
+       version = "0.14.3.2";
+       sha256 = "0gbjxbma0jyw0jli63f3apfsap9by6nr75qx77773nj2l48hxz3w";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          attoparsec attoparsec-conduit base binary binary-shared bytestring
          Cabal conduit conduit-extra containers deepseq directory
-         executable-path filepath ghc haddock hslogger HTTP ltk network
+         executable-path filepath ghc haddock-api hslogger HTTP ltk network
          network-uri parsec pretty process process-leksah resourcet strict
          text time transformers unix
        ];
@@ -73412,7 +73854,6 @@ self: {
          base conduit conduit-extra hslogger HUnit process resourcet
          transformers
        ];
-       jailbreak = true;
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
@@ -74121,7 +74562,6 @@ self: {
        extraLibraries = [ libnotify ];
        description = "Bindings to libnotify library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) libnotify;};
 
   "libnvvm" = callPackage
@@ -74617,20 +75057,20 @@ self: {
 
   "linear" = callPackage
     ({ mkDerivation, adjunctions, base, binary, bytestring, containers
-     , directory, distributive, doctest, filepath, ghc-prim, hashable
-     , HUnit, lens, reflection, semigroupoids, semigroups
+     , deepseq, directory, distributive, doctest, filepath, ghc-prim
+     , hashable, HUnit, lens, reflection, semigroupoids, semigroups
      , simple-reflect, tagged, template-haskell, test-framework
      , test-framework-hunit, transformers, unordered-containers, vector
      , void
      }:
      mkDerivation {
        pname = "linear";
-       version = "1.16";
-       sha256 = "0f2qr5pssdh2hq7vp3k7gnz3ylfcsraw48bjmmjycz6d3wjmpg4g";
+       version = "1.16.2";
+       sha256 = "1nd9jxg0zyjncmlxx6qf80378si5h1c4pnyy7zzwnbyqm81d9bqv";
        buildDepends = [
-         adjunctions base binary containers distributive ghc-prim hashable
-         lens reflection semigroupoids semigroups tagged template-haskell
-         transformers unordered-containers vector void
+         adjunctions base binary containers deepseq distributive ghc-prim
+         hashable lens reflection semigroupoids semigroups tagged
+         template-haskell transformers unordered-containers vector void
        ];
        testDepends = [
          base binary bytestring directory doctest filepath HUnit lens
@@ -74731,15 +75171,15 @@ self: {
 
   "linearscan" = callPackage
     ({ mkDerivation, base, containers, free, hoopl, hspec
-     , hspec-expectations, HUnit, transformers
+     , hspec-expectations, HUnit, lens, transformers
      }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.1.0.0";
-       sha256 = "1wkq5hyc85qxzlam5kb2zfvmrd7r6ypykv4b19hnsp3qgn4pmakx";
-       buildDepends = [ base transformers ];
+       version = "0.2.0.0";
+       sha256 = "0vs53aknv26lxkx1yprgbc3nbv75pysqli24gxg9wxcakmlsvl9q";
+       buildDepends = [ base containers transformers ];
        testDepends = [
-         base containers free hoopl hspec hspec-expectations HUnit
+         base containers free hoopl hspec hspec-expectations HUnit lens
          transformers
        ];
        homepage = "http://github.com/jwiegley/linearscan";
@@ -75238,7 +75678,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-tries" = callPackage
@@ -75247,10 +75686,10 @@ self: {
        pname = "list-tries";
        version = "0.5.2";
        sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6";
+       editedCabalFile = "50826a589644da396825e57f778b8e5596df986e1cf8ca97d946d29243b0556e";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base binary containers dlist ];
-       jailbreak = true;
        homepage = "http://iki.fi/matti.niemenmaa/list-tries/";
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = stdenv.lib.licenses.bsd3;
@@ -75724,8 +76163,8 @@ self: {
     ({ mkDerivation, array, base, lmdb }:
      mkDerivation {
        pname = "lmdb";
-       version = "0.2.4";
-       sha256 = "1fc466n8y5dqbp9v6a5av381gflj67rkbj7abs5kqb7h79fdaawa";
+       version = "0.2.5";
+       sha256 = "0z8wj06b5ii0w6pls2jlqmd3mhyrplhxd1c6h1my1p0w45b2hmc0";
        buildDepends = [ array base ];
        extraLibraries = [ lmdb ];
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
@@ -76075,6 +76514,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logsink" = callPackage
+    ({ mkDerivation, base, hspec, hsyslog, logging-facade, time }:
+     mkDerivation {
+       pname = "logsink";
+       version = "0.1.0";
+       sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
+       buildDepends = [ base hsyslog logging-facade time ];
+       testDepends = [ base hspec logging-facade ];
+       description = "A logging framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lojban" = callPackage
     ({ mkDerivation, base, containers, curl, directory, haskell98, HTTP
      , markov-chain, mtl, parsec, process, random, regex-compat, strict
@@ -76237,8 +76688,8 @@ self: {
      }:
      mkDerivation {
        pname = "lord";
-       version = "2.20140625";
-       sha256 = "1yjz713kddrnwjm2i4xj2vsmx6ycamvas5h1k9vmdcnlnlmbi45a";
+       version = "2.20150122";
+       sha256 = "0kzvi4310mbz51zkgmm84qyxxpi4m5ww2bsrfkj73a45bn7z198j";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -76315,12 +76766,12 @@ self: {
      }) {};
 
   "lrucache" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, contravariant }:
      mkDerivation {
        pname = "lrucache";
-       version = "1.1.1.4";
-       sha256 = "0w3b338wsf7c0acjxxfdjxsljfpsix67aihkl2jwnp5x71awf8qh";
-       buildDepends = [ base containers ];
+       version = "1.2.0.0";
+       sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
+       buildDepends = [ base containers contravariant ];
        homepage = "http://github.com/chowells79/lrucache";
        description = "a simple, pure LRU cache";
        license = stdenv.lib.licenses.bsd3;
@@ -76344,7 +76795,6 @@ self: {
        homepage = "https://github.com/roelvandijk/ls-usb";
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lscabal" = callPackage
@@ -76506,8 +76956,8 @@ self: {
      }:
      mkDerivation {
        pname = "lucid";
-       version = "2.6.0";
-       sha256 = "17cxi2mbphgxk1rn96p8vhr56fb0iap05vmygqp2cmm0q7am77di";
+       version = "2.8.1";
+       sha256 = "1vpb3vhg5y2wz9by81k9m6vi53adm706x7z8aryzqz6kzgpqw8jc";
        buildDepends = [
          base blaze-builder bytestring containers mtl text transformers
          unordered-containers
@@ -76519,12 +76969,12 @@ self: {
      }) {};
 
   "lucid-svg" = callPackage
-    ({ mkDerivation, base, lucid, text, transformers }:
+    ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
      mkDerivation {
        pname = "lucid-svg";
-       version = "0.1.0.0";
-       sha256 = "1drl7br0f0n53g54d6ry619g7ac0vg5d0qf9h2caybwv269jrsvv";
-       buildDepends = [ base lucid text transformers ];
+       version = "0.4.0.1";
+       sha256 = "1gg4zmvz80bqw9sv11irfzn0if7z1558d50cnsl0n12fw45vz87n";
+       buildDepends = [ base blaze-builder lucid text transformers ];
        homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
        description = "DSL for SVG using lucid for HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -76769,6 +77219,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) lzma;};
 
+  "maam" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "maam";
+       version = "0.1.0.0";
+       sha256 = "016r6ifvn07089fxkki3374cxinj6z6axpg16660qx9i552lrg4r";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base Cabal containers directory template-haskell text
+       ];
+       description = "A monadic framework for abstract interpretation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "maccatcher" = callPackage
     ({ mkDerivation, base, binary, parsec, process }:
      mkDerivation {
@@ -76784,13 +77251,13 @@ self: {
 
   "machinecell" = callPackage
     ({ mkDerivation, arrows, base, free, hspec, mtl, profunctors
-     , QuickCheck
+     , QuickCheck, semigroups
      }:
      mkDerivation {
        pname = "machinecell";
-       version = "1.2.0";
-       sha256 = "0c6dqwl8pd922afvbxirhipf5kcqksfmlb6rd8iycr8ix54962gb";
-       buildDepends = [ arrows base free mtl profunctors ];
+       version = "1.3.1";
+       sha256 = "1v4rrjszh6sm2x1nwq33f4xwa41bnls0awhy9qfkap62bpad8fxg";
+       buildDepends = [ arrows base free mtl profunctors semigroups ];
        testDepends = [ base hspec mtl profunctors QuickCheck ];
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
@@ -77561,8 +78028,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.1.1.0";
-       sha256 = "12i7475r75n1azgpliyw8q1k6vhaksg7dasrn38x19czzg5mijq9";
+       version = "0.2.0.0";
+       sha256 = "1v110ji153gnr3rjlj6m3w9w30pmf6zc9z25d9l52rxggfd5pfy8";
        buildDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -77633,6 +78100,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "manifolds" = callPackage
+    ({ mkDerivation, base, comonad, constrained-categories, containers
+     , MonadRandom, random, semigroups, transformers, vector
+     , vector-algorithms, vector-space, void
+     }:
+     mkDerivation {
+       pname = "manifolds";
+       version = "0.1.0.0";
+       sha256 = "1lbgkjhbfsps882vc2l97gwg92gh668kkhdwpy7rldbj7a9bdnzq";
+       buildDepends = [
+         base comonad constrained-categories containers MonadRandom random
+         semigroups transformers vector vector-algorithms vector-space void
+       ];
+       description = "Working with manifolds in a direct, embedding-free way";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "map-syntax" = callPackage
     ({ mkDerivation, base, containers, deepseq, HUnit, mtl, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -77835,17 +78319,16 @@ self: {
 
   "markup-preview" = callPackage
     ({ mkDerivation, base, cmdargs, directory, glib, gtk, MissingH, mtl
-     , pandoc, temporary, transformers, webkit
+     , pandoc, temporary, text, transformers, webkit
      }:
      mkDerivation {
        pname = "markup-preview";
-       version = "0.2.0.2";
-       sha256 = "1y4ha8wn2v7rw9v3sy0faxnmi0g623bnvyj05gha2nnxrzif9pdd";
-       editedCabalFile = "30a8c286edef81656077ebeab2d8896d3a09db2b8304d68d80461172ab92e25b";
+       version = "0.2.2.0";
+       sha256 = "0b2rll29qsr3cqq4vfaqjr4b5b1a9b4rg9cxbs98sspmpxka88m2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base cmdargs directory glib gtk MissingH mtl pandoc temporary
+         base cmdargs directory glib gtk MissingH mtl pandoc temporary text
          transformers webkit
        ];
        jailbreak = true;
@@ -78033,21 +78516,17 @@ self: {
      }) {};
 
   "matlab" = callPackage
-    ({ mkDerivation, array, base, Cabal, eng, filepath, matlab, mx
-     , unix
-     }:
+    ({ mkDerivation, array, base, Cabal, eng, filepath, mat, mx }:
      mkDerivation {
        pname = "matlab";
-       version = "0.1";
-       sha256 = "0rrpsf0xah8as9khm1jiyrcaqc1r4ykpab2ldyx4d0szgmfb93c1";
-       buildDepends = [ array base Cabal filepath unix ];
-       buildTools = [ matlab ];
-       extraLibraries = [ eng mx ];
-       jailbreak = true;
+       version = "0.2.0.0";
+       sha256 = "08kalclinzqxy5l7j115hz6h9nw1g7mf9rzmpz8dblbhbwvj4l7x";
+       buildDepends = [ array base Cabal filepath ];
+       extraLibraries = [ eng mat mx ];
        description = "Matlab bindings and interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { eng = null;  matlab = null;  mx = null;};
+     }) { eng = null;  mat = null;  mx = null;};
 
   "matrices" = callPackage
     ({ mkDerivation, base, primitive, vector }:
@@ -79008,7 +79487,7 @@ self: {
 
   "mime-mail" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , filepath, hspec, process, random, sendmail ? "sendmail", text
+     , filepath, hspec, process, random, text
      }:
      mkDerivation {
        pname = "mime-mail";
@@ -79019,7 +79498,6 @@ self: {
          random text
        ];
        testDepends = [ base blaze-builder bytestring hspec text ];
-       configureFlags = "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\"";
        homepage = "http://github.com/snoyberg/mime-mail";
        description = "Compose MIME email messages";
        license = stdenv.lib.licenses.mit;
@@ -79177,15 +79655,16 @@ self: {
      }) {};
 
   "minioperational" = callPackage
-    ({ mkDerivation, base, clean-unions, containers, elevator
+    ({ mkDerivation, base, containers, elevator, extensible, mtl
      , template-haskell, transformers
      }:
      mkDerivation {
        pname = "minioperational";
-       version = "0.4.8.1";
-       sha256 = "02nkgbpf1dky7h3n99j9m3101wyfahcdx5wk5vidvf9snl5vy1w9";
+       version = "0.4.9";
+       sha256 = "0kbfk3gpgzxi84kyjf7awdc2x579339zd7c42khlflhk6y88j95m";
        buildDepends = [
-         base clean-unions containers elevator template-haskell transformers
+         base containers elevator extensible mtl template-haskell
+         transformers
        ];
        homepage = "https://github.com/fumieval/minioperational";
        description = "fast and simple operational monad";
@@ -79234,8 +79713,8 @@ self: {
     ({ mkDerivation, async, base, zlib }:
      mkDerivation {
        pname = "minisat";
-       version = "0.1";
-       sha256 = "039xksi6klcmkciyb8zq60g96i5nzjq7y47bgh3fvpxb02wha64a";
+       version = "0.1.1";
+       sha256 = "1myy23mrhnm7wv6mzyym9jmw8pnlqkfam9dl082i8qll3mxrl83i";
        buildDepends = [ async base ];
        extraLibraries = [ zlib ];
        description = "A Haskell bundle of the Minisat SAT solver";
@@ -79769,8 +80248,8 @@ self: {
     ({ mkDerivation, base, stm, transformers, transformers-base }:
      mkDerivation {
        pname = "monad-control";
-       version = "1.0.0.1";
-       sha256 = "1332wravhjhcbj0jh3z1hg2dyfxlkqyb3rv6zdkgz49h2pfjlfbn";
+       version = "1.0.0.2";
+       sha256 = "13l9gq00pjlp1b2g9xzfavl6zibi2s195f234rmhzbsb14yhzgnr";
        buildDepends = [ base stm transformers transformers-base ];
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
@@ -80684,8 +81163,8 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "0.4.0.2";
-       sha256 = "17f8mixdxdqbv6dr1l249pyd587z8g9nr3xy4ja81yhj2zqm1n3c";
+       version = "0.4.0.3";
+       sha256 = "1ia6rraqg8c437hn0zppkhcwvk9zjq1msxw0y105l5ipr0ydwgq3";
        buildDepends = [ base bytestring containers primes text vector ];
        testDepends = [
          base bytestring containers primes QuickCheck quickcheck-instances
@@ -80707,6 +81186,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoidal-containers" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "monoidal-containers";
+       version = "0.1.0.0";
+       sha256 = "1hlbw6xnglmwvjy1zbggxbd3xylx545hp535mjrjnpzda6bydkvd";
+       buildDepends = [
+         base containers deepseq hashable lens newtype unordered-containers
+       ];
+       homepage = "http://github.com/bgamari/monoidal-containers";
+       description = "Containers with monoidal accumulation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monoidplus" = callPackage
     ({ mkDerivation, base, contravariant, semigroups, transformers }:
      mkDerivation {
@@ -80847,14 +81342,15 @@ self: {
      }:
      mkDerivation {
        pname = "morfette";
-       version = "0.3.6";
-       sha256 = "1r27n2zyf5n4nz42is966iwalrj13w5z3qv1iympg8gvpsm5v06i";
+       version = "0.4.3";
+       sha256 = "149jp0s5nsa02zivlp868qqvvam59wwf6nkq79ynlqjsa4lanvay";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base binary bytestring containers directory filepath mtl
          pretty QuickCheck text utf8-string vector
        ];
+       jailbreak = true;
        homepage = "http://sites.google.com/site/morfetteweb/";
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
@@ -81211,6 +81707,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "mtl-prelude_1_0_2" = callPackage
+    ({ mkDerivation, mtl, transformers }:
+     mkDerivation {
+       pname = "mtl-prelude";
+       version = "1.0.2";
+       sha256 = "0rw0yr8xlkq3pnn3r1sa5v570qp993j7s62y907i8cylx1a1xpfy";
+       buildDepends = [ mtl transformers ];
+       homepage = "https://github.com/nikita-volkov/mtl-prelude";
+       description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mtl-prelude" = callPackage
     ({ mkDerivation, mtl, transformers }:
      mkDerivation {
@@ -81222,7 +81730,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl-tf" = callPackage
@@ -81241,8 +81748,8 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "mtlparse";
-       version = "0.1.2";
-       sha256 = "0hnixpchgzrlx83cqykmqnahk8llf18gz8jkq2ql5y7gwj2xk1fd";
+       version = "0.1.4.0";
+       sha256 = "1fl5rvmgk37bqgjzs3c2wh80pfhr0i4yakxbsaryg7piws7j6ygc";
        buildDepends = [ base mtl ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/";
        description = "parse library using mtl package";
@@ -81476,8 +81983,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "multirec";
-       version = "0.7.4";
-       sha256 = "01mligrin7fp3fnnwgv8nrww5938ryghgyw9xyw153a615ryj8i9";
+       version = "0.7.5";
+       sha256 = "164a0rbka606d7d0l2p11j0zry0dlwkymig10wrkvckj7mh5yydz";
        buildDepends = [ base template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic programming for families of recursive datatypes";
@@ -81550,16 +82057,16 @@ self: {
      }) {};
 
   "multistate" = callPackage
-    ({ mkDerivation, base, mtl, tfp, transformers }:
+    ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "multistate";
-       version = "0.1.3.2";
-       sha256 = "00504bn8kiv93c7xziqibngyfy105lsh4pkyn1bav7mjzzam0nhb";
+       version = "0.3.0.0";
+       sha256 = "1sqaxvvs94max8gw1sz3kkgnp8y9zwrjdclnzv1kkkhciix9a1d1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl tfp transformers ];
+       buildDepends = [ base mtl transformers ];
        homepage = "https://github.com/lspitzner/multistate";
-       description = "like mtl's ReaderT/StateT, but more than one contained value/type";
+       description = "like mtl's ReaderT/WriterT/StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -82079,8 +82586,8 @@ self: {
      }:
      mkDerivation {
        pname = "mwc-random-monad";
-       version = "0.7.1.0";
-       sha256 = "1nx6zrpwsf7606sx9qa843djxr655kv7l9y8sb7b2l62jxk4nrqi";
+       version = "0.7.2.0";
+       sha256 = "07a25qcdv88500klhyc3460pd1wjsrz4pf4m1bfydb1aib0avkzg";
        buildDepends = [
          base monad-primitive mwc-random primitive transformers vector
        ];
@@ -82297,8 +82804,8 @@ self: {
      }:
      mkDerivation {
        pname = "nagios-perfdata";
-       version = "0.2.1";
-       sha256 = "08s19c6mx5df9a7588pbjsvzgwnc43zbir2fwwqzarmrr7dh2jp3";
+       version = "0.2.2";
+       sha256 = "159m45fvxgdabh7n24bkmg2901y3792afcrccqna1in3ha9vxd22";
        buildDepends = [
          attoparsec base bifunctors bytestring containers mtl
        ];
@@ -82661,7 +83168,6 @@ self: {
        homepage = "https://github.com/nilcons/nc-indicators";
        description = "CPU load and memory usage indicators for i3bar";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ncurses" = callPackage
@@ -82679,7 +83185,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) ncurses;};
 
   "neat" = callPackage
@@ -83804,12 +84309,11 @@ self: {
      }:
      mkDerivation {
        pname = "networked-game";
-       version = "0.1.0.0";
-       sha256 = "18wr12sd2lj6wp04l47x7b5sb85q2j3h5f6j6c082nlb6snxvqhh";
+       version = "0.1.0.1";
+       sha256 = "12sy97cgqrsmqywh0cznp8wbsw8z2yahlfalsjy32qarcz44banz";
        buildDepends = [
          base binary bytestring containers network time transformers
        ];
-       jailbreak = true;
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84749,7 +85253,6 @@ self: {
        buildDepends = [ base bytestring mtl ncurses text ];
        description = "Bored? Nyan cat!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nymphaea" = callPackage
@@ -84768,7 +85271,6 @@ self: {
        jailbreak = true;
        description = "An interactive GUI for manipulating L-systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oauthenticated" = callPackage
@@ -84795,9 +85297,10 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random }:
      mkDerivation {
        pname = "obdd";
-       version = "0.3.1";
-       sha256 = "1blj9k4wd14shif4dngip5kl9zmavrhp0bnr2xciz8r8is1x0q4j";
+       version = "0.3.2";
+       sha256 = "0dck1jaw2smvnc1cdjmxjchsxsjw14h98y58lm5z0ccl3rfjr1hw";
        buildDepends = [ array base containers mtl random ];
+       homepage = "https://github.com/jwaldmann/haskell-obdd";
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
      }) {};
@@ -84860,23 +85363,22 @@ self: {
        homepage = "https://github.com/tsuraan/objectid";
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "objective" = callPackage
-    ({ mkDerivation, adjunctions, base, clean-unions, comonad
-     , containers, either, elevator, free, hashable, kan-extensions
+    ({ mkDerivation, adjunctions, base, comonad, containers, either
+     , elevator, extensible, free, hashable, kan-extensions
      , minioperational, profunctors, transformers, unordered-containers
      , void, witherable
      }:
      mkDerivation {
        pname = "objective";
-       version = "0.6.3.3";
-       sha256 = "02219hrd2kbj5ynsp8hg1m3xi9ba0y0vkhmcm37h4wb2mhzqiamx";
+       version = "0.6.5";
+       sha256 = "1mp77mfi7fng0iixpj77dap62cc7j0mrwbsjld8r67788k4jd6gh";
        buildDepends = [
-         adjunctions base clean-unions comonad containers either elevator
-         free hashable kan-extensions minioperational profunctors
-         transformers unordered-containers void witherable
+         adjunctions base comonad containers either elevator extensible free
+         hashable kan-extensions minioperational profunctors transformers
+         unordered-containers void witherable
        ];
        homepage = "https://github.com/fumieval/objective";
        description = "Extensible objects";
@@ -85045,9 +85547,8 @@ self: {
      }:
      mkDerivation {
        pname = "olwrapper";
-       version = "0.3.7.15";
-       sha256 = "16hryw00v4rb5wa7yyhin31rfnaahaciylc0yjcar0774hhj4iqh";
-       editedCabalFile = "163bc07fb1f466b89dfa05c277328c673f32d4f82cc6c9fdb92d707be390d599";
+       version = "0.3.8";
+       sha256 = "1zwzcisi6i5a1rmhzck1rpl9rbsqwij7c1lyplhdknjy0vpw9myk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -85056,7 +85557,7 @@ self: {
        ];
        jailbreak = true;
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
-       license = "GPL";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -86001,7 +86502,6 @@ self: {
        ];
        description = "Show keys pressed with an on-screen display (Linux only)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "osm-download" = callPackage
@@ -86184,9 +86684,8 @@ self: {
      }:
      mkDerivation {
        pname = "packunused";
-       version = "0.1.1.3";
-       sha256 = "1f8lc9lzqwyzdz1j8czdan04d4bj393xk1rxfhr39j4a56qskp1c";
-       editedCabalFile = "13b205abc2620715a9e4aecb110c7c8e4048430c66baf35d78915e99c92e1527";
+       version = "0.1.1.4";
+       sha256 = "1ahb8wq7yxnfzwcvppk8cyhj9r51fz9ci1pwy0h4ql7iyc3z0vy8";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -86235,20 +86734,18 @@ self: {
     ({ mkDerivation, aeson, base, bifunctors, bytestring
      , bytestring-conversion, conduit, data-default-class, exceptions
      , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
-     , monad-control, mtl, old-locale, template-haskell, text, time
-     , transformers, transformers-base, unordered-containers
+     , monad-control, mtl, template-haskell, text, time, transformers
+     , transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "pagerduty";
-       version = "0.0.0";
-       sha256 = "0g14xnk0a210fzfxyxviqnrfgl6bxvvf5ikgqsjmifjv1h9pj6b8";
-       editedCabalFile = "5dfdd3a9c0061cce3b681ba03b0a0637e60f6bfebd9239516f37be4cbd467e7d";
+       version = "0.0.1";
+       sha256 = "1cd7zwqbbm3vhzjjydsipwdb9kzync5zxpbsb2kf11gwrcwdcsss";
        buildDepends = [
          aeson base bifunctors bytestring bytestring-conversion conduit
          data-default-class exceptions generics-sop http-client http-types
-         lens lens-aeson mmorph monad-control mtl old-locale
-         template-haskell text time transformers transformers-base
-         unordered-containers
+         lens lens-aeson mmorph monad-control mtl template-haskell text time
+         transformers transformers-base unordered-containers
        ];
        jailbreak = true;
        homepage = "http://github.com/brendanhay/pagerduty";
@@ -86438,12 +86935,11 @@ self: {
          array base cairo containers directory glib mtl pretty process text
        ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ cairo pango ];
+       pkgconfigDepends = [ pango ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) cairo;  inherit (pkgs.gnome) pango;};
+     }) { inherit (pkgs.gnome) pango;};
 
   "papillon" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, monads-tf
@@ -86513,6 +87009,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "parallel_3_2_0_3" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq }:
+     mkDerivation {
+       pname = "parallel";
+       version = "3.2.0.3";
+       sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn";
+       buildDepends = [ array base containers deepseq ];
+       jailbreak = true;
+       description = "Parallel programming library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "parallel" = callPackage
     ({ mkDerivation, array, base, containers, deepseq }:
      mkDerivation {
@@ -87256,6 +87764,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "paypal-adaptive-hoops" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, errors
+     , http-client, http-types, HUnit, lens, lens-aeson, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, transformers, vector, wreq
+     }:
+     mkDerivation {
+       pname = "paypal-adaptive-hoops";
+       version = "0.5.3.0";
+       sha256 = "0bsm5gvjgjgdm3isyhvdzkcgzx3yvnaiz5ll5xq5w7q7vi8nc62v";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring data-default errors http-client http-types
+         lens lens-aeson text time transformers vector wreq
+       ];
+       testDepends = [
+         aeson base bytestring data-default HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
+       description = "Client for a limited part of PayPal's Adaptive Payments API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "paypal-api" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, failure
      , http-conduit, http-types, mtl, old-locale, text, time, wai
@@ -87855,12 +88389,12 @@ self: {
      }) {};
 
   "permutation" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
+    ({ mkDerivation, base, ghc-prim, QuickCheck }:
      mkDerivation {
        pname = "permutation";
-       version = "0.5.0.4";
-       sha256 = "0kl5yw1as2y8yf2ac2f6v7g8k7mzjqw5fdh18a6m3jfhjw9rcqf7";
-       buildDepends = [ base ghc-prim ];
+       version = "0.5.0.5";
+       sha256 = "005737s6k9dfpjmjf41m3k1wc31c2kql08ig7fd6npk22nhwmdai";
+       buildDepends = [ base ghc-prim QuickCheck ];
        homepage = "https://github.com/spacekitteh/permutation";
        description = "A library for permutations and combinations";
        license = stdenv.lib.licenses.bsd3;
@@ -88317,6 +88851,26 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "pgdl" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, configurator
+     , directory, filepath, http-conduit, process, resourcet, split
+     , tagsoup, text, transformers, vty, vty-ui
+     }:
+     mkDerivation {
+       pname = "pgdl";
+       version = "6.7";
+       sha256 = "0ccyvg785n2cmkwcp3yvh38mlf84hkix0fx6kcam6fh82p1lrbbj";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base binary bytestring Cabal configurator directory filepath
+         http-conduit process resourcet split tagsoup text transformers vty
+         vty-ui
+       ];
+       description = "pgdownloader";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "pgm" = callPackage
     ({ mkDerivation, array, base, bytestring, parsec }:
      mkDerivation {
@@ -88714,8 +89268,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-binary";
-       version = "0.4.0.3";
-       sha256 = "0r56h5f9i6hy4zb2bhfi26y7y3z0j4nacdb2dgkxmh5mqjd33f0q";
+       version = "0.4.0.4";
+       sha256 = "1c90vvdzbrp5x73iwpdcsi701v4krmqqxj0l9kyzfygvd242i56i";
        buildDepends = [
          base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse
          transformers
@@ -88724,7 +89278,6 @@ self: {
          base binary bytestring ghc-prim lens-family-core pipes pipes-parse
          smallcheck tasty tasty-hunit tasty-smallcheck transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-binary";
        description = "Encode and decode binary streams using the pipes and binary libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -88766,8 +89319,8 @@ self: {
     ({ mkDerivation, async, base, pipes, stm }:
      mkDerivation {
        pname = "pipes-concurrency";
-       version = "2.0.2";
-       sha256 = "0g4fbh8dk8ph2ga0vyanqj52rxk9c1zi6g4yk3a1g6bnf4bklhm8";
+       version = "2.0.3";
+       sha256 = "0jsfnlzl6yvhikgn6v361ld9aypv2h2nsz1q24dxfk953zvm2sp5";
        buildDepends = [ base pipes stm ];
        testDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
@@ -89034,8 +89587,8 @@ self: {
     ({ mkDerivation, base, mwc-random, pipes, time }:
      mkDerivation {
        pname = "pipes-rt";
-       version = "0.4.2";
-       sha256 = "1zi4chmzv15j7yzqj483wiavfxvjinijga5c7qr1sj4874147dcv";
+       version = "0.5.0";
+       sha256 = "1wlgwil8ag6ax0kvammbqk7v2d8k6ygdqpjpys97zxrvy47dfc6r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base mwc-random pipes time ];
@@ -89304,15 +89857,14 @@ self: {
      }:
      mkDerivation {
        pname = "playlists";
-       version = "0.2.0.0";
-       sha256 = "1brri1rl3zx2mqls3cw4bcdykq100dgxh0cslryhxfb95b4m8583";
+       version = "0.3.0.0";
+       sha256 = "1g49w0h3fms4ihxwbaq0bg0dzgqa1k83zrbnnd57svcr5qgi9clb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          attoparsec base bytestring filepath optparse-applicative text word8
        ];
        testDepends = [ base bytestring doctest hlint hspec ];
-       jailbreak = true;
        homepage = "https://github.com/pjones/playlists";
        description = "Library and executable for working with playlist files";
        license = stdenv.lib.licenses.bsd3;
@@ -89352,20 +89904,19 @@ self: {
      }) {};
 
   "plot" = callPackage
-    ({ mkDerivation, array, base, cairo, colour, hmatrix, MaybeT, mtl
-     , pango
+    ({ mkDerivation, array, base, cairo, colour, hmatrix, mtl, pango
+     , transformers
      }:
      mkDerivation {
        pname = "plot";
-       version = "0.2.3.3";
-       sha256 = "0i75p82r0ps4xlcz6zc4ja9wd06xscsv4lr7q75ycrd659dn1j02";
+       version = "0.2.3.4";
+       sha256 = "1dclv0z94xpxmx80yzzppahq92cqjwaqr0g1ama0spywxhz6l7h3";
        buildDepends = [
-         array base cairo colour hmatrix MaybeT mtl pango
+         array base cairo colour hmatrix mtl pango transformers
        ];
        homepage = "http://github.com/amcphail/plot";
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot-gtk" = callPackage
@@ -89378,7 +89929,6 @@ self: {
        homepage = "http://code.haskell.org/plot";
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot-gtk3" = callPackage
@@ -89406,7 +89956,6 @@ self: {
        homepage = "https://github.com/sumitsahrawat/plot-lab";
        description = "A plotting tool with Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plotserver-api" = callPackage
@@ -90032,14 +90581,13 @@ self: {
          array base bytestring cairo containers glib gtk mtl
        ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ cairo gdk_pixbuf glib gtk pango popplerGlib ];
+       pkgconfigDepends = [ gdk_pixbuf pango popplerGlib ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) cairo;  inherit (pkgs) gdk_pixbuf;
-          inherit (pkgs) glib;  inherit (pkgs.gnome) gtk;
-          inherit (pkgs.gnome) pango;  popplerGlib = null;};
+     }) { inherit (pkgs) gdk_pixbuf;  inherit (pkgs.gnome) pango;
+          popplerGlib = null;};
 
   "populate-setup-exe-cache" = callPackage
     ({ mkDerivation, base }:
@@ -90278,8 +90826,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-binary";
-       version = "0.5.0";
-       sha256 = "0n067ns0k86ibjy2sqzjjds761l608167lwjzgpp5jhicv1by6hs";
+       version = "0.5.1";
+       sha256 = "09y7llixrzqyl64zv2a40i6jsvq2c03szw8y7y8pz81awd6pid4q";
        buildDepends = [
          attoparsec base base-prelude bytestring loch-th placeholders
          scientific text time transformers uuid
@@ -90291,7 +90839,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-copy-escape" = callPackage
@@ -90310,8 +90857,8 @@ self: {
     ({ mkDerivation, base, bytestring, postgresql }:
      mkDerivation {
        pname = "postgresql-libpq";
-       version = "0.9.0.1";
-       sha256 = "0fdz9pkmrajqm026s6d5ib9kqg5ph93fw7l2xrgf22zagl53rzx3";
+       version = "0.9.0.2";
+       sha256 = "1x1nmzl1j6vc3vy746ch6ps4wy6hwqm78yl9cq9fvkpllh0a2dnw";
        buildDepends = [ base bytestring ];
        extraLibraries = [ postgresql ];
        homepage = "http://github.com/lpsmith/postgresql-libpq";
@@ -90388,8 +90935,8 @@ self: {
     ({ mkDerivation, base, generics-sop, postgresql-simple }:
      mkDerivation {
        pname = "postgresql-simple-sop";
-       version = "0.1.0.2";
-       sha256 = "1ixxfd7zagqm27hcf6rhki1x626647mjgzmbl16c2ywwz2vbh6z2";
+       version = "0.1.0.3";
+       sha256 = "1jnqps71r9kbflwwxnjdwi8r8fx4qc1lnp23vm34yq8wvv5sjnq2";
        buildDepends = [ base generics-sop postgresql-simple ];
        homepage = "https://github.com/openbrainsrc/postgresql-simple-sop";
        description = "Generic functions for postgresql-simple";
@@ -91032,6 +91579,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "primitive_0_5_1_0" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "primitive";
+       version = "0.5.1.0";
+       sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8";
+       editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec";
+       buildDepends = [ base ghc-prim ];
+       homepage = "https://github.com/haskell/primitive";
+       description = "Primitive memory-related operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "primitive" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -91257,8 +91817,8 @@ self: {
      }:
      mkDerivation {
        pname = "process-extras";
-       version = "0.3.0";
-       sha256 = "0dy4clrnd33dmn5dy9fnniv8khz6ifirj1a9flfm5wwx286lnkxx";
+       version = "0.3.0.1";
+       sha256 = "1kgqf6p9m6g0vf2dj8l543qn3a2b837dzzwi8knp41divlq7z76v";
        buildDepends = [ base bytestring deepseq ListLike process text ];
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
@@ -91998,8 +92558,8 @@ self: {
      }:
      mkDerivation {
        pname = "psqueues";
-       version = "0.1.1.0";
-       sha256 = "1w6i6cl9wfblbg8d06lffh4l5y42li9a27myyvwnzfv86z49s9cb";
+       version = "0.2.0.0";
+       sha256 = "1b4kmb57k21wk5740jwahkc3xx2nldmjp7lc37ws24zyang84m4c";
        buildDepends = [ base deepseq ghc-prim hashable ];
        testDepends = [
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged
@@ -92410,8 +92970,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.6.3";
-       sha256 = "0hd6aslsfw2jd06wyfzi1kr86vfj91ywvgl9rv9cyawzczk7l7v4";
+       version = "0.6.4";
+       sha256 = "1bmxp84aa2vkg3hcnaspdifkh9biiihyzibr1kgf6d3x7nd1x1sl";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -92421,9 +92981,9 @@ self: {
        ];
        testDepends = [
          base containers directory filepath mtl parsec process transformers
-         utf8-string
        ];
        buildTools = [ nodejs ];
+       jailbreak = true;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
@@ -92945,8 +93505,8 @@ self: {
     ({ mkDerivation, base, hspec, ieee754, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-assertions";
-       version = "0.1.1";
-       sha256 = "0hrnr17wafng7nc6d8w6pp1lygplri8xkb5380aq64zg9iik2s21";
+       version = "0.2.0";
+       sha256 = "0h7pa84hzy3bhv1acf1rvvw3lza0m8shd8a0vykzpx8lnkxbl3v0";
        buildDepends = [ base ieee754 QuickCheck ];
        testDepends = [ base hspec ieee754 QuickCheck ];
        homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
@@ -93220,8 +93780,8 @@ self: {
      }:
      mkDerivation {
        pname = "quoridor-hs";
-       version = "0.1.1.0";
-       sha256 = "1hmxkzrl74vcxam6kpin2fgxd4rx408fy42yzdkbl87l4bklp0gd";
+       version = "0.1.1.2";
+       sha256 = "1yha2rsphq2ar8c7p15dlg621d4ym46xgv70fga9mlq2r4zwy2lv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -93233,7 +93793,6 @@ self: {
        homepage = "https://github.com/talw/quoridor-hs";
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -93826,16 +94385,12 @@ self: {
      }) {};
 
   "rawstring-qm" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-meta
-     , template-haskell, text
-     }:
+    ({ mkDerivation, base, bytestring, template-haskell, text }:
      mkDerivation {
        pname = "rawstring-qm";
-       version = "0.1.6";
-       sha256 = "0wzf0yz7bc9nfa0px39r3nqswwvdfy79vgbgkxmj5la3sjlc5v39";
-       buildDepends = [
-         base bytestring haskell-src-meta template-haskell text
-       ];
+       version = "0.2.2.2";
+       sha256 = "0h3s62sn84skwx3p9lcycswydvg6rijig7pk3g7v4rvypfdlybz6";
+       buildDepends = [ base bytestring template-haskell text ];
        homepage = "https://github.com/tolysz/rawstring-qm";
        description = "Simple raw string quotation and dictionary interpolation";
        license = stdenv.lib.licenses.bsd3;
@@ -94104,7 +94659,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base cabal-macosx reactive-banana wx wxcore ];
-       configureFlags = [ "-f-buildExamples" ];
+       configureFlags = [ "-f-buildexamples" ];
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -94217,8 +94772,8 @@ self: {
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "readable";
-       version = "0.2";
-       sha256 = "0m14xbwmlsjkwlyrgvi15pss3rd7dyaq4y8r58fz5yxmyayf35d2";
+       version = "0.3.0.1";
+       sha256 = "0wn2k86hbjvvxbssgcsrp0k566kv1rlb3pq9mz6ipasm921cjqsy";
        buildDepends = [ base bytestring text ];
        homepage = "https://github.com/mightybyte/readable";
        description = "Reading from Text and ByteString";
@@ -94301,6 +94856,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "record" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
+     , filepath, template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "record";
+       version = "0.2.1";
+       sha256 = "12swkcpzcif5bzfp961fx75a7bi0x79z6f16qh7im41amy2zpg19";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         attoparsec base base-prelude template-haskell text transformers
+       ];
+       testDepends = [ base base-prelude directory doctest filepath ];
+       homepage = "https://github.com/nikita-volkov/record";
+       description = "First class records implemented with quasi-quotation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "records" = callPackage
     ({ mkDerivation, base, kinds, type-functions }:
      mkDerivation {
@@ -94360,7 +94934,6 @@ self: {
        homepage = "https://github.com/joeyadams/haskell-recursive-line-count";
        description = "Count lines in files and display them hierarchically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redHandlers" = callPackage
@@ -94641,8 +95214,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "reflection";
-       version = "1.5.1";
-       sha256 = "18ail6j7rs5jff9zxphxd7vjkwanpv12dhi98s86r65425fdhjlx";
+       version = "1.5.1.1";
+       sha256 = "0756jd8idkjfdpw3n9kwi57c2gqcv3g2ydzbpd8mzzhgglsn2zsv";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
@@ -94845,18 +95418,19 @@ self: {
      }) {};
 
   "regex-genex" = callPackage
-    ({ mkDerivation, base, containers, mtl, regex-tdfa, sbv
+    ({ mkDerivation, base, containers, logict, mtl, regex-tdfa, sbv
      , stream-monad, text
      }:
      mkDerivation {
        pname = "regex-genex";
-       version = "0.6.1";
-       sha256 = "14rr6ssc0kgcakmcqqdymgc1rlksr8k2wfvwhrc064rkp9lb9dn2";
+       version = "0.6.2";
+       sha256 = "1816zmlh1bmxykvjp1q2viqckjvcj2g9b11ggz31ja5xi2mwc9iq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base containers mtl regex-tdfa sbv stream-monad text
+         base containers logict mtl regex-tdfa sbv stream-monad text
        ];
+       jailbreak = true;
        homepage = "https://github.com/audreyt/regex-genex";
        description = "From a regex, generate all possible strings it can match";
        license = "unknown";
@@ -95825,22 +96399,22 @@ self: {
      }) {};
 
   "repl-toolkit" = callPackage
-    ({ mkDerivation, base, functor-monadic, ListLike, listsafe
-     , monad-loops, mtl, numericpeano, parsec, text
+    ({ mkDerivation, base, exceptions, functor-monadic, ListLike
+     , listsafe, monad-loops, mtl, numericpeano, parsec, text
+     , transformers
      }:
      mkDerivation {
        pname = "repl-toolkit";
-       version = "0.2.0.0";
-       sha256 = "1qhsanbr7rvs2c35mw5lzfkvlj0mbdwz31q0ax5bfxsn01iks896";
+       version = "0.3.0.0";
+       sha256 = "19nlnn1zn8qg6264q9hjzns8rr2jadgbv9cr6ndjjyqlyx4qd9p2";
        buildDepends = [
-         base functor-monadic ListLike listsafe monad-loops mtl numericpeano
-         parsec text
+         base exceptions functor-monadic ListLike listsafe monad-loops mtl
+         numericpeano parsec text transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/ombocomp/repl-toolkit";
        description = "Toolkit for quickly whipping up command-line interfaces";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repline" = callPackage
@@ -95853,7 +96427,6 @@ self: {
        jailbreak = true;
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repo-based-blog" = callPackage
@@ -96168,8 +96741,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-client";
-       version = "0.4.0.3";
-       sha256 = "01rdv19zkc6c3q69vh56wip4drgv1i9ibc2mfjcqlsfbil46a6v3";
+       version = "0.4.0.5";
+       sha256 = "11rsy9an7ck94ijafqd2ddichz0xgb01w2ybyg3iiwy5ckiy384s";
        buildDepends = [
          aeson-utils base bytestring case-insensitive data-default
          exception-transformers http-conduit http-types hxt hxt-pickle-utils
@@ -96189,8 +96762,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-core";
-       version = "0.34.0.1";
-       sha256 = "0jy0gmz9zc9lwbmnbmdka5zasfizqddvvcp7a924papgdvslxg6i";
+       version = "0.34.0.3";
+       sha256 = "0jcbnzw0hxq1f7f0frsji3ybdlapmps8dv19ni6rq0bvmiip2i19";
        buildDepends = [
          aeson aeson-utils base bytestring either errors fclabels hxt
          hxt-pickle-utils json-schema mtl multipart random rest-stringmap
@@ -96230,20 +96803,20 @@ self: {
   "rest-gen" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder
      , directory, fclabels, filepath, hashable, haskell-src-exts
-     , hslogger, HStringTemplate, HUnit, hxt, json-schema, pretty
-     , process, rest-core, safe, scientific, semigroups, split, tagged
+     , HStringTemplate, HUnit, hxt, json-schema, pretty, process
+     , rest-core, safe, scientific, semigroups, split, tagged
      , test-framework, test-framework-hunit, text, uniplate
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.16.1.7";
-       sha256 = "0hp76x7j3mp4hdhqcxbxyq6c3q4gmqph6r5c2xazqsqn8v4dzmw4";
+       version = "0.16.1.8";
+       sha256 = "0wwxx5a5s4b7j1qbcphprdpba2jy8qx449mq4k4qmz55xzacii2v";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
-         filepath hashable haskell-src-exts hslogger HStringTemplate hxt
-         json-schema pretty process rest-core safe scientific semigroups
-         split tagged text uniplate unordered-containers vector
+         filepath hashable haskell-src-exts HStringTemplate hxt json-schema
+         pretty process rest-core safe scientific semigroups split tagged
+         text uniplate unordered-containers vector
        ];
        testDepends = [
          base fclabels haskell-src-exts HUnit rest-core test-framework
@@ -96259,8 +96832,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-happstack";
-       version = "0.2.10.5";
-       sha256 = "124zg4nrsxgdd1fs860g2mvvvkyc3ybwpvv79a0mv2ij4l6m4jp0";
+       version = "0.2.10.6";
+       sha256 = "0b21wg4nj24yqh6akyaaw7dxmkdvvb7d9l0d32mz3hx4m2jq9ay5";
        buildDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
@@ -96274,8 +96847,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-snap";
-       version = "0.1.17.15";
-       sha256 = "064sz7rflyj7sc4nm3qjdla6hf0kjw584rbb6iv7ihl1ay2cspl4";
+       version = "0.1.17.16";
+       sha256 = "02dh2wjhaabg2aabsf7gl5w65kqpb3jigawwh9n2dr4hz6jhvwia";
        buildDepends = [
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
@@ -96319,15 +96892,15 @@ self: {
   "rest-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-types, mime-types, mtl, rest-core, text
-     , unordered-containers, utf8-string, wai
+     , unordered-containers, wai
      }:
      mkDerivation {
        pname = "rest-wai";
-       version = "0.1.0.5";
-       sha256 = "1i0pgazgsh4wdlag9a0c4qzspkij8icliv5njsv1fxn7b3lay0cm";
+       version = "0.1.0.6";
+       sha256 = "1pawc1msv8vc43jzq4ynirwv6k7l7bfrh8r6q8m2vk1rnl6zsbxz";
        buildDepends = [
          base bytestring case-insensitive containers http-types mime-types
-         mtl rest-core text unordered-containers utf8-string wai
+         mtl rest-core text unordered-containers wai
        ];
        description = "Rest driver for WAI applications";
        license = stdenv.lib.licenses.bsd3;
@@ -96541,8 +97114,8 @@ self: {
      }:
      mkDerivation {
        pname = "reverse-geocoding";
-       version = "0.1.0.2";
-       sha256 = "1zbix3fx5w57zks5d4ba10r9193x4m7hbq92b06ysw73im13rnhn";
+       version = "0.1.1.1";
+       sha256 = "05a6s6ax047b8mg73b9zs4qv33qnmlhk87a8lxnd8xx2gba9vxcb";
        buildDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
@@ -96871,12 +97444,12 @@ self: {
      }) {};
 
   "rng-utils" = callPackage
-    ({ mkDerivation, base, bytestring, mwc-random }:
+    ({ mkDerivation, base, bytestring, mwc-random, vector }:
      mkDerivation {
        pname = "rng-utils";
-       version = "0.2";
-       sha256 = "17cd2yizppvsq4lg6mfjqzaa7c9ncn5lah3y02yx38kls3s15yc6";
-       buildDepends = [ base bytestring mwc-random ];
+       version = "0.2.1";
+       sha256 = "11yy6v0dbdf0cn823vlyd90zc5q5aw0zjzylpz5s9c94wsd4pjfa";
+       buildDepends = [ base bytestring mwc-random vector ];
        description = "RNG within an MVar for convenient concurrent use";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97116,8 +97689,8 @@ self: {
      }:
      mkDerivation {
        pname = "rosa";
-       version = "0.1.2.0";
-       sha256 = "1g0vm13hc8cdb9g8m19zbbyqzqysjpymlxhw4pkq0s42ylgayczv";
+       version = "0.1.3.0";
+       sha256 = "1wyjcmr3a7lljksiq45ch3ng15dd7sk40bbb2l8yvvjgyk12990a";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -97588,16 +98161,15 @@ self: {
      }) {};
 
   "ruff" = callPackage
-    ({ mkDerivation, array, base, mtl, parsec, Vec }:
+    ({ mkDerivation, array, base, mtl, parsec, safe, strict, Vec }:
      mkDerivation {
        pname = "ruff";
-       version = "0.3.2.1";
-       sha256 = "0090l9l54j11l1h7754ivfxyz3gs436f0vl896r3ad0183pag2yw";
-       buildDepends = [ array base mtl parsec Vec ];
+       version = "0.4";
+       sha256 = "09gj31p5cbjdns7d2xs2s08kpaks0bqnhzbf93xypci6zr6gxvyl";
+       buildDepends = [ array base mtl parsec safe strict Vec ];
        homepage = "https://gitorious.org/ruff";
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ruler" = callPackage
@@ -97758,8 +98330,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "safe-access";
-       version = "0.2.1.0";
-       sha256 = "0k3ynhx6ydwz1b25z9yvpxkqy2ynz2d7db52pzbb70p6vmm1cq2i";
+       version = "0.2.1.1";
+       sha256 = "0pijjy8ilq0spmanilmhqxkkrky7ldacxphz5ci8pvnw4g6y40z8";
        buildDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/thoferon/safe-access";
@@ -97987,6 +98559,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libsodium;};
 
+  "saltine-quickcheck" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
+     , QuickCheck, saltine, sodium, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "saltine-quickcheck";
+       version = "0.1.0.0";
+       sha256 = "0x4abnpcss26nnpr0c45qkik2awkpmm3y78zhp41jw11w98sw0p9";
+       buildDepends = [
+         base bytestring bytestring-arbitrary hex QuickCheck saltine
+       ];
+       testDepends = [
+         base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
+       ];
+       extraLibraries = [ sodium ];
+       homepage = "https://github.com/tsuraan/saltine-quickcheck";
+       description = "Quickcheck implementations for some NaCl data";
+       license = stdenv.lib.licenses.mit;
+     }) { inherit (pkgs) sodium;};
+
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
      , MaybeT-transformers, monads-fd, network, old-locale, process
@@ -98304,12 +98896,12 @@ self: {
      }:
      mkDerivation {
        pname = "satchmo";
-       version = "2.8.1";
-       sha256 = "1n7my96x9djy0fkk8rx3pg0z0jyy66va8jk2bqn8ddnxvmazd05v";
+       version = "2.8.2";
+       sha256 = "1c0p5prhrm05km9sym62nyxacipdy2yib84yw6d869dh3kbd97kq";
        buildDepends = [
          array base bytestring containers directory minisat mtl process
        ];
-       homepage = "<https://github.com/jwaldmann/satchmo>";
+       homepage = "https://github.com/jwaldmann/satchmo";
        description = "SAT encoding monad";
        license = "GPL";
      }) {};
@@ -98399,8 +98991,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "3.5";
-       sha256 = "00r80h8p6w1ir2sk3m2xgims22fzxyvij9mz6b0kn9n0qsjmkpaz";
+       version = "4.0";
+       sha256 = "0clc65rwxdgr1ps7r06cv5dqq91cfb56z9zmmw700xdmjdjq73f4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -98789,8 +99381,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.3.5";
-       sha256 = "1k7jlabnb28sif33iyj6khal4j4dhhfbcqzlh9cjh83cg2d6h1rx";
+       version = "0.3.3.7";
+       sha256 = "16976av2cag4gn06mfqqvj8knj64b966f6101cszxffk530q42y0";
        buildDepends = [
          array base bytestring deepseq ghc-prim hashable integer-gmp text
        ];
@@ -99215,6 +99807,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sdf2p1-parser" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, HUnit, parsec
+     , test-framework, test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "sdf2p1-parser";
+       version = "0.1.1";
+       sha256 = "1az42i4ridb4xza6zyg2mrsfv7gjp61727cmnfcy5x5b55nl3ahz";
+       buildDepends = [ base bytestring parsec transformers ];
+       testDepends = [
+         base bytestring Cabal HUnit parsec test-framework
+         test-framework-hunit transformers
+       ];
+       homepage = "https://github.com/kojung/sdf2p1-parser";
+       description = "A parser for SDF version 2.1 using Parsec";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "sdl2" = callPackage
     ({ mkDerivation, base, SDL2, transformers }:
      mkDerivation {
@@ -99229,7 +99839,7 @@ self: {
      }) { inherit (pkgs) SDL2;};
 
   "sdl2-image" = callPackage
-    ({ mkDerivation, base, sdl2, SDL2, SDL2_image }:
+    ({ mkDerivation, base, SDL2, sdl2, SDL2_image }:
      mkDerivation {
        pname = "sdl2-image";
        version = "0.1.1.0";
@@ -99244,7 +99854,7 @@ self: {
      }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_image;};
 
   "sdl2-ttf" = callPackage
-    ({ mkDerivation, base, sdl2, SDL2, SDL2_ttf }:
+    ({ mkDerivation, base, SDL2, sdl2, SDL2_ttf }:
      mkDerivation {
        pname = "sdl2-ttf";
        version = "0.2.0";
@@ -99428,8 +100038,8 @@ self: {
     ({ mkDerivation, base, byteable, bytestring, ghc-prim }:
      mkDerivation {
        pname = "securemem";
-       version = "0.1.5";
-       sha256 = "1g3y6bb1879qdlrsh11c31fiai66slvcd732zpkrf9lg2zpv68af";
+       version = "0.1.7";
+       sha256 = "14mmis2y9xf3jzmf6s6g7g8ixgbrx99x0b422zv4ix3vpx2lj57r";
        buildDepends = [ base byteable bytestring ghc-prim ];
        homepage = "http://github.com/vincenthz/hs-securemem";
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
@@ -99627,8 +100237,8 @@ self: {
      }:
      mkDerivation {
        pname = "semigroups";
-       version = "0.16.0.1";
-       sha256 = "1j0k65mlsgx0v9gayy221iz3l5990qry5nzhx3w395pn3djrxvs6";
+       version = "0.16.1";
+       sha256 = "0ffy7xmzbwwbkcrpdyq0yw07w9ibiwnb2y5qmg0f5p71x830f3ad";
        buildDepends = [
          base bytestring containers deepseq hashable nats text
          unordered-containers
@@ -99782,29 +100392,30 @@ self: {
      }) {};
 
   "seqaid" = callPackage
-    ({ mkDerivation, array, base, Cabal, containers, deepseq-bounded
-     , directory, ghc, modulespection, mtl, process, regex-base
-     , regex-pcre, syb, template-haskell, temporary, th-expand-syns
+    ({ mkDerivation, array, base, Cabal, containers, cpphs
+     , deepseq-bounded, directory, exceptions, filepath, ghc, ghc-paths
+     , mtl, process, regex-base, regex-pcre, syb, template-haskell
+     , temporary, transformers
      }:
      mkDerivation {
        pname = "seqaid";
-       version = "0.1.7.0";
-       sha256 = "0ny511pyirmxy9j78dkwmyvgqaisa7rja53zf9p1g3grhbhydfi1";
+       version = "0.2.1.0";
+       sha256 = "1jfxi3ndipbvwfk41hnixpa3i7igkv2hjg4gzqrdibq6212fr3xw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base Cabal containers deepseq-bounded directory ghc
-         modulespection mtl process regex-base regex-pcre syb
-         template-haskell temporary th-expand-syns
+         array base Cabal containers cpphs deepseq-bounded directory
+         exceptions filepath ghc ghc-paths mtl process regex-base regex-pcre
+         syb template-haskell temporary transformers
        ];
        jailbreak = true;
-       homepage = "http://www.fremissant.net/seqaid";
+       homepage = "http://fremissant.net/seqaid";
        description = "Dynamic strictness control, including space leak repair";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "seqid" = callPackage
+  "seqid_0_1_0" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "seqid";
@@ -99816,13 +100427,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "seqid-streams" = callPackage
+  "seqid" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "seqid";
+       version = "0.3.0";
+       sha256 = "0x303al5hvw5kd4s0xa20nvmd8z9jy8m5mncldhbylsxwd402bd9";
+       buildDepends = [ base transformers ];
+       description = "Sequence ID production and consumption";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "seqid-streams_0_1_0" = callPackage
     ({ mkDerivation, base, io-streams, seqid }:
      mkDerivation {
        pname = "seqid-streams";
        version = "0.1.0";
        sha256 = "13g0c76lyl3b4qdznpyr2a3szjb1dch2bsvgyv68br94045fk6d2";
        buildDepends = [ base io-streams seqid ];
+       jailbreak = true;
+       description = "Sequence ID IO-Streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "seqid-streams" = callPackage
+    ({ mkDerivation, base, io-streams, seqid }:
+     mkDerivation {
+       pname = "seqid-streams";
+       version = "0.3.0";
+       sha256 = "1kpc972lbralvyv1y8w29ap2iqfb5prm5wcraar0mnn05c9rb9iq";
+       buildDepends = [ base io-streams seqid ];
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99885,14 +100519,14 @@ self: {
      }) {};
 
   "sequent-core" = callPackage
-    ({ mkDerivation, base, ghc }:
+    ({ mkDerivation, base, containers, ghc, transformers }:
      mkDerivation {
        pname = "sequent-core";
-       version = "0.1.0.0";
-       sha256 = "0mikfqsji08i3lmi30v3iljisvi6cp5n5xhq9cppa1ji4q8sx5la";
+       version = "0.2.0.1";
+       sha256 = "13a9ss9z0af1kgmif8sr0hwarmf3wafi8sc0r5g840qgm14g3l7x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ghc ];
+       buildDepends = [ base containers ghc transformers ];
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -100288,6 +100922,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "setdown" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, cmdargs, containers
+     , directory, filepath, happy, mtl, split, text, uuid
+     }:
+     mkDerivation {
+       pname = "setdown";
+       version = "0.1.0.1";
+       sha256 = "1007cb1p8ymnm39cbk423jfgzvdk7yip54yy3ydiiqwkfy2rxs5g";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         array base bytestring cmdargs containers directory filepath mtl
+         split text uuid
+       ];
+       buildTools = [ alex happy ];
+       jailbreak = true;
+       homepage = "http://bitbucket.org/robertmassaioli/setdown";
+       description = "Treating files as sets to perform rapid set manipulation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "setenv" = callPackage
     ({ mkDerivation, base, unix }:
      mkDerivation {
@@ -100687,8 +101342,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakespeare";
-       version = "2.0.3";
-       sha256 = "0kc6xada1c53a8z47ihbvsfmz5jfxxsp8xibrdxzn9p1wc2wr38l";
+       version = "2.0.4";
+       sha256 = "1a5pim3gqmsc4karc9qvqad3hdsv7jr5h6ly560hzkb527gdxcnb";
        buildDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim parsec process system-fileio system-filepath
@@ -101304,8 +101959,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple";
-       version = "0.10.0.3";
-       sha256 = "0dnz1n0ys5lj47giacd412hai5d31kmb3vrfg7rbjjim784scy9j";
+       version = "0.10.1";
+       sha256 = "1s75cr2fjgicgf6mndaf659xrp0dga68i2ii8l5dbjz0b2sbhhm7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -101501,6 +102156,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-get-opt" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "simple-get-opt";
+       version = "0.1.0.0";
+       sha256 = "1hia6kjx3nnv6i5wrkmvj6vz52pw12fwsz48gkz7049ygpa5jnl5";
+       buildDepends = [ base ];
+       description = "A simple library for processing command-line options";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "simple-index" = callPackage
     ({ mkDerivation, base, containers, hashable, safecopy
      , unordered-containers
@@ -101998,6 +102664,7 @@ self: {
        pname = "singletons";
        version = "1.0";
        sha256 = "1rd1728wghhqlg2djd7az8i01rf4i3wwwcnz2v43a39jjvhlklkg";
+       editedCabalFile = "a16e79659af16eee0fd4d5062a002c143dfbe306ed758f6989dab2f97ac6830f";
        buildDepends = [ base containers mtl template-haskell th-desugar ];
        testDepends = [
          base Cabal constraints filepath process tasty tasty-golden
@@ -102264,7 +102931,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/slave-thread";
        description = "A principal solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slice-cpp-gen" = callPackage
@@ -102527,8 +103193,8 @@ self: {
      }:
      mkDerivation {
        pname = "smtlib2";
-       version = "0.1";
-       sha256 = "1r9wdb3hwxy0xyh5jnrbr2y89psmnghvab095jsf30dgzwl21609";
+       version = "0.2";
+       sha256 = "1xkbsqhfjsnf3qx9x7n7hqp3l769k4bbrp1274sf9cqqgbcs2ny6";
        buildDepends = [
          array atto-lisp attoparsec base blaze-builder bytestring
          constraints containers data-fix mtl process tagged text
@@ -102556,6 +103222,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smtp-mail-ng" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring
+     , base64-bytestring, bytestring, crypto-random, cryptohash
+     , filepath, haskeline, mime-mail, mtl, network, stringsearch, text
+     , tls, transformers, transformers-compat, x509-store, x509-system
+     }:
+     mkDerivation {
+       pname = "smtp-mail-ng";
+       version = "0.1.0.1";
+       sha256 = "1r177mpyjr3bdnzghfwjamin6jna7qs33b9kfl36qg2l959qn49n";
+       buildDepends = [
+         attoparsec base base16-bytestring base64-bytestring bytestring
+         crypto-random cryptohash filepath haskeline mime-mail mtl network
+         stringsearch text tls transformers transformers-compat x509-store
+         x509-system
+       ];
+       homepage = "https://github.com/avieth/smtp-mail-ng";
+       description = "An SMTP client EDSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smtp2mta" = callPackage
     ({ mkDerivation, base, haskell98, network, process }:
      mkDerivation {
@@ -103326,8 +104013,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-persistent";
-       version = "0.4.1";
-       sha256 = "0z4q4qwn4is96a8ld5dx82nb653ijjl8zsr72di50y9w8wvd0y10";
+       version = "0.5";
+       sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k";
        buildDepends = [
          base bytestring clientsession configurator errors heist lens
          monad-logger MonadCatchIO-transformers mtl persistent
@@ -103384,8 +104071,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-purescript";
-       version = "0.1.0.0";
-       sha256 = "04p1k9rrqn1y25fxdz15lgg43y2q5nd9q5r73qv27v3gn1qsr9y0";
+       version = "0.2.0.0";
+       sha256 = "0f9014v92j5rgy0x6j965d4gay0ipz668rv7rp3m56qnghc8vp5h";
        buildDepends = [
          base configurator mtl raw-strings-qq shelly snap snap-core text
        ];
@@ -103418,12 +104105,11 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-redis";
-       version = "0.1.4.1";
-       sha256 = "0vrsvmgrds7l4q88q7gmy1bz36z5ba45rib2vm5z6v2cf0x22qz2";
+       version = "0.1.4.2";
+       sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh";
        buildDepends = [
          base configurator hedis lens mtl network snap text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/dzhus/snaplet-redis/";
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -103643,7 +104329,6 @@ self: {
        homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) snappy;};
 
   "snappy-framing" = callPackage
@@ -103656,7 +104341,6 @@ self: {
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -103994,7 +104678,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "som" = callPackage
@@ -104003,8 +104686,8 @@ self: {
      }:
      mkDerivation {
        pname = "som";
-       version = "7.4.1";
-       sha256 = "1j75mh09rwd28xvmpxrn64aq3ghflrxba8wdwsxlafxj84cc2idq";
+       version = "7.5.0";
+       sha256 = "16bfgfd5wz60ji5rj2znx58ha1i73n376x52xdz46s71x67jzv3j";
        buildDepends = [ base containers grid MonadRandom ];
        testDepends = [
          base containers grid MonadRandom QuickCheck random test-framework
@@ -104681,6 +105364,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "split_0_1_4_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "split";
+       version = "0.1.4.3";
+       sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "http://code.haskell.org/~byorgey/code/split";
+       description = "Combinator library for splitting lists";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "split" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -105695,6 +106391,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "statsd-datadog" = callPackage
+    ({ mkDerivation, base, bytestring, monad-control, network, text
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "statsd-datadog";
+       version = "0.2.0.0";
+       sha256 = "1c9kgyzfk5xdxsjkjhs6vbiz03mqm41qr0ycyfxc11v0wl78yazk";
+       buildDepends = [
+         base bytestring monad-control network text transformers-base
+       ];
+       homepage = "https://bitbucket.org/dpwiz/statsd-datadog";
+       description = "DataDog-flavored StatsD client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "statvfs" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -105912,8 +106624,8 @@ self: {
      }:
      mkDerivation {
        pname = "stm-containers";
-       version = "0.2.7";
-       sha256 = "1qgmrxccnvids2xq2n28cllfqh88f0b2512hm5grrab7qb07phar";
+       version = "0.2.8";
+       sha256 = "0dqnhi99bq093zb815q8l0yhkvm0r27h230hcjmvcp01934xga0x";
        buildDepends = [
          base-prelude focus hashable list-t loch-th placeholders primitive
          transformers
@@ -105927,7 +106639,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-delay" = callPackage
@@ -106305,6 +107016,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratum-tool" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
+     , cmdargs, connection, containers, curl, curl-aeson, network, stm
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "stratum-tool";
+       version = "0.0.4";
+       sha256 = "02m8znx5spg8mjphbqw4kw5mavjki8hjfqf6x9j9i0xsja88958p";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson async base bytestring bytestring-builder cmdargs connection
+         containers curl curl-aeson network stm text time
+         unordered-containers vector
+       ];
+       description = "Client for Stratum protocol";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "stream-fusion" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -106743,8 +107474,8 @@ self: {
      }:
      mkDerivation {
        pname = "strive";
-       version = "0.6.2";
-       sha256 = "1nlvzl58s2n50pqgvicmslfgv550sk1nk05hx7vllsa92acypz6h";
+       version = "0.7.1";
+       sha256 = "1s2rbmkalrnyqfahrp5vibgdzykzanxk9g9hh9qzv8ap3j6yfi7l";
        buildDepends = [
          aeson base bytestring data-default gpolyline http-conduit
          http-types template-haskell text time transformers
@@ -106791,8 +107522,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-haskell-mode";
-       version = "1.0.8";
-       sha256 = "00kr6wllr0rmjxiwdfbr98k8yj6jr9f3vbf9b2cx8ykgs35jayz9";
+       version = "1.0.15";
+       sha256 = "127bpxfpcchkarsi4xckgj49ypyz7ll94ad5nrfrs8928jsaw73p";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base descriptive haskell-src-exts text ];
@@ -106806,7 +107537,6 @@ self: {
        homepage = "https://github.com/chrisdone/structured-haskell-mode";
        description = "Structured editing Emacs mode for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) emacs;};
 
   "structured-mongoDB" = callPackage
@@ -106907,8 +107637,8 @@ self: {
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.5.11.0";
-       sha256 = "1174gs5a2n6l2flyb2x93yiq7viwb52kbadw6jya6041xrpblckz";
+       version = "0.5.11.1";
+       sha256 = "18d5f25wsjryvh7pzj9wsra5pcna484v4yq8fpdbbic2cp2j3vg1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -108316,6 +109046,7 @@ self: {
        pname = "tabular";
        version = "0.2.2.5";
        sha256 = "00d1f8yr7kbg30ziv09pb8f4apcvrfb6izb26my1s97kw9ixa740";
+       editedCabalFile = "9e1a07443018009aa697caa2713231daafed4dfd734a275268831bfb5aebd05f";
        buildDepends = [ base csv html mtl ];
        homepage = "http://hub.darcs.net/kowey/tabular";
        description = "Two-dimensional data tables with rendering functions";
@@ -108341,12 +109072,10 @@ self: {
          old-locale parsec process safe split stm text time transformers
          utf8-string X11 xdg-basedir xmonad xmonad-contrib
        ];
-       pkgconfigDepends = [ gtk ];
        homepage = "http://github.com/travitch/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;};
+     }) {};
 
   "tag-bits" = callPackage
     ({ mkDerivation, base, ghc-prim }:
@@ -108792,17 +109521,12 @@ self: {
      }) {};
 
   "tar" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, old-time
-     , time
-     }:
+    ({ mkDerivation, base, bytestring, directory, filepath, time }:
      mkDerivation {
        pname = "tar";
-       version = "0.4.0.1";
-       sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
-       editedCabalFile = "1653792be4d9c7ea3181842ece695f0fee9bb52bc99694bca97e0b1f826775e4";
-       buildDepends = [
-         base bytestring directory filepath old-time time
-       ];
+       version = "0.4.1.0";
+       sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm";
+       buildDepends = [ base bytestring directory filepath time ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108975,8 +109699,8 @@ self: {
     ({ mkDerivation, base, tasty }:
      mkDerivation {
        pname = "tasty-hunit";
-       version = "0.9.0.1";
-       sha256 = "0rhdjb4fakcbkz4cvmmf679zad9h5yr31i1g9xm1338p6xd4vwcb";
+       version = "0.9.1";
+       sha256 = "1sxha5m2kcxi16gi8xkg2zgyqilk8qdplj8fifd1qq9n2ak8qha7";
        buildDepends = [ base tasty ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "HUnit support for the Tasty test framework";
@@ -109033,8 +109757,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-kat";
-       version = "0.0.1";
-       sha256 = "0z02vldgg4prl06rwy78lc1fgan0740v1rfnnmw6p96r312mahil";
+       version = "0.0.3";
+       sha256 = "14yvlpli6cv6bn3kh8mlfp4x1l6ns4fvmfv6hmj75cvxyzq029d7";
        buildDepends = [ base bytestring tasty ];
        testDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
@@ -109045,12 +109769,13 @@ self: {
      }) {};
 
   "tasty-program" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, tasty }:
+    ({ mkDerivation, base, deepseq, directory, filepath, process, tasty
+     }:
      mkDerivation {
        pname = "tasty-program";
-       version = "1.0.1";
-       sha256 = "04q2pp7hwqiiry17dd3ng0i6ikqzpg7hfgf0ckcg33xw450kpx9n";
-       buildDepends = [ base directory filepath process tasty ];
+       version = "1.0.2";
+       sha256 = "0ii7jcmvmbw03r1ghm2bq9bmbs7w0jqgfc7qx34n45ymjy7ipc55";
+       buildDepends = [ base deepseq directory filepath process tasty ];
        homepage = "https://github.com/jstolarek/tasty-program";
        description = "Use tasty framework to test whether a program executes correctly";
        license = stdenv.lib.licenses.bsd3;
@@ -109088,6 +109813,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-silver" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , directory, filepath, mtl, optparse-applicative, process
+     , process-extras, tagged, tasty, tasty-hunit, temporary-rc, text
+     }:
+     mkDerivation {
+       pname = "tasty-silver";
+       version = "3.0.0.1";
+       sha256 = "1l8p7sdmbdnf3qp3q1alpj5napzhw4wrnc7dcai5w80k1chck430";
+       buildDepends = [
+         async base bytestring containers deepseq directory filepath mtl
+         optparse-applicative process process-extras tagged tasty
+         temporary-rc text
+       ];
+       testDepends = [
+         base directory filepath process tasty tasty-hunit temporary-rc
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/phile314/tasty-silver";
+       description = "Golden tests support for tasty. Fork of tasty-golden.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tasty-smallcheck" = callPackage
     ({ mkDerivation, async, base, smallcheck, tagged, tasty }:
      mkDerivation {
@@ -109978,6 +110726,7 @@ self: {
        pname = "testing-feat";
        version = "0.4.0.2";
        sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j";
+       editedCabalFile = "0168dde1e9ac0e7a1f80a33c12a6c5d2b7c5e59e4dcd060ffb8d82f100c4dd3f";
        buildDepends = [ base mtl QuickCheck tagshare template-haskell ];
        description = "Functional Enumeration of Algebraic Types";
        license = stdenv.lib.licenses.bsd3;
@@ -110329,16 +111078,17 @@ self: {
 
   "text-show" = callPackage
     ({ mkDerivation, array, base, bytestring, ghc-prim, nats
-     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, transformers, transformers-compat, void
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, transformers
+     , transformers-compat, void
      }:
      mkDerivation {
        pname = "text-show";
-       version = "0.5";
-       sha256 = "1j7y8g7ayw9npqics68r8w67733hn216l4j76swxpisiwlg70jrx";
+       version = "0.6.0.1";
+       sha256 = "01abl9vah82v8z1a8la57afnvj0hd3ri1lb7bj6w5dmzsv8pjp41";
        buildDepends = [
-         array base bytestring ghc-prim nats template-haskell text
-         transformers transformers-compat void
+         array base bytestring ghc-prim nats semigroups template-haskell
+         text transformers void
        ];
        testDepends = [
          array base bytestring nats quickcheck-instances tasty tasty-hunit
@@ -110350,28 +111100,31 @@ self: {
      }) {};
 
   "text-show-instances" = callPackage
-    ({ mkDerivation, base, containers, directory, hpc, old-locale
-     , old-time, pretty, quickcheck-instances, random, semigroups
-     , tagged, tasty, tasty-quickcheck, template-haskell, text
-     , text-show, time, transformers, unix, unordered-containers, vector
-     , xhtml
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , haskeline, hoopl, hpc, old-locale, old-time, pretty
+     , quickcheck-instances, random, semigroups, tagged, tasty
+     , tasty-hunit, tasty-quickcheck, template-haskell, terminfo, text
+     , text-show, time, transformers, transformers-compat, unix
+     , unordered-containers, utf8-string, vector, xhtml
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "0.1.0.1";
-       sha256 = "16bj8wl7zph701797j856jpcf0xca55mcd4bjkz278d6cjj23w55";
+       version = "0.2";
+       sha256 = "1zmjv5l5a60iir5w6w9jhb22ywid680s7k1xhw6jmd5d0bml27jk";
        buildDepends = [
-         base containers directory hpc old-locale old-time pretty random
-         semigroups tagged template-haskell text text-show time transformers
-         unix unordered-containers vector xhtml
+         base binary bytestring containers directory haskeline hoopl hpc
+         old-locale old-time pretty random semigroups tagged
+         template-haskell terminfo text text-show time transformers
+         transformers-compat unix unordered-containers utf8-string vector
+         xhtml
        ];
        testDepends = [
-         base containers directory hpc old-locale old-time pretty
-         quickcheck-instances random semigroups tagged tasty
-         tasty-quickcheck template-haskell text-show time transformers unix
-         unordered-containers vector xhtml
+         base binary bytestring containers directory haskeline hoopl hpc
+         old-locale old-time pretty quickcheck-instances random semigroups
+         tagged tasty tasty-hunit tasty-quickcheck template-haskell terminfo
+         text-show time transformers transformers-compat unix
+         unordered-containers utf8-string vector xhtml
        ];
-       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
@@ -111039,7 +111792,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threefish" = callPackage
@@ -111206,12 +111958,11 @@ self: {
          split text transformers utf8-string webkit xdg-basedir xmonad
          xmonad-contrib
        ];
-       pkgconfigDepends = [ gtk ];
        homepage = "https://github.com/koterpillar/tianbar";
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;};
+     }) {};
 
   "tic-tac-toe" = callPackage
     ({ mkDerivation, base, glade, gtk, haskell98 }:
@@ -111256,8 +112007,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.4.21";
-       sha256 = "06789pk07x8rpgdkyvscqw4mr9bwj258jbpwm6wq715kymnln017";
+       version = "0.4.26";
+       sha256 = "1biri4b2phc7qj12a9lzwp8k5bjx3f88a831b64a2kkcg4xdpyz0";
        buildDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
@@ -111888,8 +112639,8 @@ self: {
      }:
      mkDerivation {
        pname = "tls";
-       version = "1.2.15";
-       sha256 = "025l7zl50v813i3z184gi33fcffi9y5k9c6fccxsp6hzjjggy9m1";
+       version = "1.2.16";
+       sha256 = "0z5w8bj6acr7517y25dkqi3scjn08kzq2hjkhrc1rs6cafn8cl20";
        buildDepends = [
          asn1-encoding asn1-types async base byteable bytestring cereal
          cipher-aes cipher-des cipher-rc4 crypto-cipher-types crypto-numbers
@@ -112257,8 +113008,8 @@ self: {
     ({ mkDerivation, base, case-insensitive, text, utf8-string }:
      mkDerivation {
        pname = "tostring";
-       version = "0.2.1";
-       sha256 = "0lvfvjs1q6hndbchij3zn1xi6vb1v53r379jvyc2m92sqqcfnylw";
+       version = "0.2.1.1";
+       sha256 = "0c95a1vjnnn3bwdz8v5hv7q2sbzn23ban3hcwqmwhmzc9ba019zg";
        buildDepends = [ base case-insensitive text utf8-string ];
        description = "The ToString class";
        license = stdenv.lib.licenses.bsd3;
@@ -112327,8 +113078,8 @@ self: {
      }:
      mkDerivation {
        pname = "tpdb";
-       version = "0.9.8";
-       sha256 = "01fp42ahp85f6xlv69pwbpwlr5qzbbzr8rfmcvsndv2r6knrg6f0";
+       version = "1.1.1";
+       sha256 = "1wsjf7ds8xnfx4q3cjv5vwspyrvyq73439w9v4v3qrmmj5qcm7p9";
        buildDepends = [
          base containers filepath hashable HaXml hxt mtl parsec time
          wl-pprint-text
@@ -112973,6 +113724,28 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "tttool" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring
+     , bytestring-builder, containers, directory, filepath, ghc-prim
+     , hashable, JuicyPixels, mtl, old-locale, parsec, process
+     , template-haskell, text, time, vector, yaml
+     }:
+     mkDerivation {
+       pname = "tttool";
+       version = "1.0";
+       sha256 = "1hxisx8j9i415zysls1pfnwsb6f3vgx96rfn2xgwvzsirsbj4mai";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base binary bytestring bytestring-builder containers
+         directory filepath ghc-prim hashable JuicyPixels mtl old-locale
+         parsec process template-haskell text time vector yaml
+       ];
+       homepage = "https://github.com/entropia/tip-toi-reveng";
+       description = "Working with files for the Tiptoi® pen";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tuntap" = callPackage
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
@@ -113124,6 +113897,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle" = callPackage
+    ({ mkDerivation, async, base, clock, directory, doctest, foldl
+     , managed, process, system-fileio, system-filepath, temporary, text
+     , time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.0.0";
+       sha256 = "1swgf909akj9nsszmn38xljl5d6bmi3iiy7b28rbk0sh7bwi8f4z";
+       buildDepends = [
+         async base clock directory foldl managed process system-fileio
+         system-filepath temporary text time transformers unix
+       ];
+       testDepends = [ base doctest ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tweak" = callPackage
     ({ mkDerivation, base, containers, lens, stm, transformers }:
      mkDerivation {
@@ -113486,20 +114277,21 @@ self: {
      }) {};
 
   "twitter-types" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
-     , filepath, HUnit, template-haskell, test-framework
-     , test-framework-hunit, test-framework-th-prime, text
-     , unordered-containers
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, derive
+     , directory, filepath, HUnit, QuickCheck, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th-prime, text, unordered-containers
      }:
      mkDerivation {
        pname = "twitter-types";
-       version = "0.6.0";
-       sha256 = "0yvs57f3m0nq11qpxziazp9r95g1v231d2djmch9c5d8g22cjvdn";
+       version = "0.6.1";
+       sha256 = "0pg5l4nvkbvpn2zzn0wfpjv9j5wm89ik80xlsbmibcfc8xilyahn";
        buildDepends = [ aeson base text unordered-containers ];
        testDepends = [
-         aeson attoparsec base bytestring directory filepath HUnit
-         template-haskell test-framework test-framework-hunit
-         test-framework-th-prime text unordered-containers
+         aeson attoparsec base bytestring derive directory filepath HUnit
+         QuickCheck template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th-prime text
+         unordered-containers
        ];
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
@@ -113514,6 +114306,7 @@ self: {
        pname = "twitter-types-lens";
        version = "0.6.0";
        sha256 = "0n2z7v2mcvj2czkszkp87sf7cv4zj82yccygs9ah5ax28dw823v3";
+       editedCabalFile = "914c48c9ce684698e10d4b0adf0f87afeed2ff6018d5f208711be58d251e4dc7";
        buildDepends = [ base lens template-haskell text twitter-types ];
        homepage = "https://github.com/himura/twitter-types-lens";
        description = "Twitter JSON types (lens powered)";
@@ -114096,8 +114889,8 @@ self: {
      }:
      mkDerivation {
        pname = "typeparams";
-       version = "0.0.5";
-       sha256 = "1yfc9xpi851sd05nhjdsglsjimmjipfdfssc2w9mav6fa878xy2h";
+       version = "0.0.6";
+       sha256 = "1blhqm8ba37mqp2ziipm0igyccyrqlwcink5xbz0m56ca7lid0vb";
        buildDepends = [
          base constraints deepseq ghc-prim primitive reflection tagged
          template-haskell vector
@@ -114138,7 +114931,6 @@ self: {
        homepage = "http://github.com/paf31/typescript-docs";
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typical" = callPackage
@@ -114186,11 +114978,9 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          time tzdata unix vector
        ];
-       preConfigure = "export TZDIR=${tzdata}/share/zoneinfo";
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tzdata" = callPackage
@@ -114380,8 +115170,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-light";
-       version = "1.1.8.3";
-       sha256 = "0az6s0v5559715c6hnaxymkrl936a0cbnnpljwb91hhlfhpsl0aq";
+       version = "1.1.8.4";
+       sha256 = "0fkw5mz1wrrbcb1a9mfg59mab5b0clil8zm53q1mhnjhd7g7gd33";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -115436,6 +116226,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unsafeperformst" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unsafeperformst";
+       version = "0.9.2";
+       sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc";
+       buildDepends = [ base ];
+       homepage = "https://github.com/atzeus/unsafeperformst";
+       description = "Like unsafeperformIO, but for the ST monad";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unscramble" = callPackage
     ({ mkDerivation, array, base, optparse-applicative, stream-fusion
      , unordered-containers
@@ -115600,9 +116402,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-encode";
-       version = "1.5.0.3";
-       sha256 = "115wnc7x7gx57qza5az4c1wy0n2f40634529jk0vpxw6bb9b1mzn";
-       editedCabalFile = "455f71a45ce8ec3646f1215bf1476828fd01bb5fc1e228a6da6657c57b5f53be";
+       version = "1.5.0.4";
+       sha256 = "10pmg48h1az474qsr951inyvkm5y9xqwrdzyvxf83k53i07kijpp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring network-uri text utf8-string ];
@@ -115906,6 +116707,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "utc" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, clock
+     , QuickCheck, test-framework, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "utc";
+       version = "0.1.0.0";
+       sha256 = "14wqwyc9vgiqps5bgr1wxsfg5x98gbbk2gpkbz2haw0bjmydzzm6";
+       buildDepends = [ attoparsec base bytestring clock text ];
+       testDepends = [
+         attoparsec base bytestring Cabal clock QuickCheck test-framework
+         test-framework-quickcheck2 text
+       ];
+       homepage = "https://github.com/lpeterse/haskell-utc";
+       description = "A pragmatic time and date library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "utf8-env" = callPackage
     ({ mkDerivation, base, mtl, utf8-string }:
      mkDerivation {
@@ -115947,6 +116766,19 @@ self: {
        pname = "utf8-string";
        version = "0.3.8";
        sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0";
+       editedCabalFile = "0555d720026fff65342bdc500391ffd300858b6f2c6db441d4dd1eafbcb599ff";
+       buildDepends = [ base bytestring ];
+       homepage = "http://github.com/glguy/utf8-string/";
+       description = "Support for reading and writing UTF8 Strings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "utf8-string_1" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "utf8-string";
+       version = "1";
+       sha256 = "025snarzyk4kkw1dk3i8dsxilvxh4kazl6nwq61w9q49y39qiwvr";
        buildDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
@@ -116425,8 +117257,8 @@ self: {
      }:
      mkDerivation {
        pname = "validation";
-       version = "0.4.2";
-       sha256 = "0rsa3n3zawywbpi1gvhfrfglxf9mkmkidkc216ld3s02pmsdmclm";
+       version = "0.4.3";
+       sha256 = "1829bz7n19p4rfqgrxsgbif0n6p3v5s6hpbhw3qv2xrmigmh6fa3";
        buildDepends = [
          base bifunctors lens semigroupoids semigroups transformers
        ];
@@ -116696,6 +117528,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector_0_10_9_3" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, primitive }:
+     mkDerivation {
+       pname = "vector";
+       version = "0.10.9.3";
+       sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
+       buildDepends = [ base deepseq ghc-prim primitive ];
+       homepage = "https://github.com/haskell/vector";
+       description = "Efficient Arrays";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "vector" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
      , random, template-haskell, test-framework
@@ -117435,7 +118279,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.gnome) vte;};
 
   "vtegtk3" = callPackage
@@ -117481,7 +118324,6 @@ self: {
        homepage = "https://github.com/coreyoconnor/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -117541,7 +118383,6 @@ self: {
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-ui-extras" = callPackage
@@ -117585,8 +118426,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.0.3";
-       sha256 = "17w5mapvn8vkwv9bcyw253qwz30rj19zw5qfxjy76j9hkffydwkv";
+       version = "3.0.4";
+       sha256 = "1f6dqlcxzw9m3flv9f14l0qgwhz2ywvn4i1hycywsvbdsj5ja4vh";
        buildDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
@@ -117659,8 +118500,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-cors";
-       version = "0.2";
-       sha256 = "0ljggv4ylx9rjr595w8vfk744bv7x0b5argr7nlw61ywm8ck8djs";
+       version = "0.2.1";
+       sha256 = "1bdnlrpq8s8rb3ybnv8rmmvid5j38gsps65dhlpys32ljhfzzklz";
        buildDepends = [
          attoparsec base base-unicode-symbols bytestring case-insensitive
          charset errors http-types parsers resourcet transformers wai
@@ -117812,8 +118653,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-handler-launch";
-       version = "3.0.0.1";
-       sha256 = "00957a4a3q48yy6pb6k2m7hzdrxc3xkxdhbkmm8c9bwj05iqwhsz";
+       version = "3.0.0.2";
+       sha256 = "170a48i651zxq9xb1c45x1i5qx064yd99habha31bqbncl9s5wnq";
        buildDepends = [
          base blaze-builder bytestring http-types process streaming-commons
          transformers wai warp
@@ -118055,6 +118896,49 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-hmac" = callPackage
+    ({ mkDerivation, base, base64-bytestring, byteable, bytestring
+     , case-insensitive, cryptohash, doctest, Glob, hlint, hspec
+     , http-types, HUnit, process, regex-compat, transformers, wai
+     , wai-extra, word8
+     }:
+     mkDerivation {
+       pname = "wai-middleware-hmac";
+       version = "0.1.0.0";
+       sha256 = "01xd1nhi96lflh6ssaz3m5dkacrp2b2kwk611jc8q5j3kmyc0zqs";
+       buildDepends = [
+         base base64-bytestring byteable bytestring case-insensitive
+         cryptohash http-types transformers wai word8
+       ];
+       testDepends = [
+         base bytestring doctest Glob hlint hspec http-types HUnit process
+         regex-compat wai wai-extra
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/creichert/wai-middleware-hmac";
+       description = "HMAC Authentication Middleware for WAI";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "wai-middleware-hmac-client" = callPackage
+    ({ mkDerivation, base, base64-bytestring, byteable, bytestring
+     , case-insensitive, cryptohash, http-client, http-types, mtl
+     , old-locale, time, transformers, word8
+     }:
+     mkDerivation {
+       pname = "wai-middleware-hmac-client";
+       version = "0.1.0.0";
+       sha256 = "1mvd3gzvn2qanrk9xh6adsq8xjnwiynw97kbv8fd74pkhj7i9xlz";
+       buildDepends = [
+         base base64-bytestring byteable bytestring case-insensitive
+         cryptohash http-client http-types mtl old-locale time transformers
+         word8
+       ];
+       homepage = "https://github.com/creichert/wai-middleware-hmac";
+       description = "Wai HMAC Authentication Middleware Client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-middleware-route" = callPackage
     ({ mkDerivation, base, bytestring, http-types, HUnit
      , test-framework, test-framework-hunit, text, wai, wai-test
@@ -118393,8 +119277,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.0.5.2";
-       sha256 = "1zrazcz7nma4fkjhl50vi91pp1cxmkmfl046g24jgk5y112g97z1";
+       version = "3.0.7";
+       sha256 = "0zrjjmi24mz6qz6v1q60qg1kn6cbhfc9n75jjllznb3a6bfyps3z";
        buildDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          ghc-prim hashable http-date http-types iproute network
@@ -118880,6 +119764,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routing" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, tasty, tasty-quickcheck
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "web-routing";
+       version = "0.1.2";
+       sha256 = "1gc9p5bggb8z8zy28zs7q2nvhfjv3yd41c7lh8h1cfywilbif1ls";
+       buildDepends = [ base bytestring text unordered-containers ];
+       testDepends = [ base doctest tasty tasty-quickcheck ];
+       homepage = "https://github.com/philopon/web-routing";
+       description = "simple routing library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "webdriver" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, cond, data-default, directory, directory-tree
@@ -118912,8 +119811,8 @@ self: {
      }:
      mkDerivation {
        pname = "webdriver-angular";
-       version = "0.1.6";
-       sha256 = "10cvivmdadhvq8bsh1hij8dgw3d3f3a3ng54b00ia4gmna6996yq";
+       version = "0.1.7";
+       sha256 = "18lyw9qasg9ynsa9yg90121h6z5h7kl6lzw7q5zqgkwpm1xr1p21";
        buildDepends = [
          aeson base language-javascript template-haskell text transformers
          unordered-containers webdriver
@@ -118975,19 +119874,19 @@ self: {
      }) { LEXER = null;};
 
   "webify" = callPackage
-    ({ mkDerivation, base, binary, binary-strict, bytestring
-     , containers, filepath, hopfli, optparse-applicative, text, vector
-     , xmlgen, zlib
+    ({ mkDerivation, base, binary, binary-strict, blaze-builder
+     , bytestring, containers, filepath, hopfli, optparse-applicative
+     , text, vector, xmlgen, zlib
      }:
      mkDerivation {
        pname = "webify";
-       version = "0.1.6.0";
-       sha256 = "003br9hdammvqb2jil5ggnqm81rv3rny7rdhq6h4cb4jrdsdz60z";
+       version = "0.1.7.0";
+       sha256 = "16fsk6x875bmnqng5mfkxcxrkp3dcs3lkmsnds5fm416x4iw1sql";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base binary binary-strict bytestring containers filepath hopfli
-         optparse-applicative text vector xmlgen zlib
+         base binary binary-strict blaze-builder bytestring containers
+         filepath hopfli optparse-applicative text vector xmlgen zlib
        ];
        jailbreak = true;
        homepage = "http://github.com/ananthakumaran/webify";
@@ -119021,11 +119920,10 @@ self: {
        sha256 = "13zhqpiw5b6gz033cpgmza048hpg8c1x1il0rw1xkr3wxija76lq";
        buildDepends = [ base glib gtk webkit ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) webkit;};
+     }) {};
 
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools
@@ -119066,8 +119964,8 @@ self: {
      }:
      mkDerivation {
        pname = "webpage";
-       version = "0.0.2";
-       sha256 = "1drpclwh42z5xqzjf10765m2gpac5m0bi4z98ykb4d4p6nkk6n9p";
+       version = "0.0.3";
+       sha256 = "0j57jv9jh7kz27a5wl77ajp99mxj0747x7hhninw35qzgf88vizm";
        buildDepends = [
          base blaze-html data-default hastache lucid text
        ];
@@ -119184,7 +120082,6 @@ self: {
        ];
        description = "Wedged postcard generator";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -119449,12 +120346,13 @@ self: {
      }) {};
 
   "witness" = callPackage
-    ({ mkDerivation, base, mtl }:
+    ({ mkDerivation, base, categories, constraints, transformers }:
      mkDerivation {
        pname = "witness";
-       version = "0.2";
-       sha256 = "0ibdwp4v49landvqxfy59qggjk3ww33rw87c3f30blyak79s2g7w";
-       buildDepends = [ base mtl ];
+       version = "0.3";
+       sha256 = "0r0395blixr5g3s2dm4x4mj93yjk4zlig0b5acbnnr7yimjmnd11";
+       buildDepends = [ base categories constraints transformers ];
+       homepage = "https://github.com/AshleyYakeley/witness";
        description = "values that witness types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119463,8 +120361,8 @@ self: {
     ({ mkDerivation, base, bytestring, network, unix }:
      mkDerivation {
        pname = "witty";
-       version = "0.0.2";
-       sha256 = "0nzxz2716d4xpiz3p21bvg9klfadxnnkxd73311d62cgh3iayqlf";
+       version = "0.0.4";
+       sha256 = "1k8c74j28nji46gib7r2ivfbvvzmkka9qnyf8hh7cyjgsmxxvq83";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base bytestring network unix ];
@@ -119518,8 +120416,8 @@ self: {
      }:
      mkDerivation {
        pname = "wl-pprint-extras";
-       version = "3.5.0.3";
-       sha256 = "124wb4hqd97f3naha0589v18lvi9xbn39bmn8jwaylvyg6s5fyyp";
+       version = "3.5.0.4";
+       sha256 = "0mvg5vff574xvrdbdwnyy71kxv0cp0q5vv8fb12fbgydnvsy3mbl";
        buildDepends = [
          base containers nats semigroupoids semigroups text utf8-string
        ];
@@ -120441,7 +121339,6 @@ self: {
        jailbreak = true;
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xenstore" = callPackage
@@ -121379,7 +122276,7 @@ self: {
          random regex-posix split unix X11 xmonad xmonad-contrib
        ];
        configureFlags = [
-         "-f-with_hlist" "-fwith_split" "-fwith_parsec"
+         "-f-with_hlist" "-fwith_parsec" "-fwith_split"
        ];
        homepage = "http://projects.haskell.org/xmonad-extras";
        description = "Third party extensions for xmonad with wacky dependencies";
@@ -121396,7 +122293,6 @@ self: {
        homepage = "http://github.com/supki/xmonad-screenshot";
        description = "Workspaces screenshooting utility for XMonad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-utils" = callPackage
@@ -121615,8 +122511,8 @@ self: {
      }:
      mkDerivation {
        pname = "xss-sanitize";
-       version = "0.3.5.4";
-       sha256 = "1h9dj234sj216g676la0h73nwm0fw4snik31qi0s754vyy6bcygf";
+       version = "0.3.5.5";
+       sha256 = "05qmhd50bdy5z0nvqvrm25ax4i642gv6gkdn678flg6sckshr4s2";
        buildDepends = [
          attoparsec base containers css-text network-uri tagsoup text
          utf8-string
@@ -122129,8 +123025,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod";
-       version = "1.4.1.3";
-       sha256 = "1z00vmflmyjsb2vx52xg6nhghmydsbf8qvp00qcjydgqqbgamkxj";
+       version = "1.4.1.4";
+       sha256 = "1av6s5nanq5y9fqlzq2yq95989gg1fyqlpzg6y5pl4dcc45srm1x";
        buildDepends = [
          aeson base blaze-html blaze-markup bytestring conduit-extra
          data-default directory fast-logger monad-control monad-logger safe
@@ -122218,13 +123114,12 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-bcrypt";
-       version = "0.1.1";
-       sha256 = "04v7d88m58rgkgld2rcmi160afmn4zbbplwwfldcck3dy6i9rzhp";
+       version = "0.2.0";
+       sha256 = "06pbzk09zfnr290sczjpqjrfbbz1c6qig402siakp7lnizav4xz5";
        buildDepends = [
          base bcrypt bytestring text yesod-auth yesod-core yesod-form
          yesod-persistent
        ];
-       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "BCrypt salted and hashed passwords in a database as auth for yesod";
        license = stdenv.lib.licenses.mit;
@@ -122432,8 +123327,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.3.3";
-       sha256 = "0mbibcx1adc5k2mzypsn411bvpwggkpi8mnmg9pws4nnx3izskbz";
+       version = "1.4.3.4";
+       sha256 = "0p846afc6dvj1qq0fqn7y8wrmbc8if2929s5m1agix2srxqax1al";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -122645,8 +123540,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-fay";
-       version = "0.7.0";
-       sha256 = "1q02r7gd0fbhasc10h8my6j3vcc50pagpz8gvrbsc7x928gp42p4";
+       version = "0.7.1";
+       sha256 = "0g17n7aqr1zhlh21dkl13rhac34nq8f77mj85kll6vgcs8nfidhl";
        buildDepends = [
          aeson base bytestring data-default directory fay fay-dom
          monad-loops process pureMD5 shakespeare system-fileio
@@ -123411,8 +124306,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.11.1";
-       sha256 = "15m1wwrxmszl930az79lpgyz5rxg72gy8vi17ibpac1cszfdx192";
+       version = "0.11.2";
+       sha256 = "0kqrdbfpihyds8mdai6j4dzzd8wbcchji0gdgpfb4w5kwhhh9dvz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -123432,7 +124327,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Yi";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-contrib" = callPackage
@@ -123453,7 +124347,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Yi";
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -123484,7 +124377,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi-fuzzy-open";
        description = "Fuzzy open plugin for Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-gtk" = callPackage
@@ -123535,7 +124427,6 @@ self: {
        homepage = "https://github.com/Fuuzetsu/yi-monokai";
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-rope" = callPackage
@@ -123566,7 +124457,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi-snippet";
        description = "Snippet support for Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-spolsky" = callPackage
@@ -123580,7 +124470,6 @@ self: {
        homepage = "https://github.com/melrief/yi-spolsky";
        description = "Spolsky colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-vty" = callPackage
@@ -124071,12 +124960,12 @@ self: {
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty
-     , process, text, time, unix, zlib
+     , process, text, time, unix, zip, zlib
      }:
      mkDerivation {
        pname = "zip-archive";
-       version = "0.2.3.5";
-       sha256 = "0qa3qvaj0xkh4qw7s96rkbdmkyhnql6g92yplm7m6n7z7nxrcs18";
+       version = "0.2.3.7";
+       sha256 = "169nkxr5zlbymiz1ydlhlqr66vqiycmg85xh559phpkr64w3nqj1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -124086,10 +124975,11 @@ self: {
        testDepends = [
          base bytestring directory HUnit old-time process time
        ];
+       buildTools = [ zip ];
        homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) { inherit (pkgs) zip;};
 
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 4d0afb33ca0..2989881af69 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -22,10 +22,17 @@ rec {
   appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; });
   removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = pkgs.stdenv.lib.remove x (drv.configureFlags or []); });
 
+  addBuildTool = drv: x: addBuildTools drv [x];
+  addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; });
+
+  addBuildDepend = drv: x: addBuildDepends drv [x];
+  addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; });
+
   enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}";
   disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
 
-  markBroken = drv: overrideCabal (drv: { broken = true; });
+  markBroken = drv: overrideCabal drv (drv: { broken = true; });
+  markBrokenVersion = version: drv: assert drv.version == version; markBroken drv;
 
   enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; });
   disableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = false; });
@@ -42,4 +49,7 @@ rec {
   enableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = true; });
   disableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = false; });
 
+  appendPatch = drv: x: appendPatches drv [x];
+  appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; });
+
 }
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index d271edfe207..ae3f014eee1 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.3.9";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
-    sha256 = "1lk942v7gd3ism4cw8gqk9ndr6yjwkgxc55z7p366khiv8d4f608";
+    sha256 = "1wb0rb89mvy1x64a8z9z3jmphw72vnkxaqbc0f2v35c2wv61p839";
   };
 
   installPhase = ''
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index e437d016fac..53ff667c8b3 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, clang }:
 
 stdenv.mkDerivation rec {
-  name = "mujs-2015-01-18";
+  name = "mujs-2015-01-22";
 
   src = fetchgit {
     url = git://git.ghostscript.com/mujs.git;
-    rev  = "b005928523d2427f8b1daac093c259ab53dba3e9";
-    sha256 = "1fgcpa0lm521nbhp7ldh515q0l8012wcfkfyiffchza2wsgmrgfj";
+    rev  = "d9ed73fd717ebbefe5595d139a133b762cea4e92";
+    sha256 = "0kg69j9ra398mdxzq34k5lv92q18g0zz5vx2wcki3qmag2rzivhr";
   };
 
   buildInputs = [ clang ];
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 1945fc007c4..4c8b80c29bd 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.35";
+  version = "5.4.37";
 
   name = "php-${version}";
 
@@ -253,7 +253,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   src = fetchurl {
     url = "http://www.php.net/distributions/php-${version}.tar.bz2";
-    sha256 = "0svlp5alqvm3fxzf2044ygziacy2ks9vbrnimkpqnxqgrmjl5nwc";
+    sha256 = "1bd8yciy13v3aw4aiw57zpf8kgxpm6rcv73grp1yj2pbbrkzcyw5";
   };
 
   meta = {
diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix
index 8a6f2b61bb0..9799e810c6f 100644
--- a/pkgs/development/interpreters/pypy/2.4/default.nix
+++ b/pkgs/development/interpreters/pypy/2.4/default.nix
@@ -8,11 +8,11 @@ let
 
   majorVersion = "2.4";
   version = "${majorVersion}.0";
-  pythonVersion = "2.7";
   libPrefix = "pypy${majorVersion}";
 
   pypy = stdenv.mkDerivation rec {
     name = "pypy-${version}";
+    pythonVersion = "2.7";
 
     inherit majorVersion version;
 
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 87e4dceee4d..9bf161ffc1a 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -56,6 +56,7 @@ let
   # external dependencies.
   python = stdenv.mkDerivation {
     name = "python${if includeModules then "" else "-minimal"}-${version}";
+    pythonVersion = majorVersion;
 
     inherit majorVersion version src patches buildInputs preConfigure;
 
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 117d11f3052..0d7490d910c 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -55,6 +55,7 @@ let
   # external dependencies.
   python = stdenv.mkDerivation {
     name = "python-${version}";
+    pythonVersion = majorVersion;
 
     inherit majorVersion version src patches buildInputs preConfigure;
 
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index d3f5c6e1f13..2645b503344 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -27,6 +27,7 @@ let
 in
 stdenv.mkDerivation {
   name = "python3-${version}";
+  pythonVersion = majorVersion;
   inherit majorVersion version;
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 1f91d1bbaf4..a8953f38245 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -20,6 +20,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.3";
+  pythonVersion = majorVersion;
   version = "${majorVersion}.6";
 
   buildInputs = filter (p: p != null) [
@@ -28,6 +29,7 @@ let
 in
 stdenv.mkDerivation {
   name = "python3-${version}";
+  pythonVersion = majorVersion;
   inherit majorVersion version;
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 8c86f77ff75..5c99428463d 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -20,6 +20,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.4";
+  pythonVersion = majorVersion;
   version = "${majorVersion}.2";
   fullVersion = "${version}";
 
@@ -29,6 +30,7 @@ let
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
+  pythonVersion = majorVersion;
   inherit majorVersion version;
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index af6cf4b1956..e0181c6ed58 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,62 +1,68 @@
-{ stdenv, fetchurl, cairo, file, fontconfig, glib, gtk, freefont_ttf
-, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which, readline } :
+{ stdenv, fetchurl, makeFontsConf, makeWrapper
+, cairo, coreutils, fontconfig, freefont_ttf
+, glib, gmp, gtk, libffi, libjpeg, libpng
+, libtool, mpfr, openssl, pango, poppler
+, readline, sqlite
+}:
+
+let
+
+  fontsConf = makeFontsConf {
+    fontDirectories = [ freefont_ttf ];
+  };
+
+  libPath = stdenv.lib.makeLibraryPath [
+    cairo
+    fontconfig
+    glib
+    gmp
+    gtk
+    libjpeg
+    libpng
+    mpfr
+    openssl
+    pango
+    poppler
+    readline
+    sqlite
+  ];
+
+in
 
 stdenv.mkDerivation rec {
-  pname = "racket";
+  name = "racket-${version}";
   version = "6.1.1";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
     sha256 = "090269522d20e7a5ce85d2251a126745746ebf5e87554c05efe03f3b7173da75";
   };
 
-  # Various Racket executables do runtime searches for these.
-  ffiSharedLibs = "${cairo}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${libjpeg}/lib:"
-                + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib:"
-                + "${readline}/lib";
+  FONTCONFIG_FILE = fontsConf;
+  LD_LIBRARY_PATH = libPath;
+  NIX_LDFLAGS = "-lgcc_s";
 
-  buildInputs = [ file fontconfig freefont_ttf libtool makeWrapper sqlite which ];
+  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ];
 
   preConfigure = ''
-    export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH
-
-    # Chroot builds do not have access to /etc/fonts/fonts.conf,
-    # but the Racket bootstrap needs a working fontconfig,
-    # so here a simple temporary stand-in is used.
-    mkdir chroot-fontconfig
-    cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf
-    sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf
-    echo "<dir>${freefont_ttf}</dir>" >> chroot-fontconfig/fonts.conf
-    echo "</fontconfig>" >> chroot-fontconfig/fonts.conf
-
-    # remove extraneous directories from temporary fonts.conf
-    sed -e 's@<dir></dir>@@g' \
-        -e 's@<dir prefix="xdg">fonts</dir>@@g' \
-        -e 's@<dir>~/.fonts</dir>@@g' \
-        -e 's@<cachedir prefix="xdg">fontconfig</cachedir>@@g' \
-        -e 's@<cachedir>~/.fontconfig</cachedir>@@g' \
-        -i chroot-fontconfig/fonts.conf
-
-    export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf
-
-    cd src
-    sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
-    sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure
+    substituteInPlace src/configure --replace /usr/bin/uname ${coreutils}/bin/uname
+    mkdir src/build
+    cd src/build
   '';
 
   configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
 
-  NIX_LDFLAGS = "-lgcc_s";
-  enableParallelBuilding = true;
+  configureScript = "../configure";
+
+  enableParallelBuilding = false;
 
   postInstall = ''
     for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}";
+      wrapProgram $out/bin/$p --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}";
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A programmable programming language";
     longDescription = ''
       Racket is a full-spectrum programming language. It goes beyond
@@ -67,10 +73,9 @@ stdenv.mkDerivation rec {
       libraries support applications from web servers and databases to
       GUIs and charts.
     '';
-
     homepage = http://racket-lang.org/;
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = with stdenv.lib.maintainers; [ kkallio henrytill ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ kkallio henrytill ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile b/pkgs/development/interpreters/ruby/bundix/Gemfile
new file mode 100644
index 00000000000..b9ae407c4d4
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundix/Gemfile
@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+gem "bundix",
+  :git => "https://github.com/cstrahan/bundix.git",
+  :ref => "5df25b11b5b86e636754d54c2a8859c7c6ec78c7"
diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock
new file mode 100644
index 00000000000..c8869fdb1e3
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock
@@ -0,0 +1,19 @@
+GIT
+  remote: https://github.com/cstrahan/bundix.git
+  revision: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7
+  ref: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7
+  specs:
+    bundix (0.1.0)
+      bundler (~> 1.7.9)
+      thor (~> 0.19.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundix!
diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix
new file mode 100644
index 00000000000..0196adb8f4c
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundix/default.nix
@@ -0,0 +1,9 @@
+{ ruby, bundlerEnv }:
+
+bundlerEnv {
+  name = "bundix";
+  inherit ruby;
+  gemset = ./gemset.nix;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+}
diff --git a/pkgs/development/interpreters/ruby/bundix/gemset.nix b/pkgs/development/interpreters/ruby/bundix/gemset.nix
new file mode 100644
index 00000000000..a2c633f903c
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundix/gemset.nix
@@ -0,0 +1,22 @@
+{
+  "bundix" = {
+    version = "0.1.0";
+    source = {
+      type = "git";
+      url = "https://github.com/cstrahan/bundix.git";
+      rev = "5df25b11b5b86e636754d54c2a8859c7c6ec78c7";
+      fetchSubmodules = false;
+      sha256 = "0334jsavpzkikcs7wrx7a3r0ilvr5vsnqd34lhc58b8cgvgll47p";
+    };
+    dependencies = [
+      "thor"
+    ];
+  };
+  "thor" = {
+    version = "0.19.1";
+    source = {
+      type = "gem";
+      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+    };
+  };
+}
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
new file mode 100644
index 00000000000..eba2a0b0a10
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
@@ -0,0 +1,142 @@
+# The standard set of gems in nixpkgs including potential fixes.
+#
+# The gemset is derived from two points of entry:
+# - An attrset describing a gem, including version, source and dependencies
+#   This is just meta data, most probably automatically generated by a tool
+#   like Bundix (https://github.com/aflatter/bundix).
+#   {
+#     name = "bundler";
+#     version = "1.6.5";
+#     sha256 = "1s4x0f5by9xs2y24jk6krq5ky7ffkzmxgr4z1nhdykdmpsi2zd0l";
+#     dependencies = [ "rake" ];
+#   }
+# - An optional derivation that may override how the gem is built. For popular
+#   gems that don't behave correctly, fixes are already provided in the form of
+#   derivations.
+#
+# This seperates "what to build" (the exact gem versions) from "how to build"
+# (to make gems behave if necessary).
+
+{ lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which
+, libiconv, postgresql, v8, v8_3_16_14, clang, sqlite, zlib, imagemagick
+, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
+, cmake, libssh2, openssl, mysql
+}:
+
+let
+  v8 = v8_3_16_14;
+  mysql = (import <nixpkgs> {}).mysql;
+
+in
+
+{
+  charlock_holmes = attrs: {
+    buildInputs = [ which icu ];
+  };
+
+  ffi = attrs: {
+    buildInputs = [ libffi pkgconfig ];
+  };
+
+  gpgme = attrs: {
+    buildInputs = [ gpgme ];
+  };
+
+  libv8 = attrs: {
+    buildInputs = [ which v8 python ];
+    buildFlags = [
+      "--with-system-v8=true"
+    ];
+    patches = [
+      # see: https://github.com/cowboyd/libv8/pull/161
+      (fetchpatch {
+        url = https://github.com/cstrahan/libv8/commit/c79378bf346d4ed2429af36d745d17c478ffbe96.patch;
+        sha256 = "1l6572cmigc22g249jj8h0xlbig88mj43kdqdbimhw2pmpv3q0rs";
+      })
+    ];
+  };
+
+  mysql2 = attrs: {
+    buildInputs = [ mysql zlib openssl ];
+  };
+
+  ncursesw = attrs: {
+    buildInputs = [ ncurses ];
+    buildFlags = [
+      "--with-cflags=-I${ncurses}/include"
+      "--with-ldflags=-L${ncurses}/lib"
+    ];
+  };
+
+  nokogiri = attrs: {
+    buildFlags = [
+      "--use-system-libraries"
+      "--with-zlib-dir=${zlib}"
+      "--with-xml2-lib=${libxml2}/lib"
+      "--with-xml2-include=${libxml2}/include/libxml2"
+      "--with-xslt-lib=${libxslt}/lib"
+      "--with-xslt-include=${libxslt}/include"
+      "--with-exslt-lib=${libxslt}/lib"
+      "--with-exslt-include=${libxslt}/include"
+    ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
+  };
+
+  pg = attrs: {
+    buildFlags = [
+      "--with-pg-config=${postgresql}/bin/pg_config"
+    ];
+  };
+
+  rmagick = attrs: {
+    buildInputs = [ imagemagick pkgconfig ];
+  };
+
+  rugged = attrs: {
+    buildInputs = [ cmake pkgconfig openssl libssh2 zlib ];
+  };
+
+  sqlite3 = attrs: {
+    buildFlags = [
+      "--with-sqlite3-include=${sqlite}/include"
+      "--with-sqlite3-lib=${sqlite}/lib"
+    ];
+  };
+
+  sup = attrs: {
+    # prevent sup from trying to dynamically install `xapian-ruby`.
+    postPatch = ''
+      cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb
+
+      substituteInPlace lib/sup/crypto.rb \
+        --replace 'which gpg2' \
+                  '${which}/bin/which gpg2'
+    '';
+  };
+
+  therubyracer = attrs: {
+    buildFlags = [
+      "--with-v8-dir=${v8}"
+      "--with-v8-include=${v8}/include"
+      "--with-v8-lib=${v8}/lib"
+    ];
+  };
+
+  tzinfo = attrs: {
+    postPatch = ''
+      substituteInPlace lib/tzinfo/zoneinfo_data_source.rb \
+        --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+    '';
+  };
+
+  xapian-ruby = attrs: {
+    # use the system xapian
+    buildInputs = [ xapian pkgconfig zlib ];
+    postPatch = ''
+      cp ${./xapian-Rakefile} Rakefile
+    '';
+    preInstall = ''
+      export XAPIAN_CONFIG=${xapian}/bin/xapian-config
+    '';
+  };
+}
+
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix
new file mode 100644
index 00000000000..f90e756030f
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix
@@ -0,0 +1,312 @@
+{ stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
+, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem , bundler_HEAD
+, git
+}@defs:
+
+# This is a work-in-progress.
+# The idea is that his will replace load-ruby-env.nix.
+
+{ name, gemset, gemfile, lockfile, ruby ? defs.ruby, gemConfig ? defaultGemConfig
+, enableParallelBuilding ? false # TODO: this might not work, given the env-var shinanigans.
+, postInstall ? null
+, documentation ? false
+, meta ? {}
+}@args:
+
+let
+
+  shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
+  const = x: y: x;
+  bundler = bundler_HEAD.override { inherit ruby; };
+  inherit (builtins) attrValues;
+
+  gemName = attrs: "${attrs.name}-${attrs.version}.gem";
+
+  fetchers.path = attrs: attrs.source.path;
+  fetchers.gem = attrs: fetchurl {
+    url = "${attrs.source.source or "https://rubygems.org"}/downloads/${gemName attrs}";
+    inherit (attrs.source) sha256;
+  };
+  fetchers.git = attrs: fetchgit {
+    inherit (attrs.source) url rev sha256 fetchSubmodules;
+    leaveDotGit = true;
+  };
+
+  applySrc = attrs:
+    attrs // {
+      src = (fetchers."${attrs.source.type}" attrs);
+    };
+
+  applyGemConfigs = attrs:
+    if gemConfig ? "${attrs.name}"
+    then attrs // gemConfig."${attrs.name}" attrs
+    else attrs;
+
+  needsPatch = attrs:
+    (attrs ? patches) || (attrs ? prePatch) || (attrs ? postPatch);
+
+  # patch a gem or source tree.
+  # for gems, the gem is unpacked, patched, and then repacked.
+  # see: https://github.com/fedora-ruby/gem-patch/blob/master/lib/rubygems/patcher.rb
+  applyPatches = attrs:
+    if !needsPatch attrs
+    then attrs
+    else attrs // { src =
+      stdenv.mkDerivation {
+        name = gemName attrs;
+        phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+        buildInputs = [ ruby ] ++ attrs.buildInputs or [];
+        patches = attrs.patches or [ ];
+        prePatch = attrs.prePatch or "true";
+        postPatch = attrs.postPatch or "true";
+        unpackPhase = ''
+          runHook preUnpack
+
+          if [[ -f ${attrs.src} ]]; then
+            isGem=1
+            # we won't know the name of the directory that RubyGems creates,
+            # so we'll just use a glob to find it and move it over.
+            gem unpack ${attrs.src} --target=container
+            cp -r container/* contents
+            rm -r container
+          else
+            cp -r ${attrs.src} contents
+            chmod -R +w contents
+          fi
+
+          cd contents
+          runHook postUnpack
+        '';
+        installPhase = ''
+          runHook preInstall
+
+          if [[ -n "$isGem" ]]; then
+            ${writeScript "repack.rb" ''
+              #!${ruby}/bin/ruby
+              require 'rubygems'
+              require 'rubygems/package'
+              require 'fileutils'
+
+              if defined?(Encoding.default_internal)
+                Encoding.default_internal = Encoding::UTF_8
+                Encoding.default_external = Encoding::UTF_8
+              end
+
+              if Gem::VERSION < '2.0'
+                load "${./package-1.8.rb}"
+              end
+
+              out = ENV['out']
+              files = Dir['**/{.[^\.]*,*}']
+
+              package = Gem::Package.new("${attrs.src}")
+              patched_package = Gem::Package.new(package.spec.file_name)
+              patched_package.spec = package.spec.clone
+              patched_package.spec.files = files
+
+              patched_package.build(false)
+
+              FileUtils.cp(patched_package.spec.file_name, out)
+            ''}
+          else
+            cp -r . $out
+          fi
+
+          runHook postInstall
+        '';
+      };
+    };
+
+  instantiate = (attrs:
+    applyPatches (applyGemConfigs (applySrc attrs))
+  );
+
+  instantiated = lib.flip lib.mapAttrs (import gemset) (name: attrs:
+    instantiate (attrs // { inherit name; })
+  );
+
+  needsPreInstall = attrs:
+    (attrs ? preInstall) || (attrs ? buildInputs) || (attrs ? nativeBuildInputs);
+
+  # TODO: support cross compilation? look at stdenv/generic/default.nix.
+  runPreInstallers = lib.fold (next: acc:
+    if !needsPreInstall next
+    then acc
+    else acc + ''
+      ${writeScript "${next.name}-pre-install" ''
+        #!${stdenv.shell}
+
+        export nativeBuildInputs="${toString ((next.nativeBuildInputs or []) ++ (next.buildInputs or []))}"
+
+        source ${stdenv}/setup
+
+        header "running pre-install script for ${next.name}"
+
+        ${next.preInstall or ""}
+
+        ${ruby}/bin/ruby -e 'print ENV.inspect' > env/${next.name}
+
+        stopNest
+      ''}
+    ''
+  ) "" (attrValues instantiated);
+
+  # copy *.gem to ./gems
+  copyGems = lib.fold (next: acc:
+    if next.source.type == "gem"
+    then acc + "cp ${next.src} gems/${gemName next}\n"
+    else acc
+  ) "" (attrValues instantiated);
+
+  runRuby = name: env: command:
+    runCommand name env ''
+      ${ruby}/bin/ruby ${writeText name command}
+    '';
+
+  # TODO: include json_pure, so the version of ruby doesn't matter.
+  # not all rubies have support for JSON built-in,
+  # so we'll convert JSON to ruby expressions.
+  json2rb = writeScript "json2rb" ''
+    #!${ruby}/bin/ruby
+    begin
+      require 'json'
+    rescue LoadError => ex
+      require 'json_pure'
+    end
+
+    puts JSON.parse(STDIN.read).inspect
+  '';
+
+  # dump the instantiated gemset as a ruby expression.
+  serializedGemset = runCommand "gemset.rb" { json = builtins.toJSON instantiated; } ''
+    printf '%s' "$json" | ${json2rb} > $out
+  '';
+
+  # this is a mapping from a source type and identifier (uri/path/etc)
+  # to the pure store path.
+  # we'll use this from the patched bundler to make fetching sources pure.
+  sources = runRuby "sources.rb" { gemset = serializedGemset; } ''
+    out    = ENV['out']
+    gemset = eval(File.read(ENV['gemset']))
+
+    sources = {
+      "git"  => { },
+      "path" => { },
+      "gem"  => { },
+      "svn"  => { }
+    }
+
+    gemset.each_value do |spec|
+      type = spec["source"]["type"]
+      val = spec["src"]
+      key =
+        case type
+        when "gem"
+          spec["name"]
+        when "git"
+          spec["source"]["url"]
+        when "path"
+          spec["source"]["originalPath"]
+        when "svn"
+          nil # TODO
+        end
+
+      sources[type][key] = val if key
+    end
+
+    File.open(out, "wb") do |f|
+      f.print sources.inspect
+    end
+  '';
+
+  # rewrite PATH sources to point into the nix store.
+  purifiedLockfile = runRuby "purifiedLockfile" {} ''
+    out     = ENV['out']
+    sources = eval(File.read("${sources}"))
+    paths   = sources["path"]
+
+    lockfile = File.read("${lockfile}")
+
+    paths.each_pair do |impure, pure|
+      lockfile.gsub!(/^  remote: #{Regexp.escape(impure)}/, "  remote: #{pure}")
+    end
+
+    File.open(out, "wb") do |f|
+      f.print lockfile
+    end
+  '';
+
+  needsBuildFlags = attrs: attrs ? buildFlags;
+
+  mkBuildFlags = spec:
+    "export BUNDLE_BUILD__${lib.toUpper spec.name}='${lib.concatStringsSep " " (map shellEscape spec.buildFlags)}'";
+
+  allBuildFlags =
+    lib.concatStringsSep "\n"
+      (map mkBuildFlags
+        (lib.filter needsBuildFlags (attrValues instantiated)));
+
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  buildInputs = [
+    ruby
+    bundler
+    git
+  ];
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  outputs = [
+    "out"    # the installed libs/bins
+    "bundle" # supporting files for bundler
+  ];
+
+  installPhase = ''
+    mkdir -p $bundle
+    export BUNDLE_GEMFILE=$bundle/Gemfile
+    cp ${gemfile} $BUNDLE_GEMFILE
+    cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock
+
+    export NIX_GEM_SOURCES=${sources}
+    export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath}
+
+    export GEM_HOME=$out/${ruby.gemPath}
+    export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME
+    mkdir -p $GEM_HOME
+
+    ${allBuildFlags}
+
+    mkdir gems
+    cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems
+    ${copyGems}
+
+    ${lib.optionalString (!documentation) ''
+      mkdir home
+      HOME="$(pwd -P)/home"
+      echo "gem: --no-rdoc --no-ri" > $HOME/.gemrc
+    ''}
+
+    mkdir env
+    ${runPreInstallers}
+
+    mkdir $out/bin
+    cp ${./monkey_patches.rb} monkey_patches.rb
+    export RUBYOPT="-rmonkey_patches.rb -I $(pwd -P)"
+    bundler install --frozen --binstubs ${lib.optionalString enableParallelBuilding "--jobs $NIX_BUILD_CORES"}
+    RUBYOPT=""
+
+    runHook postInstall
+  '';
+
+  inherit postInstall;
+
+  passthru = {
+    inherit ruby;
+    inherit bundler;
+  };
+
+  inherit meta;
+}
diff --git a/pkgs/development/interpreters/ruby/bundler-env/mkrf_conf_xapian.rb b/pkgs/development/interpreters/ruby/bundler-env/mkrf_conf_xapian.rb
new file mode 100644
index 00000000000..e19f06e23ac
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-env/mkrf_conf_xapian.rb
@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb'
+require 'rbconfig'
+
+begin
+  Gem::Command.build_args = ARGV
+rescue NoMethodError
+end
+
+# create dummy rakefile to indicate success
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
+f.write("task :default\n")
+f.close
diff --git a/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb b/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
new file mode 100644
index 00000000000..f3849446fe6
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
@@ -0,0 +1,238 @@
+require 'bundler'
+
+# Undo the RUBYOPT trickery.
+opt = ENV['RUBYOPT'].dup
+opt.gsub!(/-rmonkey_patches.rb -I [^ ]*/, '')
+ENV['RUBYOPT'] = opt
+
+Bundler.module_eval do
+  class << self
+    # mappings from original uris to store paths.
+    def nix_gem_sources
+      @nix_gem_sources ||=
+        begin
+          src = ENV['NIX_GEM_SOURCES']
+          eval(Bundler.read_file(src))
+        end
+    end
+
+    # extract the gemspecs from the gems pulled from Rubygems.
+    def nix_gemspecs
+      @nix_gemspecs ||= Dir.glob("gems/*.gem").map do |path|
+        Bundler.rubygems.spec_from_gem(path)
+      end
+    end
+
+    # swap out ENV
+    def nix_with_env(env, &block)
+      if env
+        old_env = ENV.to_hash
+        begin
+          ENV.replace(env)
+          block.call
+        ensure
+          ENV.replace(old_env)
+        end
+      else
+        block.call
+      end
+    end
+
+    # map a git uri to a fetchgit store path.
+    def nix_git(uri)
+      Pathname.new(nix_gem_sources["git"][uri])
+    end
+  end
+end
+
+Bundler::Source::Git::GitProxy.class_eval do
+  def checkout
+    unless path.exist?
+      FileUtils.mkdir_p(path.dirname)
+      FileUtils.cp_r(Bundler.nix_git(@uri).join(".git"), path)
+      system("chmod -R +w #{path}")
+    end
+  end
+
+  def copy_to(destination, submodules=false)
+    unless File.exist?(destination.join(".git"))
+      FileUtils.mkdir_p(destination.dirname)
+      FileUtils.cp_r(Bundler.nix_git(@uri), destination)
+      system("chmod -R +w #{destination}")
+    end
+  end
+end
+
+Bundler::Fetcher.class_eval do
+  def use_api
+    true
+  end
+
+  def fetch_dependency_remote_specs(gem_names)
+    Bundler.ui.debug "Query Gemcutter Dependency Endpoint API: #{gem_names.join(',')}"
+    deps_list = []
+
+    spec_list = gem_names.map do |name|
+      spec = Bundler.nix_gemspecs.detect {|spec| spec.name == name }
+      dependencies = spec.dependencies.
+        select {|dep| dep.type != :development}.
+        map do |dep|
+          deps_list << dep.name
+          dep
+        end
+
+      [spec.name, spec.version, spec.platform, dependencies]
+    end
+
+    [spec_list, deps_list.uniq]
+  end
+end
+
+Bundler::Source::Rubygems.class_eval do
+  # We copy all gems into $PWD/gems, and this allows RubyGems to find those
+  # gems during installation.
+  def fetchers
+    @fetchers ||= [
+      Bundler::Fetcher.new(URI.parse("file://#{File.expand_path(Dir.pwd)}"))
+    ]
+  end
+
+  # Look-up gems that were originally from RubyGems.
+  def remote_specs
+    @remote_specs ||=
+      begin
+        lockfile = Bundler::LockfileParser.new(Bundler.read_file(Bundler.default_lockfile))
+        gem_names = lockfile.specs.
+          select {|spec| spec.source.is_a?(Bundler::Source::Rubygems)}.
+          map {|spec| spec.name}
+        idx = Bundler::Index.new
+        api_fetchers.each do |f|
+          Bundler.ui.info "Fetching source index from #{f.uri}"
+          idx.use f.specs(gem_names, self)
+        end
+        idx
+      end
+  end
+end
+
+Bundler::Installer.class_eval do
+
+  # WHY:
+  # This allows us to provide a typical Nix experience, where
+  # `buildInputs` and/or `preInstall` may set up the $PATH and other env-vars
+  # as needed. By swapping out the environment per install, we can have finer
+  # grained control than we would have otherwise.
+  #
+  # HOW:
+  # This is a wrapper around the original `install_gem_from_spec`.
+  # We expect that a "pre-installer" might exist at `pre-installers/<gem-name>`,
+  # and if it does, we execute it.
+  # The pre-installer is expected to dump its environment variables as a Ruby
+  # hash to `env/<gem-name>`.
+  # We then swap out the environment for the duration of the install,
+  # and then set it back to what it was originally.
+  alias original_install_gem_from_spec install_gem_from_spec
+  def install_gem_from_spec(spec, standalone = false, worker = 0)
+    env_dump = "env/#{spec.name}"
+    if File.exist?(env_dump)
+      env = eval(Bundler.read_file(env_dump))
+      unless env
+        Bundler.ui.error "The environment variables for #{spec.name} could not be loaded!"
+        exit 1
+      end
+      Bundler.nix_with_env(env) do
+        original_install_gem_from_spec(spec, standalone, worker)
+      end
+    else
+      original_install_gem_from_spec(spec, standalone, worker)
+    end
+  end
+
+  def generate_bundler_executable_stubs(spec, options = {})
+    return if spec.executables.empty?
+
+    out = ENV['out']
+
+    spec.executables.each do |executable|
+      next if executable == "bundle" || executable == "bundler"
+
+      binstub_path = "#{out}/bin/#{executable}"
+
+      File.open(binstub_path, 'w', 0777 & ~File.umask) do |f|
+        f.print <<-TEXT
+#!#{RbConfig.ruby}
+
+old_gemfile  = ENV["BUNDLE_GEMFILE"]
+old_gem_home = ENV["GEM_HOME"]
+old_gem_path = ENV["GEM_PATH"]
+
+ENV["BUNDLE_GEMFILE"] =
+  "#{ENV["BUNDLE_GEMFILE"]}"
+ENV["GEM_HOME"] =
+  "#{ENV["GEM_HOME"]}"
+ENV["GEM_PATH"] =
+  "#{ENV["NIX_BUNDLER_GEMPATH"]}:\#{ENV["GEM_HOME"]}\#{old_gem_path ? ":\#{old_gem_path}" : ""}}"
+
+require 'rubygems'
+require 'bundler/setup'
+
+ENV["BUNDLE_GEMFILE"] = old_gemfile
+ENV["GEM_HOME"]       = old_gem_home
+ENV["GEM_PATH"]       = old_gem_path
+
+load Gem.bin_path('#{spec.name}', '#{executable}')
+TEXT
+      end
+    end
+  end
+end
+
+Gem::Installer.class_eval do
+  # Make the wrappers automagically use bundler.
+  #
+  # Stage 1.
+  #   Set $BUNDLE_GEMFILE so bundler knows what gems to load.
+  #   Set $GEM_HOME to the installed gems, because bundler looks there for
+  #     non-Rubygems installed gems (e.g. git/svn/path sources).
+  #   Set $GEM_PATH to include both bundler and installed gems.
+  #
+  # Stage 2.
+  #   Setup bundler, locking down the gem versions.
+  #
+  # Stage 3.
+  #   Reset $BUNDLE_GEMFILE, $GEM_HOME, $GEM_PATH.
+  #
+  # Stage 4.
+  #   Run the actual executable.
+  def app_script_text(bin_file_name)
+    return <<-TEXT
+#!#{RbConfig.ruby}
+#
+# This file was generated by Nix's RubyGems.
+#
+# The application '#{spec.name}' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+old_gemfile  = ENV["BUNDLE_GEMFILE"]
+old_gem_home = ENV["GEM_HOME"]
+old_gem_path = ENV["GEM_PATH"]
+
+ENV["BUNDLE_GEMFILE"] =
+  "#{ENV["BUNDLE_GEMFILE"]}"
+ENV["GEM_HOME"] =
+  "#{ENV["GEM_HOME"]}"
+ENV["GEM_PATH"] =
+  "#{ENV["NIX_BUNDLER_GEMPATH"]}:\#{ENV["GEM_HOME"]}\#{old_gem_path ? ":\#{old_gem_path}" : ""}}"
+
+require 'rubygems'
+require 'bundler/setup'
+
+ENV["BUNDLE_GEMFILE"] = old_gemfile
+ENV["GEM_HOME"]       = old_gem_home
+ENV["GEM_PATH"]       = old_gem_path
+
+load Gem.bin_path('#{spec.name}', '#{bin_file_name}')
+TEXT
+  end
+end
diff --git a/pkgs/development/interpreters/ruby/bundler-env/package-1.8.rb b/pkgs/development/interpreters/ruby/bundler-env/package-1.8.rb
new file mode 100644
index 00000000000..079b65f97ec
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-env/package-1.8.rb
@@ -0,0 +1,29 @@
+require 'rubygems/installer'
+require 'rubygems/builder'
+
+# Simulate RubyGems 2.0 behavior.
+
+module Gem::Package
+  def self.new(gem)
+    @gem = gem
+    self
+  end
+
+  def self.extract_files(dir)
+    installer = Gem::Installer.new @gem
+    installer.unpack(dir)
+  end
+
+  def self.build(skip_validation=false)
+    builder = Gem::Builder.new(spec)
+    builder.build
+  end
+
+  def self.spec=(spec)
+    @spec = spec
+  end
+
+  def self.spec
+    @spec ||= Gem::Installer.new(@gem).spec
+  end
+end
diff --git a/pkgs/development/interpreters/ruby/bundler-env/xapian-Rakefile b/pkgs/development/interpreters/ruby/bundler-env/xapian-Rakefile
new file mode 100644
index 00000000000..9f0b8e72f08
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-env/xapian-Rakefile
@@ -0,0 +1,38 @@
+# encoding: utf-8
+# Install the xapian binaries into the lib folder of the gem
+require 'rbconfig'
+
+c = RbConfig::CONFIG
+
+def system!(cmd)
+  puts cmd
+  system(cmd) or raise
+end
+
+source_dir = 'xapian_source'
+bindings = Dir["#{source_dir}/xapian-bindings-*"].first
+bindings = File.basename(bindings, ".tar.xz")
+
+task :default do
+  system! "tar -xJf #{source_dir}/#{bindings}.tar.xz"
+
+  prefix = Dir.pwd
+  ENV['LDFLAGS'] = "-L#{prefix}/lib"
+
+  system! "mkdir -p lib"
+
+  Dir.chdir bindings do
+    ENV['RUBY'] ||= "#{c['bindir']}/#{c['RUBY_INSTALL_NAME']}"
+    system! "./configure --prefix=#{prefix} --exec-prefix=#{prefix} --with-ruby"
+    system! "make clean all"
+  end
+
+  system! "cp -r #{bindings}/ruby/.libs/_xapian.* lib"
+  system! "cp #{bindings}/ruby/xapian.rb lib"
+
+  system! "rm lib/*.la"
+  system! "rm lib/*.lai"
+
+  system! "rm -R #{bindings}"
+  system! "rm -R #{source_dir}"
+end
diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
new file mode 100644
index 00000000000..2e8cfc8cbf1
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -0,0 +1,18 @@
+{ buildRubyGem, coreutils, fetchgit }:
+
+buildRubyGem {
+  name = "bundler-HEAD";
+  src = fetchgit {
+    url = "https://github.com/bundler/bundler.git";
+    rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
+    sha256 = "1l4r55n1wzr817l225l6pm97li1mxg9icd8s51cpfihh91nkdz68";
+    leaveDotGit = true;
+  };
+  dontPatchShebangs = true;
+  postInstall = ''
+    find $out -type f -perm +0100 | while read f; do
+      substituteInPlace $f \
+         --replace "/usr/bin/env" "${coreutils}/bin/env"
+    done
+  '';
+}
diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix
new file mode 100644
index 00000000000..cbec8d0ad75
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler.nix
@@ -0,0 +1,13 @@
+{ buildRubyGem, coreutils }:
+
+buildRubyGem {
+  name = "bundler-1.7.9";
+  sha256 = "1gd201rh17xykab9pbqp0dkxfm7b9jri02llyvmrc0c5bz2vhycm";
+  dontPatchShebangs = true;
+  postInstall = ''
+    find $out -type f -perm +0100 | while read f; do
+      substituteInPlace $f \
+         --replace "/usr/bin/env" "${coreutils}/bin/env"
+    done
+  '';
+}
diff --git a/pkgs/development/interpreters/ruby/fix-gem-nix-versions.patch b/pkgs/development/interpreters/ruby/fix-gem-nix-versions.patch
deleted file mode 100644
index c67eaff2ac5..00000000000
--- a/pkgs/development/interpreters/ruby/fix-gem-nix-versions.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/lib/nix/gem-nix-command.rb b/lib/nix/gem-nix-command.rb
-index 8d3733e..ba942ff 100644
---- a/lib/nix/gem-nix-command.rb
-+++ b/lib/nix/gem-nix-command.rb
-@@ -108,11 +108,12 @@ class Gem::Commands::NixCommand < Gem::Command
- 
-       # args to dep informations
-       args.each { |arg|
--        if arg =~ /(.+)-?(.*)?/ then
-+        if arg =~ /(.+)-([0-9][^-]+)/ then
-           gem_name = $1
--          version =  $2.empty? ?  Gem::Requirement.default : Gem::Version.new($2)
-+          version =  Gem::Version.new($2)
-         else
--          raise Gem::CommandLineError, "couldn't parse arg. expected: name or name-version"
-+          gem_name = arg
-+          version =  Gem::Requirement.default
-         end
- 
-         adddep(Gem::Dependency.new gem_name, version)
-@@ -162,7 +163,13 @@ class Gem::Commands::NixCommand < Gem::Command
-     spec, source_uri = find_gem_with_source(dep)
-     full_name = spec.full_name
- 
--    return if @gems_with_deps.key?(full_name)
-+    if @gems_with_deps.key?(full_name)
-+      unless @gems_with_deps[full_name].nil?
-+        return @gems_with_deps[full_name][0]
-+      else
-+        return nil
-+      end
-+    end
-     @gems_with_deps[full_name] = nil # there maybe circular dependencies. thus mark this gem seen as early as possible
- 
-     # development deps can't be found. Some are old. Thus only add rutime dependencies
diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix
index b5be8cf2b65..dd6338cd813 100644
--- a/pkgs/development/interpreters/ruby/gem.nix
+++ b/pkgs/development/interpreters/ruby/gem.nix
@@ -1,63 +1,136 @@
-{stdenv, fetchurl, ruby, rubygems, makeWrapper, patches, overrides}:
-
-let
-  gemDefaults = { name, basename, requiredGems, sha256, meta }:
-  {
-    buildInputs = [rubygems makeWrapper];
-    unpackPhase = ":";
-    configurePhase=":";
-    bulidPhase=":";
-
-    src = fetchurl {
-      url = "http://rubygems.org/downloads/${name}.gem";
-      inherit sha256;
+{ lib, ruby, rubygemsFun, fetchurl, makeWrapper, git } @ defs:
+
+lib.makeOverridable (
+
+{ name
+, ruby ? defs.ruby
+, rubygems ? (rubygemsFun ruby)
+, stdenv ? ruby.stdenv
+, namePrefix ? "${ruby.name}" + "-"
+, buildInputs ? []
+, doCheck ? false
+, dontBuild ? true
+, meta ? {}
+, gemPath ? []
+, ...} @ attrs:
+
+stdenv.mkDerivation (attrs // {
+  inherit ruby rubygems;
+  inherit doCheck;
+
+  buildInputs = [ ruby rubygems makeWrapper git ] ++ buildInputs;
+
+  name = namePrefix + name;
+
+  src = if attrs ? src
+    then attrs.src
+    else fetchurl {
+      url = "http://rubygems.org/downloads/${attrs.name}.gem";
+      inherit (attrs) sha256;
     };
 
-    name = "ruby-${name}";
+  phases = [ "unpackPhase" "patchPhase" "buildPhase" "checkPhase" "installPhase" "fixupPhase" ];
+
+  # The source is expected to either be a gem package or a directory.
+  #
+  # - Gem packages are already built, so they don't even need to be unpacked.
+  #   They will skip the buildPhase.
+  # - A directory containing the sources will need to go through all of the
+  #   usual phases.
+  unpackPhase= ''
+    gemRegex="\.gem"
+    if [[ $src =~ $gemRegex ]]
+    then
+      runHook preUnpack
+      echo "source is a gem package, won't unpack"
+      gempkg=$src
+      dontBuild=1
+      runHook postUnpack
+    else
+      # Fall back to the original thing for everything else.
+      unpackPhase
+    fi
+  '';
+
+  checkPhase = "true";
+
+  buildPhase = ''
+    runHook preBuild
+
+    # TODO: Investigate. The complete working tree is touched by fetchgit.
+    if [ -d .git ]; then
+      git reset
+    fi
+
+    gemspec=$(find . -name '*.gemspec')
+    echo "found the following gemspecs:"
+    echo "$gemspec"
 
-    propagatedBuildInputs = requiredGems ++ [ruby];
+    gemspec=$(echo "$gemspec" | head -n1)
+    echo "building $gemspec"
 
-    inherit meta;
+    exec 3>&1
+    output=$(gem build $gemspec | tee >(cat - >&3))
+    exec 3>&-
 
-    installPhase = ''
-      export HOME=$TMP/home; mkdir -pv "$HOME"
+    gempkg=$(echo "$output" | grep -oP 'File: \K(.*)')
 
-      gem install -V --ignore-dependencies \
-      -i "$out/${ruby.gemPath}" -n "$out/bin" "$src" $gemFlags -- $buildFlags
-      rm -frv $out/${ruby.gemPath}/cache # don't keep the .gem file here
+    echo "gem package built: $gempkg"
 
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # NOTE: This does NOT build the unpacked gem, but installs $src directly.
+    #       Gems that have not been downloaded from rubygems.org may need a
+    #       separate buildPhase.
+    #       --ignore-dependencies is necessary as rubygems otherwise always
+    #       connects to the repository, thus breaking pure builds.
+    GEM_HOME=$out/${ruby.gemPath} \
+      gem install \
+      --local \
+      --force \
+      --http-proxy "http://nodtd.invalid" \
+      --ignore-dependencies \
+      --build-root "/" \
+      --backtrace \
+      $gempkg $gemFlags -- $buildFlags
+
+    # Yes, we really do need the $out/${ruby.gemPath}/cache.
+    # This is very important in order for many parts of RubyGems/Bundler to not blow up.
+    # See https://github.com/bundler/bundler/issues/3327
+
+    mkdir -p $out/bin
+    for prog in $out/${ruby.gemPath}/gems/*/bin/*; do
+      makeWrapper $prog $out/bin/$(basename $prog) \
+        --prefix GEM_PATH : "$out/${ruby.gemPath}:$GEM_PATH" \
+        --prefix RUBYLIB : "${rubygems}/lib" \
+        $extraWrapperFlags ''${extraWrapperFlagsArray[@]}
+    done
+        #--prefix RUBYOPT rubygems \
+
+    # looks like useless files which break build repeatability and consume space
+    rm -fv $out/${ruby.gemPath}/doc/*/*/created.rid || true
+    rm -fv $out/${ruby.gemPath}/gems/*/ext/*/mkmf.log || true
+
+    mkdir -p $out/nix-support
+
+    cat > $out/nix-support/setup-hook <<EOF
+    if [[ "\$GEM_PATH" != *$out* ]]; then
       addToSearchPath GEM_PATH $out/${ruby.gemPath}
+    fi
+    EOF
+
+    runHook postInstall
+  '';
+
+  propagatedBuildInputs = gemPath;
+  propagatedUserEnvPkgs = gemPath;
+
+  passthru.isRubyGem = true;
+  inherit meta;
+})
 
-      for prog in $out/bin/*; do
-        wrapProgram "$prog" \
-          --prefix GEM_PATH : "$GEM_PATH" \
-          --prefix RUBYLIB : "${rubygems}/lib" \
-          --set RUBYOPT rubygems \
-          $extraWrapperFlags ''${extraWrapperFlagsArray[@]}
-      done
-
-      for prog in $out/gems/*/bin/*; do
-        [[ -e "$out/bin/$(basename $prog)" ]]
-      done
-
-      # looks like useless files which break build repeatability and consume space
-      rm $out/${ruby.gemPath}/doc/*/*/created.rid || true
-      rm $out/${ruby.gemPath}/gems/*/ext/*/mkmf.log || true
-
-      runHook postInstall
-    '';
-
-    propagatedUserEnvPkgs = requiredGems;
-
-    passthru.isRubyGem = true;
-
-  };
-  mb = stdenv.lib.maybeAttr;
-  patchedGem = a: stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults
-      ([ (gemDefaults a) ]
-      ++ (stdenv.lib.concatMap (p: [(mb a.basename {} p) (mb a.name {} p)] )
-      patches)))
-    [ "mergeAttrBy" ]);
-in
-aName: a@{ name, basename, requiredGems, sha256, meta }:
-  stdenv.lib.foldl (d: o: mb name (mb basename d o) o) (patchedGem a) overrides
+)
diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
deleted file mode 100644
index 85e66dc4faa..00000000000
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ /dev/null
@@ -1,2615 +0,0 @@
-# WARNING: automatically generated file
-# Generated by 'gem nix' command that comes from 'nix' gem
-g: # Get dependencies from patched gems
-{
-  aliases = {
-    ZenTest = g.ZenTest_4_11_0;
-    actionmailer = g.actionmailer_4_1_8;
-    actionpack = g.actionpack_4_1_8;
-    actionview = g.actionview_4_1_8;
-    activemodel = g.activemodel_4_1_8;
-    activerecord = g.activerecord_4_1_8;
-    activesupport = g.activesupport_4_1_8;
-    addressable = g.addressable_2_3_6;
-    arel = g.arel_5_0_1_20140414130214;
-    atoulme_Antwrap = g.atoulme_Antwrap_0_7_5;
-    autotest_rails = g.autotest_rails_4_2_1;
-    aws_sdk = g.aws_sdk_1_59_1;
-    aws_sdk_v1 = g.aws_sdk_v1_1_59_1;
-    backports = g.backports_3_6_4;
-    bitbucket_backup = g.bitbucket_backup_0_3_1;
-    blankslate = g.blankslate_2_1_2_4;
-    builder = g.builder_3_2_2;
-    buildr = g.buildr_1_4_21;
-    bundler = g.bundler_1_7_9;
-    celluloid = g.celluloid_0_16_0;
-    childprocess = g.childprocess_0_5_5;
-    chronic = g.chronic_0_10_2;
-    chunky_png = g.chunky_png_1_3_3;
-    classifier_reborn = g.classifier_reborn_2_0_2;
-    coderay = g.coderay_1_1_0;
-    coffee_script = g.coffee_script_2_3_0;
-    coffee_script_source = g.coffee_script_source_1_8_0;
-    colorator = g.colorator_0_1;
-    compass = g.compass_1_0_1;
-    compass_core = g.compass_core_1_0_1;
-    compass_import_once = g.compass_import_once_1_0_5;
-    cucumber = g.cucumber_1_3_17;
-    daemons = g.daemons_1_1_9;
-    diff_lcs = g.diff_lcs_1_2_5;
-    dimensions = g.dimensions_1_2_0;
-    domain_name = g.domain_name_0_5_22;
-    dotenv = g.dotenv_1_0_2;
-    em_resolv_replace = g.em_resolv_replace_1_1_3;
-    erubis = g.erubis_2_7_0;
-    ethon = g.ethon_0_7_1;
-    eventmachine = g.eventmachine_1_0_3;
-    eventmachine_tail = g.eventmachine_tail_0_6_4;
-    excon = g.excon_0_42_1;
-    execjs = g.execjs_2_2_2;
-    fakes3 = g.fakes3_0_1_6_1;
-    faraday = g.faraday_0_9_0;
-    faraday_middleware = g.faraday_middleware_0_9_1;
-    fast_stemmer = g.fast_stemmer_1_0_2;
-    ffi = g.ffi_1_9_6;
-    file_tail = g.file_tail_1_1_0;
-    foreman = g.foreman_0_76_0;
-    gettext = g.gettext_3_1_4;
-    gh = g.gh_0_13_2;
-    gherkin = g.gherkin_2_12_2;
-    heroku = g.heroku_3_20_0;
-    heroku_api = g.heroku_api_0_3_21;
-    highline = g.highline_1_6_21;
-    hike = g.hike_1_2_3;
-    hitimes = g.hitimes_1_2_2;
-    hoe = g.hoe_3_7_1;
-    http_cookie = g.http_cookie_1_0_2;
-    i18n = g.i18n_0_6_11;
-    iconv = g.iconv_1_0_4;
-    jekyll = g.jekyll_2_5_2;
-    jekyll_coffeescript = g.jekyll_coffeescript_1_0_1;
-    jekyll_gist = g.jekyll_gist_1_1_0;
-    jekyll_paginate = g.jekyll_paginate_1_1_0;
-    jekyll_sass_converter = g.jekyll_sass_converter_1_3_0;
-    jekyll_watch = g.jekyll_watch_1_2_0;
-    jsduck = g.jsduck_5_3_4;
-    json = g.json_1_8_1;
-    json_pure = g.json_pure_1_8_0;
-    kitchen_ansible = g.kitchen_ansible_0_0_4;
-    kitchen_vagrant = g.kitchen_vagrant_0_15_0;
-    kramdown = g.kramdown_1_5_0;
-    launchy = g.launchy_2_4_3;
-    liquid = g.liquid_2_6_1;
-    listen = g.listen_2_8_3;
-    locale = g.locale_2_1_0;
-    lockfile = g.lockfile_2_1_3;
-    macaddr = g.macaddr_1_7_1;
-    mail = g.mail_2_6_3;
-    mechanize = g.mechanize_2_7_3;
-    mercenary = g.mercenary_0_3_5;
-    method_source = g.method_source_0_8_2;
-    mime_types = g.mime_types_2_4_3;
-    mini_portile = g.mini_portile_0_6_1;
-    minitar = g.minitar_0_5_4;
-    minitest = g.minitest_5_5_0;
-    mixlib_shellout = g.mixlib_shellout_1_6_1;
-    multi_json = g.multi_json_1_10_1;
-    multi_test = g.multi_test_0_1_1;
-    multipart_post = g.multipart_post_2_0_0;
-    net_http_digest_auth = g.net_http_digest_auth_1_4;
-    net_http_persistent = g.net_http_persistent_2_9_4;
-    net_http_pipeline = g.net_http_pipeline_1_0_1;
-    net_scp = g.net_scp_1_2_1;
-    net_sftp = g.net_sftp_2_1_2;
-    net_ssh = g.net_ssh_2_9_1;
-    netrc = g.netrc_0_10_1;
-    newrelic_plugin = g.newrelic_plugin_1_3_1;
-    nix = g.nix_0_1_1;
-    nokogiri = g.nokogiri_1_6_5;
-    ntlm_http = g.ntlm_http_0_1_1;
-    orderedhash = g.orderedhash_0_0_6;
-    papertrail = g.papertrail_0_9_11;
-    papertrail_cli = g.papertrail_cli_0_9_3;
-    parallel = g.parallel_0_7_1;
-    parslet = g.parslet_1_5_0;
-    posix_spawn = g.posix_spawn_0_3_9;
-    pry = g.pry_0_9_12_6;
-    pusher_client = g.pusher_client_0_6_0;
-    pygments_rb = g.pygments_rb_0_6_0;
-    rabbitmq_manager = g.rabbitmq_manager_0_1_0;
-    rack = g.rack_1_5_2;
-    rack_protection = g.rack_protection_1_5_3;
-    rack_test = g.rack_test_0_6_2;
-    rails = g.rails_4_1_8;
-    railties = g.railties_4_1_8;
-    rake = g.rake_10_4_2;
-    rb_fsevent = g.rb_fsevent_0_9_4;
-    rb_inotify = g.rb_inotify_0_9_5;
-    rdiscount = g.rdiscount_2_1_7_1;
-    rdoc = g.rdoc_4_2_0;
-    redcarpet = g.redcarpet_3_2_2;
-    redis = g.redis_3_2_0;
-    remote_syslog = g.remote_syslog_1_6_14;
-    rest_client = g.rest_client_1_6_7;
-    riemann_dash = g.riemann_dash_0_2_9;
-    right_aws = g.right_aws_3_1_0;
-    right_http_connection = g.right_http_connection_1_5_0;
-    rjb = g.rjb_1_5_2;
-    rkelly_remix = g.rkelly_remix_0_0_6;
-    rmail = g.rmail_1_0_0;
-    rspec = g.rspec_2_14_1;
-    rspec_core = g.rspec_core_2_14_8;
-    rspec_expectations = g.rspec_expectations_2_14_5;
-    rspec_mocks = g.rspec_mocks_2_14_6;
-    rubyzip = g.rubyzip_1_1_6;
-    safe_yaml = g.safe_yaml_1_0_4;
-    sass = g.sass_3_4_9;
-    selenium_webdriver = g.selenium_webdriver_2_44_0;
-    servolux = g.servolux_0_10_0;
-    sinatra = g.sinatra_1_4_5;
-    slop = g.slop_3_6_0;
-    sprockets = g.sprockets_2_12_3;
-    sprockets_rails = g.sprockets_rails_2_2_2;
-    syslog_protocol = g.syslog_protocol_0_9_2;
-    systemu = g.systemu_2_6_4;
-    taskjuggler = g.taskjuggler_3_5_0;
-    term_ansicolor = g.term_ansicolor_1_3_0;
-    terminal_notifier = g.terminal_notifier_1_6_2;
-    test_kitchen = g.test_kitchen_1_2_1;
-    text = g.text_1_3_0;
-    thin = g.thin_1_6_3;
-    thor = g.thor_0_19_1;
-    thread_safe = g.thread_safe_0_3_4;
-    tilt = g.tilt_1_4_1;
-    timers = g.timers_4_0_1;
-    tins = g.tins_1_3_3;
-    tmuxinator = g.tmuxinator_0_6_9;
-    toml = g.toml_0_1_2;
-    travis = g.travis_1_7_4;
-    trollop = g.trollop_2_0;
-    typhoeus = g.typhoeus_0_6_9;
-    tzinfo = g.tzinfo_1_2_2;
-    uglifier = g.uglifier_2_6_0;
-    unf = g.unf_0_1_4;
-    unf_ext = g.unf_ext_0_0_6;
-    uuid = g.uuid_2_3_7;
-    webrick = g.webrick_1_3_1;
-    webrobots = g.webrobots_0_1_1;
-    websocket = g.websocket_1_2_1;
-    xapian_full = g.xapian_full_1_2_3;
-    xapian_ruby = g.xapian_ruby_1_2_17;
-    xml_simple = g.xml_simple_1_1_2;
-    yajl_ruby = g.yajl_ruby_1_2_1;
-  };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''kitchen-ansible'' ''kitchen-vagrant'' ''lockfile'' ''mechanize'' ''newrelic_plugin'' ''nix'' ''papertrail-cli'' ''rabbitmq_manager-0.1.0'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''redis'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''test-kitchen'' ''thin'' ''tmuxinator'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ];
-  gems = {
-    ZenTest_4_11_0 = {
-      basename = ''ZenTest'';
-      meta = {
-        description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
-        homepage = ''https://github.com/seattlerb/zentest'';
-        longDescription = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and
-multiruby.
-
-zentest scans your target and unit-test code and writes your missing
-code based on simple naming rules, enabling XP at a much quicker pace.
-zentest only works with Ruby and Minitest or Test::Unit. There is
-enough evidence to show that this is still proving useful to users, so
-it stays.
-
-unit_diff is a command-line filter to diff expected results from
-actual results and allow you to quickly see exactly what is wrong.
-Do note that minitest 2.2+ provides an enhanced assert_equal obviating
-the need for unit_diff
-
-autotest is a continous testing facility meant to be used during
-development. As soon as you save a file, autotest will run the
-corresponding dependent tests.
-
-multiruby runs anything you want on multiple versions of ruby. Great
-for compatibility checking! Use multiruby_setup to manage your
-installed versions.'';
-      };
-      name = ''ZenTest-4.11.0'';
-      requiredGems = [  ];
-      sha256 = ''0pm0kxrcbcg787jgd9z6cq0p0mg1v2m27n6sgs3pj0v219f526y8'';
-    };
-    actionmailer_4_1_8 = {
-      basename = ''actionmailer'';
-      meta = {
-        description = ''Email composition, delivery, and receiving framework (part of Rails).'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
-      };
-      name = ''actionmailer-4.1.8'';
-      requiredGems = [ g.actionpack_4_1_8 g.actionview_4_1_8 g.mail_2_6_3 ];
-      sha256 = ''1x2jd4vbymkvikdaribgi12mbhbxnfvy54bi4wcilh2a0222m46s'';
-    };
-    actionpack_4_1_8 = {
-      basename = ''actionpack'';
-      meta = {
-        description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
-      };
-      name = ''actionpack-4.1.8'';
-      requiredGems = [ g.activesupport_4_1_8 g.rack_1_5_2 g.rack_test_0_6_2 g.actionview_4_1_8 ];
-      sha256 = ''19q0z7rkc7mrqapikyi4qzcxkl8bzy8dxipqq19gskrk2aqyrbsg'';
-    };
-    actionview_4_1_8 = {
-      basename = ''actionview'';
-      meta = {
-        description = ''Rendering framework putting the V in MVC (part of Rails).'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''Simple, battle-tested conventions and helpers for building web pages.'';
-      };
-      name = ''actionview-4.1.8'';
-      requiredGems = [ g.activesupport_4_1_8 g.builder_3_2_2 g.erubis_2_7_0 ];
-      sha256 = ''1a870vq2r6q4rxand0nwvq52rwakp9l4p6a834i2rjz5rildmigk'';
-    };
-    activemodel_4_1_8 = {
-      basename = ''activemodel'';
-      meta = {
-        description = ''A toolkit for building modeling frameworks (part of Rails).'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, serialization, internationalization, and testing.'';
-      };
-      name = ''activemodel-4.1.8'';
-      requiredGems = [ g.activesupport_4_1_8 g.builder_3_2_2 ];
-      sha256 = ''1zvj66715rmfzf2zwwc8jyk4s21gggxvykvb6fqsny3hlhc1axq5'';
-    };
-    activerecord_4_1_8 = {
-      basename = ''activerecord'';
-      meta = {
-        description = ''Object-relational mapper framework (part of Rails).'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
-      };
-      name = ''activerecord-4.1.8'';
-      requiredGems = [ g.activesupport_4_1_8 g.activemodel_4_1_8 g.arel_5_0_1_20140414130214 ];
-      sha256 = ''0nmgyskdpp59jpq51bc5jnahxs30ik08qld57p1hmy0arh39yc2g'';
-    };
-    activesupport_4_1_8 = {
-      basename = ''activesupport'';
-      meta = {
-        description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
-      };
-      name = ''activesupport-4.1.8'';
-      requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_5_0 g.thread_safe_0_3_4 ];
-      sha256 = ''012w64jqmkkhcah4rzmcmmd53ihrxdn81nifi6dgrg8i40cxqb8r'';
-    };
-    addressable_2_3_6 = {
-      basename = ''addressable'';
-      meta = {
-        description = ''URI Implementation'';
-        homepage = ''http://addressable.rubyforge.org/'';
-        longDescription = ''Addressable is a replacement for the URI implementation that is part of
-Ruby's standard library. It more closely conforms to the relevant RFCs and
-adds support for IRIs and URI templates.
-'';
-      };
-      name = ''addressable-2.3.6'';
-      requiredGems = [  ];
-      sha256 = ''137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8'';
-    };
-    arel_5_0_1_20140414130214 = {
-      basename = ''arel'';
-      meta = {
-        description = ''Arel is a SQL AST manager for Ruby'';
-        homepage = ''http://github.com/rails/arel'';
-        longDescription = ''Arel is a SQL AST manager for Ruby. It
-
-1. Simplifies the generation of complex SQL queries
-2. Adapts to various RDBMSes
-
-It is intended to be a framework framework; that is, you can build your own ORM
-with it, focusing on innovative object and collection modeling as opposed to
-database compatibility and query generation.'';
-      };
-      name = ''arel-5.0.1.20140414130214'';
-      requiredGems = [  ];
-      sha256 = ''0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9'';
-    };
-    atoulme_Antwrap_0_7_5 = {
-      basename = ''atoulme_Antwrap'';
-      meta = {
-        description = ''A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.'';
-        homepage = ''http://rubyforge.org/projects/antwrap/'';
-        longDescription = ''	A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.
-
-== FEATURES/PROBLEMS:
-
-	Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, 
-	1.6.5 and 1.7.0. For more information, 	see the Project Info (http://rubyforge.org/projects/antwrap/) page. 
-	 
-== SYNOPSIS:
-
-	Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute 
-	Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to 
-	check out Buildr!'';
-      };
-      name = ''atoulme-Antwrap-0.7.5'';
-      requiredGems = [ g.rjb_1_5_2 ];
-      sha256 = ''05s3iw44lqa81f8nfy5f0xjj808600h82zb9bsh46b9kcq2w2kmz'';
-    };
-    autotest_rails_4_2_1 = {
-      basename = ''autotest_rails'';
-      meta = {
-        description = ''This is an autotest plugin to provide rails support'';
-        homepage = ''https://github.com/seattlerb/autotest-rails'';
-        longDescription = ''This is an autotest plugin to provide rails support. It provides basic
-rails support and extra plugins for migrations and fixtures.'';
-      };
-      name = ''autotest-rails-4.2.1'';
-      requiredGems = [ g.ZenTest_4_11_0 ];
-      sha256 = ''1v1dm9zlhdlrxvk90zs8d439ldar674ix41s7pncddgyswcfgg5l'';
-    };
-    aws_sdk_1_59_1 = {
-      basename = ''aws_sdk'';
-      meta = {
-        description = ''AWS SDK for Ruby V1'';
-        homepage = ''http://aws.amazon.com/sdkforruby'';
-        longDescription = ''Version 1 of the AWS SDK for Ruby. Available as both `aws-sdk` and `aws-sdk-v1`.
-Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same
-application.'';
-      };
-      name = ''aws-sdk-1.59.1'';
-      requiredGems = [ g.aws_sdk_v1_1_59_1 ];
-      sha256 = ''1g20jj507l98x8nijfy3dwzmagr201rv1wy949bnh1y3hzs83dh4'';
-    };
-    aws_sdk_v1_1_59_1 = {
-      basename = ''aws_sdk_v1'';
-      meta = {
-        description = ''AWS SDK for Ruby V1'';
-        homepage = ''http://aws.amazon.com/sdkforruby'';
-        longDescription = ''Version 1 of the AWS SDK for Ruby. Available as both `aws-sdk` and `aws-sdk-v1`.
-Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same
-application.'';
-      };
-      name = ''aws-sdk-v1-1.59.1'';
-      requiredGems = [ g.nokogiri_1_6_5 g.json_1_8_1 ];
-      sha256 = ''0wxmzxaly1jkp694wshkyh7rg9lf6ai1amn6mj9ib8azxw7mgcsg'';
-    };
-    backports_3_6_4 = {
-      basename = ''backports'';
-      meta = {
-        description = ''Backports of Ruby features for older Ruby.'';
-        homepage = ''http://github.com/marcandre/backports'';
-        longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.1.0 for earlier versions.'';
-      };
-      name = ''backports-3.6.4'';
-      requiredGems = [  ];
-      sha256 = ''0x2i84g14v5k63i1i2hwzpc2i8h1vkcjz7gr6gicdwsxbvnszwsc'';
-    };
-    bitbucket_backup_0_3_1 = {
-      basename = ''bitbucket_backup'';
-      meta = {
-        description = ''A tool to backup Bitbucket repos.'';
-        homepage = ''https://bitbucket.org/seth/bitbucket-backup'';
-        longDescription = ''A tool to backup Bitbucket repos.'';
-      };
-      name = ''bitbucket-backup-0.3.1'';
-      requiredGems = [ g.highline_1_6_21 g.json_1_8_1 ];
-      sha256 = ''17d2pfk0z3cxcx9m90avcp5wxhdbrq23zd665263m3hh9b5qi0fj'';
-    };
-    blankslate_2_1_2_4 = {
-      basename = ''blankslate'';
-      meta = {
-        description = ''BlankSlate extracted from Builder.'';
-        homepage = ''http://github.com/masover/blankslate'';
-      };
-      name = ''blankslate-2.1.2.4'';
-      requiredGems = [  ];
-      sha256 = ''0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx'';
-    };
-    builder_3_2_2 = {
-      basename = ''builder'';
-      meta = {
-        description = ''Builders for MarkUp.'';
-        homepage = ''http://onestepback.org'';
-        longDescription = ''Builder provides a number of builder objects that make creating structured data
-simple to do.  Currently the following builder objects are supported:
-
-* XML Markup
-* XML Events
-'';
-      };
-      name = ''builder-3.2.2'';
-      requiredGems = [  ];
-      sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2'';
-    };
-    buildr_1_4_21 = {
-      basename = ''buildr'';
-      meta = {
-        description = ''Build like you code'';
-        homepage = ''http://buildr.apache.org/'';
-        longDescription = ''Apache Buildr is a build system for Java-based applications, including support
-for Scala, Groovy and a growing number of JVM languages and tools.  We wanted
-something that's simple and intuitive to use, so we only need to tell it what
-to do, and it takes care of the rest.  But also something we can easily extend
-for those one-off tasks, with a language that's a joy to use.
-'';
-      };
-      name = ''buildr-1.4.21'';
-      requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_5_1 g.atoulme_Antwrap_0_7_5 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_9 g.orderedhash_0_0_6 ];
-      sha256 = ''0a7x5vckpy9f8fdvb1w4swl095g8pw1zim2a19f3bfz9g2nd37i2'';
-    };
-    bundler_1_7_9 = {
-      basename = ''bundler'';
-      meta = {
-        description = ''The best way to manage your application's dependencies'';
-        homepage = ''http://bundler.io'';
-        longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
-      };
-      name = ''bundler-1.7.9'';
-      requiredGems = [  ];
-      sha256 = ''1gd201rh17xykab9pbqp0dkxfm7b9jri02llyvmrc0c5bz2vhycm'';
-    };
-    celluloid_0_16_0 = {
-      basename = ''celluloid'';
-      meta = {
-        description = ''Actor-based concurrent object framework for Ruby'';
-        homepage = ''https://github.com/celluloid/celluloid'';
-        longDescription = ''Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects'';
-      };
-      name = ''celluloid-0.16.0'';
-      requiredGems = [ g.timers_4_0_1 ];
-      sha256 = ''044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3'';
-    };
-    childprocess_0_5_5 = {
-      basename = ''childprocess'';
-      meta = {
-        description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
-        homepage = ''http://github.com/jarib/childprocess'';
-        longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
-      };
-      name = ''childprocess-0.5.5'';
-      requiredGems = [ g.ffi_1_9_6 ];
-      sha256 = ''0cxzh17vjlmpqfcas4815x50dc1gzfwgbs51zzpd4chrl6ak4n4v'';
-    };
-    chronic_0_10_2 = {
-      basename = ''chronic'';
-      meta = {
-        description = ''Natural language date/time parsing.'';
-        homepage = ''http://github.com/mojombo/chronic'';
-        longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.'';
-      };
-      name = ''chronic-0.10.2'';
-      requiredGems = [  ];
-      sha256 = ''1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn'';
-    };
-    chunky_png_1_3_3 = {
-      basename = ''chunky_png'';
-      meta = {
-        description = ''Pure ruby library for read/write, chunk-level access to PNG files'';
-        homepage = ''http://wiki.github.com/wvanbergen/chunky_png'';
-        longDescription = ''    This pure Ruby library can read and write PNG images without depending on an external
-    image library, like RMagick. It tries to be memory efficient and reasonably fast.
-
-    It supports reading and writing all PNG variants that are defined in the specification,
-    with one limitation: only 8-bit color depth is supported. It supports all transparency,
-    interlacing and filtering options the PNG specifications allows. It can also read and
-    write textual metadata from PNG files. Low-level read/write access to PNG chunks is
-    also possible.
-
-    This library supports simple drawing on the image canvas and simple operations like
-    alpha composition and cropping. Finally, it can import from and export to RMagick for
-    interoperability.
-
-    Also, have a look at OilyPNG at http://github.com/wvanbergen/oily_png. OilyPNG is a
-    drop in mixin module that implements some of the ChunkyPNG algorithms in C, which
-    provides a massive speed boost to encoding and decoding.
-'';
-      };
-      name = ''chunky_png-1.3.3'';
-      requiredGems = [  ];
-      sha256 = ''1lc25p87ljn9r62wps32bq88d8i292kda9fs2m05x15zjm3r6y20'';
-    };
-    classifier_reborn_2_0_2 = {
-      basename = ''classifier_reborn'';
-      meta = {
-        description = ''A general classifier module to allow Bayesian and other types of classifications.'';
-        homepage = ''https://github.com/jekyll/classifier-reborn'';
-      };
-      name = ''classifier-reborn-2.0.2'';
-      requiredGems = [ g.fast_stemmer_1_0_2 ];
-      sha256 = ''0adp6hchmlhzjkai9z482cyfnbv4ywks4dlly5hhiaxrn1aybpzh'';
-    };
-    coderay_1_1_0 = {
-      basename = ''coderay'';
-      meta = {
-        description = ''Fast syntax highlighting for selected languages.'';
-        homepage = ''http://coderay.rubychan.de'';
-        longDescription = ''Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.'';
-      };
-      name = ''coderay-1.1.0'';
-      requiredGems = [  ];
-      sha256 = ''059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s'';
-    };
-    coffee_script_2_3_0 = {
-      basename = ''coffee_script'';
-      meta = {
-        description = ''Ruby CoffeeScript Compiler'';
-        homepage = ''http://github.com/josh/ruby-coffee-script'';
-        longDescription = ''    Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler.
-'';
-      };
-      name = ''coffee-script-2.3.0'';
-      requiredGems = [ g.coffee_script_source_1_8_0 g.execjs_2_2_2 ];
-      sha256 = ''0i0p52f2s7hk8sq3q9342and3whjnhjhc7ldg8zmnjjcm44asm3d'';
-    };
-    coffee_script_source_1_8_0 = {
-      basename = ''coffee_script_source'';
-      meta = {
-        description = ''The CoffeeScript Compiler'';
-        homepage = ''http://jashkenas.github.com/coffee-script/'';
-        longDescription = ''    CoffeeScript is a little language that compiles into JavaScript.
-    Underneath all of those embarrassing braces and semicolons,
-    JavaScript has always had a gorgeous object model at its heart.
-    CoffeeScript is an attempt to expose the good parts of JavaScript
-    in a simple way.
-'';
-      };
-      name = ''coffee-script-source-1.8.0'';
-      requiredGems = [  ];
-      sha256 = ''04998xd43z9kqs6kmzvng90s2xn3ybp8918rq7xz6ljhv8yjqm88'';
-    };
-    colorator_0_1 = {
-      basename = ''colorator'';
-      meta = {
-        description = ''String core extensions for terminal coloring.'';
-        homepage = ''https://github.com/octopress/colorator'';
-        longDescription = ''Colorize your text in the terminal.'';
-      };
-      name = ''colorator-0.1'';
-      requiredGems = [  ];
-      sha256 = ''09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs'';
-    };
-    compass_1_0_1 = {
-      basename = ''compass'';
-      meta = {
-        description = ''A Real Stylesheet Framework'';
-        homepage = ''http://compass-style.org'';
-        longDescription = ''Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintenance of CSS.'';
-      };
-      name = ''compass-1.0.1'';
-      requiredGems = [ g.sass_3_4_9 g.compass_core_1_0_1 g.compass_import_once_1_0_5 g.chunky_png_1_3_3 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ];
-      sha256 = ''0cxb6nbj37wz2zwwb4pkbvg9pg0ymamxx9v400h9ibvlb5n0ri40'';
-    };
-    compass_core_1_0_1 = {
-      basename = ''compass_core'';
-      meta = {
-        description = ''The Compass core stylesheet library'';
-        homepage = ''http://compass-style.org/reference/compass/'';
-        longDescription = ''The Compass core stylesheet library and minimum required ruby extensions. This library can be used stand-alone without the compass ruby configuration file or compass command line tools.'';
-      };
-      name = ''compass-core-1.0.1'';
-      requiredGems = [ g.sass_3_4_9 g.multi_json_1_10_1 ];
-      sha256 = ''0zhbmgjq6s9j2qdx3cz0v8s216mh8g0ymk4fzmq3c4an9rryl1zx'';
-    };
-    compass_import_once_1_0_5 = {
-      basename = ''compass_import_once'';
-      meta = {
-        description = ''Speed up your Sass compilation by making @import only import each file once.'';
-        homepage = ''https://github.com/chriseppstein/compass/tree/master/import-once'';
-        longDescription = ''Changes the behavior of Sass's @import directive to only import a file once.'';
-      };
-      name = ''compass-import-once-1.0.5'';
-      requiredGems = [ g.sass_3_4_9 ];
-      sha256 = ''0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq'';
-    };
-    cucumber_1_3_17 = {
-      basename = ''cucumber'';
-      meta = {
-        description = ''cucumber-1.3.17'';
-        homepage = ''http://cukes.info'';
-        longDescription = ''Behaviour Driven Development with elegance and joy'';
-      };
-      name = ''cucumber-1.3.17'';
-      requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_5 g.gherkin_2_12_2 g.multi_json_1_10_1 g.multi_test_0_1_1 ];
-      sha256 = ''1gjnxxrcf43mzs5qlg1m0b61g8vwfzjkj1wwi6xbpsqlhcwjjq1x'';
-    };
-    daemons_1_1_9 = {
-      basename = ''daemons'';
-      meta = {
-        description = ''A toolkit to create and control daemons in different ways'';
-        homepage = ''http://daemons.rubyforge.org'';
-        longDescription = ''Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server)  to be run as a daemon and to be controlled by simple start/stop/restart commands.  You can also call blocks as daemons and control them from the parent or just daemonize the current process.  Besides this basic functionality, daemons offers many advanced features like exception  backtracing and logging (in case your ruby script crashes) and monitoring and automatic restarting of your processes if they crash.'';
-      };
-      name = ''daemons-1.1.9'';
-      requiredGems = [  ];
-      sha256 = ''1j1m64pirsldhic6x6sg4lcrmp1bs1ihpd49xm8m1b2rc1c3irzy'';
-    };
-    diff_lcs_1_2_4 = {
-      basename = ''diff_lcs'';
-      meta = {
-        description = ''Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm'';
-        homepage = ''http://diff-lcs.rubyforge.org/'';
-        longDescription = ''Diff::LCS computes the difference between two Enumerable sequences using the
-McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
-to create a simple HTML diff output format and a standard diff-like tool.
-
-This is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did
-not properly prune common sequences at the beginning of a comparison set.
-Thanks to Paul Kunysch for fixing this issue.
-
-Coincident with the release of diff-lcs 1.2.3, we reported an issue with
-Rubinius in 1.9 mode
-({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]).
-We are happy to report that this issue has been resolved.'';
-      };
-      name = ''diff-lcs-1.2.4'';
-      requiredGems = [  ];
-      sha256 = ''09xbffjg639y8n43zp88ki0m489vv2c86znmfib2fg1di6svi1xd'';
-    };
-    diff_lcs_1_2_5 = {
-      basename = ''diff_lcs'';
-      meta = {
-        description = ''Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm'';
-        homepage = ''http://diff-lcs.rubyforge.org/'';
-        longDescription = ''Diff::LCS computes the difference between two Enumerable sequences using the
-McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
-to create a simple HTML diff output format and a standard diff-like tool.
-
-This is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did
-not properly prune common sequences at the beginning of a comparison set.
-Thanks to Paul Kunysch for fixing this issue.
-
-Coincident with the release of diff-lcs 1.2.3, we reported an issue with
-Rubinius in 1.9 mode
-({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]).
-We are happy to report that this issue has been resolved.'';
-      };
-      name = ''diff-lcs-1.2.5'';
-      requiredGems = [  ];
-      sha256 = ''1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1'';
-    };
-    dimensions_1_2_0 = {
-      basename = ''dimensions'';
-      meta = {
-        description = ''Pure Ruby dimension measurement for GIF, PNG, JPEG and TIFF images'';
-        homepage = ''https://github.com/sstephenson/dimensions'';
-        longDescription = ''A pure Ruby library for measuring the dimensions and rotation angles of GIF, PNG, JPEG and TIFF images.'';
-      };
-      name = ''dimensions-1.2.0'';
-      requiredGems = [  ];
-      sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0'';
-    };
-    domain_name_0_5_22 = {
-      basename = ''domain_name'';
-      meta = {
-        description = ''Domain Name manipulation library for Ruby'';
-        homepage = ''https://github.com/knu/ruby-domain_name'';
-        longDescription = ''This is a Domain Name manipulation library for Ruby.
-
-It can also be used for cookie domain validation based on the Public
-Suffix List.
-'';
-      };
-      name = ''domain_name-0.5.22'';
-      requiredGems = [ g.unf_0_1_4 ];
-      sha256 = ''0r3kj0hjibv5y7z3m46xdjrc19pkhnkhzr4xmvq9gypr2h7vz2yb'';
-    };
-    dotenv_1_0_2 = {
-      basename = ''dotenv'';
-      meta = {
-        description = ''Loads environment variables from `.env`.'';
-        homepage = ''https://github.com/bkeepers/dotenv'';
-        longDescription = ''Loads environment variables from `.env`.'';
-      };
-      name = ''dotenv-1.0.2'';
-      requiredGems = [  ];
-      sha256 = ''1g6sdv55842a7iv11wawrbfrx8x5k7gl598nl6my55jb2nbynkmw'';
-    };
-    em_resolv_replace_1_1_3 = {
-      basename = ''em_resolv_replace'';
-      meta = {
-        description = ''EventMachine-aware DNS lookup for Ruby'';
-        homepage = ''http://github.com/mperham/em-resolv-replace'';
-      };
-      name = ''em-resolv-replace-1.1.3'';
-      requiredGems = [  ];
-      sha256 = ''1w5y4rzmp51ni56v05qwgay5wrs2i6i3q92pvlcrghmhxhgsbqg7'';
-    };
-    erubis_2_7_0 = {
-      basename = ''erubis'';
-      meta = {
-        description = ''a fast and extensible eRuby implementation which supports multi-language'';
-        homepage = ''http://www.kuwata-lab.com/erubis/'';
-        longDescription = ''  Erubis is an implementation of eRuby and has the following features:
-
-  * Very fast, almost three times faster than ERB and about 10% faster than eruby.
-  * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript)
-  * Auto escaping support
-  * Auto trimming spaces around '&lt;% %&gt;'
-  * Embedded pattern changeable (default '&lt;% %&gt;')
-  * Enable to handle Processing Instructions (PI) as embedded pattern (ex. '&lt;?rb ... ?&gt;')
-  * Context object available and easy to combine eRuby template with YAML datafile
-  * Print statement available
-  * Easy to extend and customize in subclass
-  * Ruby on Rails support
-'';
-      };
-      name = ''erubis-2.7.0'';
-      requiredGems = [  ];
-      sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
-    };
-    ethon_0_7_1 = {
-      basename = ''ethon'';
-      meta = {
-        description = ''Libcurl wrapper.'';
-        homepage = ''https://github.com/typhoeus/ethon'';
-        longDescription = ''Very lightweight libcurl wrapper.'';
-      };
-      name = ''ethon-0.7.1'';
-      requiredGems = [ g.ffi_1_9_6 ];
-      sha256 = ''0b762cmnj20fjlrlzk5vsndzv4ac3ybdi4vikx5c11abl7x5wbg6'';
-    };
-    eventmachine_1_0_3 = {
-      basename = ''eventmachine'';
-      meta = {
-        description = ''Ruby/EventMachine library'';
-        homepage = ''http://rubyeventmachine.com'';
-        longDescription = ''EventMachine implements a fast, single-threaded engine for arbitrary network
-communications. It's extremely easy to use in Ruby. EventMachine wraps all
-interactions with IP sockets, allowing programs to concentrate on the
-implementation of network protocols. It can be used to create both network
-servers and clients. To create a server or client, a Ruby program only needs
-to specify the IP address and port, and provide a Module that implements the
-communications protocol. Implementations of several standard network protocols
-are provided with the package, primarily to serve as examples. The real goal
-of EventMachine is to enable programs to easily interface with other programs
-using TCP/IP, especially if custom protocols are required.'';
-      };
-      name = ''eventmachine-1.0.3'';
-      requiredGems = [  ];
-      sha256 = ''09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil'';
-    };
-    eventmachine_tail_0_6_4 = {
-      basename = ''eventmachine_tail'';
-      meta = {
-        description = ''eventmachine tail - a file tail implementation with glob support'';
-        homepage = ''http://code.google.com/p/semicomplete/wiki/EventMachineTail'';
-        longDescription = ''Add file 'tail' implemented with EventMachine. Also includes a 'glob watch' class for watching a directory pattern for new matches, like /var/log/*.log'';
-      };
-      name = ''eventmachine-tail-0.6.4'';
-      requiredGems = [ g.eventmachine_1_0_3 ];
-      sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
-    };
-    excon_0_42_1 = {
-      basename = ''excon'';
-      meta = {
-        description = ''speed, persistence, http(s)'';
-        homepage = ''https://github.com/excon/excon'';
-        longDescription = ''EXtended http(s) CONnections'';
-      };
-      name = ''excon-0.42.1'';
-      requiredGems = [  ];
-      sha256 = ''1za1jmp83149qmykih2bfgxlwyyz3hrpaq4kxww7467fvgwh58xj'';
-    };
-    execjs_2_2_2 = {
-      basename = ''execjs'';
-      meta = {
-        description = ''Run JavaScript code from Ruby'';
-        homepage = ''https://github.com/sstephenson/execjs'';
-        longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
-      };
-      name = ''execjs-2.2.2'';
-      requiredGems = [  ];
-      sha256 = ''05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f'';
-    };
-    fakes3_0_1_6_1 = {
-      basename = ''fakes3'';
-      meta = {
-        description = ''FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects'';
-        homepage = ''https://github.com/jubos/fake-s3'';
-        longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
-      };
-      name = ''fakes3-0.1.6.1'';
-      requiredGems = [ g.thor_0_19_1 g.builder_3_2_2 ];
-      sha256 = ''1s2w06lgwlhsr3q7b58qnjdqqi6x3ksl3hjqq54d57gb0y65s0p3'';
-    };
-    faraday_0_9_0 = {
-      basename = ''faraday'';
-      meta = {
-        description = ''HTTP/REST API client library.'';
-        homepage = ''https://github.com/lostisland/faraday'';
-      };
-      name = ''faraday-0.9.0'';
-      requiredGems = [ g.multipart_post_2_0_0 ];
-      sha256 = ''13wi8y7j6mp0mszps50gqr0fyddiz45wqkvpnnrv797gklr9sh46'';
-    };
-    faraday_middleware_0_9_1 = {
-      basename = ''faraday_middleware'';
-      meta = {
-        description = ''Various middleware for Faraday'';
-        homepage = ''https://github.com/lostisland/faraday_middleware'';
-        longDescription = ''Various middleware for Faraday'';
-      };
-      name = ''faraday_middleware-0.9.1'';
-      requiredGems = [ g.faraday_0_9_0 ];
-      sha256 = ''1kndkrww1biz9j64fnyaqgis1gdiawxfv0ncadsz06gd555fgs6q'';
-    };
-    fast_stemmer_1_0_2 = {
-      basename = ''fast_stemmer'';
-      meta = {
-        description = ''Fast Porter stemmer based on a C version of algorithm'';
-        homepage = ''http://github.com/romanbsd/fast-stemmer'';
-        longDescription = ''Fast Porter stemmer based on a C version of algorithm'';
-      };
-      name = ''fast-stemmer-1.0.2'';
-      requiredGems = [  ];
-      sha256 = ''0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh'';
-    };
-    ffi_1_9_6 = {
-      basename = ''ffi'';
-      meta = {
-        description = ''Ruby FFI'';
-        homepage = ''http://wiki.github.com/ffi/ffi'';
-        longDescription = ''Ruby FFI library'';
-      };
-      name = ''ffi-1.9.6'';
-      requiredGems = [  ];
-      sha256 = ''1ckw1336rnyv9yvvl614qgkqqi477g4hljv6xsws2vz14ynlvzhj'';
-    };
-    file_tail_1_1_0 = {
-      basename = ''file_tail'';
-      meta = {
-        description = ''File::Tail for Ruby'';
-        homepage = ''http://github.com/flori/file-tail'';
-        longDescription = ''Library to tail files in Ruby'';
-      };
-      name = ''file-tail-1.1.0'';
-      requiredGems = [ g.tins_1_3_3 ];
-      sha256 = ''0idypaigk7l8kzhhnjfhz84mrvqd905njyycgqdq6v23jgif9n64'';
-    };
-    foreman_0_76_0 = {
-      basename = ''foreman'';
-      meta = {
-        description = ''Process manager for applications with multiple components'';
-        homepage = ''http://github.com/ddollar/foreman'';
-        longDescription = ''Process manager for applications with multiple components'';
-      };
-      name = ''foreman-0.76.0'';
-      requiredGems = [ g.thor_0_19_1 g.dotenv_1_0_2 ];
-      sha256 = ''1akr7gjnzbjpp71gf4hw6hd7hrl9fnm9ggazkkvnz84l9l36cgm2'';
-    };
-    gettext_3_1_4 = {
-      basename = ''gettext'';
-      meta = {
-        description = ''Gettext is a pure Ruby libary and tools to localize messages.'';
-        homepage = ''http://ruby-gettext.github.com/'';
-        longDescription = ''Gettext is a GNU gettext-like program for Ruby.
-The catalog file(po-file) is same format with GNU gettext.
-So you can use GNU gettext tools for maintaining.
-'';
-      };
-      name = ''gettext-3.1.4'';
-      requiredGems = [ g.locale_2_1_0 g.text_1_3_0 ];
-      sha256 = ''0gfnbkj2knpq8jxplkdr18by64kcadqxjhrxr3ncldz2ghm5zhvb'';
-    };
-    gh_0_13_2 = {
-      basename = ''gh'';
-      meta = {
-        description = ''layered github client'';
-        homepage = ''http://gh.rkh.im/'';
-        longDescription = ''multi-layer client for the github api v3'';
-      };
-      name = ''gh-0.13.2'';
-      requiredGems = [ g.faraday_0_9_0 g.backports_3_6_4 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ];
-      sha256 = ''17scqa35j6ghpykzk986gnd6dvbrh8nn60ib04hb2gbyh9dns1dj'';
-    };
-    gherkin_2_12_2 = {
-      basename = ''gherkin'';
-      meta = {
-        description = ''gherkin-2.12.2'';
-        homepage = ''http://github.com/cucumber/gherkin'';
-        longDescription = ''A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.'';
-      };
-      name = ''gherkin-2.12.2'';
-      requiredGems = [ g.multi_json_1_10_1 ];
-      sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25'';
-    };
-    heroku_3_20_0 = {
-      basename = ''heroku'';
-      meta = {
-        description = ''Client library and CLI to deploy apps on Heroku.'';
-        homepage = ''http://heroku.com/'';
-        longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.'';
-      };
-      name = ''heroku-3.20.0'';
-      requiredGems = [ g.heroku_api_0_3_21 g.launchy_2_4_3 g.netrc_0_10_1 g.rest_client_1_6_7 g.rubyzip_0_9_9 g.multi_json_1_10_1 ];
-      sha256 = ''0iw3x413sbc5a5f2r3aicdprghw3vnmj5lrbd9gdh9pm4v7saf8b'';
-    };
-    heroku_api_0_3_21 = {
-      basename = ''heroku_api'';
-      meta = {
-        description = ''Ruby Client for the Heroku API'';
-        homepage = ''http://github.com/heroku/heroku.rb'';
-        longDescription = ''Ruby Client for the Heroku API'';
-      };
-      name = ''heroku-api-0.3.21'';
-      requiredGems = [ g.excon_0_42_1 g.multi_json_1_10_1 ];
-      sha256 = ''0f41zzx4sshpba5p013hmjmk7lxkk5dfasb292zvx1cfi4l60lwd'';
-    };
-    highline_1_6_21 = {
-      basename = ''highline'';
-      meta = {
-        description = ''HighLine is a high-level command-line IO library.'';
-        homepage = ''http://highline.rubyforge.org'';
-        longDescription = ''A high-level IO library that provides validation, type conversion, and more for
-command-line interfaces. HighLine also includes a complete menu system that can
-crank out anything from simple list selection to complete shells with just
-minutes of work.
-'';
-      };
-      name = ''highline-1.6.21'';
-      requiredGems = [  ];
-      sha256 = ''06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1'';
-    };
-    hike_1_2_3 = {
-      basename = ''hike'';
-      meta = {
-        description = ''Find files in a set of paths'';
-        homepage = ''http://github.com/sstephenson/hike'';
-        longDescription = ''A Ruby library for finding files in a set of paths.'';
-      };
-      name = ''hike-1.2.3'';
-      requiredGems = [  ];
-      sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm'';
-    };
-    hitimes_1_2_2 = {
-      basename = ''hitimes'';
-      meta = {
-        description = ''Hitimes is a fast, high resolution timer library for recording performance metrics.  It uses the appropriate low method calls for each system to get the highest granularity time increments possible.'';
-        homepage = ''http://github.com/copiousfreetime/hitimes'';
-        longDescription = ''Hitimes is a fast, high resolution timer library for recording performance metrics.  It uses the appropriate low method calls for each system to get the highest granularity time increments possible.   It currently supports any of the following systems: * any system with the POSIX call `clock_gettime()` * Mac OS X * Windows * JRuby Using Hitimes can be faster than using a series of `Time.new` calls, and it will have a much higher granularity. It is definitely faster than using `Process.times`.'';
-      };
-      name = ''hitimes-1.2.2'';
-      requiredGems = [  ];
-      sha256 = ''17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4'';
-    };
-    hoe_3_7_1 = {
-      basename = ''hoe'';
-      meta = {
-        description = ''Hoe is a rake/rubygems helper for project Rakefiles'';
-        homepage = ''http://www.zenspider.com/projects/hoe.html'';
-        longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps you
-manage, maintain, and release your project and includes a dynamic
-plug-in system allowing for easy extensibility. Hoe ships with
-plug-ins for all your usual project tasks including rdoc generation,
-testing, packaging, deployment, and announcement..
-
-See class rdoc for help. Hint: `ri Hoe` or any of the plugins listed
-below.
-
-For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
-      };
-      name = ''hoe-3.7.1'';
-      requiredGems = [ g.rake_10_4_2 ];
-      sha256 = ''0lyrdbzxj4isxzyfp93w0q1g9sqw6grkjp91xirzlw1z1714qsw3'';
-    };
-    http_cookie_1_0_2 = {
-      basename = ''http_cookie'';
-      meta = {
-        description = ''A Ruby library to handle HTTP Cookies based on RFC 6265'';
-        homepage = ''https://github.com/sparklemotion/http-cookie'';
-        longDescription = ''HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265.  It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers.  It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.'';
-      };
-      name = ''http-cookie-1.0.2'';
-      requiredGems = [ g.domain_name_0_5_22 ];
-      sha256 = ''0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw'';
-    };
-    i18n_0_6_11 = {
-      basename = ''i18n'';
-      meta = {
-        description = ''New wave Internationalization support for Ruby'';
-        homepage = ''http://github.com/svenfuchs/i18n'';
-        longDescription = ''New wave Internationalization support for Ruby.'';
-      };
-      name = ''i18n-0.6.11'';
-      requiredGems = [  ];
-      sha256 = ''0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk'';
-    };
-    iconv_1_0_4 = {
-      basename = ''iconv'';
-      meta = {
-        description = ''iconv wrapper library'';
-        homepage = ''https://github.com/nurse/iconv'';
-        longDescription = ''iconv wrapper library'';
-      };
-      name = ''iconv-1.0.4'';
-      requiredGems = [  ];
-      sha256 = ''16sgj6gqs4bgwv6q4vv811fb43908psr33dz7sphn1z8la3y7m2v'';
-    };
-    jekyll_2_5_2 = {
-      basename = ''jekyll'';
-      meta = {
-        description = ''A simple, blog aware, static site generator.'';
-        homepage = ''https://github.com/jekyll/jekyll'';
-        longDescription = ''Jekyll is a simple, blog aware, static site generator.'';
-      };
-      name = ''jekyll-2.5.2'';
-      requiredGems = [ g.liquid_2_6_1 g.kramdown_1_5_0 g.mercenary_0_3_5 g.safe_yaml_1_0_4 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_2_2 g.toml_0_1_2 g.jekyll_paginate_1_1_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_3_0 g.jekyll_watch_1_2_0 g.classifier_reborn_2_0_2 ];
-      sha256 = ''03ka7jcfk5byvphy5ks35w75i78ahshrrgm3zbnsxj8xvbxg9bgi'';
-    };
-    jekyll_coffeescript_1_0_1 = {
-      basename = ''jekyll_coffeescript'';
-      meta = {
-        description = ''A CoffeeScript converter for Jekyll.'';
-        homepage = ''https://github.com/jekyll/jekyll-coffeescript'';
-      };
-      name = ''jekyll-coffeescript-1.0.1'';
-      requiredGems = [ g.coffee_script_2_3_0 ];
-      sha256 = ''19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg'';
-    };
-    jekyll_gist_1_1_0 = {
-      basename = ''jekyll_gist'';
-      meta = {
-        description = ''Liquid tag for displaying GitHub Gists in Jekyll sites.'';
-        homepage = ''https://github.com/jekyll/jekyll-gist'';
-      };
-      name = ''jekyll-gist-1.1.0'';
-      requiredGems = [  ];
-      sha256 = ''06d4jwf64fl7x3dqfimnfqzr4d3wbsdz2l4fif35j91mmh37nmq9'';
-    };
-    jekyll_paginate_1_1_0 = {
-      basename = ''jekyll_paginate'';
-      meta = {
-        description = ''Built-in Pagination Generator for Jekyll'';
-        homepage = ''https://github.com/jekyll/jekyll-paginate'';
-      };
-      name = ''jekyll-paginate-1.1.0'';
-      requiredGems = [  ];
-      sha256 = ''0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8'';
-    };
-    jekyll_sass_converter_1_3_0 = {
-      basename = ''jekyll_sass_converter'';
-      meta = {
-        description = ''A basic Sass converter for Jekyll.'';
-        homepage = ''https://github.com/jekyll/jekyll-sass-converter'';
-      };
-      name = ''jekyll-sass-converter-1.3.0'';
-      requiredGems = [ g.sass_3_4_9 ];
-      sha256 = ''1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1'';
-    };
-    jekyll_watch_1_2_0 = {
-      basename = ''jekyll_watch'';
-      meta = {
-        description = ''Rebuild your Jekyll site when a file changes with the `--watch` switch.'';
-        homepage = ''https://github.com/jekyll/jekyll-watch'';
-      };
-      name = ''jekyll-watch-1.2.0'';
-      requiredGems = [ g.listen_2_8_3 ];
-      sha256 = ''0ivw66jww4wlw067pspapgd8ibw781xfwdi6r5mzswjz4nvyf056'';
-    };
-    jsduck_5_3_4 = {
-      basename = ''jsduck'';
-      meta = {
-        description = ''Simple JavaScript Duckumentation generator'';
-        homepage = ''https://github.com/senchalabs/jsduck'';
-        longDescription = ''Documentation generator for Sencha JS frameworks'';
-      };
-      name = ''jsduck-5.3.4'';
-      requiredGems = [ g.rdiscount_2_1_7_1 g.json_1_8_1 g.parallel_0_7_1 g.rkelly_remix_0_0_6 g.dimensions_1_2_0 ];
-      sha256 = ''0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr'';
-    };
-    json_1_8_1 = {
-      basename = ''json'';
-      meta = {
-        description = ''JSON Implementation for Ruby'';
-        homepage = ''http://flori.github.com/json'';
-        longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
-      };
-      name = ''json-1.8.1'';
-      requiredGems = [  ];
-      sha256 = ''0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn'';
-    };
-    json_pure_1_8_0 = {
-      basename = ''json_pure'';
-      meta = {
-        description = ''JSON Implementation for Ruby'';
-        homepage = ''http://flori.github.com/json'';
-        longDescription = ''This is a JSON implementation in pure Ruby.'';
-      };
-      name = ''json_pure-1.8.0'';
-      requiredGems = [  ];
-      sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
-    };
-    kitchen_ansible_0_0_4 = {
-      basename = ''kitchen_ansible'';
-      meta = {
-        description = ''ansible provisioner for test-kitchen'';
-        homepage = ''https://github.com/neillturner/kitchen-ansible'';
-        longDescription = ''== DESCRIPTION:
-
-Ansible Provisioner for Test Kitchen
-
-== FEATURES:
-
-Supports running ansible-playbook
-
-'';
-      };
-      name = ''kitchen-ansible-0.0.4'';
-      requiredGems = [  ];
-      sha256 = ''0wwp7yq2n1jjisy00yiahzpxjdjvk40ry0m9a1rzd56fr9yvck2y'';
-    };
-    kitchen_vagrant_0_15_0 = {
-      basename = ''kitchen_vagrant'';
-      meta = {
-        description = ''Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.'';
-        homepage = ''https://github.com/test-kitchen/kitchen-vagrant/'';
-        longDescription = ''Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.'';
-      };
-      name = ''kitchen-vagrant-0.15.0'';
-      requiredGems = [ g.test_kitchen_1_2_1 ];
-      sha256 = ''1blf6qr0j9ab9ajrkb9fx67wnns3hgi9gda2l83hd3zfrjp6vc9w'';
-    };
-    kramdown_1_5_0 = {
-      basename = ''kramdown'';
-      meta = {
-        description = ''kramdown is a fast, pure-Ruby Markdown-superset converter.'';
-        homepage = ''http://kramdown.gettalong.org'';
-        longDescription = ''kramdown is yet-another-markdown-parser but fast, pure Ruby,
-using a strict syntax definition and supporting several common extensions.
-'';
-      };
-      name = ''kramdown-1.5.0'';
-      requiredGems = [  ];
-      sha256 = ''1max2dyap3lwi6ssaqi5gbzpmb0nlx1qy47bwc1bpls3y18hd6hm'';
-    };
-    launchy_2_4_3 = {
-      basename = ''launchy'';
-      meta = {
-        description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.'';
-        homepage = ''http://github.com/copiousfreetime/launchy'';
-        longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.'';
-      };
-      name = ''launchy-2.4.3'';
-      requiredGems = [ g.addressable_2_3_6 ];
-      sha256 = ''190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2'';
-    };
-    liquid_2_6_1 = {
-      basename = ''liquid'';
-      meta = {
-        description = ''A secure, non-evaling end user template engine with aesthetic markup.'';
-        homepage = ''http://www.liquidmarkup.org'';
-      };
-      name = ''liquid-2.6.1'';
-      requiredGems = [  ];
-      sha256 = ''0fc67cx36x05hsw0cc56la4qr3939g34cdgqmqgdi8yzs72cbv7x'';
-    };
-    listen_2_8_3 = {
-      basename = ''listen'';
-      meta = {
-        description = ''Listen to file modifications'';
-        homepage = ''https://github.com/guard/listen'';
-        longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!'';
-      };
-      name = ''listen-2.8.3'';
-      requiredGems = [ g.celluloid_0_16_0 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ];
-      sha256 = ''1cvnr8p6kq7z63a32lwcx24ama6rsyh501pzmlpd2gvi891jxbgw'';
-    };
-    locale_2_1_0 = {
-      basename = ''locale'';
-      meta = {
-        description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.'';
-        homepage = ''https://github.com/ruby-gettext/locale'';
-        longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.
-'';
-      };
-      name = ''locale-2.1.0'';
-      requiredGems = [  ];
-      sha256 = ''18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj'';
-    };
-    lockfile_2_1_3 = {
-      basename = ''lockfile'';
-      meta = {
-        description = ''lockfile'';
-        homepage = ''https://github.com/ahoward/lockfile'';
-        longDescription = ''a ruby library for creating perfect and NFS safe lockfiles'';
-      };
-      name = ''lockfile-2.1.3'';
-      requiredGems = [  ];
-      sha256 = ''0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr'';
-    };
-    macaddr_1_7_1 = {
-      basename = ''macaddr'';
-      meta = {
-        description = ''macaddr'';
-        homepage = ''https://github.com/ahoward/macaddr'';
-        longDescription = ''cross platform mac address determination for ruby'';
-      };
-      name = ''macaddr-1.7.1'';
-      requiredGems = [ g.systemu_2_6_4 ];
-      sha256 = ''1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b'';
-    };
-    mail_2_6_3 = {
-      basename = ''mail'';
-      meta = {
-        description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
-        homepage = ''https://github.com/mikel/mail'';
-        longDescription = ''A really Ruby Mail handler.'';
-      };
-      name = ''mail-2.6.3'';
-      requiredGems = [ g.mime_types_2_4_3 ];
-      sha256 = ''1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp'';
-    };
-    mechanize_2_7_3 = {
-      basename = ''mechanize'';
-      meta = {
-        description = ''The Mechanize library is used for automating interaction with websites'';
-        homepage = ''http://mechanize.rubyforge.org'';
-        longDescription = ''The Mechanize library is used for automating interaction with websites.
-Mechanize automatically stores and sends cookies, follows redirects,
-and can follow links and submit forms.  Form fields can be populated and
-submitted.  Mechanize also keeps track of the sites that you have visited as
-a history.'';
-      };
-      name = ''mechanize-2.7.3'';
-      requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9_4 g.mime_types_2_4_3 g.http_cookie_1_0_2 g.nokogiri_1_6_5 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_22 ];
-      sha256 = ''00jkazj8fqnynaxca0lnwx5a084irxrnw8n8i0kppq4vg71g7rrx'';
-    };
-    mercenary_0_3_5 = {
-      basename = ''mercenary'';
-      meta = {
-        description = ''Lightweight and flexible library for writing command-line apps in Ruby.'';
-        homepage = ''https://github.com/jekyll/mercenary'';
-        longDescription = ''Lightweight and flexible library for writing command-line apps in Ruby.'';
-      };
-      name = ''mercenary-0.3.5'';
-      requiredGems = [  ];
-      sha256 = ''0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb'';
-    };
-    method_source_0_8_2 = {
-      basename = ''method_source'';
-      meta = {
-        description = ''retrieve the sourcecode for a method'';
-        homepage = ''http://banisterfiend.wordpress.com'';
-        longDescription = ''retrieve the sourcecode for a method'';
-      };
-      name = ''method_source-0.8.2'';
-      requiredGems = [  ];
-      sha256 = ''1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2'';
-    };
-    mime_types_2_4_3 = {
-      basename = ''mime_types'';
-      meta = {
-        description = ''The mime-types library provides a library and registry for information about MIME content type definitions'';
-        homepage = ''https://github.com/halostatue/mime-types/'';
-        longDescription = ''The mime-types library provides a library and registry for information about
-MIME content type definitions. It can be used to determine defined filename
-extensions for MIME types, or to use filename extensions to look up the likely
-MIME type definitions.
-
-MIME content types are used in MIME-compliant communications, as in e-mail or
-HTTP traffic, to indicate the type of content which is transmitted. The
-mime-types library provides the ability for detailed information about MIME
-entities (provided as an enumerable collection of MIME::Type objects) to be
-determined and used programmatically. There are many types defined by RFCs and
-vendors, so the list is long but by definition incomplete; don't hesitate to to
-add additional type definitions (see Contributing.rdoc). The primary sources
-for MIME type definitions found in mime-types is the IANA collection of
-registrations (see below for the link), RFCs, and W3C recommendations.
-
-This is release 2.4.3, restoring full compatibility with Ruby 1.9.2 (which will
-be dropped in mime-types 3.0). It also includes the performance improvements
-from mime-types 2.4.2 (since yanked because of the broken Ruby 1.9.2 support)
-and the 2.4.1 fix of a bug in observed use of the mime-types library where
-extensions were not previously sorted, such that
-
-    MIME::Types.of('image.jpg').first.extensions.first
-
-returned a value of +jpeg+ in mime-types 1, but +jpe+ in mime-types 2. This was
-introduced because extensions were sorted during assignment
-(MIME::Type#extensions=). This behaviour has been reverted to protect clients
-that work as noted above. The preferred way to express this is the new method:
-
-    MIME::Type.of('image.jpg').first.preferred_extension
-
-Łukasz Śliwa created the
-{friendly_mime}[https://github.com/lukaszsliwa/friendly_mime] gem, which offers
-friendly descriptive names for MIME types. This functionality and
-English-language data has been added to mime-types as MIME::Type#friendly. To
-make it easy for internationalization, MIME::Type#i18n_key has been added,
-which will return a key suitable for use with the
-{I18n}[https://github.com/svenfuchs/i18n] library.
-
-As a reminder, mime-types 2.x is no longer compatible with Ruby 1.8 and
-mime-types 1.x is only being maintained for security issues. No new MIME types
-or features will be added.
-
-mime-types (previously called MIME::Types for Ruby) was originally based on
-MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to
-conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA Media
-Types registry}[https://www.iana.org/assignments/media-types/media-types.xhtml]
-with some types added by the users of mime-types.'';
-      };
-      name = ''mime-types-2.4.3'';
-      requiredGems = [  ];
-      sha256 = ''16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq'';
-    };
-    mini_portile_0_6_1 = {
-      basename = ''mini_portile'';
-      meta = {
-        description = ''Simplistic port-like solution for developers'';
-        homepage = ''http://github.com/luislavena/mini_portile'';
-        longDescription = ''Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.'';
-      };
-      name = ''mini_portile-0.6.1'';
-      requiredGems = [  ];
-      sha256 = ''07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l'';
-    };
-    minitar_0_5_4 = {
-      basename = ''minitar'';
-      meta = {
-        description = ''Provides POSIX tarchive management from Ruby programs.'';
-        homepage = ''http://www.github.com/atoulme/minitar'';
-        longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects. Antoine Toulme forked the original project on rubyforge to place it on github, under http://www.github.com/atoulme/minitar'';
-      };
-      name = ''minitar-0.5.4'';
-      requiredGems = [  ];
-      sha256 = ''1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka'';
-    };
-    minitest_5_5_0 = {
-      basename = ''minitest'';
-      meta = {
-        description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking'';
-        homepage = ''https://github.com/seattlerb/minitest'';
-        longDescription = ''minitest provides a complete suite of testing facilities supporting
-TDD, BDD, mocking, and benchmarking.
-
-    "I had a class with Jim Weirich on testing last week and we were
-     allowed to choose our testing frameworks. Kirk Haines and I were
-     paired up and we cracked open the code for a few test
-     frameworks...
-
-     I MUST say that minitest is *very* readable / understandable
-     compared to the 'other two' options we looked at. Nicely done and
-     thank you for helping us keep our mental sanity."
-
-    -- Wayne E. Seguin
-
-minitest/unit is a small and incredibly fast unit testing framework.
-It provides a rich set of assertions to make your tests clean and
-readable.
-
-minitest/spec is a functionally complete spec engine. It hooks onto
-minitest/unit and seamlessly bridges test assertions over to spec
-expectations.
-
-minitest/benchmark is an awesome way to assert the performance of your
-algorithms in a repeatable manner. Now you can assert that your newb
-co-worker doesn't replace your linear algorithm with an exponential
-one!
-
-minitest/mock by Steven Baker, is a beautifully tiny mock (and stub)
-object framework.
-
-minitest/pride shows pride in testing and adds coloring to your test
-output. I guess it is an example of how to write IO pipes too. :P
-
-minitest/unit is meant to have a clean implementation for language
-implementors that need a minimal set of methods to bootstrap a working
-test suite. For example, there is no magic involved for test-case
-discovery.
-
-    "Again, I can't praise enough the idea of a testing/specing
-     framework that I can actually read in full in one sitting!"
-
-    -- Piotr Szotkowski
-
-Comparing to rspec:
-
-    rspec is a testing DSL. minitest is ruby.
-
-    -- Adam Hawkins, "Bow Before MiniTest"
-
-minitest doesn't reinvent anything that ruby already provides, like:
-classes, modules, inheritance, methods. This means you only have to
-learn ruby to use minitest and all of your regular OO practices like
-extract-method refactorings still apply.'';
-      };
-      name = ''minitest-5.5.0'';
-      requiredGems = [  ];
-      sha256 = ''1kzq25l8fh2ngshlwy7k535ncb15n2piqmha86272frh71vw0xq2'';
-    };
-    mixlib_shellout_1_6_1 = {
-      basename = ''mixlib_shellout'';
-      meta = {
-        description = ''Run external commands on Unix or Windows'';
-        homepage = ''http://wiki.opscode.com/'';
-        longDescription = ''Run external commands on Unix or Windows'';
-      };
-      name = ''mixlib-shellout-1.6.1'';
-      requiredGems = [  ];
-      sha256 = ''0awwll2gbsvsz7g6j473f0xrjzyxq755vl260lmki6p937d33f7a'';
-    };
-    multi_json_1_10_1 = {
-      basename = ''multi_json'';
-      meta = {
-        description = ''A common interface to multiple JSON libraries.'';
-        homepage = ''http://github.com/intridea/multi_json'';
-        longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.'';
-      };
-      name = ''multi_json-1.10.1'';
-      requiredGems = [  ];
-      sha256 = ''1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c'';
-    };
-    multi_json_1_3_6 = {
-      basename = ''multi_json'';
-      meta = {
-        description = ''A gem to provide swappable JSON backends.'';
-        homepage = ''http://github.com/intridea/multi_json'';
-        longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
-      };
-      name = ''multi_json-1.3.6'';
-      requiredGems = [  ];
-      sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr'';
-    };
-    multi_test_0_1_1 = {
-      basename = ''multi_test'';
-      meta = {
-        description = ''multi-test-0.1.1'';
-        homepage = ''http://cukes.info'';
-        longDescription = ''Wafter-thin gem to help control rogue test/unit/autorun requires'';
-      };
-      name = ''multi_test-0.1.1'';
-      requiredGems = [  ];
-      sha256 = ''1dd810limbdc8k7ss83g83krrsjjqs79nicbdxk74l1a2sp2jhwv'';
-    };
-    multipart_post_2_0_0 = {
-      basename = ''multipart_post'';
-      meta = {
-        description = ''A multipart form post accessory for Net::HTTP.'';
-        homepage = ''https://github.com/nicksieger/multipart-post'';
-        longDescription = ''Use with Net::HTTP to do multipart form posts.  IO values that have #content_type, #original_filename, and #local_path will be posted as a binary file.'';
-      };
-      name = ''multipart-post-2.0.0'';
-      requiredGems = [  ];
-      sha256 = ''09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x'';
-    };
-    net_http_digest_auth_1_4 = {
-      basename = ''net_http_digest_auth'';
-      meta = {
-        description = ''An implementation of RFC 2617 - Digest Access Authentication'';
-        homepage = ''http://github.com/drbrain/net-http-digest_auth'';
-        longDescription = ''An implementation of RFC 2617 - Digest Access Authentication.  At this time
-the gem does not drop in to Net::HTTP and can be used for with other HTTP
-clients.
-
-In order to use net-http-digest_auth you'll need to perform some request
-wrangling on your own.  See the class documentation at Net::HTTP::DigestAuth
-for an example.'';
-      };
-      name = ''net-http-digest_auth-1.4'';
-      requiredGems = [  ];
-      sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi'';
-    };
-    net_http_persistent_2_9_4 = {
-      basename = ''net_http_persistent'';
-      meta = {
-        description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8'';
-        homepage = ''http://docs.seattlerb.org/net-http-persistent'';
-        longDescription = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
-It's thread-safe too!
-
-Using persistent HTTP connections can dramatically increase the speed of HTTP.
-Creating a new HTTP connection for every request involves an extra TCP
-round-trip and causes TCP congestion avoidance negotiation to start over.
-
-Net::HTTP supports persistent connections with some API methods but does not
-handle reconnection gracefully.  Net::HTTP::Persistent supports reconnection
-and retry according to RFC 2616.'';
-      };
-      name = ''net-http-persistent-2.9.4'';
-      requiredGems = [  ];
-      sha256 = ''1y9fhaax0d9kkslyiqi1zys6cvpaqx9a0y0cywp24rpygwh4s9r4'';
-    };
-    net_http_pipeline_1_0_1 = {
-      basename = ''net_http_pipeline'';
-      meta = {
-        description = ''An HTTP/1.1 pipelining implementation atop Net::HTTP'';
-        homepage = ''http://docs.seattlerb.org/net-http-pipeline'';
-        longDescription = ''An HTTP/1.1 pipelining implementation atop Net::HTTP.  A pipelined connection
-sends multiple requests to the HTTP server without waiting for the responses.
-The server will respond in-order.'';
-      };
-      name = ''net-http-pipeline-1.0.1'';
-      requiredGems = [  ];
-      sha256 = ''0bxjy33yhxwsbnld8xj3zv64ibgfjn9rjpiqkyd5ipmz50pww8v9'';
-    };
-    net_scp_1_2_1 = {
-      basename = ''net_scp'';
-      meta = {
-        description = ''A pure Ruby implementation of the SCP client protocol'';
-        homepage = ''https://github.com/net-ssh/net-scp'';
-        longDescription = ''A pure Ruby implementation of the SCP client protocol'';
-      };
-      name = ''net-scp-1.2.1'';
-      requiredGems = [ g.net_ssh_2_9_1 ];
-      sha256 = ''0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j'';
-    };
-    net_sftp_2_1_2 = {
-      basename = ''net_sftp'';
-      meta = {
-        description = ''A pure Ruby implementation of the SFTP client protocol'';
-        homepage = ''https://github.com/net-ssh/net-sftp'';
-        longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
-      };
-      name = ''net-sftp-2.1.2'';
-      requiredGems = [ g.net_ssh_2_9_1 ];
-      sha256 = ''04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y'';
-    };
-    net_ssh_2_7_0 = {
-      basename = ''net_ssh'';
-      meta = {
-        description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
-        homepage = ''https://github.com/net-ssh/net-ssh'';
-        longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
-      };
-      name = ''net-ssh-2.7.0'';
-      requiredGems = [  ];
-      sha256 = ''14v0cq2fws54kxpgz249xmjlajynhcs4s2szl8kjxgn4c78lrkmr'';
-    };
-    net_ssh_2_9_1 = {
-      basename = ''net_ssh'';
-      meta = {
-        description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
-        homepage = ''https://github.com/net-ssh/net-ssh'';
-        longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
-      };
-      name = ''net-ssh-2.9.1'';
-      requiredGems = [  ];
-      sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j'';
-    };
-    netrc_0_10_1 = {
-      basename = ''netrc'';
-      meta = {
-        description = ''Library to read and write netrc files.'';
-        homepage = ''https://github.com/geemus/netrc'';
-        longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.'';
-      };
-      name = ''netrc-0.10.1'';
-      requiredGems = [  ];
-      sha256 = ''1f7ba1zadvydjh0vs16b0spsxpqq2y9jim4h38wahd3sqygiwifc'';
-    };
-    newrelic_plugin_1_3_1 = {
-      basename = ''newrelic_plugin'';
-      meta = {
-        description = ''New Relic Ruby Plugin SDK'';
-        homepage = ''http://newrelic.com'';
-        longDescription = ''The New Relic Plugin Gem is used to send plugin data to New Relic from non-application sources.'';
-      };
-      name = ''newrelic_plugin-1.3.1'';
-      requiredGems = [ g.json_1_8_1 ];
-      sha256 = ''0vmm82mjb9spbs6sb9b94yk8b58dzhflzvgzpyhv7jb3rfdng7ak'';
-    };
-    nix_0_1_1 = {
-      basename = ''nix'';
-      meta = {
-        description = ''Nix package manager interface'';
-        homepage = ''http://gitorious.org/ruby-nix'';
-        longDescription = ''Adds 'gem nix' command that dumps given set of gems to format suitable for Nix package manager'';
-      };
-      name = ''nix-0.1.1'';
-      requiredGems = [  ];
-      sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
-    };
-    nokogiri_1_6_5 = {
-      basename = ''nokogiri'';
-      meta = {
-        description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
-        homepage = ''http://nokogiri.org'';
-        longDescription = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's
-many features is the ability to search documents via XPath or CSS3 selectors.
-
-XML is like violence - if it doesn’t solve your problems, you are not using
-enough of it.'';
-      };
-      name = ''nokogiri-1.6.5'';
-      requiredGems = [ g.mini_portile_0_6_1 ];
-      sha256 = ''1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l'';
-    };
-    ntlm_http_0_1_1 = {
-      basename = ''ntlm_http'';
-      meta = {
-        description = ''Ruby/NTLM HTTP library.'';
-        homepage = ''http://www.mindflowsolutions.net'';
-        longDescription = ''Ruby/NTLM HTTP provides NTLM authentication over http.'';
-      };
-      name = ''ntlm-http-0.1.1'';
-      requiredGems = [  ];
-      sha256 = ''0yx01ffrw87wya1syivqzf8hz02axk7jdpw6aw221xwvib767d36'';
-    };
-    orderedhash_0_0_6 = {
-      basename = ''orderedhash'';
-      meta = {
-        description = ''orderedhash'';
-        homepage = ''http://codeforpeople.com/lib/ruby/orderedhash/'';
-      };
-      name = ''orderedhash-0.0.6'';
-      requiredGems = [  ];
-      sha256 = ''0fryy7f9jbpx33jq5m402yqj01zcg563k9fsxlqbhmq638p4bzd7'';
-    };
-    papertrail_0_9_11 = {
-      basename = ''papertrail'';
-      meta = {
-        description = ''Command-line client for Papertrail hosted log management service.'';
-        homepage = ''http://github.com/papertrail/papertrail-cli'';
-        longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
-      };
-      name = ''papertrail-0.9.11'';
-      requiredGems = [ g.chronic_0_10_2 ];
-      sha256 = ''15wbj0yik5j853r1cap8s9f08z5slvx83lxaq6bsvh5kb47hbb0i'';
-    };
-    papertrail_cli_0_9_3 = {
-      basename = ''papertrail_cli'';
-      meta = {
-        description = ''Placeholder gem to point to new papertrail gem'';
-        homepage = ''http://github.com/papertrail/papertrail-cli-gem'';
-        longDescription = ''Placeholder gem to point to new papertrail gem.'';
-      };
-      name = ''papertrail-cli-0.9.3'';
-      requiredGems = [ g.papertrail_0_9_11 ];
-      sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
-    };
-    parallel_0_7_1 = {
-      basename = ''parallel'';
-      meta = {
-        description = ''Run any kind of code in parallel processes'';
-        homepage = ''https://github.com/grosser/parallel'';
-      };
-      name = ''parallel-0.7.1'';
-      requiredGems = [  ];
-      sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq'';
-    };
-    parslet_1_5_0 = {
-      basename = ''parslet'';
-      meta = {
-        description = ''Parser construction library with great error reporting in Ruby.'';
-        homepage = ''http://kschiess.github.com/parslet'';
-      };
-      name = ''parslet-1.5.0'';
-      requiredGems = [ g.blankslate_2_1_2_4 ];
-      sha256 = ''0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3'';
-    };
-    posix_spawn_0_3_9 = {
-      basename = ''posix_spawn'';
-      meta = {
-        description = ''posix_spawnp(2) for ruby'';
-        homepage = ''http://github.com/rtomayko/posix-spawn'';
-        longDescription = ''posix-spawn uses posix_spawnp(2) for faster process spawning'';
-      };
-      name = ''posix-spawn-0.3.9'';
-      requiredGems = [  ];
-      sha256 = ''042i1afggy1sv2jmdjjjhyffas28xp2r1ylj5xfv3hchy3b4civ3'';
-    };
-    pry_0_9_12_6 = {
-      basename = ''pry'';
-      meta = {
-        description = ''An IRB alternative and runtime developer console'';
-        homepage = ''http://pry.github.com'';
-        longDescription = ''An IRB alternative and runtime developer console'';
-      };
-      name = ''pry-0.9.12.6'';
-      requiredGems = [ g.coderay_1_1_0 g.slop_3_6_0 g.method_source_0_8_2 ];
-      sha256 = ''0wmgamn83m1zb1fbqc22hiszjf2a2xij5jd95w2gvm5x6l5p61q1'';
-    };
-    pusher_client_0_6_0 = {
-      basename = ''pusher_client'';
-      meta = {
-        description = ''Client for consuming WebSockets from http://pusher.com'';
-        homepage = ''http://github.com/pusher/pusher-ruby-client'';
-        longDescription = ''Client for consuming WebSockets from http://pusher.com'';
-      };
-      name = ''pusher-client-0.6.0'';
-      requiredGems = [ g.websocket_1_2_1 g.json_1_8_1 ];
-      sha256 = ''0n7l630qg6wgzak45b6gfjg9a0fmpbrs7mwchqqbja9mjs95r8qy'';
-    };
-    pygments_rb_0_6_0 = {
-      basename = ''pygments_rb'';
-      meta = {
-        description = ''pygments wrapper for ruby'';
-        homepage = ''https://github.com/tmm1/pygments.rb'';
-        longDescription = ''pygments.rb exposes the pygments syntax highlighter to Ruby'';
-      };
-      name = ''pygments.rb-0.6.0'';
-      requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_9 ];
-      sha256 = ''0jszj99cirbkxaqllbgnp9718v32xhvg08rfldvr10gy8i7bhy2s'';
-    };
-    rabbitmq_manager_0_1_0 = {
-      basename = ''rabbitmq_manager'';
-      meta = {
-        description = ''Ruby wrapper for RabbitMQ management HTTP API'';
-        homepage = ''https://github.com/carlhoerberg/rabbitmq_manager'';
-        longDescription = ''Ruby wrapper for RabbitMQ management HTTP API'';
-      };
-      name = ''rabbitmq_manager-0.1.0'';
-      requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 ];
-      sha256 = ''0364ljnk9y13b7lj0i2mks62g6c9ywv4py4v17p6fzrfx693mmbc'';
-    };
-    rack_1_5_2 = {
-      basename = ''rack'';
-      meta = {
-        description = ''a modular Ruby webserver interface'';
-        homepage = ''http://rack.github.com/'';
-        longDescription = ''Rack provides a minimal, modular and adaptable interface for developing
-web applications in Ruby.  By wrapping HTTP requests and responses in
-the simplest way possible, it unifies and distills the API for web
-servers, web frameworks, and software in between (the so-called
-middleware) into a single method call.
-
-Also see http://rack.github.com/.
-'';
-      };
-      name = ''rack-1.5.2'';
-      requiredGems = [  ];
-      sha256 = ''19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6'';
-    };
-    rack_protection_1_5_3 = {
-      basename = ''rack_protection'';
-      meta = {
-        description = ''You should use protection!'';
-        homepage = ''http://github.com/rkh/rack-protection'';
-        longDescription = ''You should use protection!'';
-      };
-      name = ''rack-protection-1.5.3'';
-      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r'';
-    };
-    rack_test_0_6_2 = {
-      basename = ''rack_test'';
-      meta = {
-        description = ''Simple testing API built on Rack'';
-        homepage = ''http://github.com/brynary/rack-test'';
-        longDescription = ''Rack::Test is a small, simple testing API for Rack apps. It can be used on its
-own or as a reusable starting point for Web frameworks and testing libraries
-to build on. Most of its initial functionality is an extraction of Merb 1.0's
-request helpers feature.'';
-      };
-      name = ''rack-test-0.6.2'';
-      requiredGems = [ g.rack_1_5_2 ];
-      sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
-    };
-    rails_4_1_8 = {
-      basename = ''rails'';
-      meta = {
-        description = ''Full-stack web application framework.'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
-      };
-      name = ''rails-4.1.8'';
-      requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.actionview_4_1_8 g.activemodel_4_1_8 g.activerecord_4_1_8 g.actionmailer_4_1_8 g.railties_4_1_8 g.bundler_1_7_9 g.sprockets_rails_2_2_2 ];
-      sha256 = ''17ar4gvnvkcw233cn77x4ps3q6ln3i5kpbqwfa2hbi6s61na9x10'';
-    };
-    railties_4_1_8 = {
-      basename = ''railties'';
-      meta = {
-        description = ''Tools for creating, working with, and running Rails applications.'';
-        homepage = ''http://www.rubyonrails.org'';
-        longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
-      };
-      name = ''railties-4.1.8'';
-      requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.rake_10_4_2 g.thor_0_19_1 ];
-      sha256 = ''171h23zr4135qynz74n61zly2pr0pzvspdi48dwxvc9xrzgzhznm'';
-    };
-    rake_0_9_2_2 = {
-      basename = ''rake'';
-      meta = {
-        description = ''Ruby based make-like utility.'';
-        homepage = ''http://rake.rubyforge.org'';
-        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
-      };
-      name = ''rake-0.9.2.2'';
-      requiredGems = [  ];
-      sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q'';
-    };
-    rake_10_4_2 = {
-      basename = ''rake'';
-      meta = {
-        description = ''Rake is a Make-like program implemented in Ruby'';
-        homepage = ''https://github.com/ruby/rake'';
-        longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
-specified in standard Ruby syntax.
-
-Rake has the following features:
-
-* Rakefiles (rake's version of Makefiles) are completely defined in
-  standard Ruby syntax.  No XML files to edit.  No quirky Makefile
-  syntax to worry about (is that a tab or a space?)
-
-* Users can specify tasks with prerequisites.
-
-* Rake supports rule patterns to synthesize implicit tasks.
-
-* Flexible FileLists that act like arrays but know about manipulating
-  file names and paths.
-
-* A library of prepackaged tasks to make building rakefiles easier. For example,
-  tasks for building tarballs and publishing to FTP or SSH sites.  (Formerly
-  tasks for building RDoc and Gems were included in rake but they're now
-  available in RDoc and RubyGems respectively.)
-
-* Supports parallel execution of tasks.'';
-      };
-      name = ''rake-10.4.2'';
-      requiredGems = [  ];
-      sha256 = ''1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8'';
-    };
-    rb_fsevent_0_9_4 = {
-      basename = ''rb_fsevent'';
-      meta = {
-        description = ''Very simple &amp; usable FSEvents API'';
-        homepage = ''http://rubygems.org/gems/rb-fsevent'';
-        longDescription = ''FSEvents API with Signals catching (without RubyCocoa)'';
-      };
-      name = ''rb-fsevent-0.9.4'';
-      requiredGems = [  ];
-      sha256 = ''12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7'';
-    };
-    rb_inotify_0_9_5 = {
-      basename = ''rb_inotify'';
-      meta = {
-        description = ''A Ruby wrapper for Linux's inotify, using FFI'';
-        homepage = ''http://github.com/nex3/rb-inotify'';
-        longDescription = ''A Ruby wrapper for Linux's inotify, using FFI'';
-      };
-      name = ''rb-inotify-0.9.5'';
-      requiredGems = [ g.ffi_1_9_6 ];
-      sha256 = ''0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9'';
-    };
-    rdiscount_2_1_7_1 = {
-      basename = ''rdiscount'';
-      meta = {
-        description = ''Fast Implementation of Gruber's Markdown in C'';
-        homepage = ''http://dafoster.net/projects/rdiscount/'';
-      };
-      name = ''rdiscount-2.1.7.1'';
-      requiredGems = [  ];
-      sha256 = ''1g70vsgv7mdwcyk9rxja7wm4qqap67prqwkj335c460vlzs6pqii'';
-    };
-    rdoc_4_2_0 = {
-      basename = ''rdoc'';
-      meta = {
-        description = ''RDoc produces HTML and command-line documentation for Ruby projects'';
-        homepage = ''http://docs.seattlerb.org/rdoc'';
-        longDescription = ''RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying documentation
-from the command-line.'';
-      };
-      name = ''rdoc-4.2.0'';
-      requiredGems = [ g.json_1_8_1 ];
-      sha256 = ''1k4hfa26r06ib1sxcig67arphy0a07cywcpsl37v57d6hhsgw6rr'';
-    };
-    redcarpet_3_2_2 = {
-      basename = ''redcarpet'';
-      meta = {
-        description = ''Markdown that smells nice'';
-        homepage = ''http://github.com/vmg/redcarpet'';
-        longDescription = ''A fast, safe and extensible Markdown to (X)HTML parser'';
-      };
-      name = ''redcarpet-3.2.2'';
-      requiredGems = [  ];
-      sha256 = ''1yf93kxnyk8dy3cdzq1lbdv8f47svns0k042w81kn8ilj1w88zhg'';
-    };
-    redis_3_2_0 = {
-      basename = ''redis'';
-      meta = {
-        description = ''A Ruby client library for Redis'';
-        homepage = ''https://github.com/redis/redis-rb'';
-        longDescription = ''    A Ruby client that tries to match Redis' API one-to-one, while still
-    providing an idiomatic interface. It features thread-safety,
-    client-side sharding, pipelining, and an obsession for performance.
-'';
-      };
-      name = ''redis-3.2.0'';
-      requiredGems = [  ];
-      sha256 = ''10h6a0dsh7yk1x6q6g75z5dlpbn8qg8z3wk9ymwqm3zv0r3himh6'';
-    };
-    remote_syslog_1_6_14 = {
-      basename = ''remote_syslog'';
-      meta = {
-        description = ''Monitor plain text log file(s) for new entries and send to remote syslog collector'';
-        homepage = ''http://github.com/papertrail/remote_syslog'';
-        longDescription = ''Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.'';
-      };
-      name = ''remote_syslog-1.6.14'';
-      requiredGems = [ g.servolux_0_10_0 g.file_tail_1_1_0 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
-      sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr'';
-    };
-    rest_client_1_6_7 = {
-      basename = ''rest_client'';
-      meta = {
-        description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.'';
-        homepage = ''http://github.com/archiloque/rest-client'';
-        longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.'';
-      };
-      name = ''rest-client-1.6.7'';
-      requiredGems = [ g.mime_types_2_4_3 ];
-      sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853'';
-    };
-    riemann_dash_0_2_9 = {
-      basename = ''riemann_dash'';
-      meta = {
-        description = ''HTTP dashboard for the distributed event system Riemann.'';
-        homepage = ''https://github.com/aphyr/riemann-dash'';
-        longDescription = ''HTTP dashboard for the distributed event system Riemann.'';
-      };
-      name = ''riemann-dash-0.2.9'';
-      requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_9 g.webrick_1_3_1 g.multi_json_1_3_6 ];
-      sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3'';
-    };
-    right_aws_3_1_0 = {
-      basename = ''right_aws'';
-      meta = {
-        description = ''The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.'';
-        longDescription = ''== DESCRIPTION:
-
-The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.
-These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon.
-The RightScale AWS gems comprise:
-
-- RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the
-  associated EBS (Elastic Block Store)
-- RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
-- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01)
-- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01)
-- RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
-- RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
-
-== FEATURES:
-
-- Full programmmatic access to EC2, EBS, S3, SQS, SDB, and CloudFront.
-- Complete error handling: all operations check for errors and report complete
-  error information by raising an AwsError.
-- Persistent HTTP connections with robust network-level retry layer using
-  RightHttpConnection).  This includes socket timeouts and retries.
-- Robust HTTP-level retry layer.  Certain (user-adjustable) HTTP errors returned
-  by Amazon's services are classified as temporary errors.
-  These errors are automaticallly retried using exponentially increasing intervals.
-  The number of retries is user-configurable.
-- Fast REXML-based parsing of responses (as fast as a pure Ruby solution allows).
-- Uses libxml (if available) for faster response parsing.
-- Support for large S3 list operations.  Buckets and key subfolders containing
-  many (&gt; 1000) keys are listed in entirety.  Operations based on list (like
-  bucket clear) work on arbitrary numbers of keys.
-- Support for streaming GETs from S3, and streaming PUTs to S3 if the data source is a file.
-- Support for single-threaded usage, multithreaded usage, as well as usage with multiple
-  AWS accounts.
-- Support for both first- and second-generation SQS (API versions 2007-05-01
-  and 2008-01-01).  These versions of SQS are not compatible.
-- Support for signature versions 0 and 1 on SQS, SDB, and EC2.
-- Interoperability with any cloud running Eucalyptus (http://eucalyptus.cs.ucsb.edu)
-- Test suite (requires AWS account to do "live" testing).
-'';
-      };
-      name = ''right_aws-3.1.0'';
-      requiredGems = [ g.right_http_connection_1_5_0 ];
-      sha256 = ''1a3l5vyvq078nq976rzkrd6fbj522sbgrxpdq3p9z373h0awha09'';
-    };
-    right_http_connection_1_5_0 = {
-      basename = ''right_http_connection'';
-      meta = {
-        description = ''RightScale's robust HTTP/S connection module'';
-        homepage = ''http://rightscale.rubyforge.org/'';
-        longDescription = ''Rightscale::HttpConnection is a robust HTTP/S library.  It implements a retry
-algorithm for low-level network errors.
-
-== FEATURES:
-
-- provides put/get streaming
-- does configurable retries on connect and read timeouts, DNS failures, etc.
-- HTTPS certificate checking
-'';
-      };
-      name = ''right_http_connection-1.5.0'';
-      requiredGems = [  ];
-      sha256 = ''0shd8v24aqxdvim1gdqzwxpanjhfgkhdaw0m0lzz7sybkb02j8qf'';
-    };
-    rjb_1_5_1 = {
-      basename = ''rjb'';
-      meta = {
-        description = ''Ruby Java bridge'';
-        homepage = ''http://rjb.rubyforge.org/'';
-        longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
-'';
-      };
-      name = ''rjb-1.5.1'';
-      requiredGems = [  ];
-      sha256 = ''1mfmx80r00ka5zn4qa3bnwsvapsnn4g0xr13g1kf95f2fgymy0yv'';
-    };
-    rjb_1_5_2 = {
-      basename = ''rjb'';
-      meta = {
-        description = ''Ruby Java bridge'';
-        homepage = ''http://rjb.rubyforge.org/'';
-        longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
-'';
-      };
-      name = ''rjb-1.5.2'';
-      requiredGems = [  ];
-      sha256 = ''1adg5bxdb7f95cw3mazj596d9zn2laz7l0wygcabkzrxbkbfif3r'';
-    };
-    rkelly_remix_0_0_6 = {
-      basename = ''rkelly_remix'';
-      meta = {
-        description = ''RKelly Remix is a fork of the RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
-        homepage = ''https://github.com/nene/rkelly-remix'';
-        longDescription = ''RKelly Remix is a fork of the
-RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.'';
-      };
-      name = ''rkelly-remix-0.0.6'';
-      requiredGems = [  ];
-      sha256 = ''1ihsns5v8nx96gvj7sqw5m8d6dsnmpfzpd07y860bldjhkjsxp1z'';
-    };
-    rmail_1_0_0 = {
-      basename = ''rmail'';
-      meta = {
-        description = ''A MIME mail parsing and generation library.'';
-        homepage = ''http://www.rfc20.org/rubymail'';
-        longDescription = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.'';
-      };
-      name = ''rmail-1.0.0'';
-      requiredGems = [  ];
-      sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp'';
-    };
-    rspec_2_14_1 = {
-      basename = ''rspec'';
-      meta = {
-        description = ''rspec-2.14.1'';
-        homepage = ''http://github.com/rspec'';
-        longDescription = ''BDD for Ruby'';
-      };
-      name = ''rspec-2.14.1'';
-      requiredGems = [ g.rspec_core_2_14_8 g.rspec_expectations_2_14_5 g.rspec_mocks_2_14_6 ];
-      sha256 = ''134y4wzk1prninb5a0bhxgm30kqfzl8dg06af4js5ylnhv2wd7sg'';
-    };
-    rspec_core_2_14_5 = {
-      basename = ''rspec_core'';
-      meta = {
-        description = ''rspec-core-2.14.5'';
-        homepage = ''http://github.com/rspec/rspec-core'';
-        longDescription = ''BDD for Ruby. RSpec runner and example groups.'';
-      };
-      name = ''rspec-core-2.14.5'';
-      requiredGems = [  ];
-      sha256 = ''18zk2y5agzj4ps16hh1jlcqmyj0bmlcr24bl0m8gyhwf0gk1xmcr'';
-    };
-    rspec_core_2_14_8 = {
-      basename = ''rspec_core'';
-      meta = {
-        description = ''rspec-core-2.14.8'';
-        homepage = ''http://github.com/rspec/rspec-core'';
-        longDescription = ''BDD for Ruby. RSpec runner and example groups.'';
-      };
-      name = ''rspec-core-2.14.8'';
-      requiredGems = [  ];
-      sha256 = ''0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc'';
-    };
-    rspec_expectations_2_14_3 = {
-      basename = ''rspec_expectations'';
-      meta = {
-        description = ''rspec-expectations-2.14.3'';
-        homepage = ''http://github.com/rspec/rspec-expectations'';
-        longDescription = ''rspec expectations (should[_not] and matchers)'';
-      };
-      name = ''rspec-expectations-2.14.3'';
-      requiredGems = [ g.diff_lcs_1_2_5 ];
-      sha256 = ''0gv5sqizmw0hdj1gl57mynp5i27kj4i0gpksrwwg9gazciq898n2'';
-    };
-    rspec_expectations_2_14_5 = {
-      basename = ''rspec_expectations'';
-      meta = {
-        description = ''rspec-expectations-2.14.5'';
-        homepage = ''http://github.com/rspec/rspec-expectations'';
-        longDescription = ''rspec expectations (should[_not] and matchers)'';
-      };
-      name = ''rspec-expectations-2.14.5'';
-      requiredGems = [ g.diff_lcs_1_2_5 ];
-      sha256 = ''1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9'';
-    };
-    rspec_mocks_2_14_3 = {
-      basename = ''rspec_mocks'';
-      meta = {
-        description = ''rspec-mocks-2.14.3'';
-        homepage = ''http://github.com/rspec/rspec-mocks'';
-        longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking'';
-      };
-      name = ''rspec-mocks-2.14.3'';
-      requiredGems = [  ];
-      sha256 = ''1xfhjisvpmb212jhb3k4r1ji3rrlv509mphcf345ij5b75gaybzr'';
-    };
-    rspec_mocks_2_14_6 = {
-      basename = ''rspec_mocks'';
-      meta = {
-        description = ''rspec-mocks-2.14.6'';
-        homepage = ''http://github.com/rspec/rspec-mocks'';
-        longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking'';
-      };
-      name = ''rspec-mocks-2.14.6'';
-      requiredGems = [  ];
-      sha256 = ''1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30'';
-    };
-    rubyzip_0_9_9 = {
-      basename = ''rubyzip'';
-      meta = {
-        description = ''rubyzip is a ruby module for reading and writing zip files'';
-        homepage = ''http://github.com/aussiegeek/rubyzip'';
-      };
-      name = ''rubyzip-0.9.9'';
-      requiredGems = [  ];
-      sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
-    };
-    rubyzip_1_1_6 = {
-      basename = ''rubyzip'';
-      meta = {
-        description = ''rubyzip is a ruby module for reading and writing zip files'';
-        homepage = ''http://github.com/rubyzip/rubyzip'';
-      };
-      name = ''rubyzip-1.1.6'';
-      requiredGems = [  ];
-      sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9'';
-    };
-    safe_yaml_1_0_4 = {
-      basename = ''safe_yaml'';
-      meta = {
-        description = ''SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.'';
-        homepage = ''https://github.com/dtao/safe_yaml'';
-        longDescription = ''Parse YAML safely'';
-      };
-      name = ''safe_yaml-1.0.4'';
-      requiredGems = [  ];
-      sha256 = ''1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094'';
-    };
-    sass_3_4_9 = {
-      basename = ''sass'';
-      meta = {
-        description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
-        homepage = ''http://sass-lang.com/'';
-        longDescription = ''      Sass makes CSS fun again. Sass is an extension of CSS3, adding
-      nested rules, variables, mixins, selector inheritance, and more.
-      It's translated to well-formatted, standard CSS using the
-      command line tool or a web-framework plugin.
-'';
-      };
-      name = ''sass-3.4.9'';
-      requiredGems = [  ];
-      sha256 = ''0vg81irnrlgsgf1xl2cvh7nx7qbq6wbi8qq7avqzzfh9bx8mp7ff'';
-    };
-    selenium_webdriver_2_44_0 = {
-      basename = ''selenium_webdriver'';
-      meta = {
-        description = ''The next generation developer focused tool for automated testing of webapps'';
-        homepage = ''http://selenium.googlecode.com'';
-        longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
-      };
-      name = ''selenium-webdriver-2.44.0'';
-      requiredGems = [ g.multi_json_1_10_1 g.rubyzip_1_1_6 g.childprocess_0_5_5 g.websocket_1_2_1 ];
-      sha256 = ''06bm0c5cdskbcv27j60ff4cgxa5jwdvw2ys2sca9ycvyd4a5s44w'';
-    };
-    servolux_0_10_0 = {
-      basename = ''servolux'';
-      meta = {
-        description = ''* {Homepage}[http://rubygems.'';
-        homepage = ''http://gemcutter.org/gems/servolux'';
-        longDescription = ''Serv-O-Lux is a collection of Ruby classes that are useful for daemon and
-process management, and for writing your own Ruby services. The code is well
-documented and tested. It works with Ruby and JRuby supporting both 1.8 and 1.9
-interpreters.'';
-      };
-      name = ''servolux-0.10.0'';
-      requiredGems = [  ];
-      sha256 = ''08jdrk35f61ab8b48ffm85p9lgfpbnzq3n4is00gqhpcrrq72dhs'';
-    };
-    sinatra_1_3_2 = {
-      basename = ''sinatra'';
-      meta = {
-        description = ''Classy web-development dressed in a DSL'';
-        homepage = ''http://www.sinatrarb.com/'';
-        longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
-      };
-      name = ''sinatra-1.3.2'';
-      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_3 g.tilt_1_4_1 ];
-      sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
-    };
-    sinatra_1_4_5 = {
-      basename = ''sinatra'';
-      meta = {
-        description = ''Classy web-development dressed in a DSL'';
-        homepage = ''http://www.sinatrarb.com/'';
-        longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
-      };
-      name = ''sinatra-1.4.5'';
-      requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_3 ];
-      sha256 = ''0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s'';
-    };
-    slop_3_6_0 = {
-      basename = ''slop'';
-      meta = {
-        description = ''Simple Lightweight Option Parsing'';
-        homepage = ''http://github.com/leejarvis/slop'';
-        longDescription = ''A simple DSL for gathering options and parsing the command line'';
-      };
-      name = ''slop-3.6.0'';
-      requiredGems = [  ];
-      sha256 = ''00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n'';
-    };
-    sprockets_2_12_3 = {
-      basename = ''sprockets'';
-      meta = {
-        description = ''Rack-based asset packaging system'';
-        homepage = ''http://getsprockets.org/'';
-        longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
-      };
-      name = ''sprockets-2.12.3'';
-      requiredGems = [ g.hike_1_2_3 g.multi_json_1_10_1 g.rack_1_5_2 g.tilt_1_4_1 ];
-      sha256 = ''1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2'';
-    };
-    sprockets_rails_2_2_2 = {
-      basename = ''sprockets_rails'';
-      meta = {
-        description = ''Sprockets Rails integration'';
-        homepage = ''https://github.com/rails/sprockets-rails'';
-      };
-      name = ''sprockets-rails-2.2.2'';
-      requiredGems = [ g.sprockets_2_12_3 g.actionpack_4_1_8 g.activesupport_4_1_8 ];
-      sha256 = ''192d4vfl1gjz6phli6sqk98364x6v4jkpl5imajvimsinvgyv81b'';
-    };
-    syslog_protocol_0_9_2 = {
-      basename = ''syslog_protocol'';
-      meta = {
-        description = ''Syslog protocol parser and generator'';
-        homepage = ''https://github.com/eric/syslog_protocol'';
-        longDescription = ''Syslog protocol parser and generator'';
-      };
-      name = ''syslog_protocol-0.9.2'';
-      requiredGems = [  ];
-      sha256 = ''1yb2cmbyj0zmb2yhkgnmghcngrkhcxs4g1svcmgfj90l2hs23nmc'';
-    };
-    systemu_2_6_4 = {
-      basename = ''systemu'';
-      meta = {
-        description = ''systemu'';
-        homepage = ''https://github.com/ahoward/systemu'';
-        longDescription = ''universal capture of stdout and stderr and handling of child process pid for windows, *nix, etc.'';
-      };
-      name = ''systemu-2.6.4'';
-      requiredGems = [  ];
-      sha256 = ''16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z'';
-    };
-    taskjuggler_3_5_0 = {
-      basename = ''taskjuggler'';
-      meta = {
-        description = ''A Project Management Software'';
-        homepage = ''http://www.taskjuggler.org'';
-        longDescription = ''TaskJuggler is a modern and powerful, Free and Open Source Software project
-management tool. Its new approach to project planing and tracking is more
-flexible and superior to the commonly used Gantt chart editing tools.
-
-TaskJuggler is project management software for serious project managers. It
-covers the complete spectrum of project management tasks from the first idea
-to the completion of the project. It assists you during project scoping,
-resource assignment, cost and revenue planing, risk and communication
-management.
-'';
-      };
-      name = ''taskjuggler-3.5.0'';
-      requiredGems = [ g.mail_2_6_3 g.term_ansicolor_1_3_0 ];
-      sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2'';
-    };
-    term_ansicolor_1_3_0 = {
-      basename = ''term_ansicolor'';
-      meta = {
-        description = ''Ruby library that colors strings using ANSI escape sequences'';
-        homepage = ''http://flori.github.com/term-ansicolor'';
-        longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output'';
-      };
-      name = ''term-ansicolor-1.3.0'';
-      requiredGems = [ g.tins_1_3_3 ];
-      sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b'';
-    };
-    terminal_notifier_1_6_2 = {
-      basename = ''terminal_notifier'';
-      meta = {
-        description = ''Send User Notifications on Mac OS X 10.8 or higher.'';
-        homepage = ''https://github.com/alloy/terminal-notifier'';
-      };
-      name = ''terminal-notifier-1.6.2'';
-      requiredGems = [  ];
-      sha256 = ''0v0bqpmnyivn0dqqkbzq0xcmas2l1msbwlpp2iclkninkmcqg9sf'';
-    };
-    test_kitchen_1_2_1 = {
-      basename = ''test_kitchen'';
-      meta = {
-        description = ''Test Kitchen is an integration tool for developing and testing infrastructure code and software on isolated target platforms.'';
-        homepage = ''http://kitchen.ci'';
-        longDescription = ''Test Kitchen is an integration tool for developing and testing infrastructure code and software on isolated target platforms.'';
-      };
-      name = ''test-kitchen-1.2.1'';
-      requiredGems = [ g.mixlib_shellout_1_6_1 g.net_scp_1_2_1 g.net_ssh_2_9_1 g.safe_yaml_1_0_4 g.thor_0_19_1 ];
-      sha256 = ''1pmjzvmcvlfhk6l8p665dvx7qw6kypcbhwshkq999wjhbwmjq1nk'';
-    };
-    text_1_3_0 = {
-      basename = ''text'';
-      meta = {
-        description = ''A collection of text algorithms'';
-        homepage = ''http://github.com/threedaymonk/text'';
-        longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming'';
-      };
-      name = ''text-1.3.0'';
-      requiredGems = [  ];
-      sha256 = ''1bfn0rm2a7gpsxplx3dii3a7q16hi7idsqp54fh92b3j9sqgidj7'';
-    };
-    thin_1_6_3 = {
-      basename = ''thin'';
-      meta = {
-        description = ''A thin and fast web server'';
-        homepage = ''http://code.macournoyer.com/thin/'';
-        longDescription = ''A thin and fast web server'';
-      };
-      name = ''thin-1.6.3'';
-      requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
-      sha256 = ''1m56aygh5rh8ncp3s2gnn8ghn5ibkk0bg6s3clmh1vzaasw2lj4i'';
-    };
-    thor_0_19_1 = {
-      basename = ''thor'';
-      meta = {
-        description = ''Thor is a toolkit for building powerful command-line interfaces.'';
-        homepage = ''http://whatisthor.com/'';
-        longDescription = ''Thor is a toolkit for building powerful command-line interfaces.'';
-      };
-      name = ''thor-0.19.1'';
-      requiredGems = [  ];
-      sha256 = ''08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z'';
-    };
-    thread_safe_0_3_4 = {
-      basename = ''thread_safe'';
-      meta = {
-        description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier'';
-        homepage = ''https://github.com/headius/thread_safe'';
-        longDescription = ''Thread-safe collections and utilities for Ruby'';
-      };
-      name = ''thread_safe-0.3.4'';
-      requiredGems = [  ];
-      sha256 = ''1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n'';
-    };
-    tilt_1_4_1 = {
-      basename = ''tilt'';
-      meta = {
-        description = ''Generic interface to multiple Ruby template engines'';
-        homepage = ''http://github.com/rtomayko/tilt/'';
-        longDescription = ''Generic interface to multiple Ruby template engines'';
-      };
-      name = ''tilt-1.4.1'';
-      requiredGems = [  ];
-      sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir'';
-    };
-    timers_4_0_1 = {
-      basename = ''timers'';
-      meta = {
-        description = ''Schedule procs to run after a certain time, or at periodic intervals, using any API that accepts a timeout'';
-        homepage = ''https://github.com/celluloid/timers'';
-        longDescription = ''Pure Ruby one-shot and periodic timers'';
-      };
-      name = ''timers-4.0.1'';
-      requiredGems = [ g.hitimes_1_2_2 ];
-      sha256 = ''03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l'';
-    };
-    tins_1_3_3 = {
-      basename = ''tins'';
-      meta = {
-        description = ''Useful stuff.'';
-        homepage = ''http://flori.github.com/tins'';
-        longDescription = ''All the stuff that isn't good/big enough for a real library.'';
-      };
-      name = ''tins-1.3.3'';
-      requiredGems = [  ];
-      sha256 = ''14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna'';
-    };
-    tmuxinator_0_6_9 = {
-      basename = ''tmuxinator'';
-      meta = {
-        description = ''Create and manage complex tmux sessions easily.'';
-        homepage = ''https://github.com/aziz/tmuxinator'';
-        longDescription = ''Create and manage complex tmux sessions easily.'';
-      };
-      name = ''tmuxinator-0.6.9'';
-      requiredGems = [ g.thor_0_19_1 g.erubis_2_7_0 ];
-      sha256 = ''0q0ld82dznjsan7ciblfsxz59brcc16fwmvr9n3c7vdcndj8rd27'';
-    };
-    toml_0_1_2 = {
-      basename = ''toml'';
-      meta = {
-        description = ''Parse your TOML.'';
-        homepage = ''http://github.com/jm/toml'';
-        longDescription = ''Parse your TOML, seriously.'';
-      };
-      name = ''toml-0.1.2'';
-      requiredGems = [ g.parslet_1_5_0 ];
-      sha256 = ''1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v'';
-    };
-    travis_1_7_4 = {
-      basename = ''travis'';
-      meta = {
-        description = ''Travis CI client'';
-        homepage = ''https://github.com/travis-ci/travis.rb'';
-        longDescription = ''CLI and Ruby client library for Travis CI'';
-      };
-      name = ''travis-1.7.4'';
-      requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_4 g.gh_0_13_2 g.launchy_2_4_3 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ];
-      sha256 = ''12c1ghki28qs45j1aw5ihcblh5s45wkzayfv6zjpj282z3q0ygnz'';
-    };
-    trollop_2_0 = {
-      basename = ''trollop'';
-      meta = {
-        description = ''Trollop is a commandline option parser for Ruby that just gets out of your way.'';
-        homepage = ''http://trollop.rubyforge.org'';
-        longDescription = ''Trollop is a commandline option parser for Ruby that just
-gets out of your way. One line of code per option is all you need to write.
-For that, you get a nice automatically-generated help page, robust option
-parsing, command subcompletion, and sensible defaults for everything you don't
-specify.'';
-      };
-      name = ''trollop-2.0'';
-      requiredGems = [  ];
-      sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz'';
-    };
-    typhoeus_0_6_9 = {
-      basename = ''typhoeus'';
-      meta = {
-        description = ''Parallel HTTP library on top of libcurl multi.'';
-        homepage = ''https://github.com/typhoeus/typhoeus'';
-        longDescription = ''Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.'';
-      };
-      name = ''typhoeus-0.6.9'';
-      requiredGems = [ g.ethon_0_7_1 ];
-      sha256 = ''1j4l2zwx821hzsfqskcq47xpk6b7yzl30mhzmdrfrsrhsigmayar'';
-    };
-    tzinfo_1_2_2 = {
-      basename = ''tzinfo'';
-      meta = {
-        description = ''Daylight savings aware timezone library'';
-        homepage = ''http://tzinfo.github.io'';
-        longDescription = ''TZInfo provides daylight savings aware transformations between times in different time zones.'';
-      };
-      name = ''tzinfo-1.2.2'';
-      requiredGems = [ g.thread_safe_0_3_4 ];
-      sha256 = ''1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx'';
-    };
-    uglifier_2_6_0 = {
-      basename = ''uglifier'';
-      meta = {
-        description = ''Ruby wrapper for UglifyJS JavaScript compressor'';
-        homepage = ''http://github.com/lautis/uglifier'';
-        longDescription = ''Uglifier minifies JavaScript files by wrapping UglifyJS to be accessible in Ruby'';
-      };
-      name = ''uglifier-2.6.0'';
-      requiredGems = [ g.execjs_2_2_2 g.json_1_8_1 ];
-      sha256 = ''1lih36zfw8bclsbgrh2ai0b923716lv12qzpfd27i3889gfsq2xb'';
-    };
-    unf_0_1_4 = {
-      basename = ''unf'';
-      meta = {
-        description = ''A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby'';
-        homepage = ''https://github.com/knu/ruby-unf'';
-        longDescription = ''This is a wrapper library to bring Unicode Normalization Form support
-to Ruby/JRuby.
-'';
-      };
-      name = ''unf-0.1.4'';
-      requiredGems = [ g.unf_ext_0_0_6 ];
-      sha256 = ''0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9'';
-    };
-    unf_ext_0_0_6 = {
-      basename = ''unf_ext'';
-      meta = {
-        description = ''Unicode Normalization Form support library for CRuby'';
-        homepage = ''https://github.com/knu/ruby-unf_ext'';
-        longDescription = ''Unicode Normalization Form support library for CRuby'';
-      };
-      name = ''unf_ext-0.0.6'';
-      requiredGems = [  ];
-      sha256 = ''07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg'';
-    };
-    uuid_2_3_7 = {
-      basename = ''uuid'';
-      meta = {
-        description = ''UUID generator'';
-        homepage = ''http://github.com/assaf/uuid'';
-        longDescription = ''UUID generator for producing universally unique identifiers based on RFC 4122
-(http://www.ietf.org/rfc/rfc4122.txt).
-'';
-      };
-      name = ''uuid-2.3.7'';
-      requiredGems = [ g.macaddr_1_7_1 ];
-      sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp'';
-    };
-    webrick_1_3_1 = {
-      basename = ''webrick'';
-      meta = {
-        description = ''WEBrick is an HTTP server toolkit that can be configured as an HTTPS server,'';
-        homepage = ''http://github.com/nahi/webrick'';
-      };
-      name = ''webrick-1.3.1'';
-      requiredGems = [  ];
-      sha256 = ''0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g'';
-    };
-    webrobots_0_1_1 = {
-      basename = ''webrobots'';
-      meta = {
-        description = ''A Ruby library to help write robots.txt compliant web robots'';
-        homepage = ''https://github.com/knu/webrobots'';
-        longDescription = ''This library helps write robots.txt compliant web robots in Ruby.
-'';
-      };
-      name = ''webrobots-0.1.1'';
-      requiredGems = [  ];
-      sha256 = ''1jlnhhpa1mkrgsmihs2qx13z3n6xhswjnlk5a2ypyplw2id5x32n'';
-    };
-    websocket_1_2_1 = {
-      basename = ''websocket'';
-      meta = {
-        description = ''Universal Ruby library to handle WebSocket protocol'';
-        homepage = ''http://github.com/imanel/websocket-ruby'';
-        longDescription = ''Universal Ruby library to handle WebSocket protocol'';
-      };
-      name = ''websocket-1.2.1'';
-      requiredGems = [  ];
-      sha256 = ''17mf28xp6h4gglbn1606jjrhdz9r6kyb2pr603ckadsrx31wh9p6'';
-    };
-    xapian_full_1_2_3 = {
-      basename = ''xapian_full'';
-      meta = {
-        description = ''xapian-core + Ruby xapian-bindings'';
-        longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library'';
-      };
-      name = ''xapian-full-1.2.3'';
-      requiredGems = [  ];
-      sha256 = ''02z0wsir38jsp5d6sqrkgv5prk8s6sdf6g2h718j2374kpnkyrxv'';
-    };
-    xapian_ruby_1_2_17 = {
-      basename = ''xapian_ruby'';
-      meta = {
-        description = ''xapian libraries and ruby bindings'';
-        homepage = ''https://github.com/garaio/xapian-ruby'';
-      };
-      name = ''xapian-ruby-1.2.17'';
-      requiredGems = [  ];
-      sha256 = ''1vhqykr0b877pb8x5n3v4fb4znm92mqhijinss7mvqzfimwfbxfg'';
-    };
-    xml_simple_1_1_2 = {
-      basename = ''xml_simple'';
-      meta = {
-        description = ''A simple API for XML processing.'';
-        homepage = ''https://github.com/maik/xml-simple'';
-      };
-      name = ''xml-simple-1.1.2'';
-      requiredGems = [  ];
-      sha256 = ''0ni8cbkj7l2k5pc4fs2jzp1ymxy4xqa2jc681l4y9iy9chrayddb'';
-    };
-    yajl_ruby_1_1_0 = {
-      basename = ''yajl_ruby'';
-      meta = {
-        description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.'';
-        homepage = ''http://github.com/brianmario/yajl-ruby'';
-      };
-      name = ''yajl-ruby-1.1.0'';
-      requiredGems = [  ];
-      sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m'';
-    };
-    yajl_ruby_1_2_1 = {
-      basename = ''yajl_ruby'';
-      meta = {
-        description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.'';
-        homepage = ''http://github.com/brianmario/yajl-ruby'';
-      };
-      name = ''yajl-ruby-1.2.1'';
-      requiredGems = [  ];
-      sha256 = ''0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf'';
-    };
-  };
-}
diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix
deleted file mode 100644
index 1b4b7aec2b1..00000000000
--- a/pkgs/development/interpreters/ruby/libs.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, config, fetchurl, callPackage }:
-
-let
-  inherit (stdenv.lib) fold optional;
-  gemsMergeableFun = { generatedFuns ? [], patchFuns ? [], overrideFuns ? [] }:
-  let
-    generatedAttrs = map (f: f customGems) generatedFuns;
-    generatedGems = map (a: a.gems) generatedAttrs;
-    gem = callPackage ./gem.nix {
-      patches = map (f: callPackage f { inherit gems; }) patchFuns;
-      overrides = map (f: callPackage f { }) overrideFuns;
-    };
-    customGems = stdenv.lib.mapAttrs gem (fold (x: y: x // y) { } generatedGems);
-    gems = fold (x: y: x // y) customGems (map (a: a.aliases) generatedAttrs);
-  in
-  gems // {
-    merge = { generated ? null, patches ? null, overrides ? null }:
-      gemsMergeableFun {
-        generatedFuns = generatedFuns ++ optional (generated != null) generated;
-        patchFuns = patchFuns ++ optional (patches != null) patches;
-        overrideFuns = overrideFuns ++ optional (overrides != null) overrides;
-      };
-  };
-in
-((gemsMergeableFun { }).merge {
-  generated = import ./generated.nix;
-  patches = import ./patches.nix;
-  overrides = import ./overrides.nix;
-}).merge (
-  let
-    localGemDir = (builtins.getEnv "HOME") + "/.nixpkgs/gems/";
-    getLocalGemFun = name:
-      let
-        file = localGemDir + name + ".nix";
-        fallback =
-          if builtins.pathExists file then import (builtins.toPath file)
-          else null;
-      in
-      stdenv.lib.attrByPath [ "gems" name ] fallback config;
-  in
-{
-  generated = getLocalGemFun "generated";
-  patches = getLocalGemFun "patches";
-  overrides = getLocalGemFun "overrides";
-})
diff --git a/pkgs/development/interpreters/ruby/load-ruby-env.nix b/pkgs/development/interpreters/ruby/load-ruby-env.nix
new file mode 100644
index 00000000000..c4356ed5f50
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/load-ruby-env.nix
@@ -0,0 +1,69 @@
+{ ruby, lib, callPackage, gemFixes, fetchurl, fetchgit, buildRubyGem }@defs:
+
+# This function builds a set of gems. You first convert your Gemfile to an attrset
+# called a "gemset", and then use this function to build the gemset.
+#
+# A gemset looks like the following:
+#
+#   {
+#     libv8 = {
+#       version = "3.16.14.7";
+#       src = {
+#         type = "gem";
+#         sha256 = "...";
+#       };
+#     };
+#     therubyracer = {
+#       version = "0.12.1";
+#       dependencies = [ "libv8" ];
+#       src = {
+#         type = "gem";
+#         sha256 = "...";
+#       };
+#     };
+#   }
+#
+# If you use these gems as build inputs, the GEM_PATH will be updated
+# appropriately, and command like `bundle exec` should work out of the box.
+
+{ gemset, ruby ? defs.ruby, fixes ? gemFixes }@args:
+
+let
+  const = x: y: x;
+
+  fetchers.path = attrs: attrs.src.path;
+  fetchers.gem = attrs: fetchurl {
+    url = "${attrs.src.source or "https://rubygems.org"}/downloads/${attrs.name}-${attrs.version}.gem";
+    inherit (attrs.src) sha256;
+  };
+  fetchers.git = attrs: fetchgit {
+    inherit (attrs.src) url rev sha256 fetchSubmodules;
+    leaveDotGit = true;
+  };
+
+  instantiate = (attrs:
+    let
+      defaultAttrs = {
+        name = "${attrs.name}-${attrs.version}";
+        inherit ruby gemPath;
+      };
+      gemPath = map (name: gemset''."${name}") (attrs.dependencies or []);
+      fixedAttrs = attrs // (fixes."${attrs.name}" or (const {})) attrs;
+      withSource = fixedAttrs //
+        (if (lib.isDerivation fixedAttrs.src || builtins.isString fixedAttrs.src)
+           then {}
+           else { src = (fetchers."${fixedAttrs.src.type}" fixedAttrs); });
+
+    in
+      buildRubyGem (withSource // defaultAttrs)
+  );
+
+  gemset' = if builtins.isAttrs gemset then gemset else import gemset;
+
+  gemset'' = lib.flip lib.mapAttrs gemset' (name: attrs:
+    if (lib.isDerivation attrs)
+      then attrs
+      else instantiate (attrs // { inherit name; })
+  );
+
+in gemset''
diff --git a/pkgs/development/interpreters/ruby/overrides.nix b/pkgs/development/interpreters/ruby/overrides.nix
deleted file mode 100644
index 01d73a19d64..00000000000
--- a/pkgs/development/interpreters/ruby/overrides.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ xapianBindings }:
-
-{
-  xapian_full = xapianBindings.merge { cfg = { rubySupport = true; }; };
-}
diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
index 9f2945dfb76..3c2ea71ecf2 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchFromGitHub
 , zlib, zlibSupport ? true
 , openssl, opensslSupport ? true
 , gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
+, ncurses, readline, cursesSupport ? true
 , groff, docSupport ? false
 , ruby_1_8_7, autoreconfHook, bison, useRailsExpress ? true
 }:
@@ -75,6 +75,12 @@ stdenv.mkDerivation rec {
 
     envHooks+=(addGemPath)
     EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
   meta = {
@@ -88,7 +94,8 @@ stdenv.mkDerivation rec {
     minorVersion = "8";
     teenyVersion = "7";
     patchLevel = "374";
-    libPath = "lib/ruby/${majorVersion}.${minorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
   };
 }
diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
index c812abc70fe..db807ebbd8b 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchFromGitHub
 , zlib, zlibSupport ? true
 , openssl, opensslSupport ? true
 , gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
+, ncurses, readline, cursesSupport ? true
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , ruby_1_9_3, autoreconfHook, bison, useRailsExpress ? true
@@ -93,6 +93,12 @@ stdenv.mkDerivation rec {
 
     envHooks+=(addGemPath)
     EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
   meta = {
@@ -108,7 +114,8 @@ stdenv.mkDerivation rec {
     minorVersion = "9";
     teenyVersion = "3";
     patchLevel = "547";
-    libPath = "lib/ruby/${majorVersion}.${minorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
   };
 }
diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
index ea8fcc327ee..31408b73807 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchFromGitHub
 , zlib, zlibSupport ? true
 , openssl, opensslSupport ? true
 , gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
+, ncurses, readline, cursesSupport ? true
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
@@ -77,6 +77,12 @@ stdenv.mkDerivation rec {
 
     envHooks+=(addGemPath)
     EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
   meta = {
@@ -91,7 +97,8 @@ stdenv.mkDerivation rec {
     minorVersion = "0";
     teenyVersion = "0";
     patchLevel = "481";
-    libPath = "lib/ruby/${majorVersion}.${minorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
   };
 }
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
index 8467bc4eb38..95ab84eedb8 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchgit, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub
 , zlib, zlibSupport ? true
 , openssl, opensslSupport ? true
 , gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
+, ncurses, readline, cursesSupport ? true
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
@@ -92,8 +92,15 @@ stdenv.mkDerivation rec {
 
     envHooks+=(addGemPath)
     EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
+
   meta = {
     license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
@@ -106,7 +113,8 @@ stdenv.mkDerivation rec {
     minorVersion = "1";
     teenyVersion = "0";
     patchLevel = "0";
-    libPath = "lib/ruby/${majorVersion}.${minorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
   };
 }
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix
index 6a53c2d93ea..abd09c0f276 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchgit, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub
 , zlib, zlibSupport ? true
 , openssl, opensslSupport ? true
 , gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
+, ncurses, readline, cursesSupport ? true
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
@@ -91,6 +91,12 @@ stdenv.mkDerivation rec {
 
     envHooks+=(addGemPath)
     EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
   meta = {
@@ -105,7 +111,8 @@ stdenv.mkDerivation rec {
     minorVersion = "1";
     teenyVersion = "1";
     patchLevel = "0";
-    libPath = "lib/ruby/${majorVersion}.${minorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
   };
 }
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
index fe03b86d86d..8612cd6bd43 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchgit, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub
 , zlib, zlibSupport ? true
 , openssl, opensslSupport ? true
 , gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
+, ncurses, readline, cursesSupport ? true
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
@@ -90,6 +90,12 @@ stdenv.mkDerivation rec {
 
     envHooks+=(addGemPath)
     EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
   meta = {
@@ -104,7 +110,8 @@ stdenv.mkDerivation rec {
     minorVersion = "1";
     teenyVersion = "2";
     patchLevel = "353";
-    libPath = "lib/ruby/${majorVersion}.${minorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
   };
 }
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix
index 9609a8758f9..1ba97daac04 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchgit, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub
 , zlib, zlibSupport ? true
 , openssl, opensslSupport ? true
 , gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
+, ncurses, readline, cursesSupport ? true
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
@@ -94,6 +94,12 @@ stdenv.mkDerivation rec {
 
     envHooks+=(addGemPath)
     EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
   meta = {
@@ -108,7 +114,8 @@ stdenv.mkDerivation rec {
     minorVersion = "1";
     teenyVersion = "3";
     patchLevel = "0";
-    libPath = "lib/ruby/${majorVersion}.${minorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
   };
 }
diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
index 908d8a566b6..0fb01a5a535 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchgit, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub
 , zlib, zlibSupport ? true
 , openssl, opensslSupport ? true
 , gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
+, ncurses, readline, cursesSupport ? true
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
@@ -85,6 +85,12 @@ stdenv.mkDerivation rec {
 
     envHooks+=(addGemPath)
     EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
   meta = {
@@ -99,7 +105,8 @@ stdenv.mkDerivation rec {
     minorVersion = "2";
     teenyVersion = "0";
     patchLevel = "0";
-    libPath = "lib/ruby/${majorVersion}.${minorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
   };
 }
diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index 3b66464ce22..773a752ffef 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -1,10 +1,11 @@
 args : with args; 
-rec {
 
-  version = "1.8.25";
+rec {
+  name = "rubygems-" + version;
+  version = "2.4.1";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
-    sha256 = "1j0wiy829nsfrpdzr9xzs39jf1lga3f5b7773vxqfs3lz3fli4v4";
+    sha256 = "0cpr6cx3h74ykpb0cp4p4xg7a8j0bhz3sk271jq69l4mm4zy4h4f";
   };
 
   buildInputs = [ruby makeWrapper];
@@ -23,7 +24,6 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doPatch" "doInstall"];
       
-  name = "rubygems-" + version;
   meta = {
     description = "Ruby gems package collection";
     longDescription = ''
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 463386ddfe2..3ba91ccaa1a 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "accountsservice-${version}";
-  version = "0.6.39";
+  version = "0.6.40";
   
   src = fetchurl {
     url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "0p9kfnr1wvg1qwi6zsgxw031j1wqh41137xl0mv4rm6x2zas6f7r";
+    sha256 = "0ayb3y3l25dmwxlh9g071h02mphjfbkvi2k5f635bayb01k7akzh";
   };
 
   buildInputs = [ pkgconfig glib intltool libtool makeWrapper
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index fc8b2efd5ae..fa53782fb2a 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let
-  version = "1.4";
+  version = "1.5.0";
 in
 stdenv.mkDerivation {
   name = "adns-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
       "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
       "mirror://gnu/adns/adns-${version}.tar.gz"
     ];
-    sha256 = "1zm99i9fd5gfijd144ajngn6x73563355im79sqdi98pj6ir4yvi";
+    sha256 = "0hg89b5n84zjhzvbzrpvhl0hbm4s6d1z2pzllfis64ai656ypibz";
   };
 
   preConfigure =
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
new file mode 100644
index 00000000000..5cdfa4bc601
--- /dev/null
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, cmake, pkgconfig, gettext, intltool
+, xmlto, docbook_xsl, docbook_xml_dtd_45
+, glib, xapian, libxml2, libyaml, gobjectIntrospection
+}:
+
+stdenv.mkDerivation {
+  name = "appstream-0.8.0";
+
+  meta = with stdenv.lib; {
+    description = "Software metadata handling library";
+    homepage    = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/";
+    longDescription =
+    ''
+      AppStream is a cross-distro effort for building Software-Center applications
+      and enhancing metadata provided by software components.  It provides
+      specifications for meta-information which is shipped by upstream projects and
+      can be consumed by other software.
+    '';
+    license     = licenses.lgpl21Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+ };
+
+  src = fetchurl {
+    url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz";
+    sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr";
+  };
+
+  nativeBuildInputs = [
+    cmake pkgconfig gettext intltool
+    xmlto docbook_xsl docbook_xml_dtd_45
+    gobjectIntrospection
+  ];
+
+  buildInputs = [ glib xapian libxml2 libyaml ];
+}
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index 6f938680d7e..6f730d4821e 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ ppl ];
 
-  buildInputs = [ automake autoconf libtool ];
+  nativeBuildInputs = [ automake autoconf libtool ];
 
   patches = [ ./fix-ppl-version.patch ];
 
diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index db69e2d6979..f3104757fe8 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.5.1";
+  version = "2.5.3";
   name = "ffmpeg-${version}";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "0lpgqw3pcsxjnj167fgsp70zycbhndhcji7icvj4i58hz6r51kq3";
+    sha256 = "06j1cgw9h9ya5z8gpcf9v9zik3l4xz7sr4wshj06kznzz5z3sf4x";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;
diff --git a/pkgs/development/libraries/filter_audio/default.nix b/pkgs/development/libraries/filter_audio/default.nix
new file mode 100644
index 00000000000..3082e11efbf
--- /dev/null
+++ b/pkgs/development/libraries/filter_audio/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, utillinux }:
+
+stdenv.mkDerivation rec {
+  name = "filter_audio-${version}";
+  version = "76428a6cda43ae77f3936f4527c5f86eb3a5e211";
+
+  src = fetchFromGitHub {
+    owner  = "irungentoo";
+    repo   = "filter_audio";
+    rev    = "${version}";
+    sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
+  };
+
+  buildInputs = [ utillinux ];
+  makeFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "An easy to use audio filtering library made from webrtc code";
+    homepage    = https://github.com/irungentoo/filter_audio;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ np ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index c3cfa6e8c87..2cfb5d3522f 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -10,9 +10,12 @@ stdenv.mkDerivation {
       sed -e s@/usr/@$out/@ \
         -e 's@-o root -g root@@' \
         -e 's@ldconfig@echo not running ldconfig@' \
-        -i Makefile.gnu
+        -i Makefile.gnu Makefile.fip
   '';
+
+  postBuild = "make -f Makefile.fip";
   preInstall = "mkdir -p $out/include $out/lib";
+  postInstall = "make -f Makefile.fip install";
 
   meta = {
     description = "Open Source library for accessing popular graphics image file formats";
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 6b715028e8a..ee7f39585ef 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -2,7 +2,7 @@
 , gsettings_desktop_schemas }:
 
 let
-  ver_maj = "2.40";
+  ver_maj = "2.42";
   ver_min = "1";
 in
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
-    sha256 = "9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28";
+    sha256 = "c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0";
   };
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
diff --git a/pkgs/development/libraries/glm/0954.nix b/pkgs/development/libraries/glm/0954.nix
index a5b62c6b04e..4eb3497b039 100644
--- a/pkgs/development/libraries/glm/0954.nix
+++ b/pkgs/development/libraries/glm/0954.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://glm.g-truc.net/;
     license = licenses.mit;
+    branch = "0.9.5.4";
     platforms = platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
diff --git a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch b/pkgs/development/libraries/gnome-sharp/Makefile.in.patch
new file mode 100644
index 00000000000..46b644f2471
--- /dev/null
+++ b/pkgs/development/libraries/gnome-sharp/Makefile.in.patch
@@ -0,0 +1,11 @@
+--- a/sample/gnomevfs/Makefile.in	2009-03-03 16:09:52.000000000 +0000
++++ b/sample/gnomevfs/Makefile.in	2014-10-14 13:35:51.020427244 +0100
+@@ -218,7 +218,7 @@
+ 
+ @ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS = 
+ @ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS = 
+-@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe
++@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS =
+ assemblies = ../../gnomevfs/gnome-vfs-sharp.dll
+ references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies))
+ noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS)
diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix
new file mode 100644
index 00000000000..5818726e345
--- /dev/null
+++ b/pkgs/development/libraries/gnome-sharp/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, gtk, mono, gtk-sharp, gnome}:
+
+stdenv.mkDerivation {
+  name = "gnome-sharp-2.24.1";
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz;
+    sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p";
+  };
+
+  buildInputs = [ pkgconfig gtk mono gtk-sharp ]
+  ++ (with gnome; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]);
+
+  patches = [ ./Makefile.in.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.mono-project.com/docs/gui/gtksharp/;
+    description = "A .NET language binding for assorted GNOME libraries";
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ vbgl ];
+  };
+}
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index c77500906e6..2e51f70e91d 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   name = "gpgme-1.5.3";
 
   src = fetchurl {
-    url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
+    url = "mirror://gnupg/gpgme/${name}.tar.bz2";
     sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 78d3c3f1a23..5e306f5500f 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection
-, glib
+, glib, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -19,10 +19,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig perl bison flex python gobjectIntrospection
+    pkgconfig perl bison flex python gobjectIntrospection makeWrapper
   ];
 
   propagatedBuildInputs = [ glib ];
 
+  postInstall = ''
+    for prog in "$out/bin/"*; do
+        wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")"
+    done
+  '';
+
   setupHook = ./setup-hook.sh;
 }
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index 0ca161e9ccf..d4db4fa8de5 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./v4l.patch ./linux-headers-3.9.patch ];
 
-  configureFlags = "--disable-oss";
+  configureFlags = "--enable-experimental --disable-oss";
 
   buildInputs =
     [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ]
diff --git a/pkgs/development/libraries/gtk-sharp-1/builder.sh b/pkgs/development/libraries/gtk-sharp-1/builder.sh
deleted file mode 100644
index 4b8f757540b..00000000000
--- a/pkgs/development/libraries/gtk-sharp-1/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-genericBuild
-
-# !!! hack
-export ALL_INPUTS="$out $pkgs"
-
-find $out -name "*.dll.config" | while read configFile; do
-    echo "modifying config file $configFile"
-    $monoDLLFixer "$configFile"
-done
diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix
deleted file mode 100644
index 863ee6c038d..00000000000
--- a/pkgs/development/libraries/gtk-sharp-1/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, mono
-, glib
-, pango
-, gtk
-, GConf ? null
-, libglade ? null
-, libgtkhtml ? null
-, gtkhtml ? null
-, libgnomecanvas ? null
-, libgnomeui ? null
-, libgnomeprint ? null
-, libgnomeprintui ? null
-, libxml2
-, monoDLLFixer
-}:
-
-stdenv.mkDerivation {
-  name = "gtk-sharp-1.0.6";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/gtk-sharp-1.0.6.tar.gz;
-    md5 = "2651d14fe77174ab20b8af53d150ee11";
-  };
-
-  patches = [
-    ./dllmap-glue.patch
-    ./glib-include.patch
-  ];
-
-  buildInputs = [
-    pkgconfig mono glib pango gtk GConf libglade libgnomecanvas
-    libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
-  ];
-
-  inherit monoDLLFixer;
-}
diff --git a/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch b/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch
deleted file mode 100644
index 51f4524811d..00000000000
--- a/pkgs/development/libraries/gtk-sharp-1/dllmap-glue.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -rc gtk-sharp-1.0.6-orig/gdk/gdk-sharp.dll.config.in gtk-sharp-1.0.6/gdk/gdk-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/gdk/gdk-sharp.dll.config.in	2004-12-16 18:15:44.000000000 +0100
---- gtk-sharp-1.0.6/gdk/gdk-sharp.dll.config.in	2005-03-08 12:40:58.000000000 +0100
-***************
-*** 3,6 ****
---- 3,7 ----
-    <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="gdksharpglue" target="libgdksharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/glade/glade-sharp.dll.config.in gtk-sharp-1.0.6/glade/glade-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/glade/glade-sharp.dll.config.in	2004-12-16 18:15:46.000000000 +0100
---- gtk-sharp-1.0.6/glade/glade-sharp.dll.config.in	2005-03-08 12:41:19.000000000 +0100
-***************
-*** 1,3 ****
---- 1,4 ----
-  <configuration>
-    <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="gladesharpglue" target="libgladesharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/glib/glib-sharp.dll.config.in gtk-sharp-1.0.6/glib/glib-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/glib/glib-sharp.dll.config.in	2004-12-16 18:15:38.000000000 +0100
---- gtk-sharp-1.0.6/glib/glib-sharp.dll.config.in	2005-03-08 12:37:57.000000000 +0100
-***************
-*** 2,5 ****
---- 2,6 ----
-    <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="glibsharpglue" target="libglibsharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/gnome/gnome-sharp.dll.config.in gtk-sharp-1.0.6/gnome/gnome-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/gnome/gnome-sharp.dll.config.in	2004-12-16 18:15:43.000000000 +0100
---- gtk-sharp-1.0.6/gnome/gnome-sharp.dll.config.in	2005-03-08 12:41:50.000000000 +0100
-***************
-*** 8,11 ****
---- 8,12 ----
-    <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="gnomesharpglue" target="libgnomesharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/gtk/gtk-sharp.dll.config.in gtk-sharp-1.0.6/gtk/gtk-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/gtk/gtk-sharp.dll.config.in	2004-12-16 18:14:51.000000000 +0100
---- gtk-sharp-1.0.6/gtk/gtk-sharp.dll.config.in	2005-03-08 12:38:19.000000000 +0100
-***************
-*** 3,6 ****
---- 3,7 ----
-    <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="gtksharpglue" target="libgtksharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
-diff -rc gtk-sharp-1.0.6-orig/pango/pango-sharp.dll.config.in gtk-sharp-1.0.6/pango/pango-sharp.dll.config.in
-*** gtk-sharp-1.0.6-orig/pango/pango-sharp.dll.config.in	2004-12-16 18:14:55.000000000 +0100
---- gtk-sharp-1.0.6/pango/pango-sharp.dll.config.in	2005-03-08 12:42:11.000000000 +0100
-***************
-*** 1,4 ****
---- 1,5 ----
-  <configuration>
-    <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-    <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+   <dllmap dll="pangosharpglue" target="libpangosharpglue@LIB_PREFIX@@LIB_SUFFIX@"/>
-  </configuration>
diff --git a/pkgs/development/libraries/gtk-sharp-1/glib-include.patch b/pkgs/development/libraries/gtk-sharp-1/glib-include.patch
deleted file mode 100644
index e8f4b0ef5af..00000000000
--- a/pkgs/development/libraries/gtk-sharp-1/glib-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru gtk-sharp-1.0.6.orig/glib/glue/list.c gtk-sharp-1.0.6/glib/glue/list.c
---- gtk-sharp-1.0.6.orig/glib/glue/list.c	2014-01-09 10:58:06.727352451 +0000
-+++ gtk-sharp-1.0.6/glib/glue/list.c	2014-01-09 11:00:34.256583614 +0000
-@@ -20,7 +20,7 @@
-  */
- 
- 
--#include <glib/glist.h>
-+#include <glib.h>
- 
- /* Forward declarations */
- gpointer gtksharp_list_get_data (GList *l);
-diff -ru gtk-sharp-1.0.6.orig/glib/glue/slist.c gtk-sharp-1.0.6/glib/glue/slist.c
---- gtk-sharp-1.0.6.orig/glib/glue/slist.c	2014-01-09 10:58:06.727352451 +0000
-+++ gtk-sharp-1.0.6/glib/glue/slist.c	2014-01-09 11:00:47.572695223 +0000
-@@ -20,7 +20,7 @@
-  */
- 
- 
--#include <glib/gslist.h>
-+#include <glib.h>
- 
- /* Forward declarations */
- gpointer gtksharp_slist_get_data (GSList *l);
diff --git a/pkgs/development/libraries/gtksourceview-sharp/builder.sh b/pkgs/development/libraries/gtksourceview-sharp/builder.sh
deleted file mode 100644
index 4b8f757540b..00000000000
--- a/pkgs/development/libraries/gtksourceview-sharp/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-genericBuild
-
-# !!! hack
-export ALL_INPUTS="$out $pkgs"
-
-find $out -name "*.dll.config" | while read configFile; do
-    echo "modifying config file $configFile"
-    $monoDLLFixer "$configFile"
-done
diff --git a/pkgs/development/libraries/gtksourceview-sharp/default.nix b/pkgs/development/libraries/gtksourceview-sharp/default.nix
deleted file mode 100644
index 56c6e1b1ee5..00000000000
--- a/pkgs/development/libraries/gtksourceview-sharp/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtksourceview, monoDLLFixer}:
-
-stdenv.mkDerivation {
-  name = "gtksourceview-sharp-0.6-pre40261";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/gtksourceview-sharp-0.6-pre40261.tar.bz2;
-    md5 = "8bc26c182bd897f50988e110a9a11f34";
-  };
-
-  patches = [ ./prefix.patch ];
-
-  buildInputs = [
-    pkgconfig mono gtksharp gtksourceview
-  ];
-
-  inherit monoDLLFixer;
-}
diff --git a/pkgs/development/libraries/gtksourceview-sharp/prefix.patch b/pkgs/development/libraries/gtksourceview-sharp/prefix.patch
deleted file mode 100644
index b1b69206344..00000000000
--- a/pkgs/development/libraries/gtksourceview-sharp/prefix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -rc gtksourceview-sharp/gtksourceview/Makefile.in gtksourceview-sharp-new/gtksourceview/Makefile.in
-*** gtksourceview-sharp/gtksourceview/Makefile.in	2005-03-08 18:55:15.000000000 +0100
---- gtksourceview-sharp-new/gtksourceview/Makefile.in	2005-03-08 18:59:10.000000000 +0100
-***************
-*** 192,198 ****
-  EXTRA_DIST = $(sources) $(customs) Gtk.metadata gtksourceview-api.raw AssemblyInfo.cs.in
-  DISTCLEANFILES = AssemblyInfo.cs
-  noinst_DATA = gtksourceview-sharp.dll
-! apidir = $(gtksharp_prefix)/share/gapi-2.0
-  api_DATA = gtksourceview-api.xml
-  sources = \
-  GtkSourceView.cs
---- 192,198 ----
-  EXTRA_DIST = $(sources) $(customs) Gtk.metadata gtksourceview-api.raw AssemblyInfo.cs.in
-  DISTCLEANFILES = AssemblyInfo.cs
-  noinst_DATA = gtksourceview-sharp.dll
-! apidir = $(prefix)/share/gapi-2.0
-  api_DATA = gtksourceview-api.xml
-  sources = \
-  GtkSourceView.cs
-Only in gtksourceview-sharp-new/gtksourceview: Makefile.in~
-Only in gtksourceview-sharp-new/gtksourceview: Makefile.in.orig
-Only in gtksourceview-sharp-new/gtksourceview: Makefile.in.rej
-diff -rc gtksourceview-sharp/Makefile.in gtksourceview-sharp-new/Makefile.in
-*** gtksourceview-sharp/Makefile.in	2005-03-08 18:55:16.000000000 +0100
---- gtksourceview-sharp-new/Makefile.in	2005-03-08 18:59:33.000000000 +0100
-***************
-*** 211,217 ****
-  target_vendor = @target_vendor@
-  SUBDIRS = gtksourceview sample doc 
-  EXTRA_DIST = nemerle.lang vbnet.lang gtksourceview-sharp.pc.in gtk-sharp.snk
-! extra_langdir = $(gtksourceview_prefix)/share/gtksourceview-1.0/language-specs
-  extra_lang_DATA = nemerle.lang vbnet.lang
-  pkgconfigdir = $(libdir)/pkgconfig
-  pkgconfig_DATA = gtksourceview-sharp.pc
---- 211,217 ----
-  target_vendor = @target_vendor@
-  SUBDIRS = gtksourceview sample doc 
-  EXTRA_DIST = nemerle.lang vbnet.lang gtksourceview-sharp.pc.in gtk-sharp.snk
-! extra_langdir = $(prefix)/share/gtksourceview-1.0/language-specs
-  extra_lang_DATA = nemerle.lang vbnet.lang
-  pkgconfigdir = $(libdir)/pkgconfig
-  pkgconfig_DATA = gtksourceview-sharp.pc
-Only in gtksourceview-sharp-new/: Makefile.in~
-Only in gtksourceview-sharp-new/: Makefile.in.orig
-Only in gtksourceview-sharp-new/: Makefile.in.rej
diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix
index 5cf966f35bd..a44cdbfa6c1 100644
--- a/pkgs/development/libraries/haskell/base-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/base-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base-prelude";
-  version = "0.1.7";
-  sha256 = "0xzgwj5sqx7y57biby77d6vrsghcmq85ha3frn8k4xq7wqqk4aqp";
+  version = "0.1.11";
+  sha256 = "0g6p1d3r6jbqcd8flxfbasb40ga7k90bc0q07drwhlaiadjnx1an";
   meta = {
     homepage = "https://github.com/nikita-volkov/base-prelude";
     description = "The most complete prelude formed from only the \"base\" package";
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 81ca10bdb38..d0683175482 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,21 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl
-, QuickCheck, resourcet, safe, transformers, transformersBase, void
+{ cabal, exceptions, hspec, liftedBase, mmorph, mtl, QuickCheck
+, resourcet, safe, transformers, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.2.3";
-  sha256 = "1n4cc5mij9q5wrnm394a2dka7vbnnr9c2kg5d3f4sl1fh156lf6n";
+  version = "1.2.3.1";
+  sha256 = "04n330f9iad6asmry81aqvb7wyh7b962d6pvcfnpm327z4llnvbq";
   buildDepends = [
-    exceptions liftedBase mmorph monadControl mtl resourcet
-    transformers transformersBase void
+    exceptions liftedBase mmorph mtl resourcet transformers
+    transformersBase void
   ];
   testDepends = [
     exceptions hspec mtl QuickCheck resourcet safe transformers void
   ];
-  doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Streaming data processing library";
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index f7e7cead1ac..70c8573ade5 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "4.3.2";
-  sha256 = "0bmw4qc263fs5ivf94qfzrq26v8kflb13gims7c474d4jhg8g0w1";
+  version = "4.3.2.1";
+  sha256 = "09c1xal7d6azw0cc8mwi0ry8blysg29cmyfipdhg1b7vzyjavv22";
   buildDepends = [
     bifunctors exceptions free monadControl MonadRandom mtl profunctors
     semigroupoids semigroups transformers transformersBase
diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
index 970c0e6845e..13ea889119c 100644
--- a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
+++ b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
@@ -3,4 +3,4 @@
 COMMAND=$1
 shift
 HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \
-    $COMMAND -d @out@/share/hoogle "$@"
+    "$COMMAND" -d @out@/share/hoogle "$@"
diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix
index 400bd6c9e9d..90125ff7a00 100644
--- a/pkgs/development/libraries/haskell/jwt/default.nix
+++ b/pkgs/development/libraries/haskell/jwt/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "jwt";
-  version = "0.5.0";
-  sha256 = "0445biw5rj4plbz4nbmzrn446dfsjnggzrrcn1m292g3dqp6gzgh";
+  version = "0.5.3";
+  sha256 = "1225fa53gghfpgwhr4x269a6kygfj39fh2qdapdi9mrrvlg302i4";
   buildDepends = [
     aeson base64Bytestring cryptohash dataDefault httpTypes network
     networkUri scientific semigroups text time unorderedContainers
diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
index 97a252d13d5..ecb6b9aa18a 100644
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-async/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, async, HUnit, liftedBase, monadControl, mtl, tasty
+{ cabal, async, constraints, HUnit, liftedBase, monadControl, mtl, tasty
 , tastyHunit, tastyTh, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "lifted-async";
-  version = "0.2.0.2";
-  sha256 = "07sqgd3lxplfwrpys4jhz0068sx99765lpx8n4nj3k117z32slgf";
-  buildDepends = [ async liftedBase monadControl transformersBase ];
+  version = "0.6.0.1";
+  sha256 = "12qbibsl26njx6m1dq12gqfb15rkyag23c1vkcinlk301a0cvsmf";
+  buildDepends = [ async constraints liftedBase monadControl transformersBase ];
   testDepends = [
     async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh
   ];
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 80961ba86c8..2aa24f83325 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.3.1";
-  sha256 = "1ga2kvacb44syvv1l0gaqyzlp12h7rrqn8k5fvy7ca5ffxwy5472";
+  version = "0.2.3.3";
+  sha256 = "1n015i21pyh1ksrdiy105c9sw3gm3yvmlwv1sajy7nvpxb2xdjc3";
   buildDepends = [ monadControl transformersBase ];
   testDepends = [
     HUnit monadControl testFramework testFrameworkHunit transformers
diff --git a/pkgs/development/libraries/haskell/logsink/default.nix b/pkgs/development/libraries/haskell/logsink/default.nix
new file mode 100644
index 00000000000..d272a4d4c2b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/logsink/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec, hsyslog, loggingFacade, time }:
+
+cabal.mkDerivation (self: {
+  pname = "logsink";
+  version = "0.1.0";
+  sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
+  buildDepends = [ hsyslog loggingFacade time ];
+  testDepends = [ hspec loggingFacade ];
+  meta = {
+    description = "A logging framework for Haskell";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index 918e694f54c..f75688ef4ce 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, transformers, transformersBase }:
+{ cabal, stm, transformers, transformersBase }:
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.3.3.0";
-  sha256 = "0vjff64iwnd9vplqfjyylbd900qmsr92h62hnh715wk06yacji7g";
-  buildDepends = [ transformers transformersBase ];
+  version = "1.0.0.2";
+  sha256 = "13l9gq00pjlp1b2g9xzfavl6zibi2s195f234rmhzbsb14yhzgnr";
+  buildDepends = [ stm transformers transformersBase ];
   meta = {
     homepage = "https://github.com/basvandijk/monad-control";
     description = "Lift control operations, like exception catching, through monad transformers";
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 3d312a6809f..2ee001b4225 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "1.1.3.1";
-  sha256 = "13g8vj9hc59q8n696j0w79k5bhp3mgs923y4d2cffnd0p7yd8r8x";
+  version = "1.1.3.3";
+  sha256 = "0ih5p1k0n3ylcv0yk5x7hjzbzhs67vxmng708g9vz7a24xs2m7w2";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl transformers
     transformersBase
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index fca81a974fb..3ed0912b0f3 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -1,16 +1,15 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, extra, filepath, hashable, jsFlot
+{ gcc, cabal, binary, deepseq, extra, filepath, hashable, jsFlot
 , jsJquery, QuickCheck, random, time, transformers
 , unorderedContainers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.14.2";
-  sha256 = "0wb4rvnkw6gag1jffv9z2by7y8gifp58pnw3n7dyc01yglbys72m";
+  version = "0.14.3";
+  sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl";
   isLibrary = true;
   isExecutable = true;
+  buildTools = [ gcc ];
   buildDepends = [
     binary deepseq extra filepath hashable jsFlot jsJquery random time
     transformers unorderedContainers utf8String
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 10659c72266..251cb6a17b5 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.5.6";
-  sha256 = "1vnn0s3i3n76286b7rc70qjzgkmfwllpg7w4zin627v6466pfpzl";
+  version = "1.6.0";
+  sha256 = "0yrx7sv1s8pddpap143d3yi3ypvf84jjh16i8b3dm4kb3m4x3mdv";
   buildDepends = [
     async enclosedExceptions exceptions liftedAsync liftedBase
     monadControl mtl systemFileio systemFilepath text time transformers
diff --git a/pkgs/development/libraries/haskell/web-routes-happstack/default.nix b/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
new file mode 100644
index 00000000000..299357e2073
--- /dev/null
+++ b/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, happstackServer, text, webRoutes }:
+
+cabal.mkDerivation (self: {
+  pname = "web-routes-happstack";
+  version = "0.23.9";
+  sha256 = "0vsjm979z21858wk9z1b855jqmr4apm35b5ff8x6nynq6kiflrzw";
+  buildDepends = [ happstackServer text webRoutes ];
+  meta = {
+    description = "Adds support for using web-routes with Happstack";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index 0f0fa3f775a..7b78c39924f 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "jansson-2.5";
+  name = "jansson-2.7";
 
   src = fetchurl {
     url = "http://www.digip.org/jansson/releases/${name}.tar.gz";
-    sha256 = "1cdi1g4pyjwrw76z99ys8cr13iz9nz9i8sq6ivl1q0ymiarvz2yx";
+    sha256 = "1mvq9p85khsl818i4vbszyfab0fd45mdrwrxjkzw05mk1xcyc1br";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/default.nix b/pkgs/development/libraries/kde-frameworks-5.5/default.nix
new file mode 100644
index 00000000000..aac9eecb931
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/default.nix
@@ -0,0 +1,185 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
+
+with stdenv.lib; with autonix;
+
+let
+
+  mkDerivation = drv:
+    stdenv.mkDerivation
+      (drv // {
+        src = fetchurl drv.src;
+
+        setupHook = ./setup-hook.sh;
+
+        enableParallelBuilding = drv.enableParallelBuilding or true;
+        cmakeFlags =
+          (drv.cmakeFlags or [])
+          ++ [ "-DBUILD_TESTING=OFF"
+            "-DKDE_DEFAULT_HOME=.kde5"
+            "-DKDE4_DEFAULT_HOME=.kde"
+          ]
+          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+        meta = drv.meta or
+          {
+            license = with stdenv.lib.licenses; [
+              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+            ];
+            platforms = stdenv.lib.platforms.linux;
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+          };
+      });
+
+  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
+
+  scope =
+    # packages in this collection
+    (mapAttrs (dep: name: kf5."${name}") renames) //
+    # packages pinned to this version of Qt 5
+    {
+      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      Qt5 = qt5;
+      Qt5Core = qt5;
+      Qt5DBus = qt5;
+      Qt5Test = qt5;
+      Qt5Widgets = qt5;
+      Qt5X11Extras = qt5;
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
+    } //
+    # packages from the nixpkgs collection
+    (with pkgs;
+      {
+        inherit cmake;
+        Boost = boost;
+        GIF = giflib;
+        GLIB2 = glib;
+        Gpgme = gpgme;
+        JPEG = libjpeg;
+        LibGcrypt = libgcrypt;
+        LibGit2 = libgit2;
+        LibIntl = gettext;
+        LibLZMA = lzma;
+        Perl = perl;
+        PythonInterp = python;
+        QImageBlitz = qimageblitz;
+        SharedMimeInfo = shared_mime_info;
+        ZLIB = zlib;
+      }
+    );
+
+  mirror = "mirror://kde";
+
+  preResolve = super:
+    fold (f: x: f x) super
+      [
+        (userEnvPkg "SharedMimeInfo")
+        (userEnvPkg "SharedDesktopOntologies")
+      ];
+
+  postResolve = super:
+    super // {
+      extra-cmake-modules = {
+        inherit (super.extra-cmake-modules) name src;
+
+        propagatedNativeBuildInputs = with pkgs; [ cmake pkgconfig ];
+        cmakeFlags = ["-DBUILD_TESTING=OFF"];
+        patches =
+          [
+            ./extra-cmake-modules/0001-libdir-default.patch
+            ./extra-cmake-modules/0002-qt5-plugin-dir.patch
+          ];
+        meta = {
+          license = with stdenv.lib.licenses; [ bsd2 ];
+          platforms = stdenv.lib.platforms.linux;
+          maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+          homepage = "http://www.kde.org";
+        };
+      };
+
+      kauth = with pkgs; super.kauth // {
+        buildInputs = super.kauth.buildInputs ++ [polkit_qt5];
+        patches = [./kauth/kauth-policy-install.patch];
+      };
+
+      kcmutils = super.kcmutils // {
+        patches =
+          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
+      };
+
+      kconfigwidgets = super.kconfigwidgets // {
+        patches =
+          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
+      };
+
+      kdelibs4support = with pkgs; super.kdelibs4support // {
+        buildInputs =
+          super.kdelibs4support.buildInputs
+          ++ [networkmanager xlibs.libSM];
+        cmakeFlags =
+          (super.kdelibs4support.cmakeFlags or [])
+          ++ [
+            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+            "-DDocBookXML4_DTD_VERSION=4.5"
+          ];
+      };
+
+      kdoctools = with pkgs; super.kdoctools // {
+        cmakeFlags =
+          (super.kdoctools.cmakeFlags or [])
+          ++ [
+            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+            "-DDocBookXML4_DTD_VERSION=4.5"
+            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+          ];
+        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
+      };
+
+      ki18n = with pkgs; super.ki18n // {
+        propagatedNativeBuildInputs =
+          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
+      };
+
+      kimageformats = with pkgs; super.kimageformats // {
+        NIX_CFLAGS_COMPILE =
+          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
+          + " -I${ilmbase}/include/OpenEXR";
+      };
+
+      kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
+
+      kservice = super.kservice // {
+        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
+        patches =
+          [
+            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
+            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+          ];
+      };
+
+      plasma-framework = super.plasma-framework // {
+        patches = [ ./plasma-framework/plasma-framework-external-paths.patch ];
+      };
+    };
+
+  kf5 = generateCollection ./. {
+    inherit mirror mkDerivation preResolve postResolve renames scope;
+  };
+
+in
+
+  kf5 // { inherit mkDerivation qt5 scope; }
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix
new file mode 100644
index 00000000000..feafa94e81d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix
@@ -0,0 +1,484 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+  attica = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  extra-cmake-modules = {
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
+    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  frameworkintegration = {
+    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5Test" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kactivities = {
+    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kapidox = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "PythonInterp" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  karchive = {
+    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5Test" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kauth = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbookmarks = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcmutils = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcodecs = {
+    buildInputs = [ "ECM" "Qt5Core" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcompletion = {
+    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kconfig = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kconfigwidgets = {
+    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcoreaddons = {
+    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kcrash = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdbusaddons = {
+    buildInputs = [ "ECM" "Qt5DBus" "Qt5Test" "Qt5X11Extras" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5DBus" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeclarative = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kded = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdelibs4support = {
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesignerplugin = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesu = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Pty" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdewebkit = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdnssd = {
+    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Network" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdoctools = {
+    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kemoticons = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kglobalaccel = {
+    buildInputs = [ "ECM" "Qt5" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kguiaddons = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5X11Extras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khtml = {
+    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ki18n = {
+    buildInputs = [ "ECM" "LibIntl" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kiconthemes = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kidletime = {
+    buildInputs = [ "ECM" "Qt5" "X11" "X11_XCB" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kimageformats = {
+    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5PrintSupport" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kinit = {
+    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kio = {
+    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" "Qt5Widgets" "Strigi" "X11" "ZLIB" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kitemmodels = {
+    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5Script" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kitemviews = {
+    buildInputs = [ "ECM" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjobwidgets = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjs = {
+    buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5Test" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjsembed = {
+    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmediaplayer = {
+    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Parts" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knewstuff = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knotifications = {
+    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knotifyconfig = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kparts = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kplotting = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kpty = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kross = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  krunner = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kservice = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktexteditor = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktextwidgets = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kunitconversion = {
+    buildInputs = [ "ECM" "KF5I18n" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwallet = {
+    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwidgetsaddons = {
+    buildInputs = [ "ECM" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwindowsystem = {
+    buildInputs = [ "ECM" "Qt5" "Qt5WinExtras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kxmlgui = {
+    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-framework = {
+    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Test" "Qt5Widgets" "Solid" "X11" "XCB" ];
+    nativeBuildInputs = [ "SH" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  solid = {
+    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Qml" "UDev" ];
+    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  sonnet = {
+    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5Test" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  threadweaver = {
+    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.5/dependencies.sh
new file mode 100755
index 00000000000..2b220244c59
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/dependencies.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script rebuilds dependencies.nix.
+# You must run manifest.sh first to download the packages.
+
+# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
+# If you are working on the packages, this is probably what you want.
+
+# You can also pass the path to a source tree where you have built
+# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
+# probably what you want.
+
+manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch b/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch
new file mode 100644
index 00000000000..faed0e6edc9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch
@@ -0,0 +1,55 @@
+From f1e22a65f94a231edfe01ac6a3fcf30d95b6329f Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 31 Dec 2014 07:16:45 -0600
+Subject: [PATCH 1/2] libdir default
+
+---
+ kde-modules/KDEInstallDirs.cmake | 31 +------------------------------
+ 1 file changed, 1 insertion(+), 30 deletions(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index e255e87..a79a12a 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -162,37 +162,8 @@
+ # (To distribute this file outside of extra-cmake-modules, substitute the full
+ #  License text for the above reference.)
+ 
+-# Figure out what the default install directory for libraries should be.
+-# This is based on the logic in GNUInstallDirs, but simplified (the
+-# GNUInstallDirs code deals with re-configuring, but that is dealt with
+-# by the _define_* macros in this module).
++# The default library directory on NixOS is *always* /lib.
+ set(_LIBDIR_DEFAULT "lib")
+-# Override this default 'lib' with 'lib64' iff:
+-#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+-#  - we are NOT on debian
+-#  - we are on a 64 bits system
+-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+-# See http://wiki.debian.org/Multiarch
+-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+-   AND NOT CMAKE_CROSSCOMPILING)
+-  if (EXISTS "/etc/debian_version") # is this a debian system ?
+-    if(CMAKE_LIBRARY_ARCHITECTURE)
+-      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-    endif()
+-  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+-      message(AUTHOR_WARNING
+-        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
+-        "Please enable at least one language before including KDEInstallDirs.")
+-    else()
+-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+-        set(_LIBDIR_DEFAULT "lib64")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+ 
+ # Macro for variables that are relative to another variable. We store an empty
+ # value in the cache (for documentation/GUI cache editor purposes), and store
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch b/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch
new file mode 100644
index 00000000000..5982aa8a06f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch
@@ -0,0 +1,25 @@
+From e4fb9d880cefa743df2b5da3a67db617d66faf63 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 31 Dec 2014 07:23:59 -0600
+Subject: [PATCH 2/2] qt5 plugin dir
+
+---
+ kde-modules/KDEInstallDirs.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index a79a12a..70dbe02 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -315,7 +315,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ else()
+-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
++    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
+         "Qt plugins"
+         QT_PLUGIN_INSTALL_DIR)
+ 
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch
new file mode 100644
index 00000000000..340155256f2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
+index e859ec7..9a8ab18 100644
+--- a/KF5AuthConfig.cmake.in
++++ b/KF5AuthConfig.cmake.in
+@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+ set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
new file mode 100644
index 00000000000..47b8dfad180
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index c63241b..2243f94 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
+     QStringList desktopFileNames;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString &dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             desktopFileNames.append(it.next());
+         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
new file mode 100644
index 00000000000..3bd946cbd84
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
+index 53a331e..80fbb01 100644
+--- a/src/khelpclient.cpp
++++ b/src/khelpclient.cpp
+@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
+     QString docPath;
+     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
+     Q_FOREACH (const QString &dir, desktopDirs) {
+-        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             const QString desktopPath(it.next());
+             KDesktopFile desktopFile(desktopPath);
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 00000000000..4e3a33efab3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c4863c..f731775 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
+                       )
+ 
+ 
+-find_package(DocBookXML4 "4.5")
+ 
+ set_package_properties(DocBookXML4 PROPERTIES
+                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch
new file mode 100644
index 00000000000..a6ccb2085d3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch
@@ -0,0 +1,30 @@
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 3c3c913..f510620 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
+         if (!libpath.isEmpty()) {
+             if (!l.load()) {
+                 if (libpath_relative) {
+-                    // NB: Because Qt makes the actual dlopen() call, the
+-                    //     RUNPATH of kdeinit is *not* respected - see
+-                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
+-                    //     - so we try hacking it in ourselves
+-                    QString install_lib_dir = QFile::decodeName(
+-                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+-                    libpath = install_lib_dir + libpath;
+-                    l.setFileName(libpath);
++                  // Use QT_PLUGIN_PATH to find shared library directories
++                  // For KF5, the plugin path is /lib/plugins, so the kdeinit5
++                  // shared libraries should be in /lib/plugins/../
++                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
++                  const QString up = QString::fromLocal8Bit("/../");
++                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
++                  Q_FOREACH (const QString &path, paths) {
++                    l.setFileName(path + up + libpath);
+                     l.load();
++                    if (l.isLoaded()) break;
++                  }
+                 }
+             }
+             if (!l.isLoaded()) {
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch
new file mode 100644
index 00000000000..e9bc418544a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
+index 69b1427..9c37a49 100644
+--- a/src/kbuildsycoca/kbuildsycoca.cpp
++++ b/src/kbuildsycoca/kbuildsycoca.cpp
+@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
+         QStringList relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
new file mode 100644
index 00000000000..7e21ebfe86f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
+index 2eb1275..e39a36f 100644
+--- a/src/kbuildsycoca/vfolder_menu.cpp
++++ b/src/kbuildsycoca/vfolder_menu.cpp
+@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++        QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.5/manifest.nix
new file mode 100644
index 00000000000..b22ea32ca28
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/manifest.nix
@@ -0,0 +1,364 @@
+# This file is generated automatically. DO NOT EDIT!
+{ mirror }:
+[
+  {
+    url = "${mirror}/stable/frameworks/5.5/extra-cmake-modules-1.5.0.tar.xz";
+    sha256 = "0rhvrpakahylfrnwkw5n32xh95609b3ca40qjkd1bcqh9mw8s8n7";
+    name = "extra-cmake-modules-1.5.0.tar.xz";
+    store = "/nix/store/adn9n0xazi0wdmc7ffwfbxdbm05wvlg9-extra-cmake-modules-1.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kdoctools-5.5.0.tar.xz";
+    sha256 = "19pzafqinngzyk52c2a3l8llfxqh77y436sj3rvkir1falvg7jqi";
+    name = "kdoctools-5.5.0.tar.xz";
+    store = "/nix/store/i624z246bj0iy36r9fwzwnfanggkp7kj-kdoctools-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/knotifications-5.5.0.tar.xz";
+    sha256 = "04fp1gkjv828464xs7y3wm5p8ww2n9alfds8bs76i49gpd42xjyh";
+    name = "knotifications-5.5.0.tar.xz";
+    store = "/nix/store/5dmvw3gp1hbq03pnp5llav77ggrya3qv-knotifications-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kdesu-5.5.0.tar.xz";
+    sha256 = "0m47ha6xwxv3w9hijdf6z4bb84rr0rw9p4sr5nmb9wdngzrmzcpd";
+    name = "kdesu-5.5.0.tar.xz";
+    store = "/nix/store/ixyfa6piyz5hcw8y9pkx75cg189y4qf8-kdesu-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kdnssd-5.5.0.tar.xz";
+    sha256 = "1j94162lvnc47y1nfjshpa28biaihyxghi7nz9rjdlr7cf40gp4r";
+    name = "kdnssd-5.5.0.tar.xz";
+    store = "/nix/store/z381zrhhyjk482arjnbra8pbwib9jrkp-kdnssd-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kdewebkit-5.5.0.tar.xz";
+    sha256 = "0y5d7mabkgc5676aax64hficjy06fqkm8a72jki1hl808pbapvwy";
+    name = "kdewebkit-5.5.0.tar.xz";
+    store = "/nix/store/xi41pfsfghkayasng6kqn5b65cfgs4vs-kdewebkit-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kparts-5.5.0.tar.xz";
+    sha256 = "0l6na645j2ijais4nqir54jxzn13csigivcg098m6m0mpiz8j4w6";
+    name = "kparts-5.5.0.tar.xz";
+    store = "/nix/store/l5011v85i02gqnk2hfkif5d7cwq5zm0s-kparts-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kdeclarative-5.5.0.tar.xz";
+    sha256 = "1pb9dlggdr0vzy9bhzsjncnkalvdbrjhgbp1hzba9pyzpmmhx6pq";
+    name = "kdeclarative-5.5.0.tar.xz";
+    store = "/nix/store/7527cdligx3667bjbjqcjxk3m6ifqldc-kdeclarative-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/ktextwidgets-5.5.0.tar.xz";
+    sha256 = "1iqssmpilzxgjs5b2q3f1dpcq4wrwa528an6z9h6rx66lrmbcwml";
+    name = "ktextwidgets-5.5.0.tar.xz";
+    store = "/nix/store/93xq5dl3xmb713rfv0imh261lb6jr3d8-ktextwidgets-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/solid-5.5.0.tar.xz";
+    sha256 = "1vcphw9fj0hqxr612p4dv8ggbb6vh7bnpa8b7l216ixqpg3wg1gs";
+    name = "solid-5.5.0.tar.xz";
+    store = "/nix/store/knsf1bxiymf8nh65w65bakb1cvzjq2il-solid-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kpty-5.5.0.tar.xz";
+    sha256 = "147zxsdyw4fwn0d99nkbjxgcs5vf6wzvgm9d9fpiyzq2747pmnin";
+    name = "kpty-5.5.0.tar.xz";
+    store = "/nix/store/yic1isk1ak0fwr9i3k3af986m1k8z87g-kpty-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/sonnet-5.5.0.tar.xz";
+    sha256 = "0ck2li0y9z2vlby4axhva409bn5nw06g84mm4g3s86mfjypii3gm";
+    name = "sonnet-5.5.0.tar.xz";
+    store = "/nix/store/qgqxm6plb4vfj3yja62s4xa62nkbqmyj-sonnet-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kguiaddons-5.5.0.tar.xz";
+    sha256 = "0wlhhwf59bwscj7c1skigglp1fchdxmi8y3rrmm4ss7avbpkbjvb";
+    name = "kguiaddons-5.5.0.tar.xz";
+    store = "/nix/store/iajck67nc69d2qcczd3hxz41flkb3d7v-kguiaddons-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kunitconversion-5.5.0.tar.xz";
+    sha256 = "0h8rwnfd4dib56q0gndi4rjkrnmpq2bv0nbycsrnhjxvrzbxdfh0";
+    name = "kunitconversion-5.5.0.tar.xz";
+    store = "/nix/store/7dflp9jdaplbx4xjvy364kmy9h27yq67-kunitconversion-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kconfigwidgets-5.5.0.tar.xz";
+    sha256 = "1816n5qzjh4kgcmkicmsmwv063rx81wxvn4flbnrqxw2nglwyx41";
+    name = "kconfigwidgets-5.5.0.tar.xz";
+    store = "/nix/store/jgsadidxnli619q5i9cs7qmgkgs8hgqz-kconfigwidgets-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kimageformats-5.5.0.tar.xz";
+    sha256 = "0fhgk4pl8vx77p6jvcwx8vddzdn701rvbpjy3p0250zgzw9qjkin";
+    name = "kimageformats-5.5.0.tar.xz";
+    store = "/nix/store/qhy1ldzhhr1lij4bg5hp5w97fncqabhq-kimageformats-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/knewstuff-5.5.0.tar.xz";
+    sha256 = "0w0j20jh10zpigm1s6x0n0jgpx9czwb72miyfl8cj3h2j07ghdpz";
+    name = "knewstuff-5.5.0.tar.xz";
+    store = "/nix/store/a49vair6af9159j7bsz9y0gn8q12i0np-knewstuff-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kdbusaddons-5.5.0.tar.xz";
+    sha256 = "1k2k1bwjiv1r5pbzn3ypydgva7kjj2z8csg01jc8p2qii221afjp";
+    name = "kdbusaddons-5.5.0.tar.xz";
+    store = "/nix/store/322m5kv9whdjgc21vlk2vcjaba8yfcbq-kdbusaddons-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kio-5.5.0.tar.xz";
+    sha256 = "13y7chcln71wk32bcd3h6qld901gnafksd9f4kb0nmnahdv6z73z";
+    name = "kio-5.5.0.tar.xz";
+    store = "/nix/store/p0xphwbx522h8xacg8bar3dp8fhd26h8-kio-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kwindowsystem-5.5.0.tar.xz";
+    sha256 = "1s243453d43fpnlykmv7ix6wzxhbyl92y8nrbyn73zfb5kc7z0yh";
+    name = "kwindowsystem-5.5.0.tar.xz";
+    store = "/nix/store/63g4qavmxcgw5njpy9fq2fji5p8ji804-kwindowsystem-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kcodecs-5.5.0.tar.xz";
+    sha256 = "0wh5rcnvkq9c8vf8kll02jpqid5hix17w2ywwpsjfmgi2a4bkjz7";
+    name = "kcodecs-5.5.0.tar.xz";
+    store = "/nix/store/33fpi9a2ggbj8dfpnzhs1w3jgj6hzw78-kcodecs-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kcoreaddons-5.5.0.tar.xz";
+    sha256 = "00fg1khdndacbd6msgjcz2yan04ib5h0l35a4l7bwpyd1crk6fdj";
+    name = "kcoreaddons-5.5.0.tar.xz";
+    store = "/nix/store/2p4mz7pxz94sddm7r4j82q4nriz16i3b-kcoreaddons-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/frameworkintegration-5.5.0.tar.xz";
+    sha256 = "1781l1wzip4w4inz69si5cqy6gr0vcwx9vmhv93925jga44drpaz";
+    name = "frameworkintegration-5.5.0.tar.xz";
+    store = "/nix/store/6v1s33dyv1qvzv8x7m9ak4qn79g52ygz-frameworkintegration-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kwidgetsaddons-5.5.0.tar.xz";
+    sha256 = "0s3aybvnlri8pdfms4dmbgzqan656pzlaghsy8065x19dn4hmwl2";
+    name = "kwidgetsaddons-5.5.0.tar.xz";
+    store = "/nix/store/4f6681v6fp9yzgclf9wbryy63xjvjfvc-kwidgetsaddons-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kidletime-5.5.0.tar.xz";
+    sha256 = "0rb29aqv8npsq161nmkrsxz2kra0jdi1xv2zw9xyapb1yyg4qsk6";
+    name = "kidletime-5.5.0.tar.xz";
+    store = "/nix/store/1d96ca5sy906lhh16hmv122lr8s3xxrp-kidletime-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/ktexteditor-5.5.0.tar.xz";
+    sha256 = "17sbdis5wnj13cxi713ncl1x4b61sdhx5i2j3fdk5gqycmrw93xf";
+    name = "ktexteditor-5.5.0.tar.xz";
+    store = "/nix/store/jy8cb6vscgzqb4gcsnh5b0b64f3pil0k-ktexteditor-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/knotifyconfig-5.5.0.tar.xz";
+    sha256 = "1vj39fsxmypdq5bf1a5sdpld3dfy0hg7k8ikzhy4b83wh5mjzsfy";
+    name = "knotifyconfig-5.5.0.tar.xz";
+    store = "/nix/store/lc1gdg5j1qk7pjg8spyz2wkrcpwqw0c7-knotifyconfig-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/attica-5.5.0.tar.xz";
+    sha256 = "10slxvfcfqxirrnwzfwdnbmlarkcc93d0rvb2110cfvghq3w676m";
+    name = "attica-5.5.0.tar.xz";
+    store = "/nix/store/53asp14pcyx5a47339g6sc3ni8wdh6l8-attica-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kxmlgui-5.5.0.tar.xz";
+    sha256 = "13n8jp7krsbajnaq8r8135xlqja9sawis7fr1z0li54hskfz18x9";
+    name = "kxmlgui-5.5.0.tar.xz";
+    store = "/nix/store/mb1fqb5w5c05yg2fsi31jfcc24hvv1jh-kxmlgui-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kglobalaccel-5.5.0.tar.xz";
+    sha256 = "1bkv7nn5x6im0d6mqr9v4grjc2p3vs481ckgcs6g28p7b4a0dfl3";
+    name = "kglobalaccel-5.5.0.tar.xz";
+    store = "/nix/store/i6dkz0bnw1yx9g8q49414pm9aszkvri3-kglobalaccel-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/plasma-framework-5.5.0.tar.xz";
+    sha256 = "0rhmybncdyy1drg08pjvshmfmzd694skc0n9kk535bm90af4ir26";
+    name = "plasma-framework-5.5.0.tar.xz";
+    store = "/nix/store/jxi0gr530wj58d93hwd9zi5irxy3wrxh-plasma-framework-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kplotting-5.5.0.tar.xz";
+    sha256 = "1gxmngxh1w7wqhy3p4l3lr6283zp8wzsj7sv8gbzd55s3z9vcvp8";
+    name = "kplotting-5.5.0.tar.xz";
+    store = "/nix/store/5nncccml3icr8i2rr7qc1ai5193wr4z6-kplotting-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kactivities-5.5.0.tar.xz";
+    sha256 = "0ypd2cp82z7gabzg96hpz5s24nmzyd2c7a95k74xibasd2fxld73";
+    name = "kactivities-5.5.0.tar.xz";
+    store = "/nix/store/n6553bypqcqpnk2yhv9h0jlfbg671c7d-kactivities-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kiconthemes-5.5.0.tar.xz";
+    sha256 = "1jdjhg38bp936qjxjx0xkdkc1b8rly453d3hyf7vki10cfkm8l9i";
+    name = "kiconthemes-5.5.0.tar.xz";
+    store = "/nix/store/308wv5wyvxdmr792b26ps8wrjxw0s2s1-kiconthemes-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kservice-5.5.0.tar.xz";
+    sha256 = "1hs8g3nnrahi9951xgk0sj5fvpcj572fjj219kj7knv9mwv346zx";
+    name = "kservice-5.5.0.tar.xz";
+    store = "/nix/store/bizwfxq4ap84fd1g8kr7zdqys2rxfzig-kservice-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kemoticons-5.5.0.tar.xz";
+    sha256 = "0yl2w3f6h4irrbf6kl8npz4jwlzmi4bglwjcqqwhs3s6qz2wni95";
+    name = "kemoticons-5.5.0.tar.xz";
+    store = "/nix/store/y5inglfgimmn51by0rf6gk9d2k7wrprc-kemoticons-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/ki18n-5.5.0.tar.xz";
+    sha256 = "11756hp266nssmkywnyh61pzd32k7y15323f5rlh8ap8hzs2cvjd";
+    name = "ki18n-5.5.0.tar.xz";
+    store = "/nix/store/06sviq6lrs60zg9541x99x57avrr460m-ki18n-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/karchive-5.5.0.tar.xz";
+    sha256 = "06bal0lk9r8nnc0vzqsxjhk6xm6yjapl9x883rhzl9r8y9jxfcx3";
+    name = "karchive-5.5.0.tar.xz";
+    store = "/nix/store/zdm1v5bc5jxbv4yc1k4brkbk2mw4srzb-karchive-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/portingAids/krunner-5.5.0.tar.xz";
+    sha256 = "139213rrkc0hmab4hy6mp501s0z59hjgsvkikcswli7wj1yvl1aj";
+    name = "krunner-5.5.0.tar.xz";
+    store = "/nix/store/ps29p1lprbpkqk77x623nfdks22sxz7a-krunner-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/portingAids/kdelibs4support-5.5.0.tar.xz";
+    sha256 = "07jb21is23mkb2yy6dncw70f6jdcn0bg2vz13mgc86f3glim35wh";
+    name = "kdelibs4support-5.5.0.tar.xz";
+    store = "/nix/store/i6wdad07jlbk9nw6khccq9ncc9y4w82f-kdelibs4support-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/portingAids/kross-5.5.0.tar.xz";
+    sha256 = "1nj4zfw6490saixhv3rwp5r7nrzvbskbhr1wvf4rxdbp0f1q20nb";
+    name = "kross-5.5.0.tar.xz";
+    store = "/nix/store/6yq7q3g76rbmdyn12rgi423jfakdzwps-kross-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/portingAids/kmediaplayer-5.5.0.tar.xz";
+    sha256 = "192sn5vqgaip2y6rl30q6y7gmasgfwq137bcalyc00di15xclp6z";
+    name = "kmediaplayer-5.5.0.tar.xz";
+    store = "/nix/store/mj667h3y2j1p9ilblv96f1k98f918hp2-kmediaplayer-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/portingAids/kjsembed-5.5.0.tar.xz";
+    sha256 = "1niqpbg33gzyxppgyxwrnlh3lrwz1wj8zym9z5lr7kimbyamw5xd";
+    name = "kjsembed-5.5.0.tar.xz";
+    store = "/nix/store/pn4w12z242ymbdq4zjg1fa1c3a0fblgc-kjsembed-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/portingAids/khtml-5.5.0.tar.xz";
+    sha256 = "078444gi0jnpn5qjnv8zv2p0p22h14sxx3rv5kzc3zgbs8c0zqq2";
+    name = "khtml-5.5.0.tar.xz";
+    store = "/nix/store/yvnwkm5pn8b93rv422082gj1iaqx4sbs-khtml-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/portingAids/kjs-5.5.0.tar.xz";
+    sha256 = "0wqvzrqd8c7mi90zf7if5cgqi7g42nmqj1ycn13kkds08varrjb6";
+    name = "kjs-5.5.0.tar.xz";
+    store = "/nix/store/55s4313gpm9qspabvq8kaahnyw03ybfv-kjs-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kauth-5.5.0.tar.xz";
+    sha256 = "03sf3cc4hg4drf9h118yqswk65f01q3q7mmj6pz8hhmsvf7rjpq0";
+    name = "kauth-5.5.0.tar.xz";
+    store = "/nix/store/bh72pjz74vhfwhk6zi7zfhrpaqrmj0gj-kauth-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kitemmodels-5.5.0.tar.xz";
+    sha256 = "0j7hifhxrmsdfbp68s4aahmn9jdfy6sy88d2p3z41cg4fw368g2v";
+    name = "kitemmodels-5.5.0.tar.xz";
+    store = "/nix/store/hx2gy0h93wqcrz0185k8blpvkgqb5rvp-kitemmodels-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kcmutils-5.5.0.tar.xz";
+    sha256 = "0na4dvj6qrh7wrdpf7k2gix8grsyj7a8ckvsrzsm35vmxkj1rppx";
+    name = "kcmutils-5.5.0.tar.xz";
+    store = "/nix/store/v93p482j7bqlcch6wh4wpmdbzm2rrb1f-kcmutils-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kconfig-5.5.0.tar.xz";
+    sha256 = "116ck6xz8j9mdz528qk2bj3yifi28jr9amdmjq10y8m67qsgfmdx";
+    name = "kconfig-5.5.0.tar.xz";
+    store = "/nix/store/y79vpd5m36ygn0ka1v030kzabkl1qnn8-kconfig-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kcrash-5.5.0.tar.xz";
+    sha256 = "1ckxphll3vcw3qf8cy3vibn177wc1zkx64g1yfj32ahvc2q5jmw9";
+    name = "kcrash-5.5.0.tar.xz";
+    store = "/nix/store/hybhzm8b650i2zah4ymzsqx5k23gnd93-kcrash-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kded-5.5.0.tar.xz";
+    sha256 = "102s41g2cd3addrqlvwj1a4q9j2rkla22pmjy535s1myk0s5zzbi";
+    name = "kded-5.5.0.tar.xz";
+    store = "/nix/store/dv5i4jlw5q7x9s2h64vgvi8lblwsiaw5-kded-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kitemviews-5.5.0.tar.xz";
+    sha256 = "1fwdl2hvp7nfbii38j89irc0cyfciji20kigzr9iiccips1j4w64";
+    name = "kitemviews-5.5.0.tar.xz";
+    store = "/nix/store/mica7hv5rmmhvdcazm7pknq57d9ln8jx-kitemviews-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kdesignerplugin-5.5.0.tar.xz";
+    sha256 = "1qdcr2gqym367g8w5k1bm6mjm4smc62p4k0aczmjhypa5f9ddkfb";
+    name = "kdesignerplugin-5.5.0.tar.xz";
+    store = "/nix/store/3qlwbyrnbv48swhsknlj319md1z1sdxl-kdesignerplugin-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kwallet-5.5.0.tar.xz";
+    sha256 = "1z2d5qv9722k27dwnj7ivpxa880jmaghh8vhfd9f1wld7lijwpgs";
+    name = "kwallet-5.5.0.tar.xz";
+    store = "/nix/store/a2n6x1kfs3qdixn7fsfy0f3rgf1bzb21-kwallet-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kapidox-5.5.0.tar.xz";
+    sha256 = "055fx8xvksz86gqldxcfbacq5kvb0f7qswaqcnipfcabqkny8vh4";
+    name = "kapidox-5.5.0.tar.xz";
+    store = "/nix/store/m6mp3qg9i6jxgb25ivwcfg0c66y06aay-kapidox-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/threadweaver-5.5.0.tar.xz";
+    sha256 = "05j5m7fscppskc9jss2pm7zab3w0glfic685ccvvabllccsvhkn7";
+    name = "threadweaver-5.5.0.tar.xz";
+    store = "/nix/store/jwq6jvla6bypm1xhh7wv1lh7f2zmx8md-threadweaver-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kcompletion-5.5.0.tar.xz";
+    sha256 = "1l2jaq5f1wjav2vfkfbrrlk4v79q5l3106ij2dyxr0q1m05jvh2v";
+    name = "kcompletion-5.5.0.tar.xz";
+    store = "/nix/store/pq6fv8xh0nr0q1ki1hyp4mpg58jldmps-kcompletion-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kbookmarks-5.5.0.tar.xz";
+    sha256 = "022w3qddbgz4195nxs7kq0xs66qcagrp57jhpm2x23kp6l92g87s";
+    name = "kbookmarks-5.5.0.tar.xz";
+    store = "/nix/store/72fld6sj34xhjpg6v64dpn1g7lqpybin-kbookmarks-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kinit-5.5.0.tar.xz";
+    sha256 = "1hw06jhm0bs3p878ij22k7lx9gzaqnd2260iihgg7glr45jxbspn";
+    name = "kinit-5.5.0.tar.xz";
+    store = "/nix/store/1p4h45a62xcvswk09qa00zs1kjl0f2mj-kinit-5.5.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.5/kjobwidgets-5.5.0.tar.xz";
+    sha256 = "0g849ggnwyw4w4lmdwv4mndgyc2kbdgavgf9hgwmqx0kr2anhi24";
+    name = "kjobwidgets-5.5.0.tar.xz";
+    store = "/nix/store/yfdc0p3mmk31plh50cpx89zfcm3jvx7y-kjobwidgets-5.5.0.tar.xz";
+  }
+]
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.5/manifest.sh
new file mode 100755
index 00000000000..c4a7cc39e52
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/manifest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]; then
+
+  # The extra slash at the end of the URL is necessary to stop wget
+  # from recursing over the whole server! (No, it's not a bug.)
+  $(nix-build ../../../.. -A autonix.manifest) \
+    http://download.kde.org/stable/frameworks/5.5/ \
+      -A '*.tar.xz'
+
+else
+
+  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
+
+fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch
new file mode 100644
index 00000000000..9a22c0bdbcd
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
+index 07b3c90..84417e3 100644
+--- a/src/plasma/package.cpp
++++ b/src/plasma/package.cpp
+@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
+       servicePrefix("plasma-applet-"),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/renames.nix b/pkgs/development/libraries/kde-frameworks-5.5/renames.nix
new file mode 100644
index 00000000000..23262232f74
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/renames.nix
@@ -0,0 +1,66 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+"Backend" = "plasma-framework";
+"CTest" = "attica";
+"ECM" = "extra-cmake-modules";
+"KDED" = "kded";
+"KF5Activities" = "kactivities";
+"KF5Archive" = "karchive";
+"KF5Attica" = "attica";
+"KF5Auth" = "kauth";
+"KF5Bookmarks" = "kbookmarks";
+"KF5Codecs" = "kcodecs";
+"KF5Completion" = "kcompletion";
+"KF5Config" = "kconfig";
+"KF5ConfigWidgets" = "kconfigwidgets";
+"KF5CoreAddons" = "kcoreaddons";
+"KF5Crash" = "kcrash";
+"KF5DBusAddons" = "kdbusaddons";
+"KF5DNSSD" = "kdnssd";
+"KF5Declarative" = "kdeclarative";
+"KF5DesignerPlugin" = "kdesignerplugin";
+"KF5DocTools" = "kdoctools";
+"KF5Emoticons" = "kemoticons";
+"KF5FrameworkIntegration" = "frameworkintegration";
+"KF5GlobalAccel" = "kglobalaccel";
+"KF5GuiAddons" = "kguiaddons";
+"KF5I18n" = "ki18n";
+"KF5IconThemes" = "kiconthemes";
+"KF5IdleTime" = "kidletime";
+"KF5Init" = "kinit";
+"KF5ItemModels" = "kitemmodels";
+"KF5ItemViews" = "kitemviews";
+"KF5JS" = "kjs";
+"KF5JobWidgets" = "kjobwidgets";
+"KF5JsEmbed" = "kjsembed";
+"KF5KCMUtils" = "kcmutils";
+"KF5KDE4Support" = "kdelibs4support";
+"KF5KDELibs4Support" = "kdelibs4support";
+"KF5KHtml" = "khtml";
+"KF5KIO" = "kio";
+"KF5Kross" = "kross";
+"KF5MediaPlayer" = "kmediaplayer";
+"KF5NewStuff" = "knewstuff";
+"KF5Notifications" = "knotifications";
+"KF5NotifyConfig" = "knotifyconfig";
+"KF5Parts" = "kparts";
+"KF5Plasma" = "plasma-framework";
+"KF5PlasmaQuick" = "plasma-framework";
+"KF5Plotting" = "kplotting";
+"KF5Pty" = "kpty";
+"KF5Runner" = "krunner";
+"KF5Service" = "kservice";
+"KF5Solid" = "solid";
+"KF5Sonnet" = "sonnet";
+"KF5Su" = "kdesu";
+"KF5TextEditor" = "ktexteditor";
+"KF5TextWidgets" = "ktextwidgets";
+"KF5ThreadWeaver" = "threadweaver";
+"KF5UnitConversion" = "kunitconversion";
+"KF5Wallet" = "kwallet";
+"KF5WebKit" = "kdewebkit";
+"KF5WidgetsAddons" = "kwidgetsaddons";
+"KF5WindowSystem" = "kwindowsystem";
+"KF5XmlGui" = "kxmlgui";
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh
new file mode 100644
index 00000000000..a8d9b7e0e36
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/default.nix b/pkgs/development/libraries/kde-frameworks-5.6/default.nix
new file mode 100644
index 00000000000..a6f3d4ea389
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/default.nix
@@ -0,0 +1,190 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
+
+with stdenv.lib; with autonix;
+
+let
+
+  mkDerivation = drv:
+    stdenv.mkDerivation
+      (drv // {
+        src = fetchurl drv.src;
+
+        setupHook = ./setup-hook.sh;
+
+        enableParallelBuilding = drv.enableParallelBuilding or true;
+        cmakeFlags =
+          (drv.cmakeFlags or [])
+          ++ [ "-DBUILD_TESTING=OFF"
+            "-DKDE_DEFAULT_HOME=.kde5"
+            "-DKDE4_DEFAULT_HOME=.kde"
+          ]
+          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+        meta = drv.meta or
+          {
+            license = with stdenv.lib.licenses; [
+              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+            ];
+            platforms = stdenv.lib.platforms.linux;
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+          };
+      });
+
+  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
+
+  scope =
+    # packages in this collection
+    (mapAttrs (dep: name: kf5."${name}") renames) //
+    # packages pinned to this version of Qt 5
+    {
+      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      Qt5 = qt5;
+      Qt5Core = qt5;
+      Qt5DBus = qt5;
+      Qt5Test = qt5;
+      Qt5Widgets = qt5;
+      Qt5X11Extras = qt5;
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
+    } //
+    # packages from the nixpkgs collection
+    (with pkgs;
+      {
+        inherit cmake;
+        Boost = boost155;
+        GIF = giflib;
+        GLIB2 = glib;
+        Gpgme = gpgme;
+        JPEG = libjpeg;
+        LibGcrypt = libgcrypt;
+        LibGit2 = libgit2;
+        LibIntl = gettext;
+        LibLZMA = lzma;
+        NetworkManager = networkmanager;
+        Perl = perl;
+        PythonInterp = python;
+        QImageBlitz = qimageblitz;
+        SharedMimeInfo = shared_mime_info;
+        ZLIB = zlib;
+      }
+    );
+
+  mirror = "mirror://kde";
+
+  preResolve = super:
+    fold (f: x: f x) super
+      [
+        (userEnvPkg "SharedMimeInfo")
+        (userEnvPkg "SharedDesktopOntologies")
+      ];
+
+  postResolve = super:
+    super // {
+      extra-cmake-modules = {
+        inherit (super.extra-cmake-modules) name src;
+
+        propagatedNativeBuildInputs = with pkgs; [ cmake pkgconfig ];
+        cmakeFlags = ["-DBUILD_TESTING=OFF"];
+        patches =
+          [
+            ./extra-cmake-modules/0001-libdir-default.patch
+            ./extra-cmake-modules/0002-qt5-plugin-dir.patch
+          ];
+        meta = {
+          license = with stdenv.lib.licenses; [ bsd2 ];
+          platforms = stdenv.lib.platforms.linux;
+          maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+          homepage = "http://www.kde.org";
+        };
+      };
+
+      kauth = with pkgs; super.kauth // {
+        buildInputs = super.kauth.buildInputs ++ [polkit_qt5];
+        patches = [./kauth/kauth-policy-install.patch];
+      };
+
+      kcmutils = super.kcmutils // {
+        patches =
+          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
+      };
+
+      kconfigwidgets = super.kconfigwidgets // {
+        patches =
+          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
+      };
+
+      kdelibs4support = with pkgs; super.kdelibs4support // {
+        buildInputs =
+          super.kdelibs4support.buildInputs
+          ++ [networkmanager xlibs.libSM];
+        cmakeFlags =
+          (super.kdelibs4support.cmakeFlags or [])
+          ++ [
+            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+            "-DDocBookXML4_DTD_VERSION=4.5"
+          ];
+      };
+
+      kdoctools = with pkgs; super.kdoctools // {
+        cmakeFlags =
+          (super.kdoctools.cmakeFlags or [])
+          ++ [
+            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+            "-DDocBookXML4_DTD_VERSION=4.5"
+            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+          ];
+        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
+      };
+
+      ki18n = with pkgs; super.ki18n // {
+        propagatedNativeBuildInputs =
+          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
+      };
+
+      kimageformats = with pkgs; super.kimageformats // {
+        NIX_CFLAGS_COMPILE =
+          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
+          + " -I${ilmbase}/include/OpenEXR";
+      };
+
+      kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
+
+      kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };
+
+      kservice = super.kservice // {
+        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
+        patches =
+          [
+            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
+            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+          ];
+      };
+
+      /*
+      plasma-framework = super.plasma-framework // {
+        patches = [ ./plasma-framework/plasma-framework-external-paths.patch ];
+      };
+      */
+    };
+
+  kf5 = generateCollection ./. {
+    inherit mirror mkDerivation preResolve postResolve renames scope;
+  };
+
+in
+
+  kf5 // { inherit mkDerivation qt5 scope; }
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix
new file mode 100644
index 00000000000..608bff01b92
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix
@@ -0,0 +1,500 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+  attica = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  extra-cmake-modules = {
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
+    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  frameworkintegration = {
+    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5Test" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kactivities = {
+    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kapidox = {
+    buildInputs = [  ];
+    nativeBuildInputs = [ "PythonInterp" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  karchive = {
+    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5Test" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kauth = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kbookmarks = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcmutils = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcodecs = {
+    buildInputs = [ "ECM" "Qt5Core" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcompletion = {
+    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kconfig = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kconfigwidgets = {
+    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kcoreaddons = {
+    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
+  };
+
+  kcrash = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdbusaddons = {
+    buildInputs = [ "ECM" "Qt5DBus" "Qt5Test" "Qt5X11Extras" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5DBus" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdeclarative = {
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kded = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdelibs4support = {
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesignerplugin = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdesu = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Pty" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdewebkit = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdnssd = {
+    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Network" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kdoctools = {
+    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kemoticons = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Test" "Qt5Xml" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kglobalaccel = {
+    buildInputs = [ "ECM" "Qt5" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kguiaddons = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5X11Extras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Gui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  khtml = {
+    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ki18n = {
+    buildInputs = [ "ECM" "LibIntl" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kiconthemes = {
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Svg" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kidletime = {
+    buildInputs = [ "ECM" "Qt5" "X11" "X11_XCB" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kimageformats = {
+    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5PrintSupport" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kinit = {
+    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kio = {
+    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" "Qt5Widgets" "Strigi" "X11" "ZLIB" ];
+    nativeBuildInputs = [ "LibXslt" "cmake" ];
+    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kitemmodels = {
+    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5Script" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kitemviews = {
+    buildInputs = [ "ECM" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjobwidgets = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5X11Extras" "X11" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjs = {
+    buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5Test" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kjsembed = {
+    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kmediaplayer = {
+    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Parts" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knewstuff = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knotifications = {
+    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  knotifyconfig = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kpackage = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kparts = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kplotting = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kpty = {
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kross = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  krunner = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kservice = {
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktexteditor = {
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" ];
+    nativeBuildInputs = [ "Perl" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  ktextwidgets = {
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kunitconversion = {
+    buildInputs = [ "ECM" "KF5I18n" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwallet = {
+    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwidgetsaddons = {
+    buildInputs = [ "ECM" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kwindowsystem = {
+    buildInputs = [ "ECM" "Qt5" "Qt5WinExtras" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Widgets" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  kxmlgui = {
+    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  networkmanager-qt = {
+    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-framework = {
+    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Test" "Qt5Widgets" "Solid" "X11" "XCB" ];
+    nativeBuildInputs = [ "SH" "cmake" ];
+    propagatedBuildInputs = [ "KF5Package" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  solid = {
+    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Qml" "UDev" ];
+    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  sonnet = {
+    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5Test" "ZLIB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  threadweaver = {
+    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" ];
+    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh
new file mode 100755
index 00000000000..2b220244c59
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script rebuilds dependencies.nix.
+# You must run manifest.sh first to download the packages.
+
+# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
+# If you are working on the packages, this is probably what you want.
+
+# You can also pass the path to a source tree where you have built
+# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
+# probably what you want.
+
+manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch
new file mode 100644
index 00000000000..faed0e6edc9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch
@@ -0,0 +1,55 @@
+From f1e22a65f94a231edfe01ac6a3fcf30d95b6329f Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 31 Dec 2014 07:16:45 -0600
+Subject: [PATCH 1/2] libdir default
+
+---
+ kde-modules/KDEInstallDirs.cmake | 31 +------------------------------
+ 1 file changed, 1 insertion(+), 30 deletions(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index e255e87..a79a12a 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -162,37 +162,8 @@
+ # (To distribute this file outside of extra-cmake-modules, substitute the full
+ #  License text for the above reference.)
+ 
+-# Figure out what the default install directory for libraries should be.
+-# This is based on the logic in GNUInstallDirs, but simplified (the
+-# GNUInstallDirs code deals with re-configuring, but that is dealt with
+-# by the _define_* macros in this module).
++# The default library directory on NixOS is *always* /lib.
+ set(_LIBDIR_DEFAULT "lib")
+-# Override this default 'lib' with 'lib64' iff:
+-#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+-#  - we are NOT on debian
+-#  - we are on a 64 bits system
+-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+-# See http://wiki.debian.org/Multiarch
+-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+-   AND NOT CMAKE_CROSSCOMPILING)
+-  if (EXISTS "/etc/debian_version") # is this a debian system ?
+-    if(CMAKE_LIBRARY_ARCHITECTURE)
+-      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-    endif()
+-  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+-      message(AUTHOR_WARNING
+-        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
+-        "Please enable at least one language before including KDEInstallDirs.")
+-    else()
+-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+-        set(_LIBDIR_DEFAULT "lib64")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+ 
+ # Macro for variables that are relative to another variable. We store an empty
+ # value in the cache (for documentation/GUI cache editor purposes), and store
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch
new file mode 100644
index 00000000000..5982aa8a06f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch
@@ -0,0 +1,25 @@
+From e4fb9d880cefa743df2b5da3a67db617d66faf63 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 31 Dec 2014 07:23:59 -0600
+Subject: [PATCH 2/2] qt5 plugin dir
+
+---
+ kde-modules/KDEInstallDirs.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index a79a12a..70dbe02 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -315,7 +315,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ else()
+-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
++    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
+         "Qt plugins"
+         QT_PLUGIN_INSTALL_DIR)
+ 
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch
new file mode 100644
index 00000000000..340155256f2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
+index e859ec7..9a8ab18 100644
+--- a/KF5AuthConfig.cmake.in
++++ b/KF5AuthConfig.cmake.in
+@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+ set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
new file mode 100644
index 00000000000..47b8dfad180
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index c63241b..2243f94 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
+     QStringList desktopFileNames;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString &dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             desktopFileNames.append(it.next());
+         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
new file mode 100644
index 00000000000..3bd946cbd84
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
+index 53a331e..80fbb01 100644
+--- a/src/khelpclient.cpp
++++ b/src/khelpclient.cpp
+@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
+     QString docPath;
+     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
+     Q_FOREACH (const QString &dir, desktopDirs) {
+-        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             const QString desktopPath(it.next());
+             KDesktopFile desktopFile(desktopPath);
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 00000000000..4e3a33efab3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c4863c..f731775 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
+                       )
+ 
+ 
+-find_package(DocBookXML4 "4.5")
+ 
+ set_package_properties(DocBookXML4 PROPERTIES
+                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch
new file mode 100644
index 00000000000..a6ccb2085d3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch
@@ -0,0 +1,30 @@
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 3c3c913..f510620 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
+         if (!libpath.isEmpty()) {
+             if (!l.load()) {
+                 if (libpath_relative) {
+-                    // NB: Because Qt makes the actual dlopen() call, the
+-                    //     RUNPATH of kdeinit is *not* respected - see
+-                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
+-                    //     - so we try hacking it in ourselves
+-                    QString install_lib_dir = QFile::decodeName(
+-                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+-                    libpath = install_lib_dir + libpath;
+-                    l.setFileName(libpath);
++                  // Use QT_PLUGIN_PATH to find shared library directories
++                  // For KF5, the plugin path is /lib/plugins, so the kdeinit5
++                  // shared libraries should be in /lib/plugins/../
++                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
++                  const QString up = QString::fromLocal8Bit("/../");
++                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
++                  Q_FOREACH (const QString &path, paths) {
++                    l.setFileName(path + up + libpath);
+                     l.load();
++                    if (l.isLoaded()) break;
++                  }
+                 }
+             }
+             if (!l.isLoaded()) {
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch
new file mode 100644
index 00000000000..440e979c008
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch
@@ -0,0 +1,25 @@
+From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 28 Jan 2015 07:15:30 -0600
+Subject: [PATCH] allow external paths
+
+---
+ src/kpackage/package.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
+index eb4a09b..f70f1a1 100644
+--- a/src/kpackage/package.cpp
++++ b/src/kpackage/package.cpp
+@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
+     : QSharedData(),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch
new file mode 100644
index 00000000000..e9bc418544a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
+index 69b1427..9c37a49 100644
+--- a/src/kbuildsycoca/kbuildsycoca.cpp
++++ b/src/kbuildsycoca/kbuildsycoca.cpp
+@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
+         QStringList relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
new file mode 100644
index 00000000000..7e21ebfe86f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
+index 2eb1275..e39a36f 100644
+--- a/src/kbuildsycoca/vfolder_menu.cpp
++++ b/src/kbuildsycoca/vfolder_menu.cpp
+@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++        QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.6/manifest.nix
new file mode 100644
index 00000000000..f8933d2f596
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/manifest.nix
@@ -0,0 +1,382 @@
+# This file is generated automatically. DO NOT EDIT!
+{ mirror }:
+[
+  {
+    url = "${mirror}/stable/frameworks/5.6/kdbusaddons-5.6.0.tar.xz";
+    sha256 = "1gn4dm983d1nw7s8x3v9iq95glk0kpyj5zblylk76q8zjnxrx63r";
+    name = "kdbusaddons-5.6.0.tar.xz";
+    store = "/nix/store/l77sb2fblas9qd9g1fc01n53yipsg6fz-kdbusaddons-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kitemmodels-5.6.0.tar.xz";
+    sha256 = "0b40hyzp9rdgm2lr2nnqq229zy6xc3y04xgz47h4cngyz2ykiidm";
+    name = "kitemmodels-5.6.0.tar.xz";
+    store = "/nix/store/vzbgb344m8j1rsmwmvz08rrqswjqf2kn-kitemmodels-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kded-5.6.0.tar.xz";
+    sha256 = "16zl0a1yr5vy18gds1kvw5g1ndl4rv3xgfgwy4bnys65rqw9j4nh";
+    name = "kded-5.6.0.tar.xz";
+    store = "/nix/store/2cwmng27rxxnkilf5rl61nfmv7f5dwgh-kded-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/attica-5.6.0.tar.xz";
+    sha256 = "1qw3fg2pm1zwjc64dmwgqf3w6bn9nhbwa4j1r2mxmsgdvm3m6y80";
+    name = "attica-5.6.0.tar.xz";
+    store = "/nix/store/1z5gs5p4riv2rzc83np3z2lch6lscbif-attica-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kimageformats-5.6.0.tar.xz";
+    sha256 = "0g09cvgr7l4lfhmwscyri2ivndl3kp9w7rnwx9kmqyrbpaq7a5p6";
+    name = "kimageformats-5.6.0.tar.xz";
+    store = "/nix/store/6fw40sn37h6kb9z58cj08fi0gafpm7il-kimageformats-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kxmlgui-5.6.0.tar.xz";
+    sha256 = "18d4bbvygrgxln54xwk3cas8ncpxapwxr4566c2402fm03y1j3zw";
+    name = "kxmlgui-5.6.0.tar.xz";
+    store = "/nix/store/cz3994azp3y1c9pkybjb6n7vq1fvrrdx-kxmlgui-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kunitconversion-5.6.0.tar.xz";
+    sha256 = "1zwmw4m5fa5r48cf28bpygwy3x8vap2xsld1ixnydzzbwc4ry3ix";
+    name = "kunitconversion-5.6.0.tar.xz";
+    store = "/nix/store/2kx18zpi5vd0j7mdg9yrrqciqqa48bzk-kunitconversion-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kcompletion-5.6.0.tar.xz";
+    sha256 = "0zk50qbm7yfjh01c89xg19yc3qji1qdlan60ggwjqabdwfx097vj";
+    name = "kcompletion-5.6.0.tar.xz";
+    store = "/nix/store/hs0amwz5nrzzx9gc4qlvw23dvacd12ys-kcompletion-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kwallet-5.6.0.tar.xz";
+    sha256 = "032yi352fdigdbvlqf6pci9srl6hcfc5gq10s90hvfp25xvyvn1k";
+    name = "kwallet-5.6.0.tar.xz";
+    store = "/nix/store/6cy8nbhblz788i0sq19vddgmm7kw3vkh-kwallet-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kservice-5.6.0.tar.xz";
+    sha256 = "1amwp6vzr4br6a37q2d8krhsvnnhvk2pvccizgml8pmk2kg1jndf";
+    name = "kservice-5.6.0.tar.xz";
+    store = "/nix/store/cfy088igxfx9p3w0npffidyd53qcf1qz-kservice-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kiconthemes-5.6.0.tar.xz";
+    sha256 = "1q06hlgs1sxnklrhdw7qxyfi4fxxjhza4nwc02p2ym1mfgj76afq";
+    name = "kiconthemes-5.6.0.tar.xz";
+    store = "/nix/store/alg2frgkj7jjy0rgq8d9c9s7ayhsxgmb-kiconthemes-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/threadweaver-5.6.0.tar.xz";
+    sha256 = "1ilwwcfczhz60542ivyvr4a1723fliz5mxv75nb0a3nsd8qh662j";
+    name = "threadweaver-5.6.0.tar.xz";
+    store = "/nix/store/22135n73yf5bgxhpfigk4vbajgqbv8za-threadweaver-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/sonnet-5.6.0.tar.xz";
+    sha256 = "0pkc7sck4lpl1ig8xqam91809s49rr70wqhqjmyd823m35134k88";
+    name = "sonnet-5.6.0.tar.xz";
+    store = "/nix/store/7m3a4g6jbbkqssm1xjzq4qc0axmdlzvw-sonnet-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kcrash-5.6.0.tar.xz";
+    sha256 = "0ismn2phd1802hb0vpdc5fn3x8h8p8lzdx1zgg1j5mqx3jddhskz";
+    name = "kcrash-5.6.0.tar.xz";
+    store = "/nix/store/hbv92rvbxwhb4mbf7skqfq7hv23v39hy-kcrash-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kio-5.6.0.tar.xz";
+    sha256 = "06kxl1x96nxkf6pn0hqm5jlpgvj0nzj16d4s3yqh80y8mb3qmy5x";
+    name = "kio-5.6.0.tar.xz";
+    store = "/nix/store/2p8kx9b47zxcgar5n6cfllxrmxc68k8j-kio-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kapidox-5.6.0.tar.xz";
+    sha256 = "1jai9na4v2brvlcb4bc7dghwbii326lp01qn97n4k2gs6gbaz72d";
+    name = "kapidox-5.6.0.tar.xz";
+    store = "/nix/store/a1wj3qs2a7p9xbhpv1lnj0fp28wbrk0a-kapidox-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kdewebkit-5.6.0.tar.xz";
+    sha256 = "18q7z8ly3dgn3vnl42swlaqqhf2ajfa8azz5pjswmfhfnxdh1dw7";
+    name = "kdewebkit-5.6.0.tar.xz";
+    store = "/nix/store/vigpp6rha2r1062nlkld92cg1kdvdqk4-kdewebkit-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/plasma-framework-5.6.0.tar.xz";
+    sha256 = "16xfhqkq29jw9wx3h6s8m3alamqqfff676qdik9kh5xxm9kyf3rq";
+    name = "plasma-framework-5.6.0.tar.xz";
+    store = "/nix/store/6xm3arrwlsl0w3xrcjxwl55fvhpqy34a-plasma-framework-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kwidgetsaddons-5.6.0.tar.xz";
+    sha256 = "179pjyjc8raiga5wv44dwpcjw68b3sc0pyv19rkwdbbym6rwx34d";
+    name = "kwidgetsaddons-5.6.0.tar.xz";
+    store = "/nix/store/59s52d30qcmlvhrbvzbhkxdm0vbq66k5-kwidgetsaddons-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kglobalaccel-5.6.0.tar.xz";
+    sha256 = "12wgv3nhr2c54vh17mqm96hyfvzjbfmm335dqh2ajqg79w7bk46v";
+    name = "kglobalaccel-5.6.0.tar.xz";
+    store = "/nix/store/yg49hswx9kr7y4rby96yl62cg8qggcld-kglobalaccel-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kparts-5.6.0.tar.xz";
+    sha256 = "1fd8kmfg6vyii8s5fx968x404wmmly29xfjlgpc2y5phw26v0jm1";
+    name = "kparts-5.6.0.tar.xz";
+    store = "/nix/store/mlb24addakwmg79h8j42yaiavfdw3xcj-kparts-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kdesignerplugin-5.6.0.tar.xz";
+    sha256 = "0nnxcqzsr4x7z08hz54n30lrbsxcnc14yc64lf8avpjs1cbgg2f6";
+    name = "kdesignerplugin-5.6.0.tar.xz";
+    store = "/nix/store/9bk81cvs0y7nicnf4z2hggpc2s2iw9mq-kdesignerplugin-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kidletime-5.6.0.tar.xz";
+    sha256 = "1byyj89iy20mwy373z5rxhkjc1adbpjjl14a3vqvc80f87x08hd5";
+    name = "kidletime-5.6.0.tar.xz";
+    store = "/nix/store/8pqylp14nd42qyh42rxhszgnby8dzz69-kidletime-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/ki18n-5.6.0.tar.xz";
+    sha256 = "0g9qzisi9hlz61l6qls5xwqkj98h26f5gnphh8pha3rxkh1nzrzm";
+    name = "ki18n-5.6.0.tar.xz";
+    store = "/nix/store/zhg3dfsqm51137kyvyc0i1qda7vjb82n-ki18n-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kinit-5.6.0.tar.xz";
+    sha256 = "1k9frj2myzzjjgg98hh5003zqkch4id3nkc0kqdx113g7walm2xy";
+    name = "kinit-5.6.0.tar.xz";
+    store = "/nix/store/kwr5nfpm93ngvsp10h1spsz93bb92l07-kinit-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/extra-cmake-modules-1.6.0.tar.xz";
+    sha256 = "08nad0mb2bxp2alh562qvpma6f4mkhznfla9p1skdb06kb0gz5s6";
+    name = "extra-cmake-modules-1.6.0.tar.xz";
+    store = "/nix/store/r6qshq5hxyrrddg7gwgwkpvbci6sxrgi-extra-cmake-modules-1.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/knewstuff-5.6.0.tar.xz";
+    sha256 = "0h60fhpc3p4l8889spj33lvwzcqplnlbf2clbwiyjpa1j86sfdf0";
+    name = "knewstuff-5.6.0.tar.xz";
+    store = "/nix/store/m465k9rzic6ax36m3wpv22wr90d6sm9w-knewstuff-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kitemviews-5.6.0.tar.xz";
+    sha256 = "0mjwvi0n55x8xwnbmqw1z6av7vc0gfrs9ljpgi1na4mmk84yqhdd";
+    name = "kitemviews-5.6.0.tar.xz";
+    store = "/nix/store/vj0ssv01sn36280g64k2dk0pwgzbff9l-kitemviews-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kpackage-5.6.0.tar.xz";
+    sha256 = "1wpvg5s0y31iad874xpyw1z78r72b7w56lxbn732imp5bzajmq2v";
+    name = "kpackage-5.6.0.tar.xz";
+    store = "/nix/store/iq9739r7pzk7zfzvk0599liylkwn9ml4-kpackage-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kcmutils-5.6.0.tar.xz";
+    sha256 = "0wzzxq3nid80q4a4wzz2yd3vfc6mzjxbdair263kw1xkxcb2l3ng";
+    name = "kcmutils-5.6.0.tar.xz";
+    store = "/nix/store/gsamabw9mhda9d3b7zwravfhvviym7gd-kcmutils-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kdeclarative-5.6.0.tar.xz";
+    sha256 = "049bknjd383vc4jlmahjrs2mnwdn0jrvz3pkjywlwx7v7ja69l5l";
+    name = "kdeclarative-5.6.0.tar.xz";
+    store = "/nix/store/zna6r1vkms0ysigsw1xcp0brwmrkkj00-kdeclarative-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kcodecs-5.6.0.tar.xz";
+    sha256 = "1l647c89rs3w6laal28hx25s1215jhl911q85jyzhz528rkd1jx6";
+    name = "kcodecs-5.6.0.tar.xz";
+    store = "/nix/store/iq1vxp7qbyrfdqh1jvfi0iq9zg17bzrm-kcodecs-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kdesu-5.6.0.tar.xz";
+    sha256 = "0agr28m80b5rnk3l4sjfcwq9cx4krs8f7nxl9ll13zx62gknwjlk";
+    name = "kdesu-5.6.0.tar.xz";
+    store = "/nix/store/8vnnjbbpnr52av5cga5y8i5iphmv73r6-kdesu-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/extra-cmake-modules-1.6.1.tar.xz";
+    sha256 = "1ri6zvhd6k721y0wigl1928dwhg7bvcqs0ifaddvhn8ql694qvgz";
+    name = "extra-cmake-modules-1.6.1.tar.xz";
+    store = "/nix/store/vpcwwg988l2647laz0mm4j65szby7yya-extra-cmake-modules-1.6.1.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/karchive-5.6.0.tar.xz";
+    sha256 = "0ldgwzzl70k4kvhmzp70r63akyprspcrpdnlafa5irdmfcc3sfzj";
+    name = "karchive-5.6.0.tar.xz";
+    store = "/nix/store/m75chqjl74piz0miwxj14szwb6834r3z-karchive-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kwindowsystem-5.6.0.tar.xz";
+    sha256 = "04qgai4ib2jm2xsmpzm2iszrkma4ns6fn8nkn8m5lbihsrfp6lmz";
+    name = "kwindowsystem-5.6.0.tar.xz";
+    store = "/nix/store/4a0hdrjz0s172vqnxwz7khysp0yz8pd7-kwindowsystem-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/knotifications-5.6.0.tar.xz";
+    sha256 = "1fz0kq8azwc3gdvbr7p07zsrpdsb707cksnzjgnddxm741wzvfr0";
+    name = "knotifications-5.6.0.tar.xz";
+    store = "/nix/store/r9p9h0ma9v57jpz1iv4gy66jd3wmi0jn-knotifications-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kactivities-5.6.0.tar.xz";
+    sha256 = "1mr375w83y8ivcq9fvswwr637ilyrikyv56bkkchyb18y34f1v1i";
+    name = "kactivities-5.6.0.tar.xz";
+    store = "/nix/store/0yazfjf3kwj7yqh60napp8i1gwp7vssm-kactivities-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kdoctools-5.6.0.tar.xz";
+    sha256 = "02vbw530gy1d6mygzrpd5pqdqjww2749q0rkj4dl14va7rw9ksx5";
+    name = "kdoctools-5.6.0.tar.xz";
+    store = "/nix/store/73xzy82hqayfb303cxxvb0pd1xsm68qi-kdoctools-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/frameworkintegration-5.6.0.tar.xz";
+    sha256 = "0kh57h2sxpz8my1wb5xx8xhxsa08nfdg3551dphvabl6mpg1jsqh";
+    name = "frameworkintegration-5.6.0.tar.xz";
+    store = "/nix/store/vljg38z53y37xafjvv7xhfnhb2cfhwby-frameworkintegration-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kauth-5.6.0.tar.xz";
+    sha256 = "0rnwh9cnn3nsk980grl1ycldpr61ihksmphcvq1jj0lpdgw80zan";
+    name = "kauth-5.6.0.tar.xz";
+    store = "/nix/store/khb8pfz5qn40mrfh859n4fp6qcv593ib-kauth-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/knotifyconfig-5.6.0.tar.xz";
+    sha256 = "0ifsnj9gm7fgwd2rb34xqnfy4hxyxr2wgyjd8ryywnp1zf4b6hfi";
+    name = "knotifyconfig-5.6.0.tar.xz";
+    store = "/nix/store/3mn9094lflb8larwzgz7p8hgf40kgq1a-knotifyconfig-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/solid-5.6.0.tar.xz";
+    sha256 = "1lnn6134s2zagcy1qcyxsr4nv31fxafmyk2cil70a0pmpq7ywyw4";
+    name = "solid-5.6.0.tar.xz";
+    store = "/nix/store/550z8fj4vabpds4d3kzn04mmhi6rb813-solid-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/networkmanager-qt-5.6.0.tar.xz";
+    sha256 = "0iwdzb75psvw4b1rg7ijrgz9kijiik7n4grryyib2nvwwgzna3lv";
+    name = "networkmanager-qt-5.6.0.tar.xz";
+    store = "/nix/store/m48q6fc34yxmiv02qmww8xdh2nrpzk6g-networkmanager-qt-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/portingAids/khtml-5.6.0.tar.xz";
+    sha256 = "1i6v3m7wkdj8cpqdp74mxhyyhq1qq8k80vsxjm1nzaqxgwq8gfvq";
+    name = "khtml-5.6.0.tar.xz";
+    store = "/nix/store/mlrqylbwp2bj7l70fxlkw0a6dcgd3q6x-khtml-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/portingAids/kmediaplayer-5.6.0.tar.xz";
+    sha256 = "0z66a2yb4i9q2mk14szs4z8832jl33awaqima9b9xsdh5w4q6llk";
+    name = "kmediaplayer-5.6.0.tar.xz";
+    store = "/nix/store/47908hvamfll3wn0rbacp455zvs0sv4g-kmediaplayer-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/portingAids/kjsembed-5.6.0.tar.xz";
+    sha256 = "08g3ac02c4vi010036kz0jgsmhv7c0s4xxk05pmkm6i7hrnslv7g";
+    name = "kjsembed-5.6.0.tar.xz";
+    store = "/nix/store/m0is4ahl2rsv4gzwarim4bw1jzzrddmm-kjsembed-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/portingAids/kross-5.6.0.tar.xz";
+    sha256 = "0pwscrk89apvysfgr596yb9vywdc6l6dsrhgxmmsplh6v3nqknph";
+    name = "kross-5.6.0.tar.xz";
+    store = "/nix/store/54p2ms8fjiikpcz15amg1kkip7ddpqfq-kross-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/portingAids/krunner-5.6.0.tar.xz";
+    sha256 = "09c11c43pw4hm59h1nixs2bqs22iwvc728fgm7hhmp76xv8vw5sf";
+    name = "krunner-5.6.0.tar.xz";
+    store = "/nix/store/2bbpl3pkd9h9di2ihlj3ab8gaxjvkfx5-krunner-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/portingAids/kjs-5.6.0.tar.xz";
+    sha256 = "0gizs498q2rjmlqgpwh7p1kb3bwdfif28fscya1i6jakdgl8s94c";
+    name = "kjs-5.6.0.tar.xz";
+    store = "/nix/store/2y2dd7s775c1699g13fbaz5b3pgb079g-kjs-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/portingAids/kdelibs4support-5.6.0.tar.xz";
+    sha256 = "057zvf1b6k8gfs19yz90fxj1jzyc2f1pyh03mhbj3a77sph82qc9";
+    name = "kdelibs4support-5.6.0.tar.xz";
+    store = "/nix/store/flmn2ls5rqyj6hh98c2vvvzmb7lx36a3-kdelibs4support-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kcoreaddons-5.6.0.tar.xz";
+    sha256 = "07z29viwijwmgashwxhz3j9pw9ksvsjywz88871nmggbw8544x0r";
+    name = "kcoreaddons-5.6.0.tar.xz";
+    store = "/nix/store/8j6zx7269w1z64wblpg0p8f9kc046qrn-kcoreaddons-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kemoticons-5.6.0.tar.xz";
+    sha256 = "1hq1dqhnj8zvna37pbi9xavc3ad41q5ayxb4gn6rn4hglg94fv68";
+    name = "kemoticons-5.6.0.tar.xz";
+    store = "/nix/store/63488dvgv4qpf60wkhmwrwylq09gnkq2-kemoticons-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kdnssd-5.6.0.tar.xz";
+    sha256 = "0cpfazdq7l9v29bjq08dj6kf8d1g8fjfq4aqljqzlzn4grsmjksq";
+    name = "kdnssd-5.6.0.tar.xz";
+    store = "/nix/store/rwdp52gpbyaak9r89lkj27mgbjhk8dhn-kdnssd-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kplotting-5.6.0.tar.xz";
+    sha256 = "0hj66zshpnaabvjhi4183fh4xhqg95sv8jjlmzwdzac7ipn09r0c";
+    name = "kplotting-5.6.0.tar.xz";
+    store = "/nix/store/4jrjvkz1dclccnwhqzh0sjia79d0bs4s-kplotting-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kconfigwidgets-5.6.0.tar.xz";
+    sha256 = "0fb1sxjcqfgvli5ndm03sqadrhqgsk841y6cql0grpyyx42b2s3s";
+    name = "kconfigwidgets-5.6.0.tar.xz";
+    store = "/nix/store/40sc8j052cpqsk663icz6x426jac6v2b-kconfigwidgets-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kpty-5.6.0.tar.xz";
+    sha256 = "02n2i4q2wasjkrivc80srs208zlgkhi0v7xxcx49xv2djhcm71nb";
+    name = "kpty-5.6.0.tar.xz";
+    store = "/nix/store/zw7lvzy73w9ffv79jmckr52bw7xsgza6-kpty-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kbookmarks-5.6.0.tar.xz";
+    sha256 = "00qn6jgz1zzz0bbj0z6ki7wcb4q611szvnmif1n7sdmmcczd2b3l";
+    name = "kbookmarks-5.6.0.tar.xz";
+    store = "/nix/store/qbi1yankzvx098cfksx8wdxh0zv0jqx3-kbookmarks-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/ktexteditor-5.6.0.tar.xz";
+    sha256 = "1s57bpr7bb2c4xw384lkik7pbwa21v1ma4vriv3dz91q029qjxgs";
+    name = "ktexteditor-5.6.0.tar.xz";
+    store = "/nix/store/c4hfl2yny47mxa8iil5xxqwrzwwlfqpl-ktexteditor-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kguiaddons-5.6.0.tar.xz";
+    sha256 = "08md1bch0cdd9ywc1g46ia1h1vqv74s36ar5x9if12jfkhiss13i";
+    name = "kguiaddons-5.6.0.tar.xz";
+    store = "/nix/store/1riwgwy3yw3n0zi1q7k3rnf3s37d397f-kguiaddons-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/ktextwidgets-5.6.0.tar.xz";
+    sha256 = "0b6q7mbdfjfzi3hb2qbjqnmdhycabsiqnrz66l2xa78phmwydvss";
+    name = "ktextwidgets-5.6.0.tar.xz";
+    store = "/nix/store/442l5jhr4vij2gnnbhf30q98xmyzd6m2-ktextwidgets-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kjobwidgets-5.6.0.tar.xz";
+    sha256 = "16l2xhlqvavzjf9hfjdz3pssa3sjdv6bvmk9dp9prf7j39pxhnw6";
+    name = "kjobwidgets-5.6.0.tar.xz";
+    store = "/nix/store/9hxzz693csamkrx8x6m7lrm5m76vx0nb-kjobwidgets-5.6.0.tar.xz";
+  }
+  {
+    url = "${mirror}/stable/frameworks/5.6/kconfig-5.6.0.tar.xz";
+    sha256 = "06rx3hwc3hay0g8pnzm9l7mdwk4pqy3waspncdlknabaxcvqmf0a";
+    name = "kconfig-5.6.0.tar.xz";
+    store = "/nix/store/26q4zhd6m4jjshknmd2r0dgxmscbgncr-kconfig-5.6.0.tar.xz";
+  }
+]
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh
new file mode 100755
index 00000000000..d6d7ccae6a5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]; then
+
+  # The extra slash at the end of the URL is necessary to stop wget
+  # from recursing over the whole server! (No, it's not a bug.)
+  $(nix-build ../../../.. -A autonix.manifest) \
+    http://download.kde.org/stable/frameworks/5.6/ \
+      -A '*.tar.xz'
+
+else
+
+  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
+
+fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch
new file mode 100644
index 00000000000..9a22c0bdbcd
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
+index 07b3c90..84417e3 100644
+--- a/src/plasma/package.cpp
++++ b/src/plasma/package.cpp
+@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
+       servicePrefix("plasma-applet-"),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/renames.nix b/pkgs/development/libraries/kde-frameworks-5.6/renames.nix
new file mode 100644
index 00000000000..58ade4e62ac
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/renames.nix
@@ -0,0 +1,68 @@
+# DO NOT EDIT! This file is generated automatically.
+{ }:
+{
+"Backend" = "plasma-framework";
+"CTest" = "attica";
+"ECM" = "extra-cmake-modules";
+"KDED" = "kded";
+"KF5Activities" = "kactivities";
+"KF5Archive" = "karchive";
+"KF5Attica" = "attica";
+"KF5Auth" = "kauth";
+"KF5Bookmarks" = "kbookmarks";
+"KF5Codecs" = "kcodecs";
+"KF5Completion" = "kcompletion";
+"KF5Config" = "kconfig";
+"KF5ConfigWidgets" = "kconfigwidgets";
+"KF5CoreAddons" = "kcoreaddons";
+"KF5Crash" = "kcrash";
+"KF5DBusAddons" = "kdbusaddons";
+"KF5DNSSD" = "kdnssd";
+"KF5Declarative" = "kdeclarative";
+"KF5DesignerPlugin" = "kdesignerplugin";
+"KF5DocTools" = "kdoctools";
+"KF5Emoticons" = "kemoticons";
+"KF5FrameworkIntegration" = "frameworkintegration";
+"KF5GlobalAccel" = "kglobalaccel";
+"KF5GuiAddons" = "kguiaddons";
+"KF5I18n" = "ki18n";
+"KF5IconThemes" = "kiconthemes";
+"KF5IdleTime" = "kidletime";
+"KF5Init" = "kinit";
+"KF5ItemModels" = "kitemmodels";
+"KF5ItemViews" = "kitemviews";
+"KF5JS" = "kjs";
+"KF5JobWidgets" = "kjobwidgets";
+"KF5JsEmbed" = "kjsembed";
+"KF5KCMUtils" = "kcmutils";
+"KF5KDE4Support" = "kdelibs4support";
+"KF5KDELibs4Support" = "kdelibs4support";
+"KF5KHtml" = "khtml";
+"KF5KIO" = "kio";
+"KF5Kross" = "kross";
+"KF5MediaPlayer" = "kmediaplayer";
+"KF5NetworkManagerQt" = "networkmanager-qt";
+"KF5NewStuff" = "knewstuff";
+"KF5Notifications" = "knotifications";
+"KF5NotifyConfig" = "knotifyconfig";
+"KF5Package" = "kpackage";
+"KF5Parts" = "kparts";
+"KF5Plasma" = "plasma-framework";
+"KF5PlasmaQuick" = "plasma-framework";
+"KF5Plotting" = "kplotting";
+"KF5Pty" = "kpty";
+"KF5Runner" = "krunner";
+"KF5Service" = "kservice";
+"KF5Solid" = "solid";
+"KF5Sonnet" = "sonnet";
+"KF5Su" = "kdesu";
+"KF5TextEditor" = "ktexteditor";
+"KF5TextWidgets" = "ktextwidgets";
+"KF5ThreadWeaver" = "threadweaver";
+"KF5UnitConversion" = "kunitconversion";
+"KF5Wallet" = "kwallet";
+"KF5WebKit" = "kdewebkit";
+"KF5WidgetsAddons" = "kwidgetsaddons";
+"KF5WindowSystem" = "kwindowsystem";
+"KF5XmlGui" = "kxmlgui";
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh
new file mode 100644
index 00000000000..a8d9b7e0e36
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
new file mode 100644
index 00000000000..18bb9f002e5
--- /dev/null
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, pkgconfig, cmake, git, doxygen, help2man, tecla, libusb1, udev }:
+
+stdenv.mkDerivation rec {
+  version = "1.1.0";
+  name = "libbladeRF-v${version}";
+
+  src = fetchgit {
+    url = "https://github.com/Nuand/bladeRF/";
+    rev = "refs/tags/libbladeRF_v${version}";
+    sha256 = "19qd26yflig51scknyjf3r3nmnc2bni75294jpsv0idzqfj87lbr";
+    name = "libbladeRF_v${version}-checkout";
+  };
+
+  buildInputs = [ pkgconfig cmake git doxygen help2man tecla libusb1 udev ];
+
+  # Fixup shebang
+  prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";
+
+  # Let us avoid nettools as a dependency.
+  patchPhase = ''
+    sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
+    sed -i 's/ --no-info/ --no-info --no-discard-stderr/' host/utilities/bladeRF-cli/CMakeLists.txt
+  '';
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Debug"
+    "-DUDEV_RULES_PATH=$out/etc/udev/rules.d"
+    "-DINSTALL_UDEV_RULES=ON"
+    "-DBUILD_DOCUMENTATION=ON"
+  ];
+
+  meta = {
+    homepage = "https://www.nuand.com/";
+    description = "Supporting library of the BladeRF SDR opensource hardware";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.funfunctor ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt5.nix
new file mode 100644
index 00000000000..99a13edf8f4
--- /dev/null
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt5.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchbzr, qt5, cmake }:
+
+stdenv.mkDerivation {
+  name = "libdbusmenu-qt-0.9.3+14";
+
+  src = fetchbzr {
+    url = "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk";
+    rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2";
+    sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd";
+  };
+
+  buildInputs = [ qt5 ];
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = "-DWITH_DOC=OFF";
+
+  meta = with stdenv.lib; {
+    homepage = "http://launchpad.net/libdbusmenu-qt";
+    description = "Provides a Qt implementation of the DBusMenu spec";
+    maintainers = [ maintainers.ttuegel ];
+    inherit (qt5.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix
index a555b4dd5f9..b37503df5d9 100644
--- a/pkgs/development/libraries/libgsystem/default.nix
+++ b/pkgs/development/libraries/libgsystem/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  name = "libgsystem-2014.2";
+  name = "libgsystem-2015.1";
 
   meta = with stdenv.lib; {
     description = "GIO-based library with Unix/Linux specific API";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "GNOME";
     repo = "libgsystem";
-    rev = "v2014.2";
-    sha256 = "10mqyy94wbmxv9rizwby4dyvqgranjr3hixr5k7fs90lhgbxbkj6";
+    rev = "v2015.1";
+    sha256 = "0j5dqn1pnspfxifklw4wkikqlbxr4faib07550n5gi58m89gg68n";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
new file mode 100644
index 00000000000..50de473c1eb
--- /dev/null
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, boost, fftw, qt5 }:
+
+stdenv.mkDerivation rec {
+  version = "0.11.0-20141105";
+  name = "libkeyfinder-${version}";
+
+  src = fetchFromGitHub {
+    repo = "libKeyFinder";
+    owner = "ibsh";
+    rev = "592ef1f3d3ada489f80814d5ccfbc8de6029dc9d";
+    sha256 = "0xcqpizwbn6wik3w7h9k1lvgrp3r3w6yyy55flvnwwwgvkry48as";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Musical key detection for digital audio (C++ library)";
+    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
+    license = with licenses; gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ fftw qt5 ];
+  propagatedBuildInputs = [ boost ];
+
+  patchPhase = ''
+    substituteInPlace LibKeyFinder.pro --replace "/usr/local" "$out"
+  '';
+
+  configurePhase = ''
+    qmake
+  '';
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    mkdir -p $out/include/keyfinder
+    cp *.h $out/include/keyfinder
+  '';
+}
diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index 7f925cd9b2a..23083ec77ac 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
       define(\`confUBINDIR', \`$out/bin')
       define(\`confINCGRP', \`root')
       define(\`confLIBGRP', \`root')
+      APPENDDEF(\`confENVDEF', \`-DNETINET6')
     EOF
     sh Build -f ./a.m4
   '';
diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix
new file mode 100644
index 00000000000..964896131c9
--- /dev/null
+++ b/pkgs/development/libraries/libpgf/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix }:
+
+with stdenv.lib;
+
+let
+  version = "6.14.12";
+in
+stdenv.mkDerivation {
+  name = "libpgf-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz";
+    sha256 = "1ssqjbh6l5jc04f67n47m9bqcigl46c6lgyabyi6cabnh1frk9dx";
+  };
+
+  buildInputs = [ autoconf automake libtool dos2unix ];
+
+  preConfigure = "dos2unix configure.ac; sh autogen.sh";
+
+# configureFlags = optional static "--enable-static --disable-shared";
+
+  meta = {
+    homepage = http://www.libpgf.org/;
+    description = "Progressive Graphics Format";
+    license = stdenv.lib.licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index f77e9a31377..fbeea0573d7 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.5";
 
   src = fetchurl {
-    url    = "http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${name}.tar.gz";
+    url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
     sha256 = "16pwgmj90k10pf03il39lnck5kqw59hj0fp2qhmgsgmrvssn6m1z";
   };
 
diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
index d5b401b804f..43c2a9089b7 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, sqlite, zlib, proj, geos }:
+{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos }:
 
 stdenv.mkDerivation rec {
-  name = "libspatialite-4.1.1";
+  name = "libspatialite-4.2.0";
 
   src = fetchurl {
     url = "http://www.gaia-gis.it/gaia-sins/${name}.tar.gz";
-    sha256 = "03wikddl60ly0yh8szrra1ng2iccsdzz645vkn6a7x2jz45a5084";
+    sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz";
   };
 
-  buildInputs = [ sqlite zlib proj geos ];
+  buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos ];
 
   configureFlags = "--disable-freexl";
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Extensible spatial index library in C++";
     homepage = https://www.gaia-gis.it/fossil/libspatialite;
     # They allow any of these
-    license = [ "GPLv2+" "LGPLv2+" "MPL1.1" ];
+    license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index de224f6b613..3ff2e1ad285 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -2,8 +2,8 @@
 , libvpx, check, libconfig, pkgconfig }:
 
 let
-  version = "f6b3e6e8fe98d2457827ac6da944e715f008a08a";
-  date = "20141219";
+  version = "4c220e336330213b151a0c20307d0a1fce04ac9e";
+  date = "20150126";
 in
 stdenv.mkDerivation rec {
   name = "tox-core-${date}-${builtins.substring 0 7 version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner  = "irungentoo";
     repo   = "toxcore";
     rev    = version;
-    sha256 = "1wd817kix3zjyzzb68jz02iir3z4y5k5p40dgl7a29757yb9m608";
+    sha256 = "152yamak9ykl8dgkx1qzyrpa3f4xr1s8lgcb5k58r9lb1iwnhvqc";
   };
 
   NIX_LDFLAGS = "-lgcc_s";
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index a3b40eb612c..d562b2364d4 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation {
   name = "mesa-noglu-${version}";
 
   src =  fetchurl {
-    url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
+    urls = [
+      "https://launchpad.net/mesa/trunk/${version}/+download/MesaLib-${version}.tar.bz2"
+      "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"
+    ];
     sha256 = "f6031f8b7113a92325b60635c504c510490eebb2e707119bbff7bd86aa34657d";
   };
 
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 01967718c40..1494092fc47 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.10.7"; in
+let version = "4.10.8"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938";
+    sha256 = "507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15";
   };
 
   preConfigure = "cd nspr";
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix
index 844c2e58009..844c2e58009 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
new file mode 100644
index 00000000000..8553e060c56
--- /dev/null
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, qt5, pkgconfig, phonon_qt5, gst_all_1 }:
+
+let
+  version = "4.8.2";
+  pname = "phonon-backend-gstreamer";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
+  };
+
+  buildInputs = with gst_all_1; [ phonon_qt5 qt5 gstreamer gst-plugins-base ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DPHONON_BUILD_PHONON4QT5=ON"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://phonon.kde.org/;
+    description = "GStreamer backend for Phonon";
+    platforms = platforms.linux;
+    maintainer = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
index 8883f5c11d9..8883f5c11d9 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
new file mode 100644
index 00000000000..9e826cb65dc
--- /dev/null
+++ b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon_qt5, qt5 }:
+
+with stdenv.lib;
+
+let
+  pname = "phonon-backend-vlc";
+  v = "0.8.2";
+  # Force same Qt version in phonon and VLC
+  vlc_ = vlc.override {
+    inherit qt5;
+    qt4 = null;
+    withQt5 = true;
+  };
+  phonon_ = phonon.override { inherit qt4 qt5 withQt5; };
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${v}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
+    sha256 = "18ysdga681my75lxxv5h242pa4qappvg5z73wnc0ks9yypnzidys";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig xz ];
+
+  buildInputs = [ vlc_ phonon_qt5 qt5];
+
+  cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"];
+
+  meta = {
+    homepage = http://phonon.kde.org/;
+    description = "VideoLAN backend for Phonon multimedia framework";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ttuegel urkud ];
+    license = licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/qt4/default.nix
index df32f04bb6c..df32f04bb6c 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/qt4/default.nix
diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix
new file mode 100644
index 00000000000..187684ca5be
--- /dev/null
+++ b/pkgs/development/libraries/phonon/qt5/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt5 }:
+
+with stdenv.lib;
+
+let
+  v = "4.8.1";
+in
+
+stdenv.mkDerivation rec {
+  name = "phonon-${v}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
+    sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
+  };
+
+  buildInputs = [ qt5 pulseaudio ];
+
+  nativeBuildInputs = [ cmake automoc4 ];
+
+  cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"];
+
+  meta = {
+    homepage = http://phonon.kde.org/;
+    description = "Multimedia API for Qt";
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 39059905a02..76a45a0ecc8 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
-, qt4Support ? false, qt4 ? null
+, qt4Support ? false, qt4 ? null, qt5
 }:
 
 let
@@ -71,4 +71,13 @@ let
     '';
   };
 
-in { inherit poppler_glib poppler_qt4; } // poppler_glib
+  poppler_qt5 = poppler_drv "qt5" {
+    propagatedBuildInputs = [ qt5 poppler_glib ];
+    postConfigure = ''
+      mkdir -p "$out/lib/pkgconfig"
+      install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig"
+      cd qt5
+    '';
+  };
+
+in { inherit poppler_glib poppler_qt4 poppler_qt5; } // poppler_glib
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 17c05ada7a8..85962d56cc3 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,16 +1,26 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "proj-4.5.0";
+  name = "proj-4.8.0";
 
   src = fetchurl {
-    url = ftp://ftp.remotesensing.org/proj/proj-4.5.0.tar.gz;
-    sha256 = "1d2qz0vgp13hkfgaz7hkblhb9w2fh2blbjqz73xdinwc08cmflqv";
+    url = http://download.osgeo.org/proj/proj-4.8.0.tar.gz;
+    sha256 = "1dfim63ks298204lv2z0v16njz6fs7bf0m4icy09i3ffzvqdpcid";
   };
 
-  meta = { 
+  postConfigure = ''
+    patch src/Makefile <<EOF
+    272c272
+    < include_HEADERS = proj_api.h org_proj4_Projections.h
+    ---
+    > include_HEADERS = proj_api.h org_proj4_Projections.h projects.h
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
     description = "Cartographic Projections Library";
-    homepage = http://proj.maptools.org;
-    license = stdenv.lib.licenses.mit;
+    homepage = http://trac.osgeo.org/proj/;
+    license = licenses.mit;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
new file mode 100644
index 00000000000..7fcedab199b
--- /dev/null
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, qt5 }:
+
+stdenv.mkDerivation rec {
+  version = "0.1.0";
+  name = "qmltermwidget-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/Swordfish90/qmltermwidget.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "19pz27jsdpa3pybj8sghmmd1zqgr73js1mp3875rhx158dav37nz";
+  };
+
+  buildInputs = [ qt5 ];
+
+  patchPhase = ''
+    substituteInPlace qmltermwidget.pro \
+      --replace '$$[QT_INSTALL_QML]' "/lib/qml/"
+  '';
+
+  configurePhase = "qmake PREFIX=$out";
+
+  installPhase=''make INSTALL_ROOT="$out" install'';
+  
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "This project is a QML port of qtermwidget";
+    homepage = "https://github.com/Swordifish90/qmltermwidget";
+    licenses = with stdenv.lib.licenses; [ gpl2 ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ skeidel ];
+  };
+}
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 52736ba5d34..8c91db74f95 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "qscintilla";
-  version = "2.8.3";
+  version = "2.8.4";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
-    sha256 = "fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505";
+    sha256 = "03z8mc7wpk0hyza9b45pyf523gdk0qsqaywkprmp6ffc81s2sywv";
   };
 
   buildInputs = [ qt ];
 
   preConfigure = ''
     cd Qt4Qt5
-    sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/libs," \
+    sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
            -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
            -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \
            -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \
diff --git a/pkgs/development/libraries/tinyxml/2.6.2-entity.patch b/pkgs/development/libraries/tinyxml/2.6.2-entity.patch
index 3164261291b..3164261291b 100755..100644
--- a/pkgs/development/libraries/tinyxml/2.6.2-entity.patch
+++ b/pkgs/development/libraries/tinyxml/2.6.2-entity.patch
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
new file mode 100644
index 00000000000..b5e1b159321
--- /dev/null
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -0,0 +1,70 @@
+{ stdenv, lib, fetchurl, gyp, readline, python, which, icu, utillinux}:
+
+assert readline != null;
+
+let
+  arch = if stdenv.is64bit then "x64" else "ia32";
+in
+
+stdenv.mkDerivation rec {
+  name = "v8-${version}";
+  version = "3.16.14";
+
+  src = fetchurl {
+    url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+        + "${name}.tar.bz2";
+    sha256 = "073f33zcb7205jp9g5ha5d7j2hfa98zs0jql572nb552z0xw3rkz";
+  };
+
+  configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    ln -s /usr/bin/xcodebuild $TMPDIR
+    export PATH=$TMPDIR:$PATH
+  '' + ''
+    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
+      ${gyp}/bin/gyp \
+        -f make \
+        --generator-output="out" \
+        -Dflock_index=0 \
+        -Dv8_enable_i18n_support=1 \
+        -Duse_system_icu=1 \
+        -Dconsole=readline \
+        -Dcomponent=shared_library \
+        -Dv8_target_arch=${arch} \
+        --depth=. -Ibuild/standalone.gypi \
+        build/all.gyp
+  '';
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ readline python icu ] ++ lib.optional stdenv.isLinux utillinux;
+
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
+  buildFlags = [
+    "-C out"
+    "builddir=$(CURDIR)/Release"
+    "BUILDTYPE=Release"
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -vD out/Release/d8 "$out/bin/d8"
+    ${if stdenv.system == "x86_64-darwin" then ''
+    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
+    '' else ''
+    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
+    ''}
+    cp -vr include "$out/"
+  '';
+
+  postFixup = if stdenv.isDarwin then ''
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib $out/lib/libv8.dylib
+  '' else null;
+
+  meta = with stdenv.lib; {
+    description = "V8 is Google's open source JavaScript engine";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index f95cffbe551..f67e3f2468b 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.6.4";
+  version = "2.6.5";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "16rffxkz4w3sd7w4j3z3dycny8sdqxrz62yq4bgcmffrxlj5xvxy";
+    sha256 = "14vmqq6hr3jzphay49984kj22vlqhpsjmwh1krdm9k57rqbq0rdi";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];
diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
index 9ce5312f69a..5d69f73d797 100644
--- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix
+++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
@@ -42,7 +42,6 @@ composableDerivation.composableDerivation {} rec {
            name = "ruby";
            enable = {
              buildInputs = [ ruby ];
-             # export same env vars as in rubyLibs 
              preConfigure = ''
                export RUBY_LIB=$out/${ruby.libPath}
                export RUBY_LIB_ARCH=$RUBY_LIB
diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 789d9a65308..740b71c59a7 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -42,7 +42,6 @@ composableDerivation.composableDerivation {} rec {
            name = "ruby";
            enable = {
              buildInputs = [ ruby ];
-             # export same env vars as in rubyLibs 
              preConfigure = ''
                export RUBY_LIB=$out/${ruby.libPath}
                export RUBY_LIB_ARCH=$RUBY_LIB
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index d74a85a9162..575fb73084c 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libuuid, zlib }:
 
 stdenv.mkDerivation {
-  name = "xapian-1.2.8";
+  name = "xapian-1.2.19";
 
   src = fetchurl {
-    url = http://oligarchy.co.uk/xapian/1.2.8/xapian-core-1.2.8.tar.gz;
-    sha256 = "00411ebac66a5592b87fc57ccfeb234c84b929ed23c185befb5df9929df3d4f9";
+    url = http://oligarchy.co.uk/xapian/1.2.19/xapian-core-1.2.19.tar.xz;
+    sha256 = "11a7lm3w3pchk4rx144nc2p31994spyqmldm18ph86zzi01jcy2a";
   };
 
   buildInputs = [ libuuid zlib ];
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 059f67baa08..04691848779 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,7 +1,7 @@
 {stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}:
 { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.0", iosWwdrCertificate ? null
+, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.1", iosWwdrCertificate ? null
 , enableWirelessDistribution ? false, installURL ? null
 }:
 
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 34e14b67c00..14ef4c20047 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "6.0.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.4.0.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.0.GA"}:
 
 let
   # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
@@ -33,6 +33,7 @@ rec {
       else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix
       else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix
       else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix
+      else if tiVersion == "3.5.0.GA" then ./titaniumsdk-3.5.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 786483d7347..487f93052f2 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -1,10 +1,10 @@
 { nixpkgs ? <nixpkgs>
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
-, xcodeVersion ? "6.0.1"
+, xcodeVersion ? "6.1.1"
 , xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "3.4.0.GA"
+, tiVersion ? "3.5.0.GA"
 , rename ? false
-, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.0", iosWwdrCertificate ? null
+, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.1", iosWwdrCertificate ? null
 , allowUnfree ? false
 , enableWirelessDistribution ? false, installURL ? null
 }:
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index a03a4830ab3..91c4901479b 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,5 +1,5 @@
 { titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false
-, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.0", iosWwdrCertificate ? null
+, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1", iosWwdrCertificate ? null
 , enableWirelessDistribution ? false, installURL ? null
 }:
 
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
index b46dcfb5b04..60cab19ecbd 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out
     cd $out
-    yes y | unzip $src
+    unzip $src
     
     # Fix shebang header for python scripts
     
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
index beeb7fed995..47414e205a0 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out
     cd $out
-    yes y | unzip $src
+    unzip $src
     
     # Fix shebang header for python scripts
     
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
index 13009265e07..59a405f61fa 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out
     cd $out
-    yes y | unzip $src
+    unzip $src
     
     # Fix shebang header for python scripts
     
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
index aba5ab0f697..041ba0d4a6c 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out
     cd $out
-    yes y | unzip $src
+    unzip $src
     
     # Fix shebang header for python scripts
     
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
new file mode 100644
index 00000000000..8a868321e13
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
@@ -0,0 +1,77 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+  name = "mobilesdk-3.5.0.GA";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-linux.zip;
+    sha1 = "c9850d5db29d8fb0c26b114e8c34bb2c91958eed";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-osx.zip;
+    sha1 = "a5ce74f13da09215b7efa81d626c6e6e83d6dc3b";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    unzip $src
+    
+    # Fix shebang header for python scripts
+    
+    find . -name \*.py | while read i
+    do
+        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+    done
+    
+    # Rename ugly version number
+    cd mobilesdk/*
+    cd 3.5.0.GA
+    
+    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
+    # Yes, I know it's nasty :-)
+    
+    cd android
+    
+    sed -i -f ${./fixtiverify.sed} builder.py
+    sed -i -f ${./fixtiprofiler.sed} builder.py
+    sed -i -f ${./fixso.sed} builder.py
+    sed -i -f ${./fixnativelibs.sed} builder.py
+    
+    # Patch some executables
+    
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+      ''
+      else ""}
+    
+    # Wrap builder script
+    
+    mv builder.py .builder.py
+    cat > builder.py <<EOF
+    #!${python}/bin/python
+    
+    import os, sys
+    
+    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
+    os.environ['JAVA_HOME'] = '${jdk.home}'
+    
+    os.execv('$(pwd)/.builder.py', sys.argv)
+    EOF
+    
+    chmod +x builder.py
+    
+  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
+    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
+    
+    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
+  '';
+}
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index 341b06d9822..d1647324865 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,4 +1,4 @@
-{stdenv, version ? "6.0.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
+{stdenv, version ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
 
 rec {
   xcodewrapper = import ./xcodewrapper.nix {
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 0a35dc92296..546d2aaa522 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -6,7 +6,7 @@ let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
 
-assert stdenv.lib.versionAtLeast ocaml_version "3.12";
+assert stdenv.lib.versionAtLeast ocaml_version "4.00";
 
 stdenv.mkDerivation {
 
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
new file mode 100644
index 00000000000..20f03667c3b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchgit, ocaml, findlib, camlpdf, ncurses }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.0";
+
+let version = "2.1.1"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-cpdf-${version}";
+
+  src = fetchgit {
+    url = https://github.com/johnwhitington/cpdf-source.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "0c482wfa5q845k0ahx8irg1jl05ncn0kv42dg08zkph7xi6dmgnv";
+  };
+
+  buildInputs = [ ocaml findlib ncurses ];
+  propagatedBuildInputs = [ camlpdf ];
+
+  createFindlibDestdir = true;
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cp cpdf $out/bin
+    mkdir -p $out/share/
+    cp -r doc $out/share
+    cp cpdfmanual.pdf $out/share/doc/cpdf/
+  '';
+
+  meta = {
+    homepage = http://www.coherentpdf.com/;
+    platforms = ocaml.meta.platforms;
+    description = "PDF Command Line Tools";
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix
new file mode 100644
index 00000000000..f54d14e4fe9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }:
+
+let version = "0.3.1"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-ezjsonm-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz";
+    sha256 = "0cz1v75j8j5y4vfcgylp5zaxiy7541qg6pm4wrgmvy6fmh82654f";
+  };
+
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ jsonm hex sexplib lwt ];
+  createFindlibDestdir = true;
+
+  configureFlags = "--enable-lwt";
+
+  meta = {
+    description = "An easy interface on top of the Jsonm library";
+    homepage = https://github.com/mirage/ezjsonm;
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
new file mode 100644
index 00000000000..51afb39ca65
--- /dev/null
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ocaml, findlib, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
+
+stdenv.mkDerivation rec {
+  name = "gapi-ocaml-0.2.6";
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/1468/${name}.tar.gz";
+    sha256 = "1sqsir07xxk9xy723l206r7d10sp6rfid9dvi0g34vbkvshm50y2";
+  };
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  buildPhase = "ocaml setup.ml -build";
+  installPhase = "ocaml setup.ml -install";
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "OCaml client for google services";
+    homepage = http://gapi-ocaml.forge.ocamlcore.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix
new file mode 100644
index 00000000000..1be3b4cbfb7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/hex/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchzip, ocaml, findlib }:
+
+let version = "0.1.0"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-hex-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/ocaml-hex/archive/${version}.tar.gz";
+    sha256 = "1nna0v5wi1g8l9ywl43xda2lqbz3sa3ncpyg84bl9baxyfmw4p9n";
+  };
+
+  buildInputs = [ ocaml findlib ];
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Mininal OCaml library providing hexadecimal converters";
+    homepage = https://github.com/mirage/ocaml-hex;
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix
new file mode 100644
index 00000000000..5445fd1e110
--- /dev/null
+++ b/pkgs/development/ocaml-modules/jsonm/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, ocaml, findlib, uutf }:
+
+let version = "0.9.1"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-jsonm-${version}";
+
+  src = fetchurl {
+    url = "http://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz";
+    sha256 = "0wszqrmx8iqlwzvs76fjf4sqh15mv20yjrbyhkd348yq8nhdrm1z";
+  };
+
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ uutf ];
+
+  unpackCmd = "tar xjf $src";
+
+  configurePhase = "ocaml setup.ml -configure --prefix $prefix";
+  buildPhase = "ocaml setup.ml -build";
+  createFindlibDestdir = true;
+  installPhase = "ocaml setup.ml -install";
+
+  meta = {
+    description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format";
+    homepage = http://erratique.ch/software/jsonm;
+    licenses = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix
new file mode 100644
index 00000000000..9f4b17f9b61
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed, camlp4 }:
+
+stdenv.mkDerivation rec {
+  version = "1.6";
+  name = "lambda-term-${version}";
+
+  src = fetchurl {
+    url = https://github.com/diml/lambda-term/archive/1.6.tar.gz;
+    sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
+  };
+
+  buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ];
+
+  propagatedBuildInputs = [ camlp4 zed ];
+
+  createFindlibDestdir = true;
+
+  meta = { description = "Terminal manipulation library for OCaml";
+    longDescription = ''
+    Lambda-term is a cross-platform library for
+    manipulating the terminal. It provides an abstraction for keys,
+    mouse events, colors, as well as a set of widgets to write
+    curses-like applications.
+
+    The main objective of lambda-term is to provide a higher level
+    functional interface to terminal manipulation than, for example,
+    ncurses, by providing a native OCaml interface instead of bindings to
+    a C library.
+
+    Lambda-term integrates with zed to provide text edition facilities in
+    console applications.
+    '';
+
+    homepage = https://github.com/diml/lambda-term;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+    branch = "1.6";
+    maintainers = [
+      stdenv.lib.maintainers.gal_bolle
+    ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index 1baea569dbd..0186ab055f5 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed, camlp4 }:
 
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+
 stdenv.mkDerivation rec {
-  version = "1.6";
+  version = "1.8";
   name = "lambda-term-${version}";
 
   src = fetchurl {
-    url = https://github.com/diml/lambda-term/archive/1.6.tar.gz;
-    sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09";
+    url = https://github.com/diml/lambda-term/archive/1.8.tar.gz;
+    sha256 = "0hy11x48q5bbh9czjp0w756cyxzr2c6qcnfm5n9f0i1l4qljwpgc";
   };
 
-  buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ];
+  buildInputs = [ libev ocaml findlib ocaml_react ];
 
-  propagatedBuildInputs = [ camlp4 zed ];
+  propagatedBuildInputs = [ camlp4 zed ocaml_lwt ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
new file mode 100644
index 00000000000..ce9f2cc02ed
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, ocaml, camlidl, fuse, findlib }:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+stdenv.mkDerivation rec {
+  name = "ocamlfuse-2.7-1";
+  src = fetchgit {
+    url = "https://github.com/astrada/ocamlfuse";
+    rev = "c436c16dbf458bc69b1166b08baf9ec0d6f9042d";
+    sha256 = "4a72097cbcb375c2be92a5c9a44f3511670fac0815d6d00f38dc7c6879e9825d";
+  };
+
+  buildInputs = [ocaml findlib];
+  propagatedBuildInputs = [camlidl fuse];
+  configurePhase = '' ocaml setup.ml -configure --prefix $out '';
+  buildPhase = "ocaml setup.ml -build";
+  installPhase = "ocaml setup.ml -install";
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = "http://sourceforge.net/projects/ocamlfuse";
+    license = stdenv.lib.licenses.gpl2;
+    description = "ocaml binding for fuse";
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
new file mode 100644
index 00000000000..73670fb3125
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, ocaml, findlib, fetchurl, curl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "ocurl-0.7.2";
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.gz";
+    sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr";
+  };
+
+  buildInputs = [ocaml findlib curl ncurses];
+  createFindlibDestdir = true;
+  meta = {
+    description = "OCaml bindings to libcurl";
+    license = stdenv.lib.licenses.bsd3;
+    homepage = http://ocurl.forge.ocamlcore.org/;
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/python-modules/gevent_sslwrap.patch b/pkgs/development/python-modules/gevent_sslwrap.patch
index 6f104a638f0..10c61478bd6 100644
--- a/pkgs/development/python-modules/gevent_sslwrap.patch
+++ b/pkgs/development/python-modules/gevent_sslwrap.patch
@@ -15,7 +15,7 @@ Index: b/gevent/ssl.py
 -                                            keyfile, certfile,
 -                                            cert_reqs, ssl_version, ca_certs,
 -                                            ciphers)
-+            ctx = SSLContext(ssl_version)
++            ctx = __ssl__.SSLContext(ssl_version)
 +            if keyfile or certfile:
 +                ctx.load_cert_chain(certfile, keyfile)
 +            if ca_certs:
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
new file mode 100644
index 00000000000..835b4f6514a
--- /dev/null
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "2.2.36";
+  name = "${python.libPrefix}-graph-tool-${version}";
+
+  meta = with stdenv.lib; {
+    description = "Python module for manipulation and statistical analysis of graphs";
+    homepage    = http://graph-tool.skewed.de/;
+    license     = licenses.gpl3;
+    platforms   = platforms.all;
+  };
+
+  src = fetchurl {
+    url = "http://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
+    sha256 = "0wp81dp2kd4bzsl6f3gxjmf11hiqr7rz7g0wa1j38fc0chq31q71";
+  };
+
+  preConfigure = ''
+    configureFlags="--with-python-module-path=$out/${python.sitePackages}"
+  '';
+
+  buildInputs = [ python cairomm pycairo sparsehash automake m4 pkgconfig makeWrapper boost expat scipy numpy cgal lndir gmp mpfr ];
+
+  propagatedBuildInputs = [ numpy ];
+
+  enableParallelBuilding = false;
+}
diff --git a/pkgs/development/python-modules/pyacoustid-py3.patch b/pkgs/development/python-modules/pyacoustid-py3.patch
new file mode 100644
index 00000000000..f79b35fd345
--- /dev/null
+++ b/pkgs/development/python-modules/pyacoustid-py3.patch
@@ -0,0 +1,32 @@
+From 19209469a709ec0914f82c9de23137e360e5e804 Mon Sep 17 00:00:00 2001
+From: Simon Chopin <chopin.simon@gmail.com>
+Date: Mon, 29 Sep 2014 10:38:20 +0200
+Subject: [PATCH] Explicit the UTF-8 encoding also when installing using Python
+ 3
+
+If the locale isn't UTF-8, or for some reason Python doesn't pick up on
+it, it will try to decode using ASCII, which will of course cause
+mayhem, crash and despair.
+
+This patch will be shipped with the Debian package 1.1.0-1
+---
+ setup.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index eafe5ea..0732fe3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,9 +18,10 @@
+ 
+ def _read(fn):
+     path = os.path.join(os.path.dirname(__file__), fn)
+-    data = open(path).read()
+     if sys.version_info[0] < 3:
+-        data = data.decode('utf8')
++        data = open(path).read().decode('utf8')
++    else:
++        data = open(path, encoding='utf8').read()
+     # Special case some Unicode characters; PyPI seems to only like ASCII.
+     data = data.replace(u'\xe1', u'a')
+     data = data.replace(u'\u0161', u's')
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 94de33f0d50..14b7bd34eae 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0dfsjsa95ix8bx3h8w4bhnz7rymgl2paclvbn93x6qp8b53y0pys";
   };
 
-  buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ];
+  buildInputs = [ python pkgconfig glib gobjectIntrospection ];
+  propagatedBuildInputs = [ pycairo cairo ];
 
   meta = {
     homepage = http://live.gnome.org/PyGObject;
diff --git a/pkgs/development/python-modules/pygtksourceview/codegendir.patch b/pkgs/development/python-modules/pygtksourceview/codegendir.patch
new file mode 100644
index 00000000000..783c5e2d467
--- /dev/null
+++ b/pkgs/development/python-modules/pygtksourceview/codegendir.patch
@@ -0,0 +1,25 @@
+diff -Nur pygtksourceview-2.10.1-orig/configure pygtksourceview-2.10.1/configure
+--- pygtksourceview-2.10.1-orig/configure	2010-04-18 15:29:55.000000000 +0200
++++ pygtksourceview-2.10.1/configure	2015-01-30 20:36:31.784541887 +0100
+@@ -12950,7 +12950,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5
+ $as_echo_n "checking for pygtk codegen... " >&6; }
+-CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
++CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
+ echo $CODEGENDIR
+ if test -f $CODEGENDIR/codegen.py; then
+ 	CODEGEN=$CODEGENDIR/codegen.py
+diff -Nur pygtksourceview-2.10.1-orig/configure.ac pygtksourceview-2.10.1/configure.ac
+--- pygtksourceview-2.10.1-orig/configure.ac	2010-04-18 15:28:39.000000000 +0200
++++ pygtksourceview-2.10.1/configure.ac	2015-01-30 20:36:42.781648830 +0100
+@@ -116,7 +116,7 @@
+ 
+ dnl codegen
+ AC_MSG_CHECKING(for pygtk codegen)
+-CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
++CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
+ echo $CODEGENDIR
+ if test -f $CODEGENDIR/codegen.py; then
+ 	CODEGEN=$CODEGENDIR/codegen.py
+
diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix
new file mode 100644
index 00000000000..f282d3d3697
--- /dev/null
+++ b/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, python, pkgconfig, pygobject, glib, pygtk, gnome2 }:
+
+let version = "2.10.1"; in
+
+stdenv.mkDerivation {
+  name = "pygtksourceview-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";
+    sha256 = "0x2r9k547ad68sfddr5am341ap6zvy8k0rh3rd0n38k7xdd7rd5l";
+  };
+
+  patches = [ ./codegendir.patch ];
+
+  buildInputs = [ python pkgconfig pygobject glib pygtk gnome2.gtksourceview ];
+}
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 574ba56bd90..2e5724f00ad 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -1,8 +1,3 @@
-# This file is generated from generate-cran-packages.R. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# Rscript generate-cran-packages.R > cran-packages.nix
-
 { self, derive }: with self; {
 A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; };
 ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; };
@@ -16,16 +11,17 @@ ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rap
 ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
 ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
 AER = derive { name="AER"; version="1.2-2"; sha256="0ny9khzqxzx4npaqmknhpi3aldz11ipg71zw4skxphclamlsgp86"; depends=[car lmtest sandwich survival zoo Formula]; };
-AFLPsim = derive { name="AFLPsim"; version="0.3-3"; sha256="1vknmd98v65118c093gqpfckcggnk4c8rn6bblsaclwmx0jdi78s"; depends=[adegenet introgress]; };
-AGD = derive { name="AGD"; version="0.30"; sha256="175hsii3g8vx5ms552wnh1hcn3p6hgfggv1zi5gpwlsc0i875iag"; depends=[gamlss]; };
+AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; };
+AGD = derive { name="AGD"; version="0.32"; sha256="1jjkclqylh43vm1bj1g4cml7a84sxdl94kmhxgmk04rdkmgf8c47"; depends=[gamlss gamlss_dist]; };
 AGSDest = derive { name="AGSDest"; version="2.1"; sha256="1l36x3sjb0732aic2y4yrvx64phii1xjfzr4nc3x9b2crr988n0g"; depends=[ldbounds]; };
-AICcmodavg = derive { name="AICcmodavg"; version="2.0-1"; sha256="1rraxdmzhjwfi4sdcagksrbprszdbxswczb0s5glgmbh2kfd3654"; depends=[lattice MASS Matrix nlme unmarked VGAM]; };
+AICcmodavg = derive { name="AICcmodavg"; version="2.0-3"; sha256="1a9jbf3vd77hsf98smjgqchhkc9z8qqp12c1mflln3l0pxx0vk8q"; depends=[lattice MASS Matrix nlme unmarked VGAM xtable]; };
 AID = derive { name="AID"; version="1.4"; sha256="1wj2jmqla0b2y9hrvl5i69bncdx1xjdd7if69j6dy1dnxv6clx1z"; depends=[MASS tseries nortest]; };
 AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival survival]; };
 ALDqr = derive { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; };
 ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp Rcpp]; };
 ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[nnls Iso]; };
 ALSCPC = derive { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; };
+ALTopt = derive { name="ALTopt"; version="0.1.0"; sha256="0vdn535x199m95gs715i42p0cf9zlj74s7xgxly7aknr0l2ypl2c"; depends=[cubature lattice]; };
 AMAP_Seq = derive { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; };
 AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; };
 AMOEBA = derive { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[snowfall rlecuyer spdep]; };
@@ -35,11 +31,12 @@ APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v
 AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
 ARPobservation = derive { name="ARPobservation"; version="1.0"; sha256="0m9sr0pgwzndia2286fmhlw7xsyn3pvy0044xlp5sw3i3gqhv39f"; depends=[]; };
 ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
+ARTool = derive { name="ARTool"; version="0.9.3"; sha256="188k3whgm93jm2kpvh711d4l73gickn9iwidz95srwdcdlf9cf1y"; depends=[lme4 car plyr pbkrtest]; };
 ASMap = derive { name="ASMap"; version="0.3-2"; sha256="0rmf12lhzgi301mnf7iy98zq6ggdalwr45lgrw09n9qzb3jf4dp5"; depends=[qtl gtools fields lattice]; };
+ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp Rcpp RcppArmadillo]; };
 ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
 AUC = derive { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; };
 AUCRF = derive { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; };
-AWS_tools = derive { name="AWS.tools"; version="0.0.5"; sha256="0z0mh8pdrqvsg49dbhds8aj0lmxmvhfi05im0gg01vdidxpmabyn"; depends=[XML]; };
 AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-3"; sha256="1camxmvz8prkvpf3d3rc07bnfphakwdlickqlr4sgzrs4k27rr4f"; depends=[]; };
 Actigraphy = derive { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; };
 ActuDistns = derive { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[reliaR actuar hypergeo]; };
@@ -58,6 +55,7 @@ AmericanCallOpt = derive { name="AmericanCallOpt"; version="0.95"; sha256="1nhy4
 AmpliconDuo = derive { name="AmpliconDuo"; version="1.0"; sha256="0l6p5c2802a1f3b77cdrrk3wdf41926mh34630p462fb3wqipps0"; depends=[ggplot2 xtable]; };
 AnDE = derive { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization functional foreign stringr]; };
 AnalyzeFMRI = derive { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[R_matlab fastICA]; };
+AnglerCreelSurveySimulation = derive { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; };
 AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
 AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[rjson plyr assertthat httr leafletR]; };
 AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; };
@@ -65,54 +63,59 @@ Anthropometry = derive { name="Anthropometry"; version="1.1"; sha256="1yqdps5n07
 AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
 AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; };
 ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
+ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[lme4 fractal fracdiff]; };
 ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; };
 AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[polynom deSolve]; };
 AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
 AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[proto cairoDevice gWidgetsRGtk2 partitions]; };
 AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; };
-AutoSEARCH = derive { name="AutoSEARCH"; version="1.3"; sha256="1wwrki8gshz4sn22a62pv5rzl1ziva930ci1ygb77bzc9wd65ka1"; depends=[zoo gets lgarch]; };
+AutoSEARCH = derive { name="AutoSEARCH"; version="1.4"; sha256="1jhw005nm2dmawpdjyh9y55cn9069dcv5dihg70c3x5l65rkrliy"; depends=[zoo gets lgarch]; };
 B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; };
+BACA = derive { name="BACA"; version="0.99.0"; sha256="19n6ajq6szpzwj36lfg7wrh2j3d3ikn13a1j3g2xvfy275qdmmm4"; depends=[ggplot2 rJava]; };
 BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; };
 BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[mvtnorm leaps boot]; };
 BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
 BAMMtools = derive { name="BAMMtools"; version="2.0.2"; sha256="10z638f79j3jksb69sqrnkzs5nzxi9srsxww4ky3bk21zb66ikhd"; depends=[ape]; };
+BANFF = derive { name="BANFF"; version="0.2"; sha256="151kkw7i1v1jvwvdczqwajmq551vg5jrarwsxz62sazwg70ffmb6"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network]; };
 BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; };
 BAS = derive { name="BAS"; version="1.0"; sha256="1j5crafky3jb25kim3b7gxg9azn3ya357ckq1v7wryzi3zi674sg"; depends=[MASS]; };
 BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
-BAT = derive { name="BAT"; version="1.0.1"; sha256="1kljrw2nc6xnqz4ryv4w8zfy17l3r7bsql921ixqa2rlp3jczyl4"; depends=[vegan]; };
+BAT = derive { name="BAT"; version="1.1"; sha256="0zj2ip3d8l37jv31a9nzgiiiwrmgk69fr1sshfgfkmb2s3fpr6w2"; depends=[vegan spatstat nls2]; };
 BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; };
 BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; };
-BBEST = derive { name="BBEST"; version="0.1-0"; sha256="0f833h8zbxgxabgmmcyi4ycys82dplmgzmi3l0fp735h2l3gy8a7"; depends=[DEoptim aws ggplot2 reshape2 shiny]; };
+BBEST = derive { name="BBEST"; version="0.1-1"; sha256="11kh1kiw4la21is9sbr5r187kgnjy1s8c668xppv9axga57m62sk"; depends=[DEoptim aws ggplot2 reshape2 shiny]; };
 BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
 BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; };
 BBmisc = derive { name="BBmisc"; version="1.8"; sha256="1h48p45pcnda095w77yqc7vfbkwzkcsn36ms0mm7lcmyjbl503m9"; depends=[checkmate]; };
 BCA = derive { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[RcmdrMisc Rcmdr car rpart flexclust clv]; };
 BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; };
-BCDating = derive { name="BCDating"; version="0.9.3"; sha256="1ibm34wab1dpigrhifkyr1nylgbprbh22fdw9zpmg8bawb7zgbsl"; depends=[]; };
+BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; };
 BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
-BCEA = derive { name="BCEA"; version="2.0-2"; sha256="1n0fp6na2y4n7p6ncwgi6hwx97mfrga3fkp3i0z06bh1p1jh8m88"; depends=[]; };
+BCEA = derive { name="BCEA"; version="2.1-0"; sha256="120xmgd7ipnrbiyh8h7z80i0bw9iv9rjf8nnb3f988h9bx8xiwp4"; depends=[]; };
 BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; };
-BDgraph = derive { name="BDgraph"; version="2.13"; sha256="15sw2b6f30z235vpn5an0ggkphl7w9cwdzb5gbq197blb4f228vf"; depends=[Matrix igraph]; };
+BDgraph = derive { name="BDgraph"; version="2.14"; sha256="1j590vm57dwn6776p0hh0x999a0ivf5ydsxyfnflz5hbhaz1zzn0"; depends=[Matrix igraph]; };
 BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; };
-BEDASSLE = derive { name="BEDASSLE"; version="1.4"; sha256="02638v89rcqky6npfckr1h7g563lbhs51bsprfr10jk44aj527np"; depends=[MASS matrixcalc emdbook]; };
-BEQI2 = derive { name="BEQI2"; version="1.0-1"; sha256="0afp8f6kfmpa8qi952qnyxl2nn6kszc8fgvplvbl13v572261m7s"; depends=[knitr markdown RJSONIO xtable plyr reshape2]; };
+BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; };
+BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; };
 BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[rjags coda]; };
 BGLR = derive { name="BGLR"; version="1.0.3"; sha256="02aw71r8khnkahqplycwziz7fh8hmnniq5bqnsk4fijv7z9gkbkg"; depends=[]; };
 BGPhazard = derive { name="BGPhazard"; version="1.1"; sha256="0wfwc97fakhv63wgjln5fdz558z1890zmi0m5ai46bjhda1rbx3f"; depends=[survival]; };
 BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
-BH = derive { name="BH"; version="1.54.0-5"; sha256="02468l7cczchn71gg22mbgn4b96m73lk2h302j8az1kryfmbl87j"; depends=[]; };
+BH = derive { name="BH"; version="1.55.0-3"; sha256="0p3xbbnj4l844sgg59ply5ng8z42lbs6z8cghsr3bxbbv4w9lkbs"; depends=[]; };
 BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; };
 BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[fmri AnalyzeFMRI wavethresh]; };
 BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.1"; sha256="1iwaw2nvs6qgmgqxlc3a7zvda6r8mkyalb6ianc643i3az8cnnxf"; depends=[Rcpp miceadds Rcpp RcppArmadillo]; };
 BIOM_utils = derive { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
 BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp Rcpp RcppArmadillo]; };
-BLR = derive { name="BLR"; version="1.3"; sha256="02p29p06vhh8gxkfnqdf9niq09bygshmiipvd3q19k92g0a10l69"; depends=[SuppDists]; };
+BLR = derive { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
 BMA = derive { name="BMA"; version="3.18.1"; sha256="0ppcjjcrjrs18lp55hrs0ad7x052v57wd0zdfmvyydlsjbgnsx1p"; depends=[survival leaps robustbase inline]; };
 BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; };
 BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; };
 BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; };
+BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
+BNPTSclust = derive { name="BNPTSclust"; version="1.0"; sha256="04qryrhbhi4qfp9rckw3x0g3292lyfrvphcwgb1p5ig661pxgg7p"; depends=[mvtnorm MASS]; };
 BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; };
-BNSP = derive { name="BNSP"; version="1.0.1"; sha256="1l9zm28ild3x9x90nrrg0jj210yzqncdbxkfqwfy3pb23ygw01nn"; depends=[]; };
+BNSP = derive { name="BNSP"; version="1.0.2"; sha256="0hbrx02mybfrzfab5g7kwi6g68jdzj2dc69zxkn3hpyf4rqwbw4x"; depends=[]; };
 BOIN = derive { name="BOIN"; version="1.0"; sha256="14rh2sz4h79vxrskc10idd6mb3dyy8ngdxrac134yxna7507ly0s"; depends=[]; };
 BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; };
 BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
@@ -129,6 +132,7 @@ BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179l
 BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp Rcpp]; };
 BatchExperiments = derive { name="BatchExperiments"; version="1.4"; sha256="1px1id2jd34vknlygljqd3cwq6bwch8jfb2npq59cvvwlxxx4qpc"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; };
 BatchJobs = derive { name="BatchJobs"; version="1.5"; sha256="1aa41rlj0n0mw03kb5n645shfrm18y5snpmlm5hm6fmlvrykqn4p"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; };
+BayClone2 = derive { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; };
 BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
 BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
 BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[rjags fields poibin]; };
@@ -137,13 +141,12 @@ BayesCR = derive { name="BayesCR"; version="1.0"; sha256="0cq1ii01j0nprnyvfxml1n
 BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; };
 BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
 BayesFactor = derive { name="BayesFactor"; version="0.9.9"; sha256="1a34caxsmixvriw7hwqsqxbkjg70lv0s81m2i5w5kybfk81xdvnh"; depends=[coda pbapply mvtnorm stringr Rcpp gtools Rcpp]; };
-BayesGESM = derive { name="BayesGESM"; version="1.0"; sha256="1ssg4l86jfriq4izlgzypz37c7xzcfsr6ngh8ksak8ka1lmidsig"; depends=[truncdist GIGrvg normalp gsl]; };
+BayesGESM = derive { name="BayesGESM"; version="1.2"; sha256="1mbi4lb7bjpmkwc3ns3mfvmfqr85pfx85rkcq95pl91saxichs4s"; depends=[truncdist GIGrvg normalp Formula]; };
 BayesLCA = derive { name="BayesLCA"; version="1.6"; sha256="1f7xmq3pni68s112k0hvdhag7nqgmm84hhycbm88cyvkdjd0kfba"; depends=[e1071 coda fields nlme MCMCpack]; };
 BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; };
 BayesMed = derive { name="BayesMed"; version="1.0"; sha256="1ppl5g8c5yy8jzhm34wvvprn9dj697ihcg8jb5111qmjybzzp0dh"; depends=[R2jags QRM polspline MCMCpack]; };
 BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2zh7pyn042w1s51wyszkmam0rwzgy0i9i51zjxwvz"; depends=[survival]; };
 BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
-BayesPen = derive { name="BayesPen"; version="1.0"; sha256="1c31n0mrx07j9mw4afdh1qznkiq2jrig3ldpsnhkv2nd2apgjbbp"; depends=[lars MCMCpack SuppDists]; };
 BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; };
 BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; };
 BayesTree = derive { name="BayesTree"; version="0.3-1.2"; sha256="1if6x7xxs8pv37c3w4yij17gxnf63k83lawzlmd2644w1i6p7sw1"; depends=[nnet]; };
@@ -151,23 +154,24 @@ BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpk
 BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS]; };
 BayesX = derive { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[shapefiles sp maptools colorspace coda]; };
 BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
-BayesianAnimalTracker = derive { name="BayesianAnimalTracker"; version="1.0"; sha256="0y710frcw1z6pnqp17g578nvj8hlh32b2iy5c8acil6dzd0fpf2d"; depends=[]; };
+BayesianAnimalTracker = derive { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
 Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[mvtnorm betareg]; };
 Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; };
 BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
-BcDiag = derive { name="BcDiag"; version="1.0.5"; sha256="18wryszrpmc2c4pdyvacns7r90l6n2x63cwsa6xjkgq3qwyz6nlj"; depends=[]; };
+BcDiag = derive { name="BcDiag"; version="1.0.7"; sha256="0wnmyn13fqbjqadsnq6f1cr4r8ism96c5v54rf8m3iz40vi58cww"; depends=[]; };
 Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[inline hdrcde MASS ellipse coda mclust]; };
 Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[MASS mclust hdrcde statmod]; };
 Benchmarking = derive { name="Benchmarking"; version="0.24"; sha256="18gx8cwip1c03p37apyr9z89p117bz439vfgx91gxbbg1scc8bfp"; depends=[lpSolveAPI ucminf]; };
 BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; };
 Bergm = derive { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[ergm network coda mvtnorm]; };
-BerlinData = derive { name="BerlinData"; version="1.0.0"; sha256="1i4vb1gs3ffb2lxdhl8hzqwcr9nm8ya484glds3bdvj10ypncrya"; depends=[XML stringr]; };
+BerlinData = derive { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139sc0siawa7gp9psfgxm58qijg5m65nihv7spki75"; depends=[XML stringr rjson]; };
 Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
 Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
 BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
 BiSEp = derive { name="BiSEp"; version="2.0"; sha256="1nm76bcdwwy8c434a94rnhfvnc3va54q0jd8blkbh79qm5nwcpf9"; depends=[mclust]; };
 BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; };
 BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[glmnet tree randomForest gbm]; };
+BinNonNor = derive { name="BinNonNor"; version="1.0"; sha256="1xn5ghg2zzcrsxjm5azbm2kr31z7wfl0160dcg2nnjxb68lmfk2b"; depends=[BB corpcor mvtnorm Matrix]; };
 BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; };
 BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; };
 BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; };
@@ -180,15 +184,15 @@ BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3a
 BlandAltmanLeh = derive { name="BlandAltmanLeh"; version="0.1.0"; sha256="0y35zkxiallp4x09646qb8wj9bayh7mpnjg43qmzhxkm7l95b78r"; depends=[]; };
 Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; };
 BlockMessage = derive { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
-Bmix = derive { name="Bmix"; version="0.3"; sha256="0p3ks3miniz356spmdikynwa7yrdk1mwlpz081fnkjnwxa3kdsw7"; depends=[mvtnorm]; };
+Bmix = derive { name="Bmix"; version="0.4"; sha256="0q6bxfdbvd3z3x4ifkmsqpfm8r5fx9jqxpyfgqlah9nkz0xjaf9z"; depends=[mvtnorm]; };
 BoSSA = derive { name="BoSSA"; version="1.2"; sha256="191hq0np9iadks4sflg360k64xnz8j956y30pqzwciinb4hgq1nr"; depends=[ape SoDA]; };
 Bolstad = derive { name="Bolstad"; version="0.2-25"; sha256="1dj0ib3jndnsdx2cqsy0dz54szdx1xq3r2xqnxzk4ysng6svdym8"; depends=[]; };
 Bolstad2 = derive { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
-BoolNet = derive { name="BoolNet"; version="2.0.1"; sha256="0g6pq39hcpfjxvij9x0j7x4xjfkynqnzn4ydkbcrjxhsrkp8h5z5"; depends=[igraph XML]; };
-Boom = derive { name="Boom"; version="0.1"; sha256="03xsfzfl1wvhbd6d1blhwx4dd0vpf7kaha2f50p6q17q6c1ph2vv"; depends=[MASS BH]; };
-BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.4.1"; sha256="0s0pbb5dmry736x19li5g364kirvhkhpyjm5q0kp5nvq83bi1hq0"; depends=[Boom BH]; };
+BoolNet = derive { name="BoolNet"; version="2.0.2"; sha256="025bn1s6wskc82z5v7xv5jwiwn1klhbasqp0p960hfcx4v43ms5y"; depends=[igraph XML]; };
+Boom = derive { name="Boom"; version="0.2"; sha256="0myb8pihjz25y9sj8b844jrkkd2x7zxyr3pg212cgkx9arby0afn"; depends=[MASS BH]; };
+BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nkznsaajx4z4bkzjx99b56mjpd8543jc1dq6ki81yxlr1v"; depends=[Boom BH]; };
 BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
-Boruta = derive { name="Boruta"; version="3.1.0"; sha256="0dmg8yyx6bb5s6glqsajk0qqf6xwb8qzwi6gbi5agd3i57xm8nak"; depends=[randomForest rFerns]; };
+Boruta = derive { name="Boruta"; version="4.0.0"; sha256="1r7bl4ab6swhks9cijhqn9gdhp2vjfhwb65fi5rzz0yvzxx97xi8"; depends=[randomForest rFerns]; };
 BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-5"; sha256="131z9ccfh55inlczy5wnzni2pch4brs6nzjrg8f5xnvkpyy6jqsp"; depends=[lme4 brglm gtools]; };
 BrailleR = derive { name="BrailleR"; version="0.11"; sha256="0vrgk89in5r13434r2p13shckl2b916dj8xn7kpmyngylp91r3a2"; depends=[nortest xtable moments knitr]; };
 Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
@@ -201,7 +205,7 @@ CADFtest = derive { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7
 CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; };
 CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; };
 CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih92ms5726b5lqw3x7r5rpbl9179rh"; depends=[sp mvtnorm]; };
-CARBayes = derive { name="CARBayes"; version="3.0"; sha256="0wflay6k159cw8149qb4ib1mlpsbgddlbkiyfxd4qz3vwl06dg3q"; depends=[MASS Rcpp truncdist spam coda Rcpp]; };
+CARBayes = derive { name="CARBayes"; version="4.0"; sha256="1v5pl1hfmmmlcnl324g45playkki20n33w4p5g536260kva74zly"; depends=[MASS Rcpp truncdist spam coda sp Rcpp]; };
 CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[Rcpp spam truncdist coda Rcpp]; };
 CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
 CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; };
@@ -211,16 +215,16 @@ CBPS = derive { name="CBPS"; version="0.9"; sha256="08pc50fndpx6xvxkvqdklrp6v98w
 CCA = derive { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
 CCAGFA = derive { name="CCAGFA"; version="1.0.4"; sha256="159gh0mx4da1gpqf5swyhg8ksclpi59p4zmzsiq5ywfpy5cjr71z"; depends=[]; };
 CCM = derive { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; };
-CCMnet = derive { name="CCMnet"; version="0.0-2"; sha256="1x5xjnnyr31yq9cgqfrvg71x7mmc2c54r59fv0az49njh3yg3vja"; depends=[sna network ergm]; };
 CCP = derive { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
 CCTpack = derive { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs3nlhyqlvwcj6aar2p79flf4xxdwsvk"; depends=[R2jags rjags psych mvtnorm polycor MASS]; };
 CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
 CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
 CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-CDM = derive { name="CDM"; version="4.0"; sha256="1qdgz4pmq1gn41ib13jbr01lsd1cvn9mcyxdih8wzpajvmb1jvhd"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc Rcpp RcppArmadillo]; };
+CDM = derive { name="CDM"; version="4.1"; sha256="1dh18fak4g6ncbnzqmvrdpbx7qzrccjbvkj1pn46vpm69dip6f28"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr Rcpp RcppArmadillo]; };
 CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; };
 CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; };
 CEC = derive { name="CEC"; version="0.9.2"; sha256="1g5w280zsm8bj9iqw07mkqhdv38vx2n745byyvfbzhx27x3brc28"; depends=[]; };
+CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[MASS DEoptim]; };
 CGP = derive { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; };
 CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; };
 CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
@@ -230,23 +234,23 @@ CIDnetworks = derive { name="CIDnetworks"; version="0.6.0"; sha256="0bx1wgcsbkg6
 CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; };
 CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
 CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[R_matlab igraph ggplot2 reshape2]; };
-CITAN = derive { name="CITAN"; version="2011.08-1"; sha256="1viv2iha6hcghh4iy4ndnbrnhcdrjixk837v78w43mdcmrkjh3rb"; depends=[DBI RSQLite RGtk2 hash ADGofTest]; };
+CITAN = derive { name="CITAN"; version="2014.12-1"; sha256="0hiccsg49zgcdm5iwj2vzyqhwyfw6h5fd2gasy6hlakjp102mvy2"; depends=[agop RSQLite RGtk2 hash stringi DBI]; };
 CLAG = derive { name="CLAG"; version="2.18.1"; sha256="0y8m6m01vw3rxwrmxvwhpiy6dd2snr0lhb026l1494y43hhqi3wy"; depends=[]; };
-CLME = derive { name="CLME"; version="1.0-1"; sha256="13j5qgyy6naicc5jc3vavas0bqzc69wggpyy3xxq9as6w2zjj5bj"; depends=[MASS quadprog shiny Iso]; };
+CLME = derive { name="CLME"; version="2.0-1"; sha256="0vnvxkqp4k54ldg2k03wkshsiykznczrfap009sn3ygy831j1zys"; depends=[MASS lme4 shiny isotone stringr prettyR]; };
 CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
 CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
 CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp Rcpp]; };
 CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
-CNOGpro = derive { name="CNOGpro"; version="1.0"; sha256="02vqnjsz0402xdqsxrxicgdsyi3nqc3cfrbabfkywn3q102gzq0f"; depends=[seqinr]; };
+CNOGpro = derive { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
 CNVassoc = derive { name="CNVassoc"; version="2.0.1"; sha256="0xf5rrcv7pl158fbz0yjibmrigpqgzwvdyl1gw0fkn5jjsm62hsm"; depends=[CNVassocData mixdist mclust survival]; };
 CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
-CNprep = derive { name="CNprep"; version="1.0"; sha256="1i8iz0ir14g56zjsj8z4kmds5rybg8jjra33v0qcjwp489s6475a"; depends=[mclust rlecuyer]; };
+CNprep = derive { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; };
 COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
 COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; };
 COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; };
-COPASutils = derive { name="COPASutils"; version="0.1.4"; sha256="0273530jis6plw1gg5mp4xbcw7x8k6bhqwdss5n3fypmi2vkb880"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; };
-CORE = derive { name="CORE"; version="2.0"; sha256="18vnqfasrn0bkplr3qj21wrksnj8wbsfhg7r0aimaa9c9nz9l7kg"; depends=[]; };
-CORElearn = derive { name="CORElearn"; version="0.9.43"; sha256="0qzj2fx8if157dplxcsss5s0gllwf183vhiqmapbkdix2h9l9jk5"; depends=[cluster rpart]; };
+COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; };
+CORE = derive { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
+CORElearn = derive { name="CORElearn"; version="0.9.44"; sha256="1hz97hkjcml83sksar863br6gszcv5ffb8yyg641gg1qgfldqc2i"; depends=[cluster rpart]; };
 CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster]; };
 COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[MASS genalg]; };
 COUNT = derive { name="COUNT"; version="1.3.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[msme sandwich MASS]; };
@@ -262,7 +266,6 @@ CRTSize = derive { name="CRTSize"; version="0.3"; sha256="0m7dc29p2vdpcgji4k4yrp
 CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; };
 CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; };
 CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; };
-CVD = derive { name="CVD"; version="1.0.0"; sha256="1lqx3rrq4abm7rxc6c9zlw0sc6flc6mll4xgfnasfrkai82kaf44"; depends=[]; };
 CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; };
 CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[wavethresh EbayesThresh]; };
 CVTuningCov = derive { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
@@ -270,7 +273,7 @@ CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fn
 CaDENCE = derive { name="CaDENCE"; version="1.2.1"; sha256="1l6mqra36syvpg9aqh4p6ndj3yj50rabx8hh788zpy4n57m5lpv7"; depends=[]; };
 Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; };
 CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; };
-CatDyn = derive { name="CatDyn"; version="1.0-5"; sha256="1syc40256104nm8n7h5b7w3ia2iya0y47p1sdxk8g1dy4l5wnalm"; depends=[optimx BB]; };
+CatDyn = derive { name="CatDyn"; version="1.0-6"; sha256="07n7qwpq8b70i2f48npy0pd87w0fj5xzjg00xw53m2idikqf82pn"; depends=[optimx BB]; };
 CateSelection = derive { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
 CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; };
 Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; };
@@ -279,7 +282,7 @@ CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="
 CensRegMod = derive { name="CensRegMod"; version="0.0"; sha256="0vfkyj2mx5l1pmcah8zilxrjlb6iign1by4ydjq8ddk1zyi242sw"; depends=[]; };
 CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; };
 CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
-ChainLadder = derive { name="ChainLadder"; version="0.1.8"; sha256="0ih0wb82i8f7hz3qyxhqzn9b6v684f66cga5w07qzv92788nzh8g"; depends=[systemfit Matrix actuar Hmisc statmod reshape2 MASS lattice tweedie]; };
+ChainLadder = derive { name="ChainLadder"; version="0.1.9"; sha256="1ysx4g16v75jn2727i56shkfbyyr08vfyngfpapc644xkf69nlq5"; depends=[systemfit Matrix actuar Hmisc statmod reshape2 MASS lattice tweedie]; };
 ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
 CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
 ChemoSpec = derive { name="ChemoSpec"; version="2.0-2"; sha256="01zng3nhsynj8kbnk7aisj1803q9svd9n6jnnl0vb82lsb29bfw7"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation]; };
@@ -292,6 +295,7 @@ CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa8
 CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
 Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.02"; sha256="1r7zxvrcn8lg8i74fnjr7mqcnhc0y5lsxy1zch1bhbrnbr19sgq5"; depends=[]; };
 ClickClust = derive { name="ClickClust"; version="1.1.3"; sha256="03xcmz1php6hl5ic0ipda3lsdyk5aql23jbilril2h9kvwifbbsf"; depends=[]; };
+ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; };
 ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
 ClustVarLV = derive { name="ClustVarLV"; version="1.3.1"; sha256="0ilfpiah8jw11n4bnr7chgycldjkqp3xgq3majisiqfqn2ankxl3"; depends=[Rcpp Rcpp]; };
 CoClust = derive { name="CoClust"; version="0.3-0"; sha256="0vcjy8mr8vfs5j1x0xz1zkjn6l08pg6r28ffbdvrqrbalnh87v3s"; depends=[copula gtools]; };
@@ -308,7 +312,7 @@ Comp2ROC = derive { name="Comp2ROC"; version="1.0"; sha256="0vymjbxdlvm5dvss4z4z
 CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp Rcpp]; };
 CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
 CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; };
-CompRandFld = derive { name="CompRandFld"; version="1.0.3-1"; sha256="0faazwmf9gr39m7bal0wb36cq4a36h9xrk6nj316sy57fd4w1aiw"; depends=[]; };
+CompRandFld = derive { name="CompRandFld"; version="1.0.3-3"; sha256="0znahwahpircjb1xl1q5f1fa3r44mk6f2jjh70bp7zfvlh6c4hr2"; depends=[]; };
 CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; };
 Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking psych boot Hmisc MASS GPArotation lpSolve nonparaeff]; };
 Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
@@ -320,8 +324,8 @@ ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3px
 ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[tkrplot lattice]; };
 CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
 CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; };
-CorReg = derive { name="CorReg"; version="0.15.8"; sha256="0gx7gq9sd3zzm4qr9g2anb0wqsxq6czzvxbq8aayrn453skndvcz"; depends=[Rcpp lars elasticnet corrplot Matrix ridge rpart MASS mvtnorm Rcpp RcppEigen]; };
-CorrBin = derive { name="CorrBin"; version="1.4"; sha256="0xnj2rhm4ph9277v2wfrp15p8nbdxiqfpcj0shj0d9z8rasx7p8m"; depends=[boot combinat]; };
+CorReg = derive { name="CorReg"; version="1.0"; sha256="061lb443wydlrgrnrpi9ibrwa0xw328wcyhsx7lndzjrni9mhcbp"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; };
+CorrBin = derive { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat geepack dirmult mvtnorm]; };
 Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
 CosmoPhotoz = derive { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[ggplot2 ggthemes arm COUNT gridExtra pcaPP mvtnorm shiny]; };
 CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[Formula expm numDeriv]; };
@@ -330,12 +334,12 @@ CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5
 CoxRidge = derive { name="CoxRidge"; version="0.9.1"; sha256="11vlsrv03j6kcxq9an7g210nq6cc6qd04b7w0pfbdk4bniqc0k60"; depends=[survival]; };
 CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; };
 CpGassoc = derive { name="CpGassoc"; version="2.11"; sha256="01hx9flf4mq1kgg77dah7s33kdkdgnmckppcl1y806xsnxqxmrxq"; depends=[nlme]; };
-Cprob = derive { name="Cprob"; version="1.2.3"; sha256="12kid241q0l28c77wfiqi1b7qj9scdz3ww6dcda5bkb8dcpr9sxv"; depends=[prodlim tpr geepack lgtdl lattice]; };
+Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[prodlim tpr geepack lgtdl lattice]; };
 CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
 Crossover = derive { name="Crossover"; version="0.1-13"; sha256="0s3nlc6yzgnrhdxpjqfpw8qcnjbhs5y0ng3qqpmpm9d9br8kivri"; depends=[rJava CommonJavaJars JavaGD ggplot2 MASS crossdes xtable Matrix multcomp digest Rcpp RcppArmadillo]; };
 CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[rJPSGCS car ellipse]; };
 Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; };
-D2C = derive { name="D2C"; version="1.0"; sha256="06g00da9mpzllar7c71kc4kgfbrqrdhh68lmlv761qxarfg1jf71"; depends=[randomForest gRbase lazy MASS corpcor infotheo]; };
+D2C = derive { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[randomForest gRbase lazy MASS corpcor foreach]; };
 DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; };
 DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[]; };
 DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
@@ -343,22 +347,23 @@ DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpd
 DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; };
 DALY = derive { name="DALY"; version="1.4.0"; sha256="1gx4q24149q1ipsrinswrm37z1nf4swgq188zsc1xifmw9l28v11"; depends=[]; };
 DAMOCLES = derive { name="DAMOCLES"; version="1.0"; sha256="1zk9r17f0nf3w78iwglw3hfz750pnjrd9p1d29bgh31zpc1714wi"; depends=[geiger caper ape deSolve matrixStats]; };
-DAMisc = derive { name="DAMisc"; version="1.2"; sha256="1fkp21inpgfr5lfid8wmajlcsqbnrgl5c35j0863sywvz6gamgc2"; depends=[car effects lattice sm MASS nnet pscl gdata xtable]; };
+DAMisc = derive { name="DAMisc"; version="1.3"; sha256="0d6fkg0c5a2jx1khv013lmahx5clyzab9w2dsi5zwxnf0jz5m8fc"; depends=[car effects lattice sm MASS nnet pscl gdata xtable]; };
 DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[xtable akima R_oo R_methodsS3 matlab lattice locfit]; };
 DBFTest = derive { name="DBFTest"; version="1.0"; sha256="0h83ic16z0lg7grjh4jbrxf672qchqv4zzypm2b1mhmzl01jn1wg"; depends=[]; };
 DBGSA = derive { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
 DBI = derive { name="DBI"; version="0.3.1"; sha256="0xj5baxwnhl23rd5nskhjvranrwrc68f3xlyrklglipi41bm69hw"; depends=[]; };
 DBKGrad = derive { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[minpack_lm SDD TSA lattice]; };
-DCGL = derive { name="DCGL"; version="2.1.1"; sha256="16jdlpl09q9pcymk5xxca2ba0vqv2l05wzi4ffb9ffydxpxy61j9"; depends=[igraph]; };
+DCGL = derive { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph]; };
 DCL = derive { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; };
 DCluster = derive { name="DCluster"; version="0.2-6"; sha256="0g7d15kq3dbrjmd5fmiwwg2b6gakz1lpsgrpkg6q89pzwlqx8xr9"; depends=[boot spdep MASS]; };
-DDD = derive { name="DDD"; version="2.5"; sha256="1svm6l8ssnnf5g3hci46pvw6amisyy1dvfm0mvdryglgfc8vv6jd"; depends=[deSolve ape ade4]; };
+DDD = derive { name="DDD"; version="2.6"; sha256="002i6256mm41cy7c6vac62dbjwch4bvz6z8w7vxk1qlj7zvnkifx"; depends=[deSolve ape ade4]; };
 DDHFm = derive { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; };
 DDIwR = derive { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[XML foreign]; };
 DECIDE = derive { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; };
+DEEPR = derive { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; };
 DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
 DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue combinat MASS cluster]; };
-DEoptim = derive { name="DEoptim"; version="2.2-2"; sha256="0yayp056knd7d6bvk07k7rnj79vibmkzflnk71dsfbkk5yx7vc77"; depends=[]; };
+DEoptim = derive { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7bkac1av4siknfg59lpknwwrsxbz208dg"; depends=[]; };
 DEoptimR = derive { name="DEoptimR"; version="1.0-2"; sha256="00viy7x3br3094az635lmjydm826d48vv2f14rwmdhqmv03066kq"; depends=[]; };
 DFIT = derive { name="DFIT"; version="1.0-1"; sha256="190k577qvbpbzgyys1r52fq1w642aq5syp2p9d7y6zp4g3xra1sr"; depends=[simex mvtnorm ggplot2]; };
 DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; };
@@ -369,14 +374,14 @@ DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9
 DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; };
 DNAprofiles = derive { name="DNAprofiles"; version="0.2"; sha256="15la7csf45175g4hkfdz41jgbj5njad5d4jwfhpadxkb9v2mgaw4"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; };
 DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[Rsolnp multicool Rcpp Rcpp]; };
-DOBAD = derive { name="DOBAD"; version="1.0.3"; sha256="0q8sjcbfdg66jrhii98kls1l2gzx5s8nzv5xrbyl497cn6ysiww0"; depends=[numDeriv]; };
+DOBAD = derive { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[numDeriv lattice]; };
 DOvalidation = derive { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; };
 DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; };
-DPw = derive { name="DPw"; version="1.1.2"; sha256="0waprp6xql67ijwwsy0z8f0fnazkzci0nzwiajwkvy7vbwcch5bx"; depends=[]; };
+DPw = derive { name="DPw"; version="1.1.3"; sha256="1cw9qig5z2nfp2b3k4ng5hpar9izd3d6jihj93mkc0rqcli2wzp1"; depends=[fOptions]; };
 DSBayes = derive { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
 DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbskh76xws3p6zsfakk63ndg3rr"; depends=[]; };
-DSpat = derive { name="DSpat"; version="0.1.5"; sha256="1njc9p2cxszcskdm21x00yvcs7gx71x18fdayih6l3g5l40c698a"; depends=[spatstat RandomFields mgcv rgeos]; };
-DSsim = derive { name="DSsim"; version="1.0.1"; sha256="0a62l8jfrnr2h9laxw27p8icvfa8f1gdhdiywwb33328barhzfrk"; depends=[shapefiles splancs mrds mgcv]; };
+DSpat = derive { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[spatstat RandomFields rgeos mgcv sp]; };
+DSsim = derive { name="DSsim"; version="1.0.2"; sha256="1dydglwgmzn3916kxngrc6wshdk9gvxm3rxqi6if63ljrb8yarnj"; depends=[shapefiles splancs mrds mgcv]; };
 DStree = derive { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[rpart pec Ecdat rpart_plot survival Rcpp Rcpp]; };
 DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
 DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
@@ -385,8 +390,8 @@ DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9
 DTR = derive { name="DTR"; version="1.5"; sha256="1c73ay0j6jkjm4iv32waz3wnn0qy399k1h72l7rwfzpyidnaprvi"; depends=[survival ggplot2 gridExtra aod proto]; };
 Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
 DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
-DatABEL = derive { name="DatABEL"; version="0.9-5"; sha256="0az3p5a9i1bkx90ky1vldkschkcynzz3a422hpp9a3hayykzrl6g"; depends=[]; };
-DataCombine = derive { name="DataCombine"; version="0.2.7"; sha256="18wl48l9b5q1b4bv16rm0k0dkb8j21fz05p6grgmnmvbalv8rvr1"; depends=[data_table dplyr]; };
+DatABEL = derive { name="DatABEL"; version="0.9-5"; sha256="1bjjfnwij6xyn2d62rs4n9j05hrv81jvkih2prk59zdyc7hwgmch"; depends=[]; };
+DataCombine = derive { name="DataCombine"; version="0.2.7.1"; sha256="03bshvcq48hqh8f61hm7vzwqr6axqfrg1rqjy3mf4sy2dxkjz3xh"; depends=[data_table dplyr]; };
 Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; };
 Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[ggplot2 JGR car MASS rJava e1071 scales plyr foreign multcomp effects]; };
 DeducerExtras = derive { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; };
@@ -395,25 +400,26 @@ DeducerPlugInScaling = derive { name="DeducerPlugInScaling"; version="0.1-0"; sh
 DeducerSpatial = derive { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[JavaGD Deducer sp maptools OpenStreetMap scales rgdal UScensus2010 Hmisc]; };
 DeducerSurvival = derive { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
 DeducerText = derive { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer tm wordcloud RColorBrewer SnowballC]; };
-Delaporte = derive { name="Delaporte"; version="2.2-1"; sha256="09xs1gyz0wkjw0k4b5ahy7zb8xjrg610bbdvvyxkfbh9jaf8q90b"; depends=[Rcpp Rcpp]; };
+Delaporte = derive { name="Delaporte"; version="2.2-2"; sha256="1smx8vbi1kvfij00aq0fzj03sxagnzn9vfws0f5973bp3q72x86q"; depends=[Rcpp Rcpp]; };
 Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts sfsmisc vegan mlogit]; };
 DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
 Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
 DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; };
-DescTools = derive { name="DescTools"; version="0.99.8.1"; sha256="1na2j0j7mkk0j2y3jac5hslmr3qp5924kv4z9zrwiymjb52jbwmr"; depends=[boot]; };
+Deriv = derive { name="Deriv"; version="1.0"; sha256="0s3jy0vjysc1wmmbv1dpc3z9jjcm16pjra1vna8fysnpy82icc7h"; depends=[]; };
+DescTools = derive { name="DescTools"; version="0.99.9"; sha256="19zz8jnhs87klzh6c6kxaq34kacfb80zrm54qywkj9627gv4ngn6"; depends=[boot mvtnorm]; };
 DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; };
 DetMCD = derive { name="DetMCD"; version="0.0.1"; sha256="1bxj7yf98bg185ig2svpkhky6hw14ijb8hwc6g5a3xx6xa9hs57y"; depends=[matrixStats pcaPP robustbase MASS Rcpp RcppEigen]; };
 DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
 Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; };
 DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; };
+DiagrammeR = derive { name="DiagrammeR"; version="0.1"; sha256="05165cnidwspd3j0i0svlb77i7hbn7mifg5p1653hl5qr3ihl0yd"; depends=[htmlwidgets]; };
 DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; };
 DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; };
-DiceKriging = derive { name="DiceKriging"; version="1.5.3"; sha256="14826fwsj6cifksyd605nbfxlfwnapr80inm4chjmm0f2xjc4r5n"; depends=[]; };
+DiceKriging = derive { name="DiceKriging"; version="1.5.4"; sha256="09i92jj5qlxr13a3x05aiy3q1z6pxz7ddar6639g4jq87vqq2vd9"; depends=[]; };
 DiceOptim = derive { name="DiceOptim"; version="1.4"; sha256="11k6gqw8bcfcnxhm6a039vnkdm7526h3aszjqwfp1s7m157w8kp2"; depends=[DiceKriging rgenoud MASS lhs]; };
 DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; };
-DierckxSpline = derive { name="DierckxSpline"; version="1.1-9"; sha256="07bp86zfbcp3d7jdhfap3z1sy15534qvdapdzscbyr2x82mmqpy3"; depends=[lattice PolynomF fda]; };
 Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
-DirichletReg = derive { name="DirichletReg"; version="0.5-2"; sha256="0x1s9x7dynykgbfdnsgpbnvq4dyc43wakmbv8r3gi9prn4af7a5k"; depends=[Formula rgl maxLik]; };
+DirichletReg = derive { name="DirichletReg"; version="0.6-1"; sha256="03ri9w6zvj28b3ckzfbak50lzrcrymvbmr5cckv3adpg7bncp0l9"; depends=[Formula rgl maxLik]; };
 Disake = derive { name="Disake"; version="1.0"; sha256="1i58q6dqk980mk8qj66hbqd64wmkvpa4v0z6c0q3lkirsvdm4cwv"; depends=[]; };
 DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
 DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0.1"; sha256="0w0s2fixpcmcwids35xx91hll9rf9qbi7155sp90dxd3vr8c939v"; depends=[Rsolnp]; };
@@ -422,11 +428,11 @@ DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0"; sha256="0v8za4
 DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
 Distance = derive { name="Distance"; version="0.9.2"; sha256="0mxwn9mwzfxnqpxvb4h8955c75hvnk09ji330924dfmi3fca8xjf"; depends=[mrds]; };
 DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[prettyGraphs car]; };
-DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="1in2k7xsaa0wadjgdh8m0v25v0dzx89pb20i5nsa19vx2iiysqbd"; depends=[RUnit]; };
+DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
 DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
 DivMelt = derive { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
 DiversitySampler = derive { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; };
-DnE = derive { name="DnE"; version="1.01"; sha256="04b2zz1b47nxpl8060ravybwq6y3s08fbkg5a4qiiaz9a84kvbhw"; depends=[]; };
+DnE = derive { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
 DoE_base = derive { name="DoE.base"; version="0.26-3"; sha256="0b0nkp85ryhy2r9xzmd0331v6a63bh2z2anzc7ra3k315c76ajq3"; depends=[conf_design vcd combinat MASS]; };
 DoE_wrapper = derive { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[FrF2 DoE_base rsm lhs DiceDesign AlgDesign]; };
 Dodge = derive { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
@@ -441,11 +447,12 @@ DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256
 EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; };
 EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; };
 EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
-EBglmnet = derive { name="EBglmnet"; version="3.4"; sha256="14bkdga07844jc8hpxijp51dx280643i2pampgiz846vkz5vvl1j"; depends=[]; };
+EBglmnet = derive { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937nc0kl1jz4d8g2br6ij8651lf2byj9s1a"; depends=[]; };
 EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
 EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
-EGRET = derive { name="EGRET"; version="2.0.1"; sha256="0h7s3n4jcvxmhmdaf2zq8vk54lwf3h29bhz6y3p9ahm5vid7n1xv"; depends=[dataRetrieval survival fields lubridate]; };
-EIAdata = derive { name="EIAdata"; version="0.0.1"; sha256="0adgkjfymgsimlaalcgcqdsagfvycrnsx93bx2xsbvlbywjk9fhn"; depends=[XML plyr xts zoo]; };
+EFDR = derive { name="EFDR"; version="0.1.0"; sha256="086vk3nff3mcpmh1js2b8wqzpjzdjvlh34fsk3l6sl066gfz49j7"; depends=[Matrix foreach doParallel waveslim gstat tidyr dplyr sp]; };
+EGRET = derive { name="EGRET"; version="2.1.0"; sha256="1gq8hmwdv2cpkgysv4bydszld38h5l7yvlcjrqzpg710xpn73fhi"; depends=[dataRetrieval survival fields lubridate]; };
+EIAdata = derive { name="EIAdata"; version="0.0.2"; sha256="1zh2nvr11l0ip7q84pzmn36q5d5zrgh0h8zwy7bnsxv5am6z27p2"; depends=[XML plyr xts zoo]; };
 EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
 EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
 ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[locfit lattice latticeExtra xlsx]; };
@@ -461,10 +468,9 @@ EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf
 EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[lattice mvtnorm KernSmooth]; };
 EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
 EMMREML = derive { name="EMMREML"; version="2.0"; sha256="0fyqwyym6d1adn5pvrfspmr933qhi30h58hxr2rbzwm5kwh6c8jr"; depends=[Matrix]; };
-EMP = derive { name="EMP"; version="1.0.2"; sha256="0kh0mirfvas0kyvx3igrwg265rqsfn2jpf2daa0swq9vvs97czis"; depends=[]; };
+EMP = derive { name="EMP"; version="2.0.1"; sha256="1zdy05jfhcgj6415pnm079v8xjg90n3akp1rwq65jbqdar38zj4y"; depends=[ROCR]; };
 EMT = derive { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
 EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; };
-ENA = derive { name="ENA"; version="1.3-0"; sha256="02gsngkzc8vfpg2jvcabwp4kpfs14cajs9xv1rh76807l5ylqihz"; depends=[GeneNet space WGCNA parmigene]; };
 ENMeval = derive { name="ENMeval"; version="0.1.1"; sha256="0g1h8dklv6rv73wwpx3vhbpnwply5lpq8x9jvl7r018x9gcvvb9m"; depends=[dismo raster rJava]; };
 ENiRG = derive { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 raster R_utils sp spgrass6 gdata fgui miniGUI]; };
 ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc vcd RColorBrewer]; };
@@ -476,9 +482,8 @@ ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahi
 ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; };
 ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
 ETLUtils = derive { name="ETLUtils"; version="1.2"; sha256="0mlfq23v7nl6lslscknk9mdx4dxk8xyc5imnvzlhzhag0k50mqj2"; depends=[ff]; };
-EVER = derive { name="EVER"; version="1.2"; sha256="1yk6ln4shp53jvph6jy1d5m4cq080p6f03qwigdw4f0al9qzja2s"; depends=[]; };
 EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools Rcpp]; };
-EasyABC = derive { name="EasyABC"; version="1.3.1"; sha256="1d1j7n6mhpmbbczg0yjs4kqjxlclc7pm5fl7pkxp9dmfic002y34"; depends=[abc pls mnormt MASS lhs]; };
+EasyABC = derive { name="EasyABC"; version="1.4"; sha256="0v3i7vlx2pnfkcqxka4g7ss8k8zphyx3vq5l0c1b433qp0fnjwf3"; depends=[abc pls mnormt MASS lhs]; };
 EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; };
 EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[MASS stringr rjags coda foreach doParallel random]; };
 EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; };
@@ -489,16 +494,18 @@ EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
 EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; };
 EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; };
+EffectTreat = derive { name="EffectTreat"; version="0.1-1"; sha256="1kcd1ns6m0l88qdz6ch3v85i69kl3z2mlvnlrbcnckyxvhpscy4n"; depends=[]; };
 EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
 ElemStatLearn = derive { name="ElemStatLearn"; version="2012.04-0"; sha256="107x2mybadqgw03j3yq8ibq3ljs4fpx90chvsirpylqhv77wsabl"; depends=[]; };
 EloRating = derive { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; };
 ElstonStewart = derive { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[kinship2 digest]; };
 EnQuireR = derive { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR SensoMineR Rcmdr MASS]; };
 EngrExpt = derive { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; };
-EnsembleBase = derive { name="EnsembleBase"; version="0.7"; sha256="064ggky8a14d510qdy1g9wj5syy4yyflxx8zsqjiz9x0vwn17gs7"; depends=[kknn gbm nnet e1071 randomForest doParallel foreach]; };
-EnsembleCV = derive { name="EnsembleCV"; version="0.7"; sha256="169wwckl15y919cak34njj4yc1zhp05pygfw9f5b7dx8xsdplyxa"; depends=[EnsembleBase]; };
+EnsembleBase = derive { name="EnsembleBase"; version="0.7.1"; sha256="1yc5afim7zprxvnk5r2m0wwrl15b8sifxnh00b1x7qnzyz4glfl2"; depends=[kknn gbm nnet e1071 randomForest doParallel foreach]; };
+EnsembleCV = derive { name="EnsembleCV"; version="0.7.1"; sha256="14mvwfjbhsrq9q7k5ph5sf9zriazgfby376v1zjm82r93y4samsf"; depends=[EnsembleBase]; };
 EnsemblePCReg = derive { name="EnsemblePCReg"; version="0.6"; sha256="0amswx7x08hpfvsrkjyfz3adkfshl7d1knyvk9nrnrrpy65rilc3"; depends=[EnsembleBase]; };
-EntropyEstimation = derive { name="EntropyEstimation"; version="1.1"; sha256="1l49xwlkv87zrlc30ws7yxlrwl32ggzwipzs33smx3rig68dnnym"; depends=[]; };
+EnsemblePenReg = derive { name="EnsemblePenReg"; version="0.6"; sha256="0fjp50jbnbhvyd7srvhy0ipysm192d8ikg9yra2vch33zrid2xbm"; depends=[EnsembleBase glmnet]; };
+EntropyEstimation = derive { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; };
 EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; };
 EnvStats = derive { name="EnvStats"; version="1.0.3"; sha256="03wcqv4v14wkrrfi68qinaza3fbspw2a1pv1rm5nshcp8hw38qga"; depends=[]; };
 EnviroStat = derive { name="EnviroStat"; version="0.4-0"; sha256="05sa63z6yzny2ncxpm5d3x0bx8snkn0x5pzpj2a7y6rwf6al5q4r"; depends=[MASS]; };
@@ -506,30 +513,32 @@ Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbk
 EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML Rcpp]; };
 EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve reshape2 ggplot2]; };
 EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-EpiModel = derive { name="EpiModel"; version="1.1.1"; sha256="1az2p033lvdb83hr6ipbky1iy8j3xh943w326kd0fpq1f3j2372g"; depends=[network networkDynamic tergm deSolve doParallel ergm foreach RColorBrewer statnet_common]; };
+EpiModel = derive { name="EpiModel"; version="1.1.3"; sha256="077sk29jzgf1hbnydsrji2bky33bljs3vyid4r4gk0hxhc9cb3pj"; depends=[deSolve network networkDynamic tergm doParallel ergm foreach RColorBrewer statnet_common]; };
 Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
 EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
 EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
 EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
 EvalEst = derive { name="EvalEst"; version="2012.4-1"; sha256="19yn4haxkny9kij0jhkwdbp34c9h2cc5l2n2b14khjhv1msqcfmi"; depends=[setRNG tframe tfplot dse]; };
-Evapotranspiration = derive { name="Evapotranspiration"; version="1.4"; sha256="1x12z44y78lcibf4wpc7l3ll7zwf1c1fkavwfm79q7sdlhwi1x9h"; depends=[zoo]; };
+Evapotranspiration = derive { name="Evapotranspiration"; version="1.5"; sha256="181s9wwil07740n79gz2ar9c1bjxy45v4fyxxkqjmdfly72la542"; depends=[zoo]; };
 EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
 ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
 Exact = derive { name="Exact"; version="1.4"; sha256="1l4cq6kslnl8x8c53m2w8w1vijmbxaxzr1fpdzrm2hfra0p5z90s"; depends=[]; };
 ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
 ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; };
 ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; };
-ExomeDepth = derive { name="ExomeDepth"; version="1.0.7"; sha256="02jsbnpyb8y4qnid084z6x1w22pdhnjq6729ixjiw715vavn4p27"; depends=[aod VGAM]; };
+ExomeDepth = derive { name="ExomeDepth"; version="1.1.1"; sha256="1ifq4nfvaa3yyz4s2140i0xz9mwd8lbwn1hclhx6lz165nixhqsx"; depends=[aod VGAM]; };
 ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; };
 ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; };
 ExtDist = derive { name="ExtDist"; version="0.3.7"; sha256="0vcckw94j02qcy298p26f2v9jrw3a0j62r4xb0cg11cj5aysqw3q"; depends=[numDeriv optimx VGAM SuppDists truncdist]; };
 ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.4.2"; sha256="0gkrip4gv7xmar323p95696r3zpmv6ick6fl33x0jc2ldzi0wrbj"; depends=[Formula]; };
+FACTscorer = derive { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; };
 FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[MASS elasticnet sparseLDA sda glmnet mnormt crossval]; };
 FAMILY = derive { name="FAMILY"; version="0.1.18"; sha256="1f1s0p721sl27b9xp2wrdyx03kv1bdin4wfknmw1k0nnc94dcnp2"; depends=[pheatmap pROC]; };
 FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; };
 FAOSTAT = derive { name="FAOSTAT"; version="1.9"; sha256="0gff60vlv35m5sjmz7glbdrd6ijy6n32a9xd26z2ix839qgywvqj"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; };
 FAdist = derive { name="FAdist"; version="2.0"; sha256="0qkbliz25xlsng7fi9hk1vshpd3535yrv5rc43m3g2mj024a9wxg"; depends=[]; };
 FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; };
+FAmle = derive { name="FAmle"; version="1.3.2"; sha256="15xp2sdzz4ipp4h89xjws47vn7iwrkgqgcwbj5957hz038gdkam1"; depends=[mvtnorm]; };
 FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; };
 FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
 FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
@@ -546,14 +555,14 @@ FHtest = derive { name="FHtest"; version="1.1"; sha256="0yqy3lvxjhk7biqfikxqlgs9
 FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
 FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; };
 FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
-FLIM = derive { name="FLIM"; version="1.1"; sha256="1gghzmj3mvih4gglk27rx1v18q72xnvymgzjwa84m5vlc8840jpa"; depends=[zoo MASS]; };
+FLIM = derive { name="FLIM"; version="1.2"; sha256="180az4zwmfcglmvismyacmh7ri4qg8jvhlisqpway0z5z6fsda6r"; depends=[zoo MASS]; };
 FLLat = derive { name="FLLat"; version="1.1"; sha256="1h2nfx7gb66hjdfkdm6im6n8c1fjdz9csg39pckb47c0khl3g9r0"; depends=[gplots]; };
 FLR = derive { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
 FLSSS = derive { name="FLSSS"; version="3.1"; sha256="0cyrjq1b0s7x0dz3x2kvd7pr8v4lyw1324ik4rnbj9hv9mf1g0af"; depends=[Rcpp Rcpp]; };
 FME = derive { name="FME"; version="1.3.2"; sha256="1sjnsc8jbylb2bln5ic24s5bany3clzn44lqnymhsy81x88396ff"; depends=[deSolve rootSolve coda minpack_lm MASS]; };
 FMStable = derive { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; };
 FNN = derive { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; };
-FPDC = derive { name="FPDC"; version="1.0"; sha256="0f6f5bjh1dqv9n6hpbgj922ymbd1zdb0b4ad5h9nk1c6c9ysai7y"; depends=[ThreeWay]; };
+FPDclustering = derive { name="FPDclustering"; version="1.0"; sha256="078vvpn9lwza45l9k53m3yzhrkkyakm1ynm93x5yld4fgkrd3c33"; depends=[ThreeWay]; };
 FRACTION = derive { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
 FRAPO = derive { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qpd882cyjb0y0jl582fxd3a2ic7n14"; depends=[quadprog Rglpk timeSeries]; };
 FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; };
@@ -566,21 +575,23 @@ FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5v
 FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; };
 FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
 FactoClass = derive { name="FactoClass"; version="1.1.0"; sha256="0y7yd2i79j1m5yl6vnvma47xhr3rl7i37h9sadyrpfm4s486b3kc"; depends=[ade4 xtable]; };
-FactoMineR = derive { name="FactoMineR"; version="1.27"; sha256="1ai76v74ygn183ka3qz1yz9wz1yidbymgylh00lg6f2mjz0r937i"; depends=[car MASS ellipse lattice cluster scatterplot3d leaps]; };
+FactoMineR = derive { name="FactoMineR"; version="1.28"; sha256="05gg4zm0lpvz830xqxrjbi8icpx88bvslibdv744nzqpn4x5ymqh"; depends=[car MASS ellipse lattice cluster scatterplot3d leaps]; };
 Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; };
 Familias = derive { name="Familias"; version="2.1"; sha256="1ccm2hm8vlm450yqx3r45qklgwa6wb54i39ybfh9g2fl544spzn8"; depends=[paramlink]; };
-FastHCS = derive { name="FastHCS"; version="0.0.3"; sha256="0nkm5c7ifywzs1w9ggawh3aw8rr0w07f6g8glwph84xvp6ni3i0g"; depends=[matrixStats Rcpp RcppEigen]; };
+FastHCS = derive { name="FastHCS"; version="0.0.4"; sha256="11ddp1xy1cmnfbsvabyw0y2wdj4z1brqykji75y7wwchf71m2bps"; depends=[matrixStats rrcov Rcpp RcppEigen]; };
 FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; };
-FastPCS = derive { name="FastPCS"; version="0.1.1"; sha256="0q6nywv1d55xvg2c39c9rqcf3kfqab095c5waps0hp6ylh76d2vx"; depends=[matrixStats Rcpp RcppEigen]; };
-FastRCS = derive { name="FastRCS"; version="0.0.5"; sha256="1dplf1xyw1vwrwknwrz4xxskl1j4sqf8smf5mpw472ainsm9b9iy"; depends=[matrixStats Rcpp RcppEigen]; };
+FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
+FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
 FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; };
-FeedbackTS = derive { name="FeedbackTS"; version="1.2"; sha256="0yg90b9fk8cq0kilhfr598x74hdnji42pny10jw43f70hdf9mkl1"; depends=[maps mapdata proj4 geoR sp]; };
+FeaLect = derive { name="FeaLect"; version="1.7"; sha256="1v4psr2j74ciyi7jxphx70hjrd47l5krwvp26ml8qsd51q1i37l8"; depends=[lars rms]; };
+FeatureHashing = derive { name="FeatureHashing"; version="0.8"; sha256="05300709d4k5fxyajvdjhwy7br558g81agfrp9pqa2y0v0qx2zkw"; depends=[Rcpp Matrix digest Rcpp digest BH]; };
+FeedbackTS = derive { name="FeedbackTS"; version="1.3"; sha256="0j5dnwq3vby20x5773hi9ay91z8wwq8mk1011x42smw1k00a9q9y"; depends=[maps mapdata proj4 geoR sp]; };
 FieldSim = derive { name="FieldSim"; version="3.1.3"; sha256="0ap1mfsjj3bflpryn0y8h9kg5mzfrnqj6h9f3m5ja32yjv19ql60"; depends=[rgl RColorBrewer]; };
 FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
 FinCal = derive { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 reshape2 scales RCurl]; };
 FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; };
-FinancialInstrument = derive { name="FinancialInstrument"; version="1.1"; sha256="19sszdrqipy9i8g2bda9v8i9g5c9w584si4va35fq3i929yv7hrl"; depends=[quantmod xts zoo]; };
+FinancialInstrument = derive { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod zoo xts TTR]; };
 FindAllRoots = derive { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; };
 FindIt = derive { name="FindIt"; version="0.3"; sha256="0bnyfv9xc5c9bzc34qpbnk6s9mvnzkx9zswjr3j210f518y8z45f"; depends=[glmnet lars glmnet lars]; };
 FindMinIC = derive { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; };
@@ -592,10 +603,10 @@ FlexParamCurve = derive { name="FlexParamCurve"; version="1.4-3"; sha256="1056lx
 FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphvghv4iqf1gk2snb8aksignaw8pnlkixnsg7"; depends=[]; };
 Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
 ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
-ForImp = derive { name="ForImp"; version="1.0.2"; sha256="1qplsg3cxs95b3ax71a3wyjfk4q207k72ggba2sl0zc7mjqhv1f4"; depends=[homals sampling mvtnorm]; };
+ForImp = derive { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals sampling mvtnorm]; };
 ForeCA = derive { name="ForeCA"; version="0.1"; sha256="1nbflawx8h4lpb9ixbp0zcyl0bqykqlqail31i00ywkak2ic3pm3"; depends=[ifultools splus2R nlme R_utils sapa mgcv astsa]; };
 FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
-Formula = derive { name="Formula"; version="1.1-2"; sha256="1axjcmy4x2175nrfjc7vwkijcyr86ws6nbs08990wq8gcal15a10"; depends=[]; };
+Formula = derive { name="Formula"; version="1.2-0"; sha256="1rf4jkx7546aqwv5dsssi956r6mvr6m90wrx0d5dvy2d0ykhcnw9"; depends=[]; };
 ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
 FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
 FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; };
@@ -604,7 +615,7 @@ Frames2 = derive { name="Frames2"; version="0.0.3"; sha256="0nsiff1lpxzhiv0ah5d1
 FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; };
 FunChisq = derive { name="FunChisq"; version="1.0"; sha256="1wrj483w6fjwwqjbymdj229nismmwaxw6v6fpba9mylqbyhs69gc"; depends=[]; };
 FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; };
-FuncMap = derive { name="FuncMap"; version="1.0-2"; sha256="0psz2bsmq22ghgr3dijsw094b9ams15dvknigcgi5sq1invafx4a"; depends=[mvbutils]; };
+FuncMap = derive { name="FuncMap"; version="1.0-3"; sha256="0bhx7y1n75r3jwf5mkx2i2bqfjgzxgsw58nwhfl48ldibgx7h1qs"; depends=[mvbutils]; };
 Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp Rcpp RcppEigen]; };
 FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[]; };
 FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
@@ -624,10 +635,11 @@ GANPAdata = derive { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym
 GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; };
 GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
 GCD = derive { name="GCD"; version="3.0.4"; sha256="1mrgscbrljfyzxprclyw9rcwlkcnifm15kkkapkv56c5ms2ic2i5"; depends=[sp raster ggplot2]; };
+GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fizm3q3cl7vbzp88vbhpij4rnk4jl"; depends=[Rcpp RcppProgress Rcpp RcppProgress]; };
 GDAtools = derive { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; };
 GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
 GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
-GENLIB = derive { name="GENLIB"; version="1.0.1"; sha256="1vgm920bwb194mn78xp471hiln4iy430jfa8mxwx976bbcxkgpkh"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; };
+GENLIB = derive { name="GENLIB"; version="1.0.2"; sha256="0zqzx5rx8x87j0x5628r29lga0smh79h26jbgczd3l7kx9dh18rr"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; };
 GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; };
 GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; };
 GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; };
@@ -636,12 +648,12 @@ GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77c
 GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; };
 GGIR = derive { name="GGIR"; version="1.1-4"; sha256="1z1dwnx8lpj3xk7fdfm6sidbxpfgxjw9righ1kdnjw9g1nnkp29x"; depends=[]; };
 GGMselect = derive { name="GGMselect"; version="0.1-9"; sha256="18l98v6hv0sjhany275lsbdjwclx3abqfi924n9qlcnap1rvsfwz"; depends=[mvtnorm lars gtools]; };
-GGally = derive { name="GGally"; version="0.4.8"; sha256="0wc91c4d8m2335rp0x6i193hw538fnwhbplq3lv0maljwsj8s2pn"; depends=[ggplot2 gtable plyr reshape stringr]; };
+GGally = derive { name="GGally"; version="0.5.0"; sha256="00ix8qafi71l7vhj6268f9srqbgr9iw1qk0202y59mhfrj6c6f5i"; depends=[ggplot2 gtable plyr reshape stringr]; };
 GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
 GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; };
 GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools sp RColorBrewer MASS rgeos]; };
-GLDEX = derive { name="GLDEX"; version="2.0.0.1"; sha256="04y5x0cnifsr28a9razgvjk4nm3sl8drj1d62x5x3d3mks1y8n8a"; depends=[cluster]; };
-GLDreg = derive { name="GLDreg"; version="1.0"; sha256="12g9j30l3h2nk2vsw9j7gb2j9qvbklpbgy2grxa6nd5fr2lhlyfl"; depends=[GLDEX]; };
+GLDEX = derive { name="GLDEX"; version="2.0.0.2"; sha256="16vy50jgk9b57h9f48097m17zrla6ksmi3wm4z2yadfg81sg8721"; depends=[cluster]; };
+GLDreg = derive { name="GLDreg"; version="1.0.1"; sha256="1lbv5h8bnb3mi66as2vq1xyzh7z7vm1ils2jf24gn0xnprl02nvq"; depends=[GLDEX MASS quantreg]; };
 GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[mvtnorm corpcor]; };
 GMCM = derive { name="GMCM"; version="1.1.1"; sha256="181in94mdc6fka0l4a6vc84n295pgsv18yf5mgf59qfmz8vjxi4n"; depends=[Rcpp Rcpp RcppArmadillo]; };
 GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
@@ -650,9 +662,11 @@ GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lh
 GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama nleqslv BB SQUAREM]; };
 GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
 GPArotation = derive { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; };
+GPC = derive { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[randtoolbox orthopolynom ks lars]; };
 GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
 GPFDA = derive { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda_usc spam fda MASS]; };
-GPLTR = derive { name="GPLTR"; version="0.95"; sha256="0fm260pwg66j91hddyql95lvvcpzvvbi3hddwzrk1bhyrgd8kj55"; depends=[rpart]; };
+GPLTR = derive { name="GPLTR"; version="1.1"; sha256="0yp4b3ddvcd6s7rjpbmszl3a0x8qq6s138jjkm135yvbgp1jk5jz"; depends=[rpart]; };
+GPareto = derive { name="GPareto"; version="1.0.0"; sha256="0mzrl4xs7f5rkx0m4lkqy1456dnsa232hprmbg3bpris1rla780b"; depends=[DiceKriging emoa Rcpp rgenoud pbivnorm pso randtoolbox KrigInv MASS Rcpp]; };
 GPfit = derive { name="GPfit"; version="0.2-1"; sha256="1r7dmrjilnis4m8v0bibai0bkm3iwka4zxzrda8r49wmcpf99n2d"; depends=[lhs lattice]; };
 GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
 GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Rcpp RcppArmadillo Matrix numDeriv Rcpp RcppArmadillo]; };
@@ -661,16 +675,15 @@ GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy
 GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
 GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; };
 GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[Rcpp MASS ggplot2 Rcpp RcppArmadillo]; };
-GSIF = derive { name="GSIF"; version="0.4-2"; sha256="0v7bmqf96qsm2kxvi89whnvw0lmi7xgjb3icmmar7w31zh53am70"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat boot rpart quantregForest randomForest nlme]; };
+GSIF = derive { name="GSIF"; version="0.4-3"; sha256="18spfkkxxhjx6v0al5zn1nn2zvnaplxxl7wz3fqnjmk7k18izr0n"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat boot rpart quantregForest randomForest nlme]; };
 GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; };
 GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
 GUILDS = derive { name="GUILDS"; version="1.2"; sha256="0nirrbq8z7axnrgwbykv5886yf3akf64zynza8l2m96nvzlkzf4y"; depends=[Rcpp pracma subplex Rcpp]; };
 GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; };
 GUTS = derive { name="GUTS"; version="0.3.5"; sha256="10yi18yv3vbm7pn11bbj3baxqga5yymilabf56bc18prpirnw51b"; depends=[Rcpp Rcpp BH]; };
-GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0w08b22xkx0llmwk1kj4ibapvg3fxkgkmjz6z6acr4nwqfwmjzzx"; depends=[vegan ape]; };
+GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; };
 GWAF = derive { name="GWAF"; version="2.1"; sha256="1s56d3b6p5fpaxi32ks2mmhsa5sgi746hf159wk0z99099gli8g3"; depends=[geepack coxme lme4]; };
 GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
-GWAtoolbox = derive { name="GWAtoolbox"; version="2.2.4"; sha256="0adpixlfh0j1py79b0636921kmz2zvhv8p07m6ism6h3xva0i4ck"; depends=[]; };
 GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
 GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; };
 GWmodel = derive { name="GWmodel"; version="1.2-3"; sha256="04sks9rnqxgxyj9q3nyrnknp4cdfck2p52svxfdrgvxqr48kf6ff"; depends=[maptools robustbase]; };
@@ -686,10 +699,11 @@ GenWin = derive { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0f
 GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[MASS longitudinal fdrtool]; };
 GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
 GeneFeST = derive { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; };
-GeneNet = derive { name="GeneNet"; version="1.2.11"; sha256="0c98qkwwwicxbax8afia1ximjs8gz30v9kqqkzafaijxxba7x83q"; depends=[corpcor longitudinal fdrtool igraph]; };
+GeneNet = derive { name="GeneNet"; version="1.2.12"; sha256="0z94ws95nvk7jx5fnrwb81925y14fash1g5pd1mmkkj8njq9kk4l"; depends=[corpcor longitudinal fdrtool igraph]; };
 GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
-Geneland = derive { name="Geneland"; version="4.0.4"; sha256="14crcj71i4vc48a132k024jrkwlwbrqi6jd9w3d1qsy6dn7inc0k"; depends=[RandomFields fields]; };
-GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="1q7bagq6c4an5jprypab5121ymich55xgyxfxnj5izihssmcwssp"; depends=[DistributionUtils RUnit]; };
+Geneland = derive { name="Geneland"; version="4.0.5"; sha256="1v2m8v4sy95rajjw8m9bg4yal5ay7x1k5kqjxrivm45ad546ykwh"; depends=[RandomFields fields]; };
+GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; };
+GeneticSubsetter = derive { name="GeneticSubsetter"; version="0.5"; sha256="1j04qbnx6j39w16ks3v05hr99lsdsy8sp8af2cfg2mqwk4dy3kx2"; depends=[rrBLUP]; };
 GeneticTools = derive { name="GeneticTools"; version="0.3"; sha256="16jqi98nvdmfbmx6z10d2kxfc9mp4zhpg22rschiy6ysp4lczs3c"; depends=[gMWT Rcpp RcppArmadillo plotrix Rcpp RcppArmadillo]; };
 GeoDE = derive { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[Matrix MASS]; };
 GeoGenetix = derive { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; };
@@ -702,10 +716,10 @@ GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527
 GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
 Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; };
 GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
-GlobalOptions = derive { name="GlobalOptions"; version="0.0.3"; sha256="0iih8fpwwrnq8jlr95ah0y18a36xswha2jwckldpsira0ara0qnc"; depends=[]; };
-Gmisc = derive { name="Gmisc"; version="0.6.7"; sha256="15bgkgxqmgg81ry3ssx1darspmyhpzfcnkhkprqf495c07sh94jb"; depends=[Hmisc stringr lattice sp]; };
-GoFKernel = derive { name="GoFKernel"; version="2.0-4"; sha256="12iashl0l8an1rdb9adjqbfvpv22rzf4y6vjdlg060r3qq7xr8kl"; depends=[KernSmooth]; };
-GrammR = derive { name="GrammR"; version="1.0.0"; sha256="1j1k891cn9fyyp1nfyj6hjcz87qflipfwd9f9zg5s8y4jf0i9a7g"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; };
+GlobalOptions = derive { name="GlobalOptions"; version="0.0.5"; sha256="0rgawyq52ykwlwq8gfmrz8wah8h1z8h3pafn9v8c73xsbr615a7j"; depends=[]; };
+Gmisc = derive { name="Gmisc"; version="1.0"; sha256="0i92f9v9h4d7vxzzgafwhy8bwf52djqb3mxsaqqz2in68fdywdqq"; depends=[htmlTable lattice sp Hmisc forestplot]; };
+GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; };
+GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; };
 GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; };
 GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspizp1vadl6kvrqr8s4zd6pghj02nd266znk9"; depends=[]; };
 GrassmannOptim = derive { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
@@ -724,11 +738,10 @@ HDPenReg = derive { name="HDPenReg"; version="0.90"; sha256="0hi1pd6lmb5w4px32sg
 HDclassif = derive { name="HDclassif"; version="1.2.2"; sha256="0j32nhl2v0bipflidwfk6q8a0pvn7qjs7ks1al2izsr772dwfcvq"; depends=[MASS]; };
 HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
 HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
-HGNChelper = derive { name="HGNChelper"; version="0.3.0"; sha256="1w1x8fkvwlm4xqfx3afg42hhsa459sxqacsiph088sr77lhd3acz"; depends=[]; };
-HH = derive { name="HH"; version="3.1-5"; sha256="0m7gydzqm7ih9ii9fcbs8l59r535l314daxdpdya661bmcgjd2ks"; depends=[lattice latticeExtra multcomp reshape2 leaps vcd colorspace RColorBrewer Rcmdr]; };
+HGNChelper = derive { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; };
+HH = derive { name="HH"; version="3.1-14"; sha256="1fxf0fp0cgpjadfwczs4i62la6fgavz9xviw20g23lq4bdxvjg7f"; depends=[lattice latticeExtra multcomp gridExtra reshape2 leaps vcd colorspace RColorBrewer Rcmdr shiny]; };
 HHG = derive { name="HHG"; version="1.4"; sha256="048jbwhrbgp1pv2j6sw234ykdn7bgpa49slwh3p5547nl2cwjysg"; depends=[]; };
 HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
-HIBAG = derive { name="HIBAG"; version="1.2.4"; sha256="0mmy7yn9xl0gp3cgkv4zym2hbzbw1kvsdhv5mvl401v95qjy5z20"; depends=[]; };
 HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
 HIest = derive { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
 HK80 = derive { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; };
@@ -739,14 +752,14 @@ HMMCont = derive { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw
 HMMpa = derive { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; };
 HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[MCMCpack dirmult]; };
 HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; };
-HMR = derive { name="HMR"; version="0.3.1"; sha256="1lmxp46r5jr0r37sk9y080irbrf89rkzhv0943xv0f0l2dyyk415"; depends=[]; };
+HMR = derive { name="HMR"; version="0.3.2"; sha256="02zhp492n6q46qpfsz0q1wsrcpskmzp4422hgspvpqyrk1hgf588"; depends=[]; };
 HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; };
-HSAUR = derive { name="HSAUR"; version="1.3-4"; sha256="1y79ivzz7dy81q9vvsa55aldas1gfrz1in9c5v53gi40q6w9pkff"; depends=[]; };
-HSAUR2 = derive { name="HSAUR2"; version="1.1-11"; sha256="18j12kj42x3myzkyxm11m9y314icavdald9y424pwpyjx4p51v1v"; depends=[]; };
-HSAUR3 = derive { name="HSAUR3"; version="1.0-2"; sha256="0anip378k6zagk722m7fnx5lsms6pk7fs375pdywy3zcr7p9pm4z"; depends=[]; };
+HSAUR = derive { name="HSAUR"; version="1.3-6"; sha256="1872diskd9yz76x0z6yjg6dn1dxh479ybnja8vcly9fr8jb0kqqj"; depends=[]; };
+HSAUR2 = derive { name="HSAUR2"; version="1.1-13"; sha256="13b14m2cknicahvprkn3kmjk1sir7a10vkaq63niinfirw603fa9"; depends=[]; };
+HSAUR3 = derive { name="HSAUR3"; version="1.0-3"; sha256="0v7nvgybfkwzii1019p8yxnbny5y1y1nrqaa81xagi8a1f1klrzl"; depends=[]; };
 HSROC = derive { name="HSROC"; version="2.1.7"; sha256="05gixmzmgdply9zhjpss54b50ch4b8586cik6c49naxcqxr0y5vd"; depends=[lattice coda MASS MCMCpack]; };
-HSSVD = derive { name="HSSVD"; version="1.1"; sha256="0kpfcb9ibwhdanc56ysbvx3zirhbrxqyrgpbmi9yvnc5m2c8377d"; depends=[bcv]; };
-HTMLUtils = derive { name="HTMLUtils"; version="0.1.5"; sha256="12r8x7b944lbzz3f4j6w88szq6j9gscbss3f5bzpisw33sr4wgx3"; depends=[R2HTML]; };
+HSSVD = derive { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
+HTMLUtils = derive { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
 HTSCluster = derive { name="HTSCluster"; version="2.0.4"; sha256="1kvq118hqxc81n88g4bq10lh84dydrqqhzig246wf3f97ajvq7y0"; depends=[capushe poisson_glm_mix plotrix]; };
 HTSDiff = derive { name="HTSDiff"; version="1.0.5"; sha256="03g5hwjgg7g79lskwrgd32gy34v0fn8yh95zndid0qm6i7vwip9w"; depends=[plotrix HTSCluster poisson_glm_mix]; };
 HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl Rcpp]; };
@@ -764,16 +777,17 @@ HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.4"; sha256="0098n5m3
 HiClimR = derive { name="HiClimR"; version="1.1.5"; sha256="1kzlp2plprrsqidfikiri0bvj67m3lfy3ansrx1vi9b5ji6lf9n8"; depends=[]; };
 HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
 HiDimDA = derive { name="HiDimDA"; version="0.2-2"; sha256="0y45c7yi20ixr7d8zmjsbxsc9kvvwpdw49qncpz5l5wmdmzhy8mm"; depends=[]; };
-HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1"; sha256="1h2sqkqb24a0ywwxx4w2qi8w3f9xq41mipmcfnpph3aygdam61y1"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; };
+HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; };
 HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw777953mhgzvbqildph4szh4xh4"; depends=[]; };
 HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
 HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-1"; sha256="13c5g6wryzry1rvqcfpkjm9vibc6lv864fvcjmr2z8ianiqrrn6p"; depends=[]; };
-HierO = derive { name="HierO"; version="0.1"; sha256="009lf28k8grldapk3smcsjs14gxl1y58p39ksc3nv9i1hzkcd62z"; depends=[rneos RCurl bitops XML tcltk2]; };
+HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[rneos RCurl bitops XML tcltk2]; };
 HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
 HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[Hmisc ash stringr]; };
 HiveR = derive { name="HiveR"; version="0.2-27"; sha256="1c0isfiq8xw68qi3mk6m5dilsvbib7hy0ill9wga6kf6qndlfc49"; depends=[RColorBrewer plyr tkrgl jpeg png]; };
 Hmisc = derive { name="Hmisc"; version="3.14-6"; sha256="0nr5m7izxm0kq64hjslvxrnpdm8szl7wmvg6ic4xqck86mxba9py"; depends=[lattice survival Formula latticeExtra cluster rpart nnet acepack foreign]; };
-Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1p7rwph50i0dwl7a6n394dq7sl9nb2y8p5ip5y6ql48ixjh4d078"; depends=[TimeWarp]; };
+Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1n6rarygdfqi7rjdqxi5j3xn1pzakvyfp5q9h9173vypxbmrk5p7"; depends=[TimeWarp]; };
+HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[RGtk2 MenuCollection deSolve]; };
 HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="0zb02wcpq09lr7lr4wcgrbw9x7jcvhi34g7f4s6h88zz7xg9daw5"; depends=[Rglpk]; };
 Hotelling = derive { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; };
 HyPhy = derive { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; };
@@ -797,9 +811,10 @@ ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f
 ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
 IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[Rsolnp gtools survival]; };
 IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
+IFP = derive { name="IFP"; version="0.1.1"; sha256="05hyyh7izgifmiqsxbspcsj97jc7vahqzn1975f954iv0ix3rzqm"; depends=[haplo_stats coda]; };
 IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; };
 IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
-INLABMA = derive { name="INLABMA"; version="0.1-5"; sha256="1z5mwibgrc0hrwjq70pm49l5ppcwwm5z4slc1madr291w37awi51"; depends=[Matrix spdep]; };
+INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[sp Matrix spdep]; };
 IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[Matrix MASS nlme]; };
 IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
 IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[qcc MASS micEcon miscTools]; };
@@ -808,7 +823,7 @@ ISBF = derive { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9
 ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
 ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
 ISOcodes = derive { name="ISOcodes"; version="2014.03.24"; sha256="0a6ap9a5h88c6iqzlqfalcg1fwm9x7rm3c8z9vwxfw6jrjs6v2cp"; depends=[]; };
-ISOpureR = derive { name="ISOpureR"; version="1.0.4"; sha256="1gs178knqzzlj1zdrv3vr3kx6ff377pky7q1z9rp4b7d1ickmg9q"; depends=[]; };
+ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp Rcpp RcppEigen]; };
 ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
 ISwR = derive { name="ISwR"; version="2.0-6"; sha256="1ms4lm1skfqaq4mnm03kvjb7kaxdzv72s6i77zp7z17gzfa40c9h"; depends=[]; };
 IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[R2jags Matching boot]; };
@@ -826,12 +841,13 @@ Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p0
 InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
 Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
 Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; };
+InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.1-4"; sha256="01yjkqj1k7haa75avcqhkxjm6569c2ds8fydz3spcmx37l2xafdp"; depends=[glmnet mboost]; };
 InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
 IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; };
 IsingSampler = derive { name="IsingSampler"; version="0.1.1"; sha256="068fy16fw2ja25mllyw4z3bn17pxdq17zg75zwlwmljds6psa1gk"; depends=[Rcpp plyr Rcpp]; };
 Iso = derive { name="Iso"; version="0.0-15"; sha256="18ig772xxsbj1vhrv7b20hrglnnz742s1mjzhwx02bpjhica4a46"; depends=[]; };
 IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
-IsoGene = derive { name="IsoGene"; version="1.0-22"; sha256="097xxgqdk2j7y22qflrgss9pgbyg01rcw5088b43pbv3sc85fqcs"; depends=[Iso xtable ff]; };
+IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[Iso xtable ff]; };
 IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; };
 JADE = derive { name="JADE"; version="1.9-92"; sha256="0ki3jpz4npjikn3jjb7ppiyx0flhxx3p8aghjxlm3klhkm0k6ix4"; depends=[clue]; };
 JAGUAR = derive { name="JAGUAR"; version="1.1"; sha256="0iy91hx4rcsx84kazkmq0jnl6gqnc1cmbkb957y0v2zr9adpqs4y"; depends=[Rcpp plyr lme4 doParallel Rcpp]; };
@@ -867,14 +883,13 @@ KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh
 Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[Rcpp data_table lattice knitr markdown Rcpp]; };
 KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; };
 Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
-KrigInv = derive { name="KrigInv"; version="1.3"; sha256="1zgrx0rmcaf3j3igqhvnbzjwh2dm2x5s5l027c7cbrl1rn20im0r"; depends=[DiceKriging rgenoud MASS lhs pbivnorm randtoolbox DiceView]; };
-KsPlot = derive { name="KsPlot"; version="1.3"; sha256="1mzpsgzscpv888ipfh9nakhqrgw7rdinb5lwhkjk9yk7ap5lfvs0"; depends=[e1071 caret nnet MASS caTools mda glmnet randomForest mvpart]; };
+KrigInv = derive { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm rgenoud randtoolbox]; };
 LARF = derive { name="LARF"; version="1.2"; sha256="1qhi5zkgk8qlgfvq0jas9dda6nlg94kcay1famm0s488ssg6sr3k"; depends=[]; };
 LCA = derive { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; };
 LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot mvtnorm rms kinship2]; };
 LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
-LDExplorer = derive { name="LDExplorer"; version="1.0.3"; sha256="1hkhbhclm1bvxzq7z663i583f94cvkklaq0z5qkswrpi406md7mi"; depends=[]; };
 LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; };
+LDPD = derive { name="LDPD"; version="1.0.2"; sha256="0bs3s6x6f9rpp53x8ird6qnz9rfayf64askrr04hdjhlgw7cs0n7"; depends=[MASS nleqslv]; };
 LDRTools = derive { name="LDRTools"; version="0.1"; sha256="1cr0v6qsdldy89p44lhr6hisqaz99qzab32kd1srdnnwnwl1q2y4"; depends=[]; };
 LDcorSV = derive { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; };
 LDheatmap = derive { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg6cfv9p4yzsggng7zy6wrw6q22559pwm6c6vr0"; depends=[genetics]; };
@@ -884,7 +899,7 @@ LGS = derive { name="LGS"; version="0.91"; sha256="0rzj1shapyg7hyzsb9v81dirwihd7
 LICORS = derive { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[RColorBrewer mvtnorm zoo FNN fields locfit Matrix]; };
 LICurvature = derive { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; };
 LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[sn moments BB Bolstad2 optimx Rmpfr]; };
-LIM = derive { name="LIM"; version="1.4.5"; sha256="1dir9dqrpns77n5ydm3fpj2k0pl7q15z8vqbi5704vsfv94mgmas"; depends=[limSolve diagram]; };
+LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[limSolve diagram]; };
 LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; };
 LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
 LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.5"; sha256="1kq0ww8h43rsygjz5pmb3ym027klgi4sw1csdr9apwgd3ydbnr7n"; depends=[Matrix lme4]; };
@@ -893,13 +908,13 @@ LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3
 LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; };
 LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; };
 LPS = derive { name="LPS"; version="1.0.4"; sha256="0dy45nn1bmzd17y2dsh4pf4jmh9qvifigvpg2lv2zrmvlx53cli5"; depends=[]; };
-LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-3"; sha256="06w4gcz3h4gi05zzb37adxj4kl6pxpmlbzl4xaf03vqyabnvv9s0"; depends=[]; };
+LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-4"; sha256="13hbwg05p48i2gg9i379msb78k35m6kqj8l29cmrpqm1gcdyh3sg"; depends=[RColorBrewer]; };
 LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Rglpk Matrix]; };
 LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
 LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[LS2W matrixStats geoR RandomFields spdep]; };
 LSAfun = derive { name="LSAfun"; version="0.3.2"; sha256="1pxa3paq7kq07h3a14hdkx4s3g3dq4wn2q5nvp1083gg0zk0fpgh"; depends=[lsa rgl]; };
 LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; };
-LSD = derive { name="LSD"; version="2.5"; sha256="0j7lmsz93q2zv9y05aan5pwhpzh8m1i45mh4p386g7bvfrwlmxbx"; depends=[MASS gtools RColorBrewer colorRamps schoolmath ellipse]; };
+LSD = derive { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; };
 LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; };
 LTPDvar = derive { name="LTPDvar"; version="1.1"; sha256="0zb3ffz5vw1zabgzhpcw1mzfqh4g7r0sq4iy31nzyv8smdwddqzw"; depends=[]; };
 LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
@@ -913,7 +928,7 @@ LambertW = derive { name="LambertW"; version="0.5"; sha256="19xkm27015q552g1c1j9
 Laterality = derive { name="Laterality"; version="0.9.2"; sha256="13b1mpjcq7a14dwscnfs07hahd9is2fbn4wxwh31732vv3hr7kwm"; depends=[ade4]; };
 LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[spam fields]; };
 LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
-LeafAngle = derive { name="LeafAngle"; version="1.2"; sha256="18b3gncn18jvsjprjmaays67iwjdcpszy5z711rb71h1vyi0fdfs"; depends=[]; };
+LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
 LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
 LiblineaR = derive { name="LiblineaR"; version="1.80-10"; sha256="0qhcrdazqn7zf3wq79rg0sr9bp9a7fw6p3gjrhyyn3b2klbrcz7k"; depends=[]; };
 LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; };
@@ -921,7 +936,7 @@ LinCal = derive { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm
 LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-0"; sha256="0yk5ys8rc8ilxrbdkf1kmqpkny66lcm47fbip90m0n83v21f1jkk"; depends=[rpanel xtable]; };
 LindenmayeR = derive { name="LindenmayeR"; version="0.1-0"; sha256="0pkb6wgbn2iqszq4zr088x90k16jkk0r8pzmfpvzxv6k3m2lrv87"; depends=[stringr]; };
 LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[kernlab LiblineaR expectreg]; };
-Lmoments = derive { name="Lmoments"; version="1.1-5"; sha256="13s9lbmfbjfam6xg0q9jl2p3q3db3pimcmnx47vx82qdm43xa4an"; depends=[]; };
+Lmoments = derive { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqrb1qr8kjcn40y57kzd10kkm98vzfjcwg4y4"; depends=[]; };
 Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; };
 LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
 LogicForest = derive { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[LogicReg CircStats gtools plotrix]; };
@@ -931,7 +946,7 @@ LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24
 LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
 LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; };
 LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
-Luminescence = derive { name="Luminescence"; version="0.3.4"; sha256="036kib458qwr1l1pl1nb4hip43rchmx7qwf32y8z7b8nf9b8sbvy"; depends=[Rserve XML shape rgl matrixStats]; };
+Luminescence = derive { name="Luminescence"; version="0.4.0"; sha256="02q36lywk2x67cjn9w214lq8pr50l9cr2q6wfmfgv6wkjnfin2nv"; depends=[XML shape rgl matrixStats raster sp zoo bbmle]; };
 M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; };
 MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; };
 MAINT_Data = derive { name="MAINT.Data"; version="0.3"; sha256="1qh7kdcnwfibzyhr53inqjz61srbpypcqjri60zdl32jpf109vng"; depends=[MASS miscTools]; };
@@ -944,29 +959,28 @@ MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv
 MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
 MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[leaps bestglm]; };
 MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; };
-MASS = derive { name="MASS"; version="7.3-35"; sha256="0kcyl2c6nk39fy6kprcxf4mwq8lkrwysgq6hwcrf4hspz79bnmd2"; depends=[]; };
+MASS = derive { name="MASS"; version="7.3-37"; sha256="0icxsmihsk7xkf2f97asjmrwri04ykr5dq0ap343ngpxddvwjaaf"; depends=[]; };
 MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; };
 MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp Rcpp RcppArmadillo]; };
-MATA = derive { name="MATA"; version="0.1"; sha256="1wdlxdw270fgh4h4dyshrrjbdha8whqrncmfjxrs3rixkh03izhb"; depends=[]; };
+MATA = derive { name="MATA"; version="0.2"; sha256="0jmsgis1jkyqywa4i5rq5inb72hsgc9s4xwmaqyfdnfa6lw44sfx"; depends=[]; };
 MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
-MAVIS = derive { name="MAVIS"; version="0.2"; sha256="0d89li88rp4dl3b13ldjfsnjsrskkphqm9qd8sbqivzn1xr2ylgv"; depends=[shiny shinyAce metafor MAd MAc quantreg ggplot2]; };
+MAVIS = derive { name="MAVIS"; version="1.0"; sha256="0xx8axy9c6g20r8in57zdphjdf3yb046w5gqqsi8y4ph46rpy5xk"; depends=[shiny shinyAce metafor MAd MAc quantreg ggplot2 compute_es]; };
 MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach multcomp randomForest MASS]; };
 MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
 MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[party plsgenomics st e1071]; };
-MAd = derive { name="MAd"; version="0.8-1"; sha256="16lis6q61d11z0kn3svd77yr0k3jm0zhqpwacl86jdjlmn67l92i"; depends=[]; };
+MAd = derive { name="MAd"; version="0.8-2"; sha256="0mhys27rmzb0kal4jr8j2y44z4qq46fw260sxl8da9qqvplcwq1p"; depends=[]; };
 MBA = derive { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[sp BH]; };
 MBCluster_Seq = derive { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
 MBESS = derive { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; };
 MBI = derive { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
-MBmca = derive { name="MBmca"; version="0.0.3-4"; sha256="1vmzf7df3d5a9nilm4pvv31dyspazab2gm3i6ccqrffq0l93kdgi"; depends=[robustbase chipPCR]; };
+MBmca = derive { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[robustbase chipPCR]; };
 MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
 MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; };
 MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41agi5nzm4f5w41pdxk98i1wc1ahhnawc3n2cdbjz"; depends=[]; };
-MCDA = derive { name="MCDA"; version="0.0.6"; sha256="0mkcvf4nllm3i2rw5kmrlzfw7lgz0mblrk1yihgnbf6wlm4v109c"; depends=[Rglpk Kendall glpkAPI]; };
+MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh2j90b9yx8yg7q52c3l7a9lks6w"; depends=[Rglpk Kendall glpkAPI]; };
 MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; };
 MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.3"; sha256="101pbg08p594ilcrrig9sqkddprpl6cd6g9y9rrk1rq6cy5cmrvr"; depends=[MCMCglmm ggplot2]; };
 MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; };
-MCMChybridGP = derive { name="MCMChybridGP"; version="4.3"; sha256="1a2mhhscjf7s2qczc4zz2pvb9kichdqr1lnkjsyiy61snbhkvp3n"; depends=[MASS]; };
 MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; };
 MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[mvtnorm multcomp]; };
 MCPMod = derive { name="MCPMod"; version="1.0-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[mvtnorm lattice]; };
@@ -997,29 +1011,30 @@ MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjk
 MKmisc = derive { name="MKmisc"; version="0.96"; sha256="1lcnmswvix290s63cqqlq4ls6wyzzb3f5ykcn4sch6nv71bn8x5x"; depends=[RColorBrewer robustbase]; };
 MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
 MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; };
-MLEP = derive { name="MLEP"; version="0.0-3"; sha256="1v3jiqy9lr3p30bpiibbq5cypy46c7vnsl40z0miyviiv4s1c3vz"; depends=[]; };
 MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
 MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
 MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; };
 MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; };
 MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; };
 MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
-MNM = derive { name="MNM"; version="1.0-0"; sha256="0qab0qqhfjmaiji5yqdvd1lqz8f90q40sdwpcah923yi3g6alh2q"; depends=[ellipse ICS ICSNP SpatialNP mvtnorm survey]; };
+MNM = derive { name="MNM"; version="1.0-1"; sha256="0fy43jfd7wak2rfdv5hdq7zc0zsxnbz9p69g6sla0zliibafg0q6"; depends=[ICSNP SpatialNP ellipse ICS]; };
 MNP = derive { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; };
 MOCCA = derive { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
-MODISTools = derive { name="MODISTools"; version="0.94.4"; sha256="177gmrzyfx13bznwx1pwfkixypi1x0r1wddxy3mzxf91qj4f335q"; depends=[RCurl XML]; };
+MODISTools = derive { name="MODISTools"; version="0.94.5"; sha256="0x0fmr79csrkxqvrz84pqrbzgnqyi7dj5qw6mp5hdwqa99gbgqkb"; depends=[RCurl XML]; };
 MOJOV = derive { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod survey saws lattice]; };
+MOrder = derive { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; };
 MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54si6i23y8s5hhkzrwmhvfyvsian9593ixy4kqlm2bz"; depends=[R_utils changepoint glmnet cghseg HDPenReg spikeslab]; };
 MPCI = derive { name="MPCI"; version="1.0.6"; sha256="1ngxx5363cm2cid3dl9amva016xy914sz49nfdkh88hjsxv3svjc"; depends=[]; };
-MPDiR = derive { name="MPDiR"; version="0.1-15"; sha256="1ga3dk9ncycsq30w6na4g7aik43v8q2kcrg7x6lpmiaa9qa2wn16"; depends=[]; };
+MPDiR = derive { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
 MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
-MPSEM = derive { name="MPSEM"; version="0.2-5"; sha256="1jy459rg7i7x24ygdnlibwlh8rx7arpajjycqw414w5p9yy9ns1f"; depends=[ape MASS]; };
+MPSEM = derive { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; };
 MPTinR = derive { name="MPTinR"; version="1.6.3"; sha256="1rxh8pj6zc06zhs5rllm98br0bkmgmc9d7hk04m251ji54mj80b1"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; };
 MPV = derive { name="MPV"; version="1.35"; sha256="0mfg05w7zx5my7g60yvbk2fiakrdskb82rcwzpncjdnn3pmc2axv"; depends=[]; };
 MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
 MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
-MRH = derive { name="MRH"; version="1.1"; sha256="1qf0kx1b4nrgzx9g68yvnycjflrdhagvxav90q2nsbxk5w6ffnrq"; depends=[survival KMsurv coda]; };
+MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[survival KMsurv coda]; };
 MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; };
+MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[matrixcalc Formula]; };
 MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; };
 MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
 MSBVAR = derive { name="MSBVAR"; version="0.9-1"; sha256="1qd8v3n9nvyp1j1byb8dkmvkbmk5p2kgx7wjmsa9sh4siqbxzn4w"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; };
@@ -1031,36 +1046,37 @@ MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4
 MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
 MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; };
 MTS = derive { name="MTS"; version="0.32"; sha256="0jxa0madik1d317wsl1svb2bndi6mw125brbxpyf019lknh6yajy"; depends=[Rcpp fGarch mvtnorm Rcpp]; };
-MTurkR = derive { name="MTurkR"; version="0.5.51"; sha256="0x3qb8419a6nm5lvmk02lcw544jmbw6swcry20wjc7gzkrldq4zr"; depends=[RCurl digest XML]; };
+MTurkR = derive { name="MTurkR"; version="0.6"; sha256="0kmi1x9xsqwi7llgwmkmnkn2hir5r9nryhqh8lrh41fwps4la9x8"; depends=[RCurl digest XML]; };
 MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; };
 MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; };
 MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
 MVN = derive { name="MVN"; version="3.7"; sha256="1rwm3wsgsrc51hil354bcgnpsmk86hbclyb37xr6nxyrkqzx0xi9"; depends=[nortest moments MASS robustbase mvoutlier plyr]; };
-MVPARTwrap = derive { name="MVPARTwrap"; version="0.1-9.2"; sha256="0kj89nlndfcddsx2i9isfd7lqzj8rlsd47anhca5cmj1nyjsb4w5"; depends=[mvpart Hmisc labdsv vegan fBasics ade4]; };
 MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; };
-MVpower = derive { name="MVpower"; version="2.0"; sha256="176g8jfn8gbbhyxcny9prvkn7gk23lmcr4pnxlf0a0pacxczsldr"; depends=[randomForest pamr kernlab class]; };
+MVar_pt = derive { name="MVar.pt"; version="1.0"; sha256="0wzc2r5psla8khyrkd7p8y23cxyn5bsy8vxglh2p3mpayfzi8k2a"; depends=[]; };
 MXM = derive { name="MXM"; version="0.2.1"; sha256="047whr0fly89i5vlyd4z8lj2nxyfkk9vvniasncnwls8vmmpf1jk"; depends=[]; };
 MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
 Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; };
 ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
 Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; };
-MapGAM = derive { name="MapGAM"; version="0.7-0"; sha256="00ggr7wrkz13n1f9gsp3qxxjwb01kq47aqv2mj4pa6p253iw19i7"; depends=[gam maptools]; };
+MapGAM = derive { name="MapGAM"; version="0.7-4"; sha256="1y1f0xmbssc7k6fw1dcs2kg06brza9mj5a2c33b8ln226hvnhk3z"; depends=[sp gam maptools]; };
 MareyMap = derive { name="MareyMap"; version="1.2"; sha256="1l7s1ffl9bg1zx5nyb1r3dba188mxiaprdda3gqm2cr1f33jmr51"; depends=[tkrplot]; };
 MarkowitzR = derive { name="MarkowitzR"; version="0.1402"; sha256="1fbn6l8z76ak8z2nyzmizcjm7h54y58773nsy03x1pwykcwpzw9f"; depends=[matrixcalc sandwich gtools]; };
-MasterBayes = derive { name="MasterBayes"; version="2.51"; sha256="0mbvhn6yspralmlajimdin14hszh78m0bxb3zdxd73xhjqxl4ixk"; depends=[coda genetics gtools kinship2]; };
+MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
 MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
 Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
 MatchingFrontier = derive { name="MatchingFrontier"; version="0.3.17"; sha256="1z4sgvcivlnfhkgqi7jr7b6iwlwskwwnkw9hsaiy4apgki4m0ngn"; depends=[igraph MASS]; };
-Matrix = derive { name="Matrix"; version="1.1-4"; sha256="1pxkyfa09gf5rwk1x9hdxrgr1hjs4390h73z3f8h2224rszr3hqh"; depends=[lattice]; };
+Matrix = derive { name="Matrix"; version="1.1-5"; sha256="0kqbabpzin7j33cjx6na3qdr5ry5fgsxbi3a7rm93ghqaadaagmj"; depends=[lattice]; };
 MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.0"; sha256="03ccawgrkv0r3y8smpym27p5bsxy8y9rhn7pqs9ybb385951azy9"; depends=[]; };
-MatrixModels = derive { name="MatrixModels"; version="0.3-1.1"; sha256="0b44gyvpfvhbkl1vymni7pplidz9a5jrcalswx19hnh5x14qw168"; depends=[Matrix]; };
+MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; };
 McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; };
 McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
 Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; };
 MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
+MenuCollection = derive { name="MenuCollection"; version="1.1"; sha256="1x44skdzyjv0jg5k4pxk2k0ksh6zgh234sh3gib6a4ldny30prfp"; depends=[RGtk2 RGtk2Extras gplots]; };
 MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[gWidgetsRGtk2 ggplot2 cairoDevice rpart]; };
 MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
 MetFns = derive { name="MetFns"; version="1.0"; sha256="03kx8cr4c6mgjincf87m305fhryh1c42hdzr1ljl63affnlp7nfp"; depends=[astroFns plotrix]; };
+MetSizeR = derive { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[mvtnorm MetabolAnalyze cairoDevice gWidgets gWidgetsRGtk2]; };
 MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[MASS abind pls]; };
 MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[survival combinat]; };
 MetaLandSim = derive { name="MetaLandSim"; version="0.1"; sha256="0g1xcv8g8vws4pppdv9xa8lgf2ip2dq4vr7dpbdn2iqn9w3dmm41"; depends=[spatstat sp e1071 fgui googleVis maptools rgeos spgrass6 raster]; };
@@ -1073,19 +1089,18 @@ Meth27QC = derive { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0j
 MethComp = derive { name="MethComp"; version="1.22"; sha256="0wp2v8z5y9nl3jalcl2a42z2fpkwkzkvl407farws0yih0hj8b8l"; depends=[nlme]; };
 Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
 Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; };
-MfUSampler = derive { name="MfUSampler"; version="0.9"; sha256="1j60skwcfzqg5fvvrflxk7qiqlla1w51xfbhwilzxrfv6ww9jq8j"; depends=[ars]; };
-MiClip = derive { name="MiClip"; version="1.3"; sha256="08chki18rxwr2mpzga0g5hbmvbr690bzvpydykkfwdaw8swqmhl8"; depends=[moments VGAM]; };
+MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; };
 MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
 MicSim = derive { name="MicSim"; version="1.0.6"; sha256="01w9x3ld8b64m3d9qjbja6gbmgnsj2bna9l7lisa17add0i11744"; depends=[chron snowfall rlecuyer]; };
 MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[memisc Hmisc]; };
 MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
 MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[SDMTools raster]; };
-MindOnStats = derive { name="MindOnStats"; version="0.8"; sha256="1fsswkbrxd3f0hz3nd25xvp36si292s4q2r52hw6rsps2mx6bgqi"; depends=[]; };
+MindOnStats = derive { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
 Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
 MissMech = derive { name="MissMech"; version="1.0.1"; sha256="0xcxzgjv9p9w8rdq07vanfrw0b49acdikr8brm78hshy0dsnas32"; depends=[]; };
 MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; };
 MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
-MixGHD = derive { name="MixGHD"; version="1.1"; sha256="1im1621jg7cd2bc2b85anr1xihxpsrd0ii9qrcz9zsq3r3ilx43v"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; };
+MixGHD = derive { name="MixGHD"; version="1.3"; sha256="1fqy0ismqzg6g4x1m82kabywfg0jnmh397py0jra2ck3gr0wizsf"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; };
 MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
 MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; };
 MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; };
@@ -1097,18 +1112,18 @@ ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6
 Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; };
 MonetDB_R = derive { name="MonetDB.R"; version="0.9.5"; sha256="0j5b2i1yyk4d6mqm2i3fijmmgp1fzi37rilxcikbc517mzsk4f7p"; depends=[DBI digest]; };
 MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; };
-Morpho = derive { name="Morpho"; version="2.1"; sha256="0l084myn49krm1j9d9rb4jb40yf9kd1v3m06arzi9bjy33id7bg2"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp Rcpp RcppArmadillo]; };
+Morpho = derive { name="Morpho"; version="2.2"; sha256="03j121ghswr1kwq40krk3b4ycn44l9ga3bp64igknvpnqikp5qcb"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp Rcpp RcppArmadillo]; };
 MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
-MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.3"; sha256="1ms9f13n554n4y04rpsnlwwbplk225k467jrldhkigshvc721m9r"; depends=[svcm lattice]; };
 MplusAutomation = derive { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot plyr gsubfn coda xtable lattice texreg]; };
 Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp Rcpp RcppArmadillo]; };
 MsatAllele = derive { name="MsatAllele"; version="1.05"; sha256="1w489xjc7vxanam6hr4ym692j6a2skkmyzgqsmccy3101pzn522h"; depends=[]; };
 MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
-MuMIn = derive { name="MuMIn"; version="1.10.5"; sha256="1pza894h6mjjv2i4ifx2z410bz7lw2a9b986z6x30sr2al4xvfkn"; depends=[]; };
+MuMIn = derive { name="MuMIn"; version="1.12.1"; sha256="1l9grnhsw0bw6hh1s4wk9f5ljsy7caa8iagq55n8yzciik4cif9l"; depends=[]; };
 MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
 MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; };
 MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
 MultiLCIRT = derive { name="MultiLCIRT"; version="2.7"; sha256="0i9ydhqw8a6rvds708vn1ypmfw5nrnpnfzjmg4s01gcm2xswvli0"; depends=[MASS limSolve]; };
+MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[gtable mvtnorm expm ggplot2 reshape2]; };
 MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; };
 MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[MASS abind epitools meta HardyWeinberg RColorBrewer gplots]; };
 MultiSV = derive { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; };
@@ -1117,6 +1132,7 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102
 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
 Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
 NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
+NAM = derive { name="NAM"; version="1.0.2"; sha256="1xvs8pjyb5q00ks2nnpdscf4bms4nvy6rf8x2s8325mcrqqi5c76"; depends=[Rcpp Matrix missForest Rcpp]; };
 NAPPA = derive { name="NAPPA"; version="2.0"; sha256="18yipic8xkf13jaaxnn388m49r5q2g7q7gb0mmw3gh7226lmz987"; depends=[plyr NanoStringNorm]; };
 NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
 NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
@@ -1127,9 +1143,9 @@ NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb
 NHANES = derive { name="NHANES"; version="1.0"; sha256="18sy2x61bnily3fz0rs61y44kn6y2ikgrzr6nhgm6fkqv02ffdg8"; depends=[]; };
 NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; };
 NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit msm MCMCpack MASS Rcpp Rcpp]; };
-NHMSAR = derive { name="NHMSAR"; version="1.0"; sha256="10n7ifzv3hg7wicf4mb46xwvfjwgjr5df6b3fq84qjhr09y64h2q"; depends=[ucminf]; };
 NHPoisson = derive { name="NHPoisson"; version="3.0"; sha256="11gdfqfly3cvr6ndxvp06kbdd7aw6k25kz8kyxxybjpzszxbpmq8"; depends=[car]; };
 NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
+NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; };
 NLP = derive { name="NLP"; version="0.1-5"; sha256="1l5c21bpbbnpspxi7nmjny1k3i9q5szyxnarndb3yx7aywkvjrkj"; depends=[]; };
 NLPutils = derive { name="NLPutils"; version="0.0-1"; sha256="036pafnjcbz7ihdgsjss4jq8fb420j8fmxyymv7kr4pr78wjysbx"; depends=[NLP SnowballC qdap]; };
 NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
@@ -1137,14 +1153,15 @@ NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6
 NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
 NMOF = derive { name="NMOF"; version="0.34-0"; sha256="05gg5hf8003yvzgh0rjsgymlsgjz9jray74cffssg4dl9d0f1jkz"; depends=[]; };
 NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
+NORTARA = derive { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; };
 NPBayesImpute = derive { name="NPBayesImpute"; version="0.4"; sha256="0r2b878xs2vjvskhz63cyizaa7qfw06sq120m8xnm5ra4r55c0fc"; depends=[Rcpp Rcpp]; };
-NPCD = derive { name="NPCD"; version="1.0-6"; sha256="1lnj55f73rpjy6amg1n5x7b0jsrmharp0fhcjcn0dflcrjwianxj"; depends=[BB R_oo R_methodsS3]; };
+NPCD = derive { name="NPCD"; version="1.0-7"; sha256="11h460h1q50qixr2hk4wd4v6wgwblp3cqvksbzqkdcinzzp8z6zh"; depends=[BB R_oo R_methodsS3]; };
 NPCirc = derive { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; };
 NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; };
-NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="1.0"; sha256="0yakcjkxqlbpzs8jdaahdl4lv5l2ffq7l7v00sl77sn9gflgprk3"; depends=[]; };
+NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="2.0"; sha256="0x8pfsi79rb7d29908hlnkqh521csccz6vz04r412z9znsj4pnkl"; depends=[]; };
 NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; };
 NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
-NPS = derive { name="NPS"; version="1.0"; sha256="1acg3367rd53dgwzqr8pnfr8z72s3699h2nhrhh2w9zdqipid89g"; depends=[]; };
+NPS = derive { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
 NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
 NRAIA = derive { name="NRAIA"; version="0.9-8"; sha256="16v8s9mqvr6sbiwwj93n3nyrm996wyw4f9l569mw2ykqpdkbp7hm"; depends=[lattice]; };
 NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[R_methodsS3 MASS matrixStats R_oo R_utils aroma_core aroma_affymetrix]; };
@@ -1157,8 +1174,9 @@ NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8
 NetCluster = derive { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; };
 NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
 NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
-NetIndices = derive { name="NetIndices"; version="1.4.3"; sha256="0ff57f5b12lccqbfin530ra373rn1wz6n42b0jnkyi2ra8hcm88f"; depends=[MASS]; };
+NetIndices = derive { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; };
 NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp Rcpp]; };
+NeuralNetTools = derive { name="NeuralNetTools"; version="1.0.0"; sha256="1bfi811d03xly5pyzhf45c5wlikvcg6df2vvv7qi0yi7i415mmcy"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; };
 Newdistns = derive { name="Newdistns"; version="1.0"; sha256="1agg5v05x9qlg1w439aycfjfd5yap6ivn1kqgsc3ck148ar11wb2"; depends=[]; };
 NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
 Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; };
@@ -1167,7 +1185,7 @@ NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sh
 NonpModelCheck = derive { name="NonpModelCheck"; version="1.0"; sha256="0mgbyp651jfqyfavpv12i9kwqf0cpk2mzh9m0b5k4n759710qv8f"; depends=[dr MASS]; };
 NormPsy = derive { name="NormPsy"; version="1.0.2"; sha256="0vkk282kiqvfx2qvan8yifpngrx3slyjqr2dwqr5h5k5snb6b0vq"; depends=[lcmm]; };
 NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[optimx histogram]; };
-NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="1yrqfqhxkavczascwpq7z77jwpa1s2dn2cfi15vxfjyayhdxq4aa"; depends=[DistributionUtils GeneralizedHyperbolic]; };
+NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; };
 Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
 OAIHarvester = derive { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[XML RCurl]; };
 ODB = derive { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
@@ -1179,7 +1197,7 @@ ONETr = derive { name="ONETr"; version="1.0.1"; sha256="05azlax5wc0qrr1aqfpdks38
 OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
 OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[gmp mvtnorm orthopolynom nlme crossdes polynom]; };
 OPE = derive { name="OPE"; version="0.7"; sha256="0ld3pr94ii1pmfk99qfwgria6ki2iz2hwmn7pj3cjwprv8jkcjji"; depends=[]; };
-OPI = derive { name="OPI"; version="1.6"; sha256="0d9863zs54chmdc74g508xpclj7gjk7q36amdnqq0bffp87bj9nq"; depends=[rJava]; };
+OPI = derive { name="OPI"; version="2.1"; sha256="1pzw5b4gwf1q98547cgq7b363fn72ll0zlvcahy56wc1ci5ny3dd"; depends=[]; };
 ORCI = derive { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
 ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni6nrwnhk11bbr00ycqym39alr2wjw"; depends=[Iso]; };
 ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; };
@@ -1187,13 +1205,12 @@ ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4
 ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
 OUwie = derive { name="OUwie"; version="1.43"; sha256="1ixyws6q9p8kms3smzj8rkmsry2y4s9al4vhxpqfmbgypigq7n9k"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; };
 Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
-OceanView = derive { name="OceanView"; version="1.0.1"; sha256="102rw6gw1mrbr00s8b1bnz2yh2nqk411qdhs6kncs6scalixjb5p"; depends=[plot3D plot3Drgl shape]; };
+OceanView = derive { name="OceanView"; version="1.0.2"; sha256="188hviv2dqvc1d7aki3a80naiy31lq27d8cc755mq4qdqq833l4d"; depends=[plot3D plot3Drgl rgl shape]; };
 Ohmage = derive { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; };
 OjaNP = derive { name="OjaNP"; version="0.9-8"; sha256="010l75irgj7nl8yq6crp8d00zjgpv9wg2maw99cj0frhqxvqzbfz"; depends=[ICS ICSNP]; };
-OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="0s76fxai1kgq0hcr5m18yz7i14algld97rjrax75cxm1ccylah71"; depends=[tkrplot]; };
+OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
 OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel ROCR irlba]; };
 Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
-OneHandClapping = derive { name="OneHandClapping"; version="1.5"; sha256="1j45qy4nwnmiqmjqnhzs4f6zspckzhr1rx56i9ddis4iahffqd19"; depends=[]; };
 OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
 OpasnetUtils = derive { name="OpasnetUtils"; version="1.1.0"; sha256="1a7j96pg0v8j527m0w48k8lxwb2ynrqq1y7140bi1ciq0466azx3"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable ggplot2 rgdal sp]; };
 OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
@@ -1208,12 +1225,13 @@ OrdFacReg = derive { name="OrdFacReg"; version="1.0.5"; sha256="1if6ghagj2196pc7
 OrdLogReg = derive { name="OrdLogReg"; version="1.1"; sha256="18s75pmz1g3yac2rfl41kj8sfflq298qkijnvqlybgxpq98ickxx"; depends=[LogicReg]; };
 OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
 OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[mvtnorm corpcor Matrix GenOrd]; };
-OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.3"; sha256="0z03dpargdkay99gci5kpxr2i8cgiw3gfras65f83bjr2pkmsdla"; depends=[mirt MASS NominalLogisticBiplot]; };
+OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[mirt MASS NominalLogisticBiplot]; };
 OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; };
 OutbreakTools = derive { name="OutbreakTools"; version="0.1-11"; sha256="0m39wppck75mpcgdhwvw0nc0cgidzn80zl58hhs6x3svpnbssn0v"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic]; };
 OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; };
-OutlierDM = derive { name="OutlierDM"; version="1.0-0"; sha256="1yphr47nswcaqa5pfamc3ksqcxwhxl388sdml2aqjjfd9w29lf2g"; depends=[quantreg MatrixModels outliers pcaPP]; };
-P2C2M = derive { name="P2C2M"; version="0.5"; sha256="1ii1jnzkcnm7ks3l3ka4gka7fh7r5x677dvndqcayg08fj5xw7wk"; depends=[ape apTreeshape ggplot2 rPython stringr]; };
+OutlierDM = derive { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[quantreg MatrixModels outliers pcaPP]; };
+OutrankingTools = derive { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
+P2C2M = derive { name="P2C2M"; version="0.5"; sha256="0yn66d6bp9mlnbw83y0q4w17cxwinryqbl17hqsa2z446qwzxqlq"; depends=[ape apTreeshape ggplot2 rPython stringr]; };
 PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
 PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; };
 PANDA = derive { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster]; };
@@ -1227,14 +1245,14 @@ PBD = derive { name="PBD"; version="1.0"; sha256="1q8ijjmcwxi8f3wgggpj4y522wmxad
 PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[MASS lme4 Matrix]; };
 PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
 PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; };
-PBSmapping = derive { name="PBSmapping"; version="2.67.60"; sha256="1n9c9fglsnch5jw248yyvy2vrq3wgca0wdkdwwhfc3n7yw83mwkr"; depends=[]; };
+PBSmapping = derive { name="PBSmapping"; version="2.68.68"; sha256="1g58jz7mc7fkrv2c739pkg048pcgmklq650800wf6px073db2kc3"; depends=[]; };
 PBSmodelling = derive { name="PBSmodelling"; version="2.66.264"; sha256="08plp74cjzmgv3dkaxgryqq1yqp0z7pdlz9jqgai8w89vwi0il35"; depends=[]; };
-PCAmixdata = derive { name="PCAmixdata"; version="2.1"; sha256="12g6pkp9yffp1arqdvnx721cn34h0a7m3bm2ayd9fsrvbaqb7ci8"; depends=[]; };
+PCAmixdata = derive { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; };
 PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[nleqslv matrixcalc]; };
 PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[RMTstat MASS]; };
 PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; };
 PCIT = derive { name="PCIT"; version="1.04-5"; sha256="10fnkad09y7vh8j3c5kgkh64lwqn2nsl5818rzl9b8d51f951qjg"; depends=[]; };
-PCPS = derive { name="PCPS"; version="1.0.1"; sha256="1av0mfv54ig1blq0228nlzgvjndrg711ip6xfq2886qhypcapgd5"; depends=[SYNCSA vegan ape picante phylobase plotrix]; };
+PCPS = derive { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[SYNCSA vegan ape picante phylobase plotrix]; };
 PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; };
 PCovR = derive { name="PCovR"; version="2.5"; sha256="1as3qd2gqznfy95mil8k31nkqrf36sgpja5s9zdwvk0vpaxv1fr7"; depends=[GPArotation ThreeWay MASS Matrix]; };
 PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
@@ -1247,7 +1265,7 @@ PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj
 PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
 PHENIX = derive { name="PHENIX"; version="1.0"; sha256="1shkf77bq3lvkj6srcil3fqwp78hfkbjnhkz2v8kmfqf92h4z5pb"; depends=[ppcor]; };
 PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
-PHeval = derive { name="PHeval"; version="0.5.1"; sha256="12vlfg2w27hc19f8dwvhl8r0xfwapp1r9bihq7ax3d9j7aayv217"; depends=[survival]; };
+PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; };
 PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; };
 PIGShift = derive { name="PIGShift"; version="1.0.0"; sha256="15cgpi7j5cs4aqdq5cy7535x8ar916d9hd109kc01njrwxp1xr96"; depends=[ape mvtnorm]; };
 PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
@@ -1256,9 +1274,7 @@ PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3
 PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
 PKfit = derive { name="PKfit"; version="1.2.4"; sha256="1vyf7w3d2wylj8hrgz7hpb2syvwsmf8bbdjh4w3kgcjdjivvnvxn"; depends=[optimx deSolve minpack_lm]; };
 PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[RGtk2 gWidgetsRGtk2 cairoDevice lattice rggobi ggplot2 proto RGtk2 gWidgetsRGtk2]; };
-PKmodelFinder = derive { name="PKmodelFinder"; version="1.1"; sha256="0v5l8j4yq6fv4cgx5psld6klwy6kjwcqg1vhf9r4i8qa12vpa1yh"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice numDeriv]; };
 PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[lattice ggplot2]; };
-PKtools = derive { name="PKtools"; version="1.5-0"; sha256="0za6qgl9q9y4j87kfhvanpc9mfckzww6q2kjz7divbv8ygn5cd1m"; depends=[lattice nlme R2HTML xtable]; };
 PLIS = derive { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
 PLRModels = derive { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
 PLSbiplot1 = derive { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
@@ -1270,13 +1286,13 @@ PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3k
 PRISMA = derive { name="PRISMA"; version="0.2-2"; sha256="0r4dhnp0f6q43iklmwjim20hy9wjijkh8q4gljx8sph47njc0xqd"; depends=[Matrix gplots ggplot2]; };
 PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; };
 PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
-PReMiuM = derive { name="PReMiuM"; version="3.0.30"; sha256="1xzs50gnwdjr34lgg1nb9kp0aihicvaif3fqha3ymp2lz5whbz5c"; depends=[Rcpp ggplot2 cluster plotrix Rcpp RcppEigen BH]; };
+PRROC = derive { name="PRROC"; version="1.0"; sha256="0md8mbbld0y0p2y9crz3np5pj5b7z3a4j7ixz2jn9gld28bydgk0"; depends=[]; };
+PReMiuM = derive { name="PReMiuM"; version="3.0.32"; sha256="03hs56vhl2xxxy2mza6cp0zivr1p596x5jj4y8f63jy0mygk62x8"; depends=[Rcpp ggplot2 cluster plotrix gamlss_dist Rcpp RcppEigen BH]; };
 PResiduals = derive { name="PResiduals"; version="0.2-0"; sha256="0bjn600wq8h11spi20q3gdv9ajrvagjyw6a8pfmm3pvangasq2nl"; depends=[Formula rms sandwich actuar]; };
 PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; };
 PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
 PSCBS = derive { name="PSCBS"; version="0.43.0"; sha256="1pv61ha8c2hx91hik9n6fz2gxdhijgcsdjhznaml5v1d5ba3vzjj"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; };
 PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[MASS numDeriv deSolve ucminf]; };
-PSMix = derive { name="PSMix"; version="1.1.1"; sha256="0g9s7v05jjc7vq08fj5bb2wg03isnyr1ql1rciiihqi5w4dwx6w7"; depends=[]; };
 PST = derive { name="PST"; version="0.84.1"; sha256="10cwlj8957sj5dag43v01fbq9lmcasfxp0lgllj0iv0lbfzd4g02"; depends=[TraMineR]; };
 PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm264x32371rbgbzmyzx89ap2c0cq"; depends=[tensor]; };
 PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
@@ -1285,7 +1301,7 @@ PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbk
 PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[TSP gtools]; };
 PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[MASS gld mvtnorm lattice ggplot2]; };
 Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
-ParDNAcopy = derive { name="ParDNAcopy"; version="1.3"; sha256="1y0fl5gj3d3xj6krfyg48fs9vz3s4jb61js0b7yfzgv6a3289g5a"; depends=[]; };
+ParDNAcopy = derive { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[]; };
 ParallelForest = derive { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; };
 ParamHelpers = derive { name="ParamHelpers"; version="1.4"; sha256="1jbzn3r8i8avwg51nxp6940c4wvqfp8ficqzw2q1xyrm5rkkqgg5"; depends=[BBmisc checkmate]; };
 ParentOffspring = derive { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
@@ -1295,23 +1311,21 @@ Peaks = derive { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dc
 PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; };
 PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
 PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2 Rcpp RcppArmadillo]; };
-PenLNM = derive { name="PenLNM"; version="1.0"; sha256="1xkz39cdp9dr8iq1cjiv862sda4zy737gvbwxxsykw15256lklmf"; depends=[remMap MASS Matrix]; };
 PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; };
-Peptides = derive { name="Peptides"; version="1.0.2"; sha256="0lfkhw5h34g7sch3b1a61i5adsdzwxn53pbx3cak6nf0lmab6k18"; depends=[]; };
+Peptides = derive { name="Peptides"; version="1.0.3"; sha256="06q4sdm3yy5rjkfr6yqkmgjsr1bhrbpghyjqkzqh416wc4lnp073"; depends=[]; };
 PerFit = derive { name="PerFit"; version="1.2"; sha256="1m0s51k497ks4y5253sw1aq5cdkhfkr70mz31xk01c50v11mb268"; depends=[ltm irtoys]; };
 PerMallows = derive { name="PerMallows"; version="1.7"; sha256="15bn8qpwl5v7kq5jzls6fis6r11pxh2v7dhj4c9qmw2w9c3x1g7s"; depends=[Rcpp Rcpp]; };
 PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; };
 PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; };
 PermAlgo = derive { name="PermAlgo"; version="1.0"; sha256="1dc4b5pn77av80k6pgh9k0ksvv9lnjqiwdb2jv55nm0ndycw0qr4"; depends=[]; };
-PhViD = derive { name="PhViD"; version="1.0.6"; sha256="17mr8gj6ic4p0xvxiva046r1gmy9azvm1s95rinxqsdd7hiak72w"; depends=[MCMCpack]; };
+PhViD = derive { name="PhViD"; version="1.0.6"; sha256="04vh3892fwb8pn2wmsw5449al80z5sm6avi6b67shky942dasl17"; depends=[MCMCpack]; };
 PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
 PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
 PhyActBedRest = derive { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; };
 PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
-PivotalR = derive { name="PivotalR"; version="0.1.17.8"; sha256="023qhinh61ix4s8jkp2kbxpfly77w05sgaiqidbrsxf7zxih3zcf"; depends=[Matrix]; };
+PivotalR = derive { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; };
 PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; };
 PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; };
-PoMoS = derive { name="PoMoS"; version="1.1.1"; sha256="0j3iw6bcsr3rzwh15afcw3rglddq9bj7470xpnlpfpmd9nk0s18d"; depends=[RGtk2 cairoDevice igraph]; };
 PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
 PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; };
 PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
@@ -1325,13 +1339,13 @@ PopGenome = derive { name="PopGenome"; version="2.1.0"; sha256="150n0fdi047nx4iy
 PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; };
 PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
 PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; };
-Power2Stage = derive { name="Power2Stage"; version="0.1-5"; sha256="1mpb1qx2iad4vqqxy1zxlsi0bx2cf4d98h6s7g1040hk9lpdl671"; depends=[PowerTOST]; };
-PowerTOST = derive { name="PowerTOST"; version="1.2-03"; sha256="1m3d70gmzhacdlb8vf1g0j5m2z2v8hc2yzh6h4lsc1p7a6h1478z"; depends=[mvtnorm]; };
+Power2Stage = derive { name="Power2Stage"; version="0.2-2"; sha256="130kfifq7klx5xp6rcmhlwv17assm5n6d78drp9dmsc8pwcxs1ff"; depends=[PowerTOST]; };
+PowerTOST = derive { name="PowerTOST"; version="1.2-05"; sha256="08g4f6wjyb4z332k96i1dkqqnkazc95d3cq984f3ycxadwbqcfyw"; depends=[mvtnorm]; };
 PracTools = derive { name="PracTools"; version="0.0-2"; sha256="1bigir9fv6qrj3r8bfff6zyvxi10c0qh56kvhqsclvwyg3hfk5yz"; depends=[]; };
-PredictABEL = derive { name="PredictABEL"; version="1.2-1"; sha256="18fmafl1d4nwf7mya9gh1rlv5936zzr2jm3fwn5r2m5fc034qqjx"; depends=[Hmisc ROCR epitools PBSmodelling]; };
+PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[Hmisc ROCR epitools PBSmodelling]; };
 PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
 PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-PrevMap = derive { name="PrevMap"; version="1.1"; sha256="13bssx7w2y5c6jcnkb99k4a8gk39ixkzfqm2p9n7c7brc2szv1lh"; depends=[geoR maxLik raster pdist splancs]; };
+PrevMap = derive { name="PrevMap"; version="1.1.4"; sha256="1m5a71s6j6x4kmqij1v7wikblk0a0l9lbskrj6q2znwj0hnbk1wy"; depends=[geoR maxLik raster pdist splancs]; };
 PrivateLR = derive { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
 ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
 ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[RandomFields fields]; };
@@ -1348,9 +1362,10 @@ PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ng
 PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[XML stringr RCurl wordcloud tm RColorBrewer]; };
 PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
 PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; };
-QCA = derive { name="QCA"; version="1.1-3"; sha256="083hc00d7srvxfkfax51ffngidbdhjqaxga3lln5gw53m2831v35"; depends=[lpSolve]; };
+QCA = derive { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; };
 QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
 QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
+QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[stringr QCA ggplot2 directlabels]; };
 QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
 QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv Rcpp]; };
 QSARdata = derive { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
@@ -1363,7 +1378,8 @@ QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdc
 Quandl = derive { name="Quandl"; version="2.4.0"; sha256="0apgwc85ija33dl9qgb8nr2wj5rx0xv6wlmg427nkxnr8pnar8ih"; depends=[xts RCurl RJSONIO zoo]; };
 QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
 QuantifQuantile = derive { name="QuantifQuantile"; version="1.0"; sha256="0r3yz8k68z6c751r0ryxv744spch4aws50313miq498r5mvr4w1y"; depends=[rgl]; };
-QuasiSeq = derive { name="QuasiSeq"; version="1.0-4"; sha256="1vpk1l7dhbfdywncdfg1c29qpj3x0m5ddpyh13d0d3ic8rzhdivf"; depends=[Matrix mgcv]; };
+QuasiSeq = derive { name="QuasiSeq"; version="1.0-5"; sha256="03zhg6l9q76s8kxib2qrpzhghwpagwyyyrgd4bda58ngiqminlk8"; depends=[Matrix mgcv]; };
+Quor = derive { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; };
 R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; };
 R_devices = derive { name="R.devices"; version="2.12.0"; sha256="0as90warygvcsa5cvicjykn7jz2d5cdw68ghqi9cj5lzqq982dkn"; depends=[R_methodsS3 R_oo R_utils base64enc]; };
 R_filesets = derive { name="R.filesets"; version="2.6.0"; sha256="0n99mxdajb6rk7cvgy4gihaifiw31llngrhx22mfn3zs7wbdk9d1"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
@@ -1382,19 +1398,19 @@ R2GUESS = derive { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkc
 R2HTML = derive { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; };
 R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-2.2"; sha256="0hnp46linvpnzifhyb3r13xmwvdc3psabs53xl6qxxm4snrl4bnd"; depends=[coda boot]; };
 R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; };
-R2SWF = derive { name="R2SWF"; version="0.8"; sha256="125r4drgl79cwda00g42m0l0dzqmi2n8p5cikx70jz67giq5blw2"; depends=[sysfonts]; };
+R2SWF = derive { name="R2SWF"; version="0.8-2"; sha256="1lyhzz2gpa3l7ljkdxfdx5s0g87jvgz2h9awgapkjsm6gxy922n2"; depends=[sysfonts]; };
 R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; };
 R2admb = derive { name="R2admb"; version="0.7.10"; sha256="0rjrd1wpr1f4l800mccnwsa121g93rrr7q9dq0xxvkl3lsbn6f2s"; depends=[]; };
-R2jags = derive { name="R2jags"; version="0.04-03"; sha256="0wygsz5zzng8fh82pzhqly3d532ljz0jj34h9nz7g3v5asv0kcqm"; depends=[rjags abind coda R2WinBUGS]; };
+R2jags = derive { name="R2jags"; version="0.05-01"; sha256="0lswadb5n2x7afz5b634cc1xkj60hykhibqq488sgcm80r1xx278"; depends=[rjags abind coda R2WinBUGS]; };
 R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; };
-R4CDISC = derive { name="R4CDISC"; version="0.2"; sha256="1g8n89y1l5jy3168qz9j0kz3dvyadhn5mhilpzlpn3pijvv2vndf"; depends=[XML]; };
+R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; };
 R4CouchDB = derive { name="R4CouchDB"; version="0.6"; sha256="0d32p5jl1fw2190dvn46hfw2j7v849ps5a00j18jky2gl4blvghs"; depends=[bitops RCurl RJSONIO]; };
 R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
 R6 = derive { name="R6"; version="2.0.1"; sha256="0ngm3hl0q3aj067q6q0iqh729z8jx3ydvasj1jw9qrr7bzjh1jn5"; depends=[]; };
 RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; };
 RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape geiger phangorn]; };
-RAHRS = derive { name="RAHRS"; version="1.0.1"; sha256="068alq0mrfgcmpa5gfrrqgixpdadva11s9ammg7p6g9lfrjx6gcc"; depends=[pracma RSpincalc]; };
-RAM = derive { name="RAM"; version="1.1.0"; sha256="0l4daqrrcmj424k7x9jr8lpcqlhx000m71ayv3i3cchdq87xmzhf"; depends=[vegan ggplot2 gridExtra RColorBrewer gplots plyr reshape2 scales labdsv stringr ggmap permute]; };
+RAM = derive { name="RAM"; version="1.2.0"; sha256="1xf296a2xqv9nq3m5lswnbfy023s6dp0yv8y0hr8xq0mw9mym3v3"; depends=[vegan ggplot2 gridExtra RColorBrewer gplots plyr reshape2 scales labdsv ggmap permute VennDiagram data_table FD MASS RgoogleMaps ape lattice reshape]; };
+RAMP = derive { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; };
 RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; };
 RANN = derive { name="RANN"; version="2.4.1"; sha256="13d2wi3r4b190f6s6y4zipqf43gy9c1h71b9j7qmc3lqca4nvzmd"; depends=[]; };
 RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
@@ -1404,39 +1420,43 @@ RApiSerialize = derive { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh
 RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; };
 RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
 RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
+RBPcurve = derive { name="RBPcurve"; version="1.0-20"; sha256="1fk2zj16xj8n9jnydzd60crdfsigqd6xs2hq572b9r65ldiikv3z"; depends=[mlr BBmisc checkmate shape TeachingDemos]; };
 RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; };
-RCALI = derive { name="RCALI"; version="0.2-6"; sha256="01zaks9mdgi9hcwsfvg3dwkihmb5ay5ilgg10fqcz2cssldj9x7x"; depends=[splancs]; };
+RCALI = derive { name="RCALI"; version="0.2-15"; sha256="0w9807dyjghqy1rnv2c0k4kdjlwxzg5fk5r3rsqrmzjj4r8x9g9w"; depends=[splancs]; };
 RCEIM = derive { name="RCEIM"; version="0.2"; sha256="0l3lfx3zqxf310rhvjkn977xchxzi7cbzij3ks0nqlx55x5ica9w"; depends=[]; };
 RCMIP5 = derive { name="RCMIP5"; version="1.1"; sha256="1aqcwxh2p4z7wn4p224xdiaharbr51rj51aa760rirs5s1ra7f6q"; depends=[abind dplyr reshape2 digest]; };
 RCPmod = derive { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[numDeriv gtools]; };
 RCassandra = derive { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
 RCircos = derive { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y772sg64ikdmw1z68lpp9i7d0shlc3qx9"; depends=[]; };
 RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
-RColorBrewer = derive { name="RColorBrewer"; version="1.0-5"; sha256="0y4ficfdjzrd7lkcaafjrdqr5r3jiha7rvg76h8m5yak396c9has"; depends=[]; };
+RColorBrewer = derive { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
+RConics = derive { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
 RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RJSONIO RCurl]; };
-RCurl = derive { name="RCurl"; version="1.95-4.3"; sha256="1gyjarnxwz3ldpm1vwq9ls6al66rvs7yshzhrl1fv9lbm1qi8yfg"; depends=[bitops]; };
+RCurl = derive { name="RCurl"; version="1.95-4.5"; sha256="0a99awma5ylcagr6y9adv82hr5wk5cg4i5flra5q0cpvhp9w8sd2"; depends=[bitops]; };
 RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
 RDML = derive { name="RDML"; version="0.4-2"; sha256="0bx1n6x3yskpbgwwwjhs6hk43sfq7x55yffvnd7bz5qb3l49wsw2"; depends=[XML chipPCR]; };
-RDS = derive { name="RDS"; version="0.6"; sha256="14zk511agqckriqjiaargglzsw14mch8q7zh97qd38xg0568mh73"; depends=[ggplot2 gridExtra rgexf igraph scales locfit Hmisc reshape2]; };
+RDS = derive { name="RDS"; version="0.7"; sha256="0xlz1pkgznk6x3298f6b40l9h26y0akwkvy91ms2hh35hwk0m7y7"; depends=[gridExtra ggplot2 Hmisc igraph locfit reshape2 scales]; };
 RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; };
+RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
 RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
 REBayes = derive { name="REBayes"; version="0.50"; sha256="0p4kv709r0577xq3mdw2vwla1gsjm8b9mnbsbfwm8fx3n3wfrx0p"; depends=[Rmosek Matrix SparseM]; };
-RECA = derive { name="RECA"; version="1.0"; sha256="0ah67yr6sppm66bfayq8k3p63g8bcc61k6j3rzrj6qx8d72kq54d"; depends=[]; };
-RECSO = derive { name="RECSO"; version="1.0"; sha256="1ipjfxk58wkrq6a0nqrg9b734xj1qa8xnr44xigbpjrpdqd5j3lm"; depends=[]; };
-REDCapR = derive { name="REDCapR"; version="0.4-28"; sha256="08x3zwcm9yq27nia320lrfwq4vq8dhy73cqsxll2zsa8nl05mpaw"; depends=[httr plyr stringr]; };
+RECA = derive { name="RECA"; version="1.1"; sha256="1wgcd53yy4xsi7i674n4255qvvv6988r43q7n7pjqrimp04g1qd0"; depends=[]; };
+REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fzwmsqvwpr74phcapkckczyznlfql4qdh1"; depends=[httr plyr stringr]; };
 REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
 REPPlab = derive { name="REPPlab"; version="0.9"; sha256="0f3p9kjsn0x3sf4qx05rm1llad09w6dimvhdd7q8w3ggwqsh2w20"; depends=[rJava lattice]; };
 REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
-REdaS = derive { name="REdaS"; version="0.9.1"; sha256="0nd0d6cnx43k73cygbw0r6hdxpwkzwrlm4vr60s6hk227am15z68"; depends=[]; };
+REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; };
 RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
 RFLPtools = derive { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
 RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[RPMG GEOmap RSEIS MASS splancs]; };
 RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
+RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF randomForest ggplot2 UsingR WilcoxCV ROCR]; };
 RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; };
 RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
-RGA = derive { name="RGA"; version="0.1.3"; sha256="0d7vwzz6yx17qskhc62v3cbia8cxj67f75wk96p78b7h8wza3zf9"; depends=[httr jsonlite httpuv shiny]; };
+RGA = derive { name="RGA"; version="0.1.4"; sha256="0l821rs1sgh4khzlgal1ibx4ymj5hxiz4mg4ki6vg5nxxrld992q"; depends=[httr httpuv RCurl jsonlite shiny]; };
 RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
-RGENERATE = derive { name="RGENERATE"; version="1.1"; sha256="1da3b50cfv5jb63ijzbnr226jadbww2bapcxzx8am7zydm6gqnss"; depends=[RMAWGEN]; };
+RGENERATE = derive { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; };
+RGENERATEPREC = derive { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[copula RGENERATE blockmatrix Matrix stringr RMAWGEN]; };
 RGIFT = derive { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
 RGenetics = derive { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
 RGoogleAnalytics = derive { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[lubridate httr]; };
@@ -1456,14 +1476,14 @@ RImpala = derive { name="RImpala"; version="0.1.5"; sha256="0kx2h6gkjxrsp6c33p1j
 RInSp = derive { name="RInSp"; version="1.0"; sha256="154ibjx5xyibaw8hhdh4hw5rbmwp340bplvz1174n6svg2dpl542"; depends=[]; };
 RInside = derive { name="RInside"; version="0.2.11"; sha256="09j4dpv30pp0q3h129ig15xxlp8yzxnk122iica4nv88niabjcaa"; depends=[Rcpp Rcpp]; };
 RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; };
-RJDBC = derive { name="RJDBC"; version="0.2-4"; sha256="14nqz4gx24gcjmnd3hrhvfs5f68c3nqhb6nypv9gvk19dx1jayg0"; depends=[DBI rJava]; };
+RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
 RJSDMX = derive { name="RJSDMX"; version="1.2"; sha256="0b4w2qva19av76gjwbdccf6gwfc2fia31pvbhgv1a48p272kxzni"; depends=[rJava zoo]; };
 RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
-RJaCGH = derive { name="RJaCGH"; version="2.0.2"; sha256="1fy8wsnv7diwg2w7j61scm6vd35a5jb36i9pzh5m7jz6yqsank50"; depends=[]; };
+RJaCGH = derive { name="RJaCGH"; version="2.0.3"; sha256="0wz7vhlgzf8smzl7gx01dx070266fnmzw66wpl0im20nxfy8mr0l"; depends=[]; };
 RKEA = derive { name="RKEA"; version="0.0-4"; sha256="0qkjnyy4b6vzdiapadx9hmw3h4gfgmbi4g5078rr6kq5kmwqlwgh"; depends=[rJava tm]; };
 RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv Rcpp]; };
 RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
-RMAWGEN = derive { name="RMAWGEN"; version="1.2.6.1"; sha256="1j8yb37sv2ycg3zgdj6hlxvlrsgvb9rh4yxd40bah2j1xgibr36z"; depends=[chron date vars]; };
+RMAWGEN = derive { name="RMAWGEN"; version="1.3.0"; sha256="19p8bxcfk802pdn6990ya0bd9ghbvg8vmk3z01x1v76w09j4bv38"; depends=[chron date vars]; };
 RMC = derive { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; };
 RMKdiscrete = derive { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; };
 RMOA = derive { name="RMOA"; version="1.0"; sha256="01mrl6544wv2jc8b8gk1whs865sbv4id5sywnf1hq3r7g8wgs8lp"; depends=[RMOAjars rJava]; };
@@ -1474,17 +1494,17 @@ RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw
 RMark = derive { name="RMark"; version="2.1.9"; sha256="1z7hh9fwaaiwa2s27vrc3yckqc0vhimazqj71601ibsqs3pljzh8"; depends=[snowfall matrixcalc msm coda]; };
 RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; };
 RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
-RMySQL = derive { name="RMySQL"; version="0.9-3"; sha256="1kmsrphzrk7a6f3i0pmpxlpj7w7yb5s2psx72lfv4zyd0aji83n1"; depends=[DBI]; };
+RMySQL = derive { name="RMySQL"; version="0.10.1"; sha256="0aqs2zjhzn4arpbshhssn7y0m2w0ghq91iapbwylab6mp97mxch8"; depends=[DBI]; };
 RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
 RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[maps RColorBrewer abind fields fossil tgp sp]; };
 RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
-RNeXML = derive { name="RNeXML"; version="1.1.3"; sha256="1fcs1fwq66fb04zi2pwgn7xfljp8053s2vb0g4j5vzv0dq7nxy98"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
+RNeXML = derive { name="RNeXML"; version="2.0.1"; sha256="10p9njlrpkwgnyjkcz7w579dwi0nwdmksyl2gpbq106fzqvh0s47"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
 RNetCDF = derive { name="RNetCDF"; version="1.6.3-1"; sha256="0c112qwxzml3mbdss69607amxvhpkfgs7ihymxidgkv0s3ra7cp5"; depends=[]; };
 RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; };
 RNiftyReg = derive { name="RNiftyReg"; version="1.1.2"; sha256="1g74qdx71wzyl0k7liwvl33rzhz7srmn15x55md5gyljxb5rqm6c"; depends=[reportr oro_nifti]; };
-ROAuth = derive { name="ROAuth"; version="0.9.3"; sha256="13h0q7dx4xx7fngi3zfm92ws5x4c6cfa2svq7smmci7c0z4kirb2"; depends=[RCurl digest]; };
+ROAuth = derive { name="ROAuth"; version="0.9.5"; sha256="1z0wn1c9hmc3x862l9qchx4kxhywayiryqyif8rbsg44idfgcmyi"; depends=[RCurl digest]; };
 ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; };
-ROCR = derive { name="ROCR"; version="1.0-5"; sha256="1zinan5hfvgg24imn0210m2lwqk5jxmmw8gz08l44j988lw8c2iw"; depends=[gplots]; };
+ROCR = derive { name="ROCR"; version="1.0-5"; sha256="0xxhr31l1k9gs99yw1plnp4m5c33mp4dy3sdfhf33i57gi3yww0a"; depends=[gplots]; };
 ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; };
 ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
 RODBC = derive { name="RODBC"; version="1.3-10"; sha256="1cswx1r0ycklqj2calhk1anmiaadx0kyazsvbsm3h5sm7wsqfw5b"; depends=[]; };
@@ -1495,21 +1515,21 @@ ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3
 ROI_plugin_quadprog = derive { name="ROI.plugin.quadprog"; version="0.0-2"; sha256="0mkjq87rv1xf0bggpqd2r4gabv11spgcds2y94r3vpmh8krf71jf"; depends=[quadprog ROI slam]; };
 ROI_plugin_symphony = derive { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; };
 ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
-RObsDat = derive { name="RObsDat"; version="14.04"; sha256="06454axywp5264cczhz8k31n7qmg95c2rnxv08frfgzwgm3cfzhr"; depends=[xts zoo DBI vwr e1071]; };
+RObsDat = derive { name="RObsDat"; version="14.12"; sha256="1b8yfp8n1ky1vmr2w2ghfpha9n7gc6x6v1kaf9llrhb6spx2w18i"; depends=[zoo spacetime xts DBI vwr e1071 sp]; };
 ROptEst = derive { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; };
 ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx RandVar evd]; };
 ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[ROptEstOld RandVar distr distrEx]; };
 ROracle = derive { name="ROracle"; version="1.1-12"; sha256="1ydmckr0wzjgvhhh410l4ih7idbr8140g6v11avh655wffk02q5p"; depends=[DBI]; };
+RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdviar29z0py050748qw7ab326lqp5d"; depends=[ape picante pspline deSolve]; };
 RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
 RPMG = derive { name="RPMG"; version="2.1-5"; sha256="1ck6bz72h1kwi7gg8vd0zw1q61pqv23rish84zri2p18z7nd9kvh"; depends=[]; };
 RPMM = derive { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; };
-RPPanalyzer = derive { name="RPPanalyzer"; version="1.4"; sha256="1v795f8abn3ma1wbvqbbmb1sfzg5q66np7kkz05c23h2yyl486mc"; depends=[quantreg lattice gam gplots ggplot2 Hmisc]; };
 RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; };
-RProtoBuf = derive { name="RProtoBuf"; version="0.4.1"; sha256="1992nz0dz4h802gakcri1c9dgacxc5nvg3h5lm2zv6yg748ha6nh"; depends=[Rcpp RCurl Rcpp]; };
-RPublica = derive { name="RPublica"; version="0.1.1"; sha256="0m0wib0nijya228jmcl98l2hsx8l28dg6lvpwmx67jyhpvpplpkl"; depends=[XML RJSONIO RCurl]; };
+RProtoBuf = derive { name="RProtoBuf"; version="0.4.2"; sha256="0ph6sdw0gys70sjlfimgvjk19rbj4v6p7wk05nar6wh8mabpvb63"; depends=[Rcpp RCurl Rcpp]; };
+RPublica = derive { name="RPublica"; version="0.1.2"; sha256="1fawjkwfxx3z370132vsjjs3ls316gzxzlxp8b4vzrshx1p7vp3q"; depends=[jsonlite httr RCurl]; };
 RPushbullet = derive { name="RPushbullet"; version="0.1.1"; sha256="0kaz7jwhg31ycvkxyfb17669jdhsz8y7fsz8brd6kxszkyyl1cvv"; depends=[RJSONIO]; };
 RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; };
-RQuantLib = derive { name="RQuantLib"; version="0.3.12"; sha256="1ih7lkpa3p0ipgc8hs9miv500rk285ddc7pmn2qv03ibpsdlvjmq"; depends=[Rcpp Rcpp]; };
+RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp Rcpp]; };
 RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
 RRreg = derive { name="RRreg"; version="0.2.0"; sha256="0pni738yc236p8aafzjha5589i8bll3b075k0fync2mkc1v4czln"; depends=[doParallel foreach]; };
 RSA = derive { name="RSA"; version="0.9.3"; sha256="132fqsr6zzv0q5maxgdh8amg6g0if3wdbhml0p0r668yy1wiq5l8"; depends=[lavaan ggplot2 lattice gridExtra plyr RColorBrewer]; };
@@ -1520,8 +1540,8 @@ RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl
 RSEIS = derive { name="RSEIS"; version="3.3-3"; sha256="13fb4mx3sgnbrcn1kkxy0a490kikjrq49ii3x14xw2s8ci030wlr"; depends=[RPMG Rwave]; };
 RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; };
 RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
-RSNNS = derive { name="RSNNS"; version="0.4-5"; sha256="1wk91vjgf7q65n9q8hciv08bgzawpljnhaqgy9qdwpr82v8959i7"; depends=[Rcpp Rcpp]; };
-RSNPset = derive { name="RSNPset"; version="0.2"; sha256="0ivym4ysadvlfr9k4ikpw2diil9xd3hqx6xj8jcz482d3h8qcgq6"; depends=[fastmatch foreach doRNG Rcpp Rcpp RcppEigen]; };
+RSNNS = derive { name="RSNNS"; version="0.4-6"; sha256="1p4gv2v9vzbgaksiibg66l9l9nabnm5lblc17md2cdcb6rygh3hp"; depends=[Rcpp Rcpp]; };
+RSNPset = derive { name="RSNPset"; version="0.3"; sha256="0dcbgwllkrhxjh4v0bz1zyi7di467vjpqmlrkx7k90pz89kmqy8k"; depends=[fastmatch foreach doRNG Rcpp Rcpp RcppEigen]; };
 RSQLServer = derive { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; };
 RSQLite = derive { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; };
 RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; };
@@ -1529,11 +1549,11 @@ RSclient = derive { name="RSclient"; version="0.7-2"; sha256="04ml4pynjl97295wrc
 RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[sybil]; };
 RSelenium = derive { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[RCurl RJSONIO XML caTools]; };
 RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
-RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.1"; sha256="0hpmrck12fdfns4dg1ksv02b7nqjpfscalrp4fgjqwzr0vbc7hgx"; depends=[jsonlite httr plyr base64enc digest stringr]; };
-RSocrata = derive { name="RSocrata"; version="1.5"; sha256="0hbazn4c3bmx9kc030l19ciz9m0r5p6760ggyxl8f7sh8g3bqw32"; depends=[httr jsonlite]; };
+RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.3"; sha256="003mazcwz7w814pm8i9zdfmsbijf02n80w48ml4grmjjn1v7x5ar"; depends=[jsonlite httr plyr base64enc digest stringr]; };
 RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp Rcpp]; };
-RSpincalc = derive { name="RSpincalc"; version="1.0.1"; sha256="0n751l329j9pgpdnqrdnf93i9l1qxfp2bl4v4ray3nrnjx8g5mc9"; depends=[]; };
+RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RJSONIO RCurl]; };
 RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
+RSurveillance = derive { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epitools epiR]; };
 RSurvey = derive { name="RSurvey"; version="0.8-2"; sha256="1fksjbzny0wl0k2sj3bxflzim7i8r5dfwz9ih4ssk5xaxfmjz2f5"; depends=[sp rgeos MBA]; };
 RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
 RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
@@ -1542,7 +1562,7 @@ RTOMO = derive { name="RTOMO"; version="1.1-2"; sha256="15swp7jx5xmj87hjcfdar3r5
 RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[SparseM randomForest tree nnet tm e1071 ipred caTools maxent glmnet tau]; };
 RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
 RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; };
-RUnit = derive { name="RUnit"; version="0.4.27"; sha256="11hxy1n2rds3yl0zr0lg3dj7cfjlhk9r2ig6r9jl57b53g802kf7"; depends=[]; };
+RUnit = derive { name="RUnit"; version="0.4.28"; sha256="0p631cg014m7linml2770g260ml0jj74d5w82ddl1p2zs5yq57hx"; depends=[]; };
 RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-41"; sha256="039263c10wlj4xyb696mcidndm1vkxwrghramvvgyivd7ybk3flw"; depends=[ade4 boot car lme4 MASS mixOmics statmod]; };
 RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; };
 RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp Rcpp]; };
@@ -1559,25 +1579,26 @@ RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srm
 RXshrink = derive { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; };
 RYoudaoTranslate = derive { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
 RadOnc = derive { name="RadOnc"; version="1.0.9"; sha256="13fr838l38cvx84dx0k55p6riw5v86n7m51lg25is2fcyn17bq2r"; depends=[rgl geometry oro_dicom ptinpoly]; };
+RadTran = derive { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
 RadioSonde = derive { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; };
 Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
 Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; };
 RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
-RandomFields = derive { name="RandomFields"; version="3.0.44"; sha256="1id0n7b78s3s677vi4n49azhm6cqqnrihsxi86slvmm3mzdnzrby"; depends=[sp colorspace spam tcltk2 tkrplot]; };
+RandomFields = derive { name="RandomFields"; version="3.0.55"; sha256="0gi08sy0m3jyigkfmmnm6jyh7n6l84hrjblbsz5wcab8cjfrdh7l"; depends=[sp]; };
 RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
 RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
 Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; };
 RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; };
 Rarity = derive { name="Rarity"; version="1.2-1"; sha256="16ds0s396f42qqmn4xrnmfk1j6v917p27dgi9iji976hn2q463hh"; depends=[]; };
 RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; };
-RbioRXN = derive { name="RbioRXN"; version="1.3.1"; sha256="122h6pghpb8dfrqvdkvp25bp7dl8kc1aka13h6hp88vaj32pf4ij"; depends=[plyr RCurl gdata data_table stringr]; };
+RbioRXN = derive { name="RbioRXN"; version="1.5"; sha256="1w4g8a72a7f5m7g43hcybkahn3p51m6jnkydwgrchp53pby8ljxy"; depends=[plyr RCurl gdata data_table stringr]; };
 Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; };
 Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
 Rcell = derive { name="Rcell"; version="1.2-6"; sha256="0wly2wgm7506a9f26jbq2b0v9wlh2wyp086r2vi6bia9j8sxhi0c"; depends=[proto plyr reshape ggplot2 digest]; };
-Rcgmin = derive { name="Rcgmin"; version="2013-02.20"; sha256="1y6095vapb3r8p9i5hqa14gfpl4q3g2n82nb64429kl6w3mlfk8f"; depends=[numDeriv]; };
-Rchoice = derive { name="Rchoice"; version="0.1"; sha256="030x42jq6dd25g7isk5m9s0v9rfqkkj7i7286i9as1mpn73nlyz5"; depends=[maxLik Formula sandwich ggplot2 plotrix car lmtest]; };
+Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
+Rchoice = derive { name="Rchoice"; version="0.2"; sha256="06xlz8ii1w42wcvkymxv68dn8pzvnn3xbyarplmdalv4p8c4jchk"; depends=[Formula maxLik msm plm plotrix]; };
 Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; };
-Rcmdr = derive { name="Rcmdr"; version="2.1-4"; sha256="0ddlwmsqj7ycjfb7ggj9qk9rzzlhk4h1hc1xln0sqmjcc3m0axi4"; depends=[RcmdrMisc car tcltk2 abind]; };
+Rcmdr = derive { name="Rcmdr"; version="2.1-5"; sha256="1450bhzys80q4ka4sx1mcl0g1a1pdgx8znlkglhkj6i1k7xn0ibm"; depends=[RcmdrMisc car tcltk2 abind]; };
 RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[car sandwich abind Hmisc MASS e1071]; };
 RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[Rcmdr BCA flexclust car RcmdrMisc nnet foreign rpart rpart_plot]; };
 RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr RcmdrMisc]; };
@@ -1586,13 +1607,13 @@ RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-8"; sha256="0lkj
 RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.27"; sha256="00yk41f8d7z602xb3hpkk0zr2r17d9ap6sx78ni8wl7rkvmn0c7r"; depends=[Rcmdr]; };
 RcmdrPlugin_EcoVirtual = derive { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[Rcmdr EcoVirtual]; };
 RcmdrPlugin_FactoMineR = derive { name="RcmdrPlugin.FactoMineR"; version="1.5-0"; sha256="1hfnn12l3jljqpczpxz4m9ywbmw5rc1c8dpfl4cabrxnh6ymnk1a"; depends=[FactoMineR Rcmdr]; };
-RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-40"; sha256="0i85bbzy46jk8568d7mx1fwq9zk51iq1jjwr2mnik4zh6914f9h5"; depends=[HH lattice latticeExtra rgl Rcmdr multcomp leaps]; };
+RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-42"; sha256="0ra5glv2p4ii2c1b3dyxbdjl4ps6idjpl6ni8ridrfb391qlmyrk"; depends=[HH lattice latticeExtra rgl mgcv Rcmdr]; };
 RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; };
 RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; };
 RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[Rcmdr MAd metafor]; };
 RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; };
-RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.7.6"; sha256="1haw1gf1cwjwkk19lhqhhigkz20grjifapbg6cd10lafppfk7pfa"; depends=[mixlm MASS pls xtable Rcmdr]; };
-RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-16"; sha256="1pxv0izdkqjhvmbvln6n2lhr1mamfy4q20ld6dqkldxj9bivzckb"; depends=[Rcmdr pROC ROCR ResourceSelection PredictABEL]; };
+RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0"; sha256="0fwzr27pk7p82wj1xbajva1ips15jdfgwxzf7815bcm7x7w9xr8v"; depends=[Rcmdr runjags rmeta igraph coda rjags]; };
+RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-17"; sha256="0asqvl99x03irnidjs72m6x4x3v8xlaikhfk0zk85v0l21lgy4iv"; depends=[Rcmdr pROC ROCR ResourceSelection]; };
 RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.0"; sha256="0z43hhp798kga70xmiq4wzp5iad553rndn17g3va3dh6lz1k3y3h"; depends=[SCVA SCRT SCMA Rcmdr]; };
 RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[SLC Rcmdr]; };
 RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[Rcmdr car RColorBrewer colorspace vcd]; };
@@ -1612,28 +1633,29 @@ RcmdrPlugin_qual = derive { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00
 RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve sampling MASS Rcmdr]; };
 RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg spatstat sgeostat]; };
 RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[sos Rcmdr tcltk2]; };
-RcmdrPlugin_steepness = derive { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="0f9b71mbj212l62mg7x5irzy7d3s11gyyi4gsjgkv1l4nbv5k6dm"; depends=[Rcmdr steepness]; };
+RcmdrPlugin_steepness = derive { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; };
 RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-4"; sha256="03rgr9klf2d1ml8i2avf9lncjr3bfcb4v7mcwg800wwdjzkwqkql"; depends=[survival date Rcmdr]; };
 RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.2"; sha256="0n5if3cip66pi0mh4xn06yq4w2nzmxgd3g56m4k1384zssrq66gn"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; };
 Rcolombos = derive { name="Rcolombos"; version="1.5.0"; sha256="139ayyc94m6srbcccw1j8p4by5nxy7s52ahvdq2ag183hk91gjq4"; depends=[httr]; };
 Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; };
 Rcpp = derive { name="Rcpp"; version="0.11.3"; sha256="0k0j99m8qqm65gdng3lxxnpbbzrcyyk6k992iq4lz5pl16qsxgha"; depends=[]; };
 Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
-RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.3"; sha256="1vbk7cfghaw051n3wbag70aa04q4h7v84a2d9z899q3l564jsxdv"; depends=[Rcpp Rcpp BH]; };
-RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.500.0"; sha256="1fi6wvs4f0sb1lxpimly1i3hl3pjzwgvh4izmb9v7wm12c068kka"; depends=[Rcpp Rcpp]; };
+RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.4"; sha256="1ybgr065cmi4ayk4j2iskn1a5fxwbz0hhzjkq8znf0y196mwc5xv"; depends=[Rcpp Rcpp BH]; };
+RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.600.0"; sha256="0wiglpl4i4k4acj8w18x7fpmg2wcbm3062ch9hrxmjmi0pkyhzpn"; depends=[Rcpp Rcpp]; };
 RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; };
-RcppCNPy = derive { name="RcppCNPy"; version="0.2.3"; sha256="1baz9272vwc44yab7xb6ig0gd2gj8idrhywir2zq77q8bfhqc9gh"; depends=[Rcpp Rcpp]; };
-RcppClassic = derive { name="RcppClassic"; version="0.9.5"; sha256="193nsplyqd1fb7hwxsk0s7dz6rm6rw7lp04jff08mswcjdkh69g4"; depends=[Rcpp Rcpp]; };
+RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; };
+RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; };
 RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic Rcpp RcppClassic]; };
 RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
-RcppEigen = derive { name="RcppEigen"; version="0.3.2.2.0"; sha256="1d3qb73d6b22pwar2mimynfm6z2c58cr36r6l1j34ysz00lyi1mk"; depends=[Matrix Rcpp Rcpp]; };
+RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp Rcpp]; };
+RcppEigen = derive { name="RcppEigen"; version="0.3.2.3.0"; sha256="16n5zkjnf1vipicx7fsr278p99agdbxgg3gjz9xq205frm9cx25a"; depends=[Matrix Rcpp Rcpp]; };
 RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp Rcpp]; };
-RcppGSL = derive { name="RcppGSL"; version="0.2.2"; sha256="0f47bs3ll42wxday2bg7w5fnv8a4280yvmzkjzn3b36v8wvm44g8"; depends=[Rcpp Rcpp]; };
-RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.9-3"; sha256="1s5h5sad4c4pxxa7vx8j74x4qlsl4a23l6qpq51k5lwrxchcjklk"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
+RcppGSL = derive { name="RcppGSL"; version="0.2.3"; sha256="1jnxxzaqa1wabas6zjbd1rv2r7r7lr4pf0ryv6vn6n6d17jrgj21"; depends=[Rcpp Rcpp]; };
+RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10"; sha256="10g9k83s6a7s5gw03f1zrxnil9kqaswwbh0vkq6h7n7iimdc3j6l"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
 RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[Rcpp pkgmaker digest stringr Rcpp]; };
 RcppParallel = derive { name="RcppParallel"; version="4.3.3"; sha256="1xsp44jfynvz6flfajgbf82aykdhz242brmwxw9w67ngx96x0dxv"; depends=[]; };
-RcppProgress = derive { name="RcppProgress"; version="0.1"; sha256="1gvj51gadljaakm1nxdwgxzh723vv3ypzpzsgacsppxpj4rivxq4"; depends=[Rcpp Rcpp]; };
-RcppRedis = derive { name="RcppRedis"; version="0.1.2"; sha256="1bx6sl7amsnj2fq5xmv8bh31wlzfc62gkpyvw5nzh630fnphpf8a"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; };
+RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp Rcpp]; };
+RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; };
 RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
 RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp Rcpp]; };
 RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts Rcpp xts]; };
@@ -1642,14 +1664,17 @@ Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dn
 Rd2roxygen = derive { name="Rd2roxygen"; version="1.5"; sha256="0qh64bd323s3h44ypjxv98ndp332q31imf5prmaqvzcjs2j0r3gh"; depends=[roxygen2 formatR]; };
 Rdistance = derive { name="Rdistance"; version="1.1"; sha256="1rgjiks4s5l0vdj4svik9zz6kwwxsh9nj6q2ng7iblny6iqm6kbd"; depends=[]; };
 Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; };
+Rdsdp = derive { name="Rdsdp"; version="1.0.2"; sha256="0rpy3897dargrfrn6qd5m1j6i1pvfk2qa3cny0iacqkgqbg8a4wx"; depends=[]; };
 Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
 ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
-ReacTran = derive { name="ReacTran"; version="1.4.1"; sha256="01k3w6iffql198na968dmqgzsqgd1kwrjb34yw7mzppyisjcyv0k"; depends=[rootSolve deSolve shape]; };
+ReacTran = derive { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[rootSolve deSolve shape]; };
 RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp Rcpp RcppArmadillo]; };
+RecordLinkage = derive { name="RecordLinkage"; version="0.4-7"; sha256="18v9jihp00xfz80vkg054v93w6grnp3aaf7prlzckwxs5i5lff70"; depends=[DBI RSQLite ff ffbase e1071 rpart ada ipred evd data_table nnet xtable RSQLite]; };
 Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
 RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; };
-RefManageR = derive { name="RefManageR"; version="0.8.40"; sha256="1d1r9whn37fv818brl98hy6hmihd6h6632xgf3n639m4km419v9r"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; };
+RefManageR = derive { name="RefManageR"; version="0.8.45"; sha256="16smvd25gdssiry2i8gs24km83hnsq2v6m225i7qadcmn9pyj4yh"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; };
 RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
+RegressionFactory = derive { name="RegressionFactory"; version="0.7"; sha256="0wskh0j9sbzqj2yvkzqmcfzw4aymx3q4ydncxjpf4pb054ifdkv9"; depends=[]; };
 RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
 Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
 ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; };
@@ -1658,16 +1683,13 @@ RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhgh
 Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[XML RCurl ape]; };
 ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp Rcpp]; };
 RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
-ReporteRs = derive { name="ReporteRs"; version="0.7.0"; sha256="13pz2q4brsbbp3bl5fik5f5fx7961arw3plz911m07x102y5kak1"; depends=[ReporteRsjars rJava]; };
+ReporteRs = derive { name="ReporteRs"; version="0.7.2"; sha256="0lcxyj0dgm5l4pjsx9whbszzsn3zk7s4jjqbkrgb5b6rvxw1s29s"; depends=[ReporteRsjars rJava]; };
 ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
 ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
 ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; };
-Rfacebook = derive { name="Rfacebook"; version="0.4"; sha256="0f5wbd16a7wsw1fpficz6i2vrwyw3n75a1qm4dv5181jr6ik492p"; depends=[httr rjson]; };
+Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httr rjson httpuv]; };
 Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; };
-RfmriVC = derive { name="RfmriVC"; version="1.0.4"; sha256="15bzpwi01gb580wl0flvp7pwqf1sgk6fsdmfq4cqaprb979js79f"; depends=[mvtnorm mgcv Rniftilib]; };
-Rgbp = derive { name="Rgbp"; version="1.0.6"; sha256="1j4j7g9z7p592f82k0yvibrydynkd9v1ldil2vf3ikc650bn2l02"; depends=[sn]; };
 Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; };
-Rgnuplot = derive { name="Rgnuplot"; version="1.0.1"; sha256="1yag6ip2ppclhnpfc3mn6bsaylv2lk2k3jr8wgrgzrb7z22p7dk8"; depends=[]; };
 RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.6"; sha256="1kd77617j2dz3dqjskv71vj8xv0yjgcysrpw7a615s0ys2hs91wp"; depends=[png RJSONIO]; };
 Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; };
 Rhpc = derive { name="Rhpc"; version="0.14-261"; sha256="09rb68dys283gqmgn00v5skz6y5mcychg7hjrmi59pcfl5i7sk71"; depends=[]; };
@@ -1678,17 +1700,16 @@ Ritc = derive { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyi
 Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
 Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
 Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
-Rlabkey = derive { name="Rlabkey"; version="2.1.125"; sha256="18hwzbrrs39y6qbqn6r5fcpxqmvr62f12jqh3j98w0zgpa16vvcy"; depends=[RCurl rjson]; };
+Rlabkey = derive { name="Rlabkey"; version="2.1.126"; sha256="1bsxy77875mqs1b5kn9djwfhwhn860cmgpgpcfy9xj3mgqghp0s7"; depends=[RCurl rjson]; };
 Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp Rcpp]; };
 Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
 Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp Rcpp]; };
 RmixmodCombi = derive { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rmixmod Rcpp]; };
-Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="1ki28357ijwzzxyb820lsf8l5x2i46shar0v71k15hvf9jn0h7zm"; depends=[Matrix Matrix]; };
+Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix Matrix]; };
 Rmpfr = derive { name="Rmpfr"; version="0.5-7"; sha256="0bqjs65wlnpq95smnnwpqjrqgwda412z2qbyafa8jw6972lmsyq9"; depends=[gmp]; };
 Rmpi = derive { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; };
-RnavGraph = derive { name="RnavGraph"; version="0.1.7"; sha256="14sgllz3jj9padhiwkb731wcn9byhqm1ba2ivpyas3121y8c7yvx"; depends=[scagnostics rgl]; };
+RnavGraph = derive { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[scagnostics rgl]; };
 RnavGraphImageData = derive { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
-Rniftilib = derive { name="Rniftilib"; version="0.0-32"; sha256="1ck7ddhm759zha1iazg5razchq3gsfq3rzvfb8ichnl5l15z9ry2"; depends=[]; };
 RobAStBase = derive { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[rrcov distr distrEx distrMod RandVar]; };
 RobLox = derive { name="RobLox"; version="0.9"; sha256="1ws6bkzvg1y1cwmls71das0lih6gncx5w3ncd2siznapd4n44p69"; depends=[distrMod RobAStBase lattice RColorBrewer RandVar distr]; };
 RobLoxBioC = derive { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[RobLox lattice RColorBrewer distr]; };
@@ -1701,6 +1722,7 @@ RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmcly
 Rook = derive { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
 RootsExtremaInflections = derive { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; };
 Rothermel = derive { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[GA ftsa]; };
+RoughSetKnowledgeReduction = derive { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; };
 RoughSets = derive { name="RoughSets"; version="1.1-0"; sha256="0v6cb0xidx2rbkgb92fahrjyy974xiaizxqryzzj1z0nnqb5zadp"; depends=[]; };
 Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; };
 Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
@@ -1714,15 +1736,15 @@ Rsolnp = derive { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcp
 Rsomoclu = derive { name="Rsomoclu"; version="1.4.1"; sha256="0yr0nsm2b7wg1x57db9zclqnqqbmhyax9vgw13ynqirq2ysxxsg6"; depends=[Rcpp]; };
 Rssa = derive { name="Rssa"; version="0.11"; sha256="06mg1fdviayvhc50p9l5imh431b7cb3f3x3pl513phwhsv0qc0lk"; depends=[svd forecast lattice]; };
 Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
-Rsymphony = derive { name="Rsymphony"; version="0.1-17"; sha256="1wg1l4535xmrqvyhf23b9kw3ggqxlcrig0x0dnhx0m2qr9v3ijni"; depends=[]; };
+Rsymphony = derive { name="Rsymphony"; version="0.1-18"; sha256="0421viap2qic53hxvjyxy3npyb4lpf8lw86zwya373w41pkpsd1v"; depends=[]; };
 Rtsne = derive { name="Rtsne"; version="0.9"; sha256="1b3ilfirlhmbv1914rwnj9mamn6clzi86csp3szfwg93gk23yymn"; depends=[Rcpp Rcpp]; };
-Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.2"; sha256="1x8lfymbp5z8vkl13cdhzqlmz47an5cdxjjs75qrikbqvyqzjr5d"; depends=[]; };
+Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; depends=[]; };
 Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp Rcpp]; };
 Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
 Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; };
 RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; };
-Rvcg = derive { name="Rvcg"; version="0.9"; sha256="0p5qnw7jqq5ia36431ywp5mwcx09lsx0pnrw0n4fvc7zvgjjqs3c"; depends=[Rcpp Rcpp RcppEigen]; };
-Rvmmin = derive { name="Rvmmin"; version="2013-11.11"; sha256="14gsdvw7qxcffwkh0ayj0vlm0cqyavqgl4rqn5ybjr0pkbsmz955"; depends=[optextras]; };
+Rvcg = derive { name="Rvcg"; version="0.10.1"; sha256="09v3k8d43lqywdq3ckjwid8hrkakdc9ysxdlqq00blzab40a8ii4"; depends=[Rcpp Rcpp RcppEigen]; };
+Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
 Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; };
 Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
 RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; };
@@ -1740,8 +1762,8 @@ SAVE = derive { name="SAVE"; version="0.9.3.9.2"; sha256="1faky3155vh54r450r4dnd
 SBRect = derive { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
 SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp Rcpp RcppArmadillo]; };
 SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; };
-SCEPtER = derive { name="SCEPtER"; version="0.1-0"; sha256="13jnqcgsz3rz5dis8jmbma1m6z72qphdjyjf3984c66clhazxnh9"; depends=[MASS]; };
-SCEPtERextras = derive { name="SCEPtERextras"; version="0.1-0"; sha256="1vv231h744c7j7rvcb2xaffmwdd9ms76yvvw2l3xcb72iwhl5dbw"; depends=[]; };
+SCEPtER = derive { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; };
+SCEPtERbinary = derive { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; };
 SCGLR = derive { name="SCGLR"; version="2.0.1"; sha256="1xanlanxq3qwj7zad6zk1fy4cpbg2ns4dxvnfld209ra3y4jmbkx"; depends=[Matrix Formula expm ggplot2 ROCR]; };
 SCI = derive { name="SCI"; version="1.0-1"; sha256="1m5a15a4n0zjqykq38pyw9133g2ih4ykbgak8c8khq8p0isnl8qb"; depends=[fitdistrplus lmomco]; };
 SCMA = derive { name="SCMA"; version="1.1"; sha256="0bims9l047xvbwp2r5ly5cgpd7fc0p2cik48gg42abwdqvppf542"; depends=[]; };
@@ -1749,7 +1771,6 @@ SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2d
 SCRT = derive { name="SCRT"; version="1.1"; sha256="0c5pyxsqivhmdd0cbpnvc90pbyw24p3a5zalz85af5b6mkqmjn8y"; depends=[]; };
 SCVA = derive { name="SCVA"; version="1.1"; sha256="0fv0xvla7gmvvp9cg9jpb1p2k3bmib7yzrf3k17xav8zp0smq4y2"; depends=[]; };
 SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; };
-SDBP = derive { name="SDBP"; version="1.0"; sha256="18yk5zasxga58ny8n8kz3b8j0j8xznb9wqf5642xzfvcb9dd1kz2"; depends=[]; };
 SDD = derive { name="SDD"; version="1.1"; sha256="1bl9xlns6np26pgiiza25c54k4989knksdkkk653g8s8gmr4y34x"; depends=[Hmisc sm tseries rpanel rgl]; };
 SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; };
 SDaA = derive { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
@@ -1796,8 +1817,8 @@ SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dv
 SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; };
 SOLOMON = derive { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; };
 SOR = derive { name="SOR"; version="0.22"; sha256="1njwlsvdnwxidvwrx18h6h4dhrsdgy0fikkhn20pip42qqwd96gz"; depends=[Matrix]; };
-SPA3G = derive { name="SPA3G"; version="1.0"; sha256="0fcbrg43c5r2n5p7bb8wslqzhl5h31paxr9rla583lkm0baxnmym"; depends=[]; };
-SPACECAP = derive { name="SPACECAP"; version="1.1.0"; sha256="1m5x2rydppib6fj7wlc6pq4gyvyvhw49yx9qgy4c2rk648wxnhrj"; depends=[coda]; };
+SPA3G = derive { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; };
+SPACECAP = derive { name="SPACECAP"; version="1.1.0"; sha256="11szdq7sqr8ldwz7apbf1dv5mh43rbyb7dkivms58s5623xrq3sm"; depends=[coda]; };
 SPARQL = derive { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[XML RCurl]; };
 SPAr = derive { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
 SPECIES = derive { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; };
@@ -1805,16 +1826,17 @@ SPEI = derive { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x613
 SPIAssay = derive { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khlnly0ybrqiisw420anr2pcdd5chxa48h8apg"; depends=[]; };
 SPIn = derive { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
 SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; };
-SPODT = derive { name="SPODT"; version="0.9"; sha256="0r5zr0h5dgbkpn6dlvpj58s2wp3ngb7zb1xdapq1j25msmhwn5yy"; depends=[rgdal sp tree]; };
+SPODT = derive { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
 SPOT = derive { name="SPOT"; version="1.0.4184"; sha256="0rikfs2rha7q2xbycvky8si2ccgmamcn662g8ni105cr6m9hvvpc"; depends=[rpart emoa]; };
 SPREDA = derive { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[survival nlme]; };
 SPSL = derive { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
-SPmlficmcm = derive { name="SPmlficmcm"; version="1.1"; sha256="02hg9dzfnxa8cz31kkq52707f7y5471cq78asfbrf397mfz82wbl"; depends=[numDeriv nleqslv boot]; };
+SPmlficmcm = derive { name="SPmlficmcm"; version="1.3"; sha256="0igybzc6fx6yd8xq06909vml4zwwzm4sl5xpds1292lgv3y3zdgb"; depends=[nleqslv]; };
 SQDA = derive { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[PDSCE mvtnorm]; };
 SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
 SQUAREM = derive { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; };
+SRCS = derive { name="SRCS"; version="1.0"; sha256="0aha9fqdigvsx8dvck4y2yb8c7v58rivz50z0xwi0bhwzdddx52f"; depends=[]; };
 SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[tcltk2 gtools]; };
-SSDforR = derive { name="SSDforR"; version="1.4.7"; sha256="0d2p8rszjk1zh5wlv0bxsf40829kdxg9264i08z3db0lvhlbmaz2"; depends=[psych TTR MASS TSA]; };
+SSDforR = derive { name="SSDforR"; version="1.4.8"; sha256="0bypbcb2d79cc4pl2i7c95l9lg65p66h5xl4sf2akpmffb3vf953"; depends=[psych TTR MASS TSA]; };
 SSN = derive { name="SSN"; version="1.1.4"; sha256="0n6xxbhvbqs15zn7w66vsr98adibfyr2qa0w7pfbw6vmrrmmn23z"; depends=[RSQLite sp MASS igraph maptools lattice BH]; };
 SSrat = derive { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; };
 SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
@@ -1844,7 +1866,7 @@ SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x
 SemiCompRisks = derive { name="SemiCompRisks"; version="1.0"; sha256="1q10bqws152vk7fpd9m8w16m0ns2i10q07wnmmbjladvfq4ja9il"; depends=[]; };
 SemiMarkov = derive { name="SemiMarkov"; version="1.4"; sha256="0z43ynkd6wrxrfdbq01jiwyvw2shc3r3pmircnzkbwm2sffd3515"; depends=[numDeriv MASS Rsolnp]; };
 SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[MASS cluster nlme]; };
-SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.2-12.1"; sha256="12nmj0i6r5k7m7d3vhkzx5rrqk1ql97v78vyx54vdv5m4wfgddd7"; depends=[mgcv mvtnorm magic CDVine VineCopula VGAM survey trust Matrix sn]; };
+SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.2-13.2"; sha256="0f28xsrjrr6dkciw1q01p2z9nqcyfpfclxx2kaxyi4wvscli04hb"; depends=[mgcv mvtnorm magic CDVine VineCopula VGAM survey trust Matrix sn]; };
 SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.1-1"; sha256="0a3kynh96gp0ngw25v05fmcapx3iiclcjbypq2nn8sybbv9991c4"; depends=[copula mgcv mvtnorm magic trust Matrix]; };
 SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; };
 SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
@@ -1853,16 +1875,15 @@ SeqFeatR = derive { name="SeqFeatR"; version="0.1.5"; sha256="1cpb64h3pcp18zrly0
 SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; };
 Sequential = derive { name="Sequential"; version="1.1"; sha256="1fr4n6qbxwj6hs01h07wdj5v4c7af5q8ccnm33yzcrx845qf8fiv"; depends=[]; };
 SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[lattice betareg lattice betareg]; };
-SharpeR = derive { name="SharpeR"; version="0.1401"; sha256="1l55llafs81gl1mdhyyi6m02w7mx8g46y65jf1kw5mbrljgri8az"; depends=[matrixcalc xtable]; };
-ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.0.3"; sha256="0smfi3sg9mkl2vshw2g9qf7vm7h4ccnj32q3mmjf9djbfs8r8zfv"; depends=[]; };
+SharpeR = derive { name="SharpeR"; version="0.1501"; sha256="138faypgrfph48wvz600l20ypqzxdir4q43bl9s7vndysya3vsnl"; depends=[matrixcalc]; };
+ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.1.0"; sha256="1v2rr97wz5521cjy41j5vdqq29xd7696pc1rzw4angsfjrq3fnh4"; depends=[]; };
 SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
-SigTree = derive { name="SigTree"; version="1.6"; sha256="1z6z3s6gay3pcjazibb0schipc9qqpp3ahf0f56fq9mhk545125z"; depends=[ape phyext RColorBrewer]; };
 SightabilityModel = derive { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
 Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.9"; sha256="1cq168ga4p70hgx7rsm9rvam8b0wvjivqp2nsprk39i864j9sr91"; depends=[scatterplot3d rgl]; };
 SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mvtnorm multcomp mratios]; };
-SimCorMultRes = derive { name="SimCorMultRes"; version="1.2"; sha256="0wgi36sdpsippdbawdl7b9bvip0l8gp8xd1v85vznd1dibkfjr1r"; depends=[evd]; };
+SimCorMultRes = derive { name="SimCorMultRes"; version="1.3.0"; sha256="0r3d91x9srzsa0g6p3jlzplpsrprbg11kv6fsbbh47pz02fvi8mc"; depends=[evd]; };
 SimRAD = derive { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[]; };
-SimSeq = derive { name="SimSeq"; version="1.0.0"; sha256="142qjkfz53q3g9k37nqhilsw1mcklsa9q05yqvyn9dvj9l06y11i"; depends=[fdrtool]; };
+SimSeq = derive { name="SimSeq"; version="1.2.0"; sha256="0jbi19bdsvyrmr2762p8skw419qx438vgnjb93xdy90lrgyx11wh"; depends=[fdrtool]; };
 Simile = derive { name="Simile"; version="1.3"; sha256="0jf0ispjv8izrxggp6y3a3scd8qlbqfgppqz8m1q9n3gy8jhbsli"; depends=[]; };
 SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; };
 SimplicialCubature = derive { name="SimplicialCubature"; version="1.0"; sha256="0da2krxsd3p7v2jm4fp2ksh0ak1y0cjxj7inwkdiwmmmgjyq033f"; depends=[]; };
@@ -1870,7 +1891,7 @@ Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72
 SimuChemPC = derive { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; };
 SimultAnR = derive { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; };
 SixSigma = derive { name="SixSigma"; version="0.8-1"; sha256="15jdr10a7a6wv50vz9y6qcrbhnddl8zh4j4d48xrarrqbjy6l4p7"; depends=[qcc lattice ggplot2 reshape2 nortest testthat]; };
-SkewHyperbolic = derive { name="SkewHyperbolic"; version="0.3-2"; sha256="00l1bz3wxvs7qwl4sy814w6nrh0k79ldck5zd6c5alvg50hjwwk3"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
+SkewHyperbolic = derive { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
 Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="1spf77ix9d264r126hnrjm7z8fw19v1bk5pqhqcf6lm93zlcgh8i"; depends=[MASS matrixcalc gtools]; };
 Sleuth2 = derive { name="Sleuth2"; version="1.0-7"; sha256="1zav2g1yqc6bvzap4r5xwy9abkdj8iswivj5y2lylc25nkxwcswg"; depends=[]; };
 Sleuth3 = derive { name="Sleuth3"; version="0.1-6"; sha256="0q8sgh2szqnxc289vgi5v0sljzz8yb803ijx9w5mswdxw87z2dq3"; depends=[]; };
@@ -1884,15 +1905,16 @@ SocialNetworks = derive { name="SocialNetworks"; version="1.1"; sha256="0d868xka
 SoftClustering = derive { name="SoftClustering"; version="0.14.02"; sha256="15j79h1ccvzfpi55prbv2d7bms1grgry0ka58cr757cvwavrnbb8"; depends=[]; };
 SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
 SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[testthat brew]; };
+SoundexBR = derive { name="SoundexBR"; version="1.0"; sha256="13x5adqn6si2qqs99zwkydybikwmpb3wwq5dfbsc8fxbdj0b67mg"; depends=[]; };
 SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
-SparseM = derive { name="SparseM"; version="1.05"; sha256="041mkl0dlydlar0v0a66n9s1n0klayr08hwzpmwr2hsr05z0z380"; depends=[]; };
+SparseM = derive { name="SparseM"; version="1.6"; sha256="1296snm3481259xwhj97vffwjb2v8367ivf2g5amd4pzqzwx6p1k"; depends=[]; };
 SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[glasso longitudinal flare MASS mvtnorm network abind]; };
 SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[sp Rcpp MASS maptools spdep Rcpp RcppArmadillo]; };
 SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; };
 SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
 SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
 SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp Rcpp RcppArmadillo]; };
-SpatialVx = derive { name="SpatialVx"; version="0.2-1"; sha256="0j6m698nyd9nq0qx1s2ykk05q2scj9jb0m813r0xyymf0sl0l90a"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
+SpatialVx = derive { name="SpatialVx"; version="0.2-2"; sha256="16qww58az1523pk8b4b5hzqnpb8djgvph2ykf6bjp8zz5qdfyhjs"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
 SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; };
 SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
 SpecsVerification = derive { name="SpecsVerification"; version="0.3-0"; sha256="19vr4xlx9gx0ph6k2kf59bpbhmzncm1mmzz7ld3pjc7k4jfba3np"; depends=[]; };
@@ -1911,20 +1933,21 @@ StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsf
 StatMatch = derive { name="StatMatch"; version="1.2.2"; sha256="1ml88ssd2xrnxh6xbg25bbskqv9jrn5vczaq3a3v4bccimv65prh"; depends=[proxy clue survey RANN]; };
 StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS rjags pmr]; };
 StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[truncdist plyr]; };
+Statomica = derive { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[distr fBasics]; };
 Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; };
 StereoMorph = derive { name="StereoMorph"; version="1.2.1"; sha256="1wvkqrfghxcdiicr81hrl320zcpj6q9kqjddsrm24p98vs83hlpi"; depends=[bezier rjson shiny Rcpp jpeg Rcpp]; };
-Storm = derive { name="Storm"; version="1.1"; sha256="118l03d6las9cvhh4d845r7z6mlqff6ixxdfrdf025jsiqagm395"; depends=[rjson]; };
+Storm = derive { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; };
 StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; };
-StratSel = derive { name="StratSel"; version="1.0"; sha256="1kr7bl2qrj2ra3szvw5z5y6ra6zz5q3v9vx81p8r5618zffa8q3b"; depends=[mnormt memisc Formula]; };
+StratSel = derive { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[MASS memisc Formula mnormt]; };
 StreamMetabolism = derive { name="StreamMetabolism"; version="1.0"; sha256="03pr7i1c3qddqwibfc2x08d2nh8fih02k7a1xhqs1awfs43x56is"; depends=[zoo chron maptools]; };
 StressStrength = derive { name="StressStrength"; version="1.0.1"; sha256="15sgdisgz8zcq4i9z4zm7isr5ckyd7bk6yl1g7a5kngams282ipx"; depends=[]; };
 SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
 SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; };
-Sunder = derive { name="Sunder"; version="0.0.3"; sha256="0iyipvlz66l84b71cjyjmyirl43jcj4sfzfqk07dzycfgvvwkz3h"; depends=[mnormt]; };
+Sunder = derive { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
 SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
 SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; };
 SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; };
-Surrogate = derive { name="Surrogate"; version="0.1-3"; sha256="1z07zck27qsp64zpz7qrxdnabkffnxqh3bixg5zrd37zgki9ig1w"; depends=[MASS nlme msm lme4]; };
+Surrogate = derive { name="Surrogate"; version="0.1-4"; sha256="0wvicdd7lxczxv4hdbdn8cnv5k36biix65r4byn4cpgqhkyy78k6"; depends=[MASS nlme msm lme4]; };
 SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; };
 Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
 SvyNom = derive { name="SvyNom"; version="1.0"; sha256="07cgg97s2kpq7vak9l1a57gwmp1gsm864m4b9q42s2fbiid8jg83"; depends=[]; };
@@ -1934,12 +1957,11 @@ SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfm
 SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
 SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; };
 Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-TAM = derive { name="TAM"; version="1.2"; sha256="125zwpah09dy2y8ifwkvv194g0ns1hzgqpg3l1di65klj0ipnv99"; depends=[CDM MASS Rcpp mirt lavaan tensor sfsmisc GPArotation psych lattice mvtnorm Rcpp RcppArmadillo]; };
+TAM = derive { name="TAM"; version="1.4-1"; sha256="0qr1wbnlkzbbwa43v2sf1bkigdg5bd7fw5kwzgj1b28gfgakg5r0"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych lattice mvtnorm msm Rcpp RcppArmadillo]; };
 TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
-TAQMNGR = derive { name="TAQMNGR"; version="2014.01-2"; sha256="1szds8yyk3ldap785jxi8lj86rf4zlpzhd7rk2y8xwcq2fhs9h62"; depends=[Rcpp]; };
-TBEST = derive { name="TBEST"; version="3.0"; sha256="1c4zbp4jsl8qsbx7bnqm7z7njm60qcc1yhxdbg75mw326brfvw1z"; depends=[signal fdrtool]; };
-TBSSurvival = derive { name="TBSSurvival"; version="1.1"; sha256="0hh0zpvwbkix8g9slf6bh4qzwmig5qif80q1ph6m5i496ywjcc80"; depends=[mcmc coda survival normalp R_utils BMS]; };
-TDA = derive { name="TDA"; version="1.2"; sha256="02nfvrg428l6pq2vrsx5dj45k9gnsfvdbhvcwj86ab66z5cdjffk"; depends=[FNN igraph scales]; };
+TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[signal fdrtool]; };
+TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[normalp survival mcmc R_utils coda Rsolnp BMS]; };
+TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; };
 TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; };
 TDMR = derive { name="TDMR"; version="1.2"; sha256="0w056qxh7c56m3p6jlrp8fv2j2r1njxzgwzk3l1lhyxr94gff263"; depends=[testit SPOT]; };
 TDboost = derive { name="TDboost"; version="1.0"; sha256="1qiwz35i89lv95v3x5s28q0mkrvcfs1cfn4l0a5spvnyhy4kcacc"; depends=[lattice]; };
@@ -1952,17 +1974,14 @@ TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclai
 TFDEA = derive { name="TFDEA"; version="0.9.5"; sha256="12rr9inzr21vkfcmknxa8zd229vws3nyc4dfz44zsfxzzwi8sqk3"; depends=[lpSolveAPI]; };
 TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp Rcpp]; };
 TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
-TH_data = derive { name="TH.data"; version="1.0-5"; sha256="09p5n2fr6p47q26gb7chs0s6vyvpvywmml3i0nrp7hrikvzqf4yv"; depends=[]; };
-TIMP = derive { name="TIMP"; version="1.11.0"; sha256="0l8n3xg5ds1lbndd993nijny26s9p36n3j128527y53fs4915lxn"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; };
+TH_data = derive { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47sly65grjkm3wvrbr3nl52q1vdmy1xsgm"; depends=[]; };
+TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8xcf4xdgxq2zjbzsx4f0p0nf5ymj"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; };
 TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; };
-TPmsm = derive { name="TPmsm"; version="1.1.1"; sha256="0fd4l1rzclq32l97g7rdvhdvfdylgwaf079y24arfvkyphs2xga4"; depends=[KernSmooth]; };
+TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; };
 TR8 = derive { name="TR8"; version="0.9.11"; sha256="164fd9g4vn4p51m5ygg65lkjapb9a42wkfcp4ngdqh542x313y2n"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk]; };
 TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
-TRIANG = derive { name="TRIANG"; version="1.2"; sha256="09hfvfmqrmx8dphlk46ga0y9s986kb32qdhgiq95faqfhpirf0qa"; depends=[]; };
-TRIANGG = derive { name="TRIANGG"; version="1.0"; sha256="1ycqyaijxmgi7v9rzdsq3gxx1wll51yfpdyxbjiyp9gpgmcs7h48"; depends=[]; };
 TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
 TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
-TSAgg = derive { name="TSAgg"; version="1.0.1"; sha256="01s0grwfbhhfipqdnc0932rjsz4k52rln2bs8dsvrk6f8wps7h1k"; depends=[lubridate]; };
 TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; };
 TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; };
 TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; };
@@ -1989,11 +2008,10 @@ TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15p
 Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
 TableMonster = derive { name="TableMonster"; version="1.1"; sha256="1xflw719isy5hxvm0z67bip01cpafylnj76zssb3c174j912f7y3"; depends=[xtable]; };
 TableToLongForm = derive { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; };
-Tampo = derive { name="Tampo"; version="1.0"; sha256="10w9is8wskl5xvjfqmjhjpyppazrxw7fq1s58hi62rvcc4mpgz37"; depends=[mvpart]; };
 TaoTeProgramming = derive { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
 TapeR = derive { name="TapeR"; version="0.3.2"; sha256="070zl7hqv5zprhs464gy1kmz0am58l0vig8xvdq6pbz94nrhvpj0"; depends=[nlme pracma]; };
 TauP_R = derive { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
-Taxonstand = derive { name="Taxonstand"; version="1.6"; sha256="04d6c84j0xdv2j7s69c64h7m5j63nw4ypsyp30r0sadjkdrvhm0q"; depends=[]; };
+Taxonstand = derive { name="Taxonstand"; version="1.7"; sha256="0xs2kdsd6sa5vpxajw1rkraiy27km6q4mqsdsq1yfdl1wxv7m0sl"; depends=[]; };
 TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[lme4 ggplot2 GSA reshape2 gtools gplots cluster stringr]; };
 TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
 TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; };
@@ -2001,6 +2019,7 @@ TeachingSampling = derive { name="TeachingSampling"; version="3.2.1"; sha256="1d
 TestScorer = derive { name="TestScorer"; version="1.6"; sha256="11125i0dwh961q5xbg57lli5bzzls3y482iw5f0qwalwkppk7sv0"; depends=[]; };
 TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; };
 Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
+ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
 ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
 ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; };
 TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
@@ -2015,7 +2034,7 @@ TraMineR = derive { name="TraMineR"; version="1.8-8"; sha256="12zbk7bq4ff4dzq86z
 TraMineRextras = derive { name="TraMineRextras"; version="0.2.2"; sha256="0sb072ssg5q3kncb3b1a0nrnapjq8rly0ibh3gdrld9fdbdbjx68"; depends=[TraMineR RColorBrewer combinat survival]; };
 TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
 TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; };
-TreePar = derive { name="TreePar"; version="3.2"; sha256="0q0cp6bci5facawwi9xvmgbqq80cdmxhai3f0bs2q1s0gzsq91y7"; depends=[ape Matrix subplex TreeSim deSolve]; };
+TreePar = derive { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape Matrix subplex TreeSim deSolve]; };
 TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5cansw10fvfjfvj164f5g0qghg9v84n"; depends=[ape geiger laser]; };
 TreeSimGM = derive { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; };
 TriMatch = derive { name="TriMatch"; version="0.9.1"; sha256="1207lnysdjd347m1lsbxy19lq73bjs1irqwk94y8idp1pcj4pfpd"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics]; };
@@ -2028,20 +2047,20 @@ TurtleGraphics = derive { name="TurtleGraphics"; version="1.0-5"; sha256="18azwb
 TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
 TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.3"; sha256="0arqpfflflsydsgcrpq364vqf4sn019m03ygmpq810wa78v4r9s0"; depends=[survival]; };
 UPMASK = derive { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[MASS RSQLite DBI]; };
-USAboundaries = derive { name="USAboundaries"; version="0.1"; sha256="0q45j80gjinbmqihbs5b5y1hhm4hmjwd0sl47ib2pi4r0qlkyn7b"; depends=[assertthat dplyr ggplot2 lubridate maptools rgeos sp]; };
+USAboundaries = derive { name="USAboundaries"; version="0.1.1"; sha256="18bk37lhrlp5j0496n956881zl88inliylmgh1p2nlkv4f195yd0"; depends=[assertthat dplyr ggplot2 lubridate maptools rgeos sp]; };
 UScancer = derive { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; };
-UScensus2000blkgrp = derive { name="UScensus2000blkgrp"; version="0.03"; sha256="196hpqrc3rq0m6ra6qinlhz1yknplx08pfp57l6yalni26c8pia0"; depends=[maptools sp foreign]; };
 UScensus2000cdp = derive { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[maptools sp foreign]; };
 UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[maptools sp foreign]; };
 UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[maptools sp foreign]; };
 UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
-Unicode = derive { name="Unicode"; version="0.1-4"; sha256="0ja0l8b95r2wgybbrpbdbbfjzdq2ns0kcvffv47sq29m516dasyh"; depends=[]; };
+Unicode = derive { name="Unicode"; version="0.1-5"; sha256="088f38qy3vympxj6n4vyvvqd4gldcfli9l8rmzgmm1rm3v195mvn"; depends=[]; };
 UsingR = derive { name="UsingR"; version="2.0-2"; sha256="0qn993bb890ihgvq7kddac6xgfgfai30x62ip0048ymnvcmvjfhf"; depends=[MASS HistData Hmisc quantreg]; };
-VAR_etp = derive { name="VAR.etp"; version="0.6"; sha256="1qdv69f24n8ww2cnbxy62sqlgwlfxivbmsp6hxxfw8jcbzpc5qj7"; depends=[]; };
+V8 = derive { name="V8"; version="0.4"; sha256="1cjlpskbpn7qkfqpf5mzx2j5jbvrphwwi1v2gmi0h21s085yw15x"; depends=[Rcpp jsonlite curl Rcpp]; };
+VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
 VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; };
 VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; };
 VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
-VGAM = derive { name="VGAM"; version="0.9-5"; sha256="1xf0n34rljxyf2c1rvfvjb8nnq9b64792x9x6dyngkddx7jhk5ng"; depends=[]; };
+VGAM = derive { name="VGAM"; version="0.9-6"; sha256="1ibf27lnl28gs1dn0xndm8y0v7r6256mci82zjvc5qmbhb0hj18m"; depends=[]; };
 VGAMdata = derive { name="VGAMdata"; version="0.9-5"; sha256="0cmb0zy2sbwsn4rpc6w4885gvamyjvyp53wn9934mwdvigm63wj9"; depends=[]; };
 VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
 VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
@@ -2056,43 +2075,43 @@ VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h4
 VarEff = derive { name="VarEff"; version="1.0"; sha256="0zp024z5xl43z2z67fq5ryfiamfvdbbbv1iaaiyw3shjbg2bp8dp"; depends=[mcmc]; };
 VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
 VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; };
-VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="01jv5qrfw8y8yyd3jy3058bpnfyzz7d0m4rx0iibs79gv2rvq5sn"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
-VdgRsm = derive { name="VdgRsm"; version="1.02"; sha256="1fbm7d4wkc4awn91vh1lf02bic9sk433fx7qmwxlmh3g05k9fvak"; depends=[permute AlgDesign]; };
-Vdgraph = derive { name="Vdgraph"; version="2.2-1"; sha256="1bbx6ab6868dn0pbhvixcvmk79h1pa6azqqr100cdljxgcnygi79"; depends=[]; };
+VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
+VdgRsm = derive { name="VdgRsm"; version="1.3"; sha256="1gaaijap1gc877kpbi2galsg6zj9430w6c4ydbs6aqcx6qy9h5ij"; depends=[permute AlgDesign]; };
+Vdgraph = derive { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; };
 VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; };
 VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[rgl misc3d MASS]; };
 VennDiagram = derive { name="VennDiagram"; version="1.6.9"; sha256="0sxgspqsn15y3pipd9wy4wh2n5rkb9bazqkfwkf88p483azpjxw9"; depends=[]; };
 VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[RJSONIO RCurl zoo pracma Rcpp Rcpp]; };
 VineCopula = derive { name="VineCopula"; version="1.3"; sha256="1vxm7bk7p452p4kbm5q3ricxcd4f74zzlibxx13wj0cbza5p49nl"; depends=[MASS mvtnorm igraph copula]; };
-VisuClust = derive { name="VisuClust"; version="1.1"; sha256="02jb8kg7bxakcn76zyl68z5ab2c9s2cdz3prrgzh95rf9k893sbc"; depends=[aplpack]; };
 VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
 Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
 VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
 W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[waveslim wavemulcor]; };
 W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-1"; sha256="1bxgsm6yl62adp3apvkihvvw40130z5ki49gnriv3syaw2bgwa0r"; depends=[XML RCurl]; };
 WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; };
+WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
 WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
 WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
-WGCNA = derive { name="WGCNA"; version="1.41-1"; sha256="0ljqlxrkfxqb7fjdapfx9wrr7115z9rh7lms07vc94z3k1y2qdlw"; depends=[dynamicTreeCut flashClust matrixStats Hmisc foreach doParallel reshape]; };
+WGCNA = derive { name="WGCNA"; version="1.43"; sha256="1za7qw6yvmw7kpf9qxlwxjp4cfb7varnav7jypi1i6pi6zwi2869"; depends=[dynamicTreeCut fastcluster matrixStats Hmisc foreach doParallel reshape survival]; };
 WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[gtools gWidgets gWidgetsRGtk2 coda cairoDevice RGtk2 XML]; };
 WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
-WRS2 = derive { name="WRS2"; version="0.2-0"; sha256="0ci1a93z25rymy9fs4by9qbbkx6nn3iwzvkwsap3bm7gg7g6dpb2"; depends=[MASS reshape]; };
+WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS reshape plyr]; };
 WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
 Watersheds = derive { name="Watersheds"; version="1.0"; sha256="11hrprl8ldbgk1j1f8z4cb327c8d94x1fc29dpacqck48gdb4wmp"; depends=[sp maptools rgeos lattice splancs]; };
 Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
 WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[waveslim lattice]; };
+WaveletComp = derive { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; };
 WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[TraMineR cluster RColorBrewer]; };
 WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
 WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
 WhiteStripe = derive { name="WhiteStripe"; version="1.0"; sha256="0j8f10dwc14a0yfnjw73i6mrh0y9iyjbxmhklz2hlxv1k53pppbg"; depends=[oro_nifti mgcv fslr]; };
-WhopGenome = derive { name="WhopGenome"; version="0.9.0"; sha256="0h750i3zpy1jff1qnp3aqyaf7z2kqi8zbdd2jgn1vcsg5y07nywd"; depends=[]; };
 WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp Rcpp]; };
-WikipediR = derive { name="WikipediR"; version="1.0.1"; sha256="154yj5syxgjlxbaxigj50w991if67hp1lbsa8mj322bvglhsgb5c"; depends=[httr jsonlite]; };
+WikipediR = derive { name="WikipediR"; version="1.1.0"; sha256="19hc1vmyv0bnf00q8vwmfr6jxrcd1h5xzb9pphy5grghbj01bcl8"; depends=[httr jsonlite]; };
 WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
 WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
 WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
 WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; };
-XBRL = derive { name="XBRL"; version="0.99.13"; sha256="0q124rpvnac1kf87s04mip2imlvjhz6m8bawssvabf7ypn71sqna"; depends=[Rcpp Rcpp]; };
+XBRL = derive { name="XBRL"; version="0.99.14"; sha256="1cy0y4wl5kic8c2r1bww1fhplpb183djlb6gsj4ih9gnsykipfb1"; depends=[Rcpp Rcpp]; };
 XLConnect = derive { name="XLConnect"; version="0.2-9"; sha256="1lbbvl4jx42cvc8paswc6p8vf8aqqhf3v52a9fhpv79lcizch558"; depends=[XLConnectJars rJava]; };
 XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; };
 XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; };
@@ -2101,10 +2120,10 @@ XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir6
 XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; };
 Xmisc = derive { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
 YPmodel = derive { name="YPmodel"; version="1.1"; sha256="036f5y8qrcxglblgnaa15xzlz9pxbhbysrbr2gl66h9dvcd6kavr"; depends=[]; };
-YaleToolkit = derive { name="YaleToolkit"; version="4.1"; sha256="1r1vf0gldvcfqa7ln87q5d4sc75d8b99v6zaynvbq02rggzzynmy"; depends=[lattice vcd MASS colorspace barcode gpairs]; };
+YaleToolkit = derive { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
 YieldCurve = derive { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
 YourCast = derive { name="YourCast"; version="1.6.2"; sha256="0vl37svwky6j1am235ac2wk1fdmh509w0h4m7y93lpjhzj6m8c1p"; depends=[ggplot2 gridExtra lattice foreign reshape2]; };
-YplantQMC = derive { name="YplantQMC"; version="0.5"; sha256="0x3ndpamj1ayy1svh9q8pwmfnar9zyw5i6h1k1hqwc92h0k6jsmz"; depends=[rgl geometry LeafAngle devtools]; };
+YplantQMC = derive { name="YplantQMC"; version="0.6-4"; sha256="09galr2bcjvfpcp84znsv45j2cfyn4yhdx31kxs062sylys6kxld"; depends=[rgl geometry LeafAngle gplots]; };
 YuGene = derive { name="YuGene"; version="1.1.2"; sha256="0sy0bh49l0fajh1z88mpb4f0k3hsf3kd1vxv731qhpxcrc3pz09b"; depends=[mixOmics]; };
 ZIM = derive { name="ZIM"; version="1.0.2"; sha256="1n4dc0as011gzaac153zq1dfbg1axvmf9znlmhl7xjj4dz4966qm"; depends=[MASS]; };
 ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[triangle deSolve]; };
@@ -2115,66 +2134,68 @@ ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zl
 aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[dummies randomForest kernelFactory ada]; };
 aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[data_table plyr caret seqinr lattice randomForest ROCR reshape2 protiq]; };
 aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; };
-aRxiv = derive { name="aRxiv"; version="0.5.5"; sha256="0szh69nllc12r0lfgx5g9jgb634cld223xzhfb8rnyk0rvx1bia2"; depends=[httr XML]; };
+aRxiv = derive { name="aRxiv"; version="0.5.8"; sha256="0kwphz9x4ljsznvxxvm03mmbrv3ipyy2fh8lgik4zvv4c63mlxsh"; depends=[httr XML]; };
 abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfjii2v9a74pf488iaywc1kd7d"; depends=[nnet quantreg MASS locfit]; };
 abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; };
-abctools = derive { name="abctools"; version="0.3-2"; sha256="0l5gxrkxiq3ri9iqgy0swc8910c84zkskcr0lc57l3y0dmf90r7q"; depends=[abc abind pls plyr]; };
+abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; depends=[abc abind plyr]; };
 abd = derive { name="abd"; version="0.2-6"; sha256="0nlqgjmzpn715kg7pb4zz3rcrf11zd4inj7gam8mr8faf4b5qq2w"; depends=[nlme lattice mosaic]; };
 abf2 = derive { name="abf2"; version="0.7-0"; sha256="0ybl7w8sjfghy8svbxj01q5ldfi05g1r24q9ah1nfca8xzby410n"; depends=[]; };
 abind = derive { name="abind"; version="1.4-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; depends=[]; };
-abn = derive { name="abn"; version="0.83"; sha256="12nhk7hb26285pyyppl5289m7y8zvssnriyj84hlnz0ykar66mpi"; depends=[]; };
+abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; };
 abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-accelerometry = derive { name="accelerometry"; version="2.2.3"; sha256="0vjaf09vii7j5sw21mz59yj2z44x56xijibx2idk6ix0hclqj0lh"; depends=[Rcpp Rcpp]; };
+accelerometry = derive { name="accelerometry"; version="2.2.4"; sha256="0jk3dirk7bbddqh5j6nw2k1wm1i3k3xnz1mcb6lb5qyf1b642miw"; depends=[Rcpp Rcpp]; };
 accrual = derive { name="accrual"; version="1.0"; sha256="0gw418i9nlrm7nkg6d4m2icd4a04a7avqfjj7nidhl6vy4nflg3k"; depends=[fgui SMPracticals]; };
 accrued = derive { name="accrued"; version="1.2"; sha256="0xkar6kpxf7sq36xqf6cvns2sp5qgqxqjb8hindp59gvlcd2r5a7"; depends=[]; };
 acepack = derive { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; };
+acid = derive { name="acid"; version="1.0"; sha256="0m59xnz6435n7j3fggv274g5rap7cpr0zby3aqbaycfdfrp78d1h"; depends=[gamlss gamlss_dist Hmisc]; };
 acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
 acnr = derive { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; };
 acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
-acp = derive { name="acp"; version="1.0"; sha256="1i7ryk2scsvck5rg8gglfvqrkzbpn505g7cr7slxykp8wkyhwplm"; depends=[tseries]; };
+acp = derive { name="acp"; version="1.1"; sha256="0bdyaab2zalqaq5m4zr86mj92wqq520wqbdb5bkvs7skq6xd1zq9"; depends=[tseries]; };
 acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[stringr plyr XML]; };
 acss = derive { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
 acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
 activity = derive { name="activity"; version="1.0"; sha256="1y1vy3kj9n21jvbyl3s5hllfkqp3z1rnn7701c5jxhay5dbdz3p2"; depends=[circular overlap pbapply]; };
-actuar = derive { name="actuar"; version="1.1-6"; sha256="0f0zvk4a3rni656jfml2nqb3h3amks3g4aczp8j2x01ywwmazqr9"; depends=[]; };
+actuar = derive { name="actuar"; version="1.1-8"; sha256="0zdw8dphpp49hr82z44az10vyawj301p8lr0cc7dk96g7xrzmlwa"; depends=[]; };
 ada = derive { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; };
-adabag = derive { name="adabag"; version="3.2"; sha256="1ijr5i5p8sf2cq7cgiwh0qk3c4wxagk6r06a2vrjy76d262m1060"; depends=[rpart mlbench caret]; };
+adabag = derive { name="adabag"; version="4.0"; sha256="0n4zls13f46rxqrx9qkvrifshb3cl8l6ni7zw36pm6fixbz844fk"; depends=[rpart mlbench caret]; };
 adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; };
 adaptDA = derive { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; };
 adaptMCMC = derive { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
 adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
 adaptivetau = derive { name="adaptivetau"; version="2.2"; sha256="1xqvbbdmn70fmycpn0680q1l9s34kcmkjl812d7yrfxwm1bjfif5"; depends=[]; };
 adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; };
-additivityTests = derive { name="additivityTests"; version="1.1-2"; sha256="0ijk91whhsb7nm1ax9wpfw9qgxfb1bvg2cq939m81gvk09kzrvgz"; depends=[]; };
+additivityTests = derive { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
 addreg = derive { name="addreg"; version="1.2"; sha256="1xgf9q0z3prvchyba1vaai6ij72nzvj2dqyr6y2wzb96jfqv19kl"; depends=[combinat glm2]; };
 ade4 = derive { name="ade4"; version="1.6-2"; sha256="0h136nhfqrapwscm3c7frlcynrfxb9x8gmd1s44gaa8m25rjgdqf"; depends=[]; };
 ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
 adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; };
-adehabitat = derive { name="adehabitat"; version="1.8.14"; sha256="048jp9408x80akfnxqpyhhlzl2f89axsc90vr8cgqkimlg6h6xjh"; depends=[ade4 tkrplot shapefiles sp]; };
-adehabitatHR = derive { name="adehabitatHR"; version="0.4.11"; sha256="1llpmpfax9846v3s2finyq9x97hyi87148jx83phzjl7daag3qn1"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; };
-adehabitatHS = derive { name="adehabitatHS"; version="0.3.9"; sha256="0jv7470z1m219q5paw8cglx3d5l99iagkpm24v6q0xgdffvcq94l"; depends=[sp ade4 adehabitatMA adehabitatHR]; };
-adehabitatLT = derive { name="adehabitatLT"; version="0.3.16"; sha256="1rav2q1n1ahrj2iik93rqc52c1gcxha5idrh7rfds0qb15jpmsvh"; depends=[sp ade4 adehabitatMA CircStats]; };
+adehabitat = derive { name="adehabitat"; version="1.8.15"; sha256="0fzswrypa8iwqqmbg3q08rk617ihf44l2dcrn91mdxqpzaw4nhnf"; depends=[ade4 tkrplot shapefiles sp]; };
+adehabitatHR = derive { name="adehabitatHR"; version="0.4.12"; sha256="112kz9cby0p7ayarwdwx5lg3dykkrdvpsc3na79xksadry3mykgj"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; };
+adehabitatHS = derive { name="adehabitatHS"; version="0.3.10"; sha256="12zwriw6dda50614hb5gx67hbpr9ybv8dms17q62f4x09rr6iap5"; depends=[sp ade4 adehabitatMA adehabitatHR]; };
+adehabitatLT = derive { name="adehabitatLT"; version="0.3.17"; sha256="193wsg4pxj6zb2c8wd2m365j0x5zglyfn1hk1fd8qb1b241ba1nj"; depends=[sp ade4 adehabitatMA CircStats]; };
 adehabitatMA = derive { name="adehabitatMA"; version="0.3.8"; sha256="1j3ngry7qyhl4p5m02bgdynixb0v9hd5nbjs6ndfqw23layh8yig"; depends=[sp]; };
 adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 phylobase ape adegenet]; };
 adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[spider ape polynom]; };
 adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; };
 adlift = derive { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; };
-ads = derive { name="ads"; version="1.5-2.1"; sha256="1jwgk48qypg36v53kj7wy5rcz059p1qg8awm3nf7xngrb2zff6h3"; depends=[ade4 spatstat]; };
+ads = derive { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; };
 adwave = derive { name="adwave"; version="1.0"; sha256="10cz870n3az7brmf2658g0jrc1x39c69vw37n99m8x6wxxp6ypn8"; depends=[waveslim]; };
 aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[dplyr stringr assertthat lubridate]; };
-afex = derive { name="afex"; version="0.12-135"; sha256="04z5g9jdb913d64y1fdg9xb9znj4476zyj5vjzdg7j69ckmrq5ya"; depends=[car lme4 reshape2 stringr coin Matrix pbkrtest]; };
+afex = derive { name="afex"; version="0.13-145"; sha256="0wyjgxh1rdibj21f8dbwg7f30q1z6jwwpj2dcjx2rh60axvp1dir"; depends=[car lme4 reshape2 stringr coin Matrix pbkrtest]; };
 aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[MASS BB survival geepack]; };
 agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[miscF lme4 R2jags]; };
 agop = derive { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[Matrix igraph]; };
 agricolae = derive { name="agricolae"; version="1.2-1"; sha256="1vrc1bjqcp3xk8q41bl3kvjvaj58gw19dv7vwsxn9r6r99hlb3j1"; depends=[klaR MASS nlme cluster spdep]; };
 agridat = derive { name="agridat"; version="1.10"; sha256="007xhynxsiqk2jnn9a1q77q1b42gwaky4vjyd034m56q3kz0adhn"; depends=[lattice reshape2]; };
-agrmt = derive { name="agrmt"; version="1.35"; sha256="164wj1bnjasc6pscz29v478ap65hjm5whxs2g2x5adghcda698i5"; depends=[]; };
+agrmt = derive { name="agrmt"; version="1.39"; sha256="0qkl8wikvg635mr8v3n9svdicnb8sl4brrh7px1n5jy71h7cswd7"; depends=[]; };
 agsemisc = derive { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
 ahaz = derive { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[survival Matrix]; };
 aidar = derive { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; };
 akima = derive { name="akima"; version="0.5-11"; sha256="17n7iiwybwanvm5mflb1f2xx1gnw1pcmfsnl1f82afixpalbs0gh"; depends=[]; };
 akmeans = derive { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
-alabama = derive { name="alabama"; version="2011.9-1"; sha256="05c1a8707akwy39n2gjg3ahdp9xdkl18a32wdchw60f0h4ixqfdi"; depends=[numDeriv]; };
+alabama = derive { name="alabama"; version="2014.12-1"; sha256="0rp9x5lijisxh57miy2l5jp7jinn200v9y3vfyriknr7903lg0if"; depends=[numDeriv]; };
+algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly stringr reshape2 Rcpp Rcpp]; };
 allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
 allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpjfsxlxrm4hwm46x42k8dgc6sihfsqbm22"; depends=[gplots]; };
 alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; };
@@ -2185,7 +2206,7 @@ alphahull = derive { name="alphahull"; version="1.0"; sha256="0k3n9l4vbvpmdb4m37
 alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; };
 alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
 alr4 = derive { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; };
-amap = derive { name="amap"; version="0.8-12"; sha256="0z7c5lrwqvjcnjm48zq2ifyx089fabvwf1zz17qlxq44i8xzpx8j"; depends=[]; };
+amap = derive { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; };
 amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
 amen = derive { name="amen"; version="0.999"; sha256="1p9ma31bzrxylcgi43nk44bq0cg4xgk9fzmxw2dpqz33x4xlrfiq"; depends=[]; };
 aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
@@ -2197,6 +2218,7 @@ anapuce = derive { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l
 anchors = derive { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[rgenoud MASS]; };
 andrews = derive { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; };
 anesrake = derive { name="anesrake"; version="0.70"; sha256="17127rmjfrdwnr2m6205cci3b0kd9girp82qranxwac4mgb7p7ld"; depends=[Hmisc]; };
+anfis = derive { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; };
 anim_plots = derive { name="anim.plots"; version="0.1"; sha256="0qjwmxpkvjf27parh1fvhrkiczm4zlv9c034dp04yysbdz65r1by"; depends=[animation]; };
 animalTrack = derive { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
 animation = derive { name="animation"; version="2.3"; sha256="1hqgkaxmyyfrx7cfzv00010r9l2n8gxm35jd41p3kc208mhd7ssp"; depends=[]; };
@@ -2204,17 +2226,19 @@ anominate = derive { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6ba
 antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[MASS evd BB numDeriv ggplot2]; };
 aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
 aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[lme4 boot]; };
-aoos = derive { name="aoos"; version="0.0.3"; sha256="0fyvw05pq9l6n0ywmpr4a2hkf9zh8krchyxl2279ims8rz79432a"; depends=[]; };
-aoristic = derive { name="aoristic"; version="0.5"; sha256="0hvq6qf5ib7x7c7jg9qbsglhazvbr5rkhfi1r43h4i2fhdvymhrn"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML]; };
+aoos = derive { name="aoos"; version="0.1.0"; sha256="06jnkw8sw77rjag8sqbbp2g60p8vvc3vxl4l4gxzldk400wlkcnq"; depends=[]; };
+aoristic = derive { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML MASS sp maptools RColorBrewer]; };
 apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
 apc = derive { name="apc"; version="1.0"; sha256="1fhw6cjcqcjwsjswhgm7rgwn3m3d9lkb9mk6cxh04jk3x2j9l3az"; depends=[]; };
-apcluster = derive { name="apcluster"; version="1.3.5"; sha256="1hckvir43s0jshn9kiwqmpsnav04lxv060l6xlf60a8yk5zf1cqs"; depends=[Rcpp Rcpp]; };
-ape = derive { name="ape"; version="3.1-4"; sha256="04vkzbqjy89vs2n421ji2r4p60x5frjnlgpjp42k9n5x295hb89s"; depends=[nlme lattice]; };
+apcluster = derive { name="apcluster"; version="1.4.1"; sha256="1s7wsgimpln5kiy1ai8clq2r0i6vh8mr5v4xjha9phdbm8l8yfbg"; depends=[Rcpp Matrix Rcpp]; };
+ape = derive { name="ape"; version="3.2"; sha256="015ibyri6r2xdmy644pb1p6xn0rzxaz49sr96859jfvafzi7p2ny"; depends=[nlme lattice]; };
+aplore3 = derive { name="aplore3"; version="0.7"; sha256="1xj3k13wjpsydcrai474b94kyj298islzfpfwn8n51k67h8r4l08"; depends=[]; };
 aplpack = derive { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
 apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[seqinr gtools]; };
 appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
 apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
 approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
+aprean3 = derive { name="aprean3"; version="1.0"; sha256="1ar83xnd9wwn5avz37qzwz5wsknrf5q3fb2a4w98g3nm0qy8yxhd"; depends=[]; };
 aprof = derive { name="aprof"; version="0.2.4"; sha256="0gw5qj6c5ygjc6nwx2lb8biykkk73fv2x3j1xxabpgnsfq1whwyc"; depends=[]; };
 apsimr = derive { name="apsimr"; version="0.1"; sha256="03j1g16drch5xkxb86czxmihs9a96f0v2kxjp73k7vig9md625dy"; depends=[ggplot2 XML lubridate reshape2]; };
 apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
@@ -2224,7 +2248,8 @@ aqp = derive { name="aqp"; version="1.7-7"; sha256="0gdaxxifcvr40j6y7db24dzla31l
 aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; };
 archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; };
 archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
-archivist = derive { name="archivist"; version="1.1"; sha256="1vqfpb1g8877zmnj12a1ariglq7w03xpqs63bj429rd9agg66pw2"; depends=[RSQLite DBI lubridate jsonlite RCurl digest httr]; };
+archiDART = derive { name="archiDART"; version="1.0"; sha256="0fahcw3032rvz1qd2vv872k8d7845zjfm2byrk1nk5b34z25wm2b"; depends=[]; };
+archivist = derive { name="archivist"; version="1.2"; sha256="10h5b8lkwndg7pn07kbj1qz1ym19alnjr43azwr1sljxybf86pb8"; depends=[RSQLite DBI shiny lubridate RCurl digest httr]; };
 arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
 arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; };
 argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
@@ -2232,16 +2257,16 @@ argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbn
 argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; };
 arm = derive { name="arm"; version="1.7-07"; sha256="19xshr5r36g9jsyxdm0dihvga89fd080hbhmyhxv1rbv4496jwqa"; depends=[MASS Matrix lme4 abind coda nlme]; };
 arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
-aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.12.0"; sha256="1r3ywi97xqvk6dif7kkc3gqapiydd2sbq0ibxs1qf6s2v236d71r"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_filesets aroma_apd MASS matrixStats]; };
+aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.0"; sha256="0rb4qijsqzrv47i30fpcngw50a1gk10zn1r13lszxcsm5i8vjqf7"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_devices R_filesets aroma_apd MASS matrixStats]; };
 aroma_apd = derive { name="aroma.apd"; version="0.5.0"; sha256="1pi4k7psrc120r8mn352vg60mjvbnm1f56dm9svfxfyl0qhcfd00"; depends=[R_methodsS3 R_oo R_utils R_huge]; };
 aroma_cn = derive { name="aroma.cn"; version="1.5.0"; sha256="1aih11r3gs969ci5gs7x7z5pia51y75iy559y23cz40q2qsq4ikc"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; };
-aroma_core = derive { name="aroma.core"; version="2.12.1"; sha256="1rg7m9z2j9hn0adj407amyabyh6jhpgip51zd8fb8rplzgbkrm7s"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; };
+aroma_core = derive { name="aroma.core"; version="2.13.0"; sha256="1r3r0hrw8akdpjmzhnc0fg6nyd9hccvv4kfbms38qll70lac4910"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; };
 arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
-ars = derive { name="ars"; version="0.4"; sha256="0ynciw8n2jpqi40gsrj189419vgr1lgs9wridh09nj7n451b4kvg"; depends=[]; };
-arules = derive { name="arules"; version="1.1-5"; sha256="0hi3ni9qwrw8abvnvdd77xn9vr4gzfj4fabm2j60zi679zz84ck2"; depends=[Matrix]; };
+ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
+arules = derive { name="arules"; version="1.1-6"; sha256="0xq0j4phwqw9cx2yzxx8xx4srnjjlv75cd463x959bycsp6fzb5r"; depends=[Matrix]; };
 arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; };
 arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; };
-arulesViz = derive { name="arulesViz"; version="0.1-9"; sha256="1s1hsf64fg32r3p1h8bvzbpr7a28szdh9hs7ck9qykh2s93xh12z"; depends=[arules scatterplot3d vcd seriation igraph]; };
+arulesViz = derive { name="arulesViz"; version="1.0-0"; sha256="0g4bqfn8jya992r2wbi044v68mj508h52snrdcd5ijhdhw8xq9xc"; depends=[arules scatterplot3d vcd seriation igraph]; };
 asbio = derive { name="asbio"; version="1.1-1"; sha256="13iz795jiplx677y24pwx5ggxbz0b8x7g8khmvvbl05h2rab3pw8"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice multcompView]; };
 ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
 ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; };
@@ -2269,7 +2294,6 @@ audit = derive { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfj
 autoencoder = derive { name="autoencoder"; version="1.0"; sha256="18i6b2vjhlq9f82syw3k88gm9bvklv827nflgzq0xzjnzh6z5nr8"; depends=[]; };
 automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[sp gstat lattice reshape]; };
 autopls = derive { name="autopls"; version="1.2-7"; sha256="173i1g11waz72myclfdch9v3wsvdr9mdz2gxdqifq9wj50s4zrg4"; depends=[pls]; };
-avgrankoverlap = derive { name="avgrankoverlap"; version="1.0"; sha256="1wyafcygwdk754wp25283nd84lnn9qxha41xij55ylrn4nvg57l1"; depends=[]; };
 aws = derive { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; };
 awsMethods = derive { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; };
 aylmer = derive { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
@@ -2285,15 +2309,15 @@ bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iy
 bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; };
 bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
 barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
-bark = derive { name="bark"; version="0.1-0"; sha256="00sgwr1sfbx0gb2ssbnmbz90mwb40sk3s24asj7lhadwgm150nly"; depends=[]; };
-bartMachine = derive { name="bartMachine"; version="1.0.4"; sha256="0j1yfwpxxins9hgmzbj5z24vbad62hmpbdz2gasfxdpdl78v1xav"; depends=[rJava car randomForest missForest]; };
+bartMachine = derive { name="bartMachine"; version="1.1.1"; sha256="1gc98s5inp5ka9ax6rykac9ij0cymp7bjwl3vxrmwmfsghvx4rc5"; depends=[rJava car randomForest missForest]; };
 base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
 base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; };
-baseline = derive { name="baseline"; version="1.1-3"; sha256="1n3g1ads26nq3y31nniirac453pdshzkdfg774w46x83cc5pc0xj"; depends=[SparseM]; };
+baseline = derive { name="baseline"; version="1.1-4"; sha256="1xwkbrqwcf1q6s65inzczgzbknwlqq7m84lph5rkwncjxid2h4lz"; depends=[SparseM]; };
 basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszznlhrk52jr19syl549qdq3nspbxcn2mj65f5pw"; depends=[]; };
 batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
 batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
-batchmeans = derive { name="batchmeans"; version="1.0-1"; sha256="06p51ipc603zqkf7ifv495jxbnqqxzx5h8mnz5l5sz9rq5pixg13"; depends=[]; };
+batchmeans = derive { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; };
+bayesDccGarch = derive { name="bayesDccGarch"; version="1.0"; sha256="1xgznixi0wdpqbqjacf5viyz69fjd0xbsdgvkgq2d8pjbgp18s0a"; depends=[coda]; };
 bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; };
 bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; };
 bayesGDS = derive { name="bayesGDS"; version="0.6.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; };
@@ -2302,7 +2326,7 @@ bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmk
 bayesPop = derive { name="bayesPop"; version="5.2-1"; sha256="15skh0fprvkhgydc320wba9nhb7hzmi7hnwr2iq73vd0by2ibfkb"; depends=[bayesTFR bayesLife abind plyr wpp2012]; };
 bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
 bayesSurv = derive { name="bayesSurv"; version="2.3-1"; sha256="1p3ppvz7qjd0yjnc3k1mrjqa6v00aind613wxg6xhgk5iz0590rg"; depends=[survival coda smoothSurv]; };
-bayesTFR = derive { name="bayesTFR"; version="4.0-11"; sha256="1zvg6jrhrw7smc6gz0nzc5g7jfd8ixb5cn4p9jf6l3wr0gj3hp45"; depends=[mvtnorm MASS coda wpp2012]; };
+bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[mvtnorm MASS coda wpp2012]; };
 bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; };
 bayescount = derive { name="bayescount"; version="0.9.9-2"; sha256="1f27dkdgpylk1v0m722r0jxha9sl17zgl1s5apnd8ihgsajm7sdc"; depends=[runjags coda lattice]; };
 bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; };
@@ -2316,7 +2340,7 @@ bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkq
 bbo = derive { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
 bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net infotheo igraph Matrix lattice]; };
 bclust = derive { name="bclust"; version="1.4"; sha256="1s04fqff5bw6d5kk0smvach6yq492dv1w0ahh9mrm2jsi2q58h7p"; depends=[]; };
-bcool = derive { name="bcool"; version="1.1"; sha256="03z6wdqpk491gyysbzz1lgfavskmi0j65r3df7baz6lrvzkg30ji"; depends=[MCMCglmm doMPI seqinr]; };
+bcool = derive { name="bcool"; version="1.2"; sha256="0830wx8z0yvw4cfik5jrjcvmhsf7klvqvcqx5l4lr4aq88rakxpq"; depends=[MCMCglmm doMPI foreach seqinr]; };
 bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp Rcpp]; };
 bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[Rcpp plyr Rcpp]; };
 bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
@@ -2329,11 +2353,11 @@ bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g
 bdscale = derive { name="bdscale"; version="1.2"; sha256="0j2h7ainfnh78szp355didbkmcl6d5vz1di8nznjarwxncrbgc6g"; depends=[ggplot2 scales]; };
 bdsmatrix = derive { name="bdsmatrix"; version="1.3-2"; sha256="16qhfwk0r1snm9hg32qwz7hizkpwc32m723hjm23m2026gvz2nwy"; depends=[]; };
 bdvis = derive { name="bdvis"; version="0.1.0"; sha256="1f837i48gmspx9xrnxzsgdbg6ykxmvkp8l20y19yd9iakhv7k3jy"; depends=[maps plotrix sqldf plyr taxize treemap ggplot2]; };
-bdynsys = derive { name="bdynsys"; version="1.2"; sha256="06n4n5yix6yd5180c5y7qdk2p5jpjqiw28147l8fp58zqxvwjrxb"; depends=[plm Formula MASS Hmisc deSolve pracma caTools matrixStats]; };
+bdynsys = derive { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[plm Formula MASS Hmisc deSolve pracma caTools matrixStats]; };
 beadarrayFilter = derive { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[RColorBrewer]; };
 beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[rggobi]; };
 beanplot = derive { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
-bear = derive { name="bear"; version="2.6.3"; sha256="1w933rb1v4ixgmxpbjxrfwzhiddpr0vxwr3gryl6z6p4wvwdwvp7"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; };
+bear = derive { name="bear"; version="2.6.4"; sha256="1v5rcb7aqzc7zjbbwwcy02z79crxq90mxs32k2gfvf7jzky09hpy"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; };
 beepr = derive { name="beepr"; version="1.1"; sha256="187gww50yc8hzrzwz6j9ib101196g6ci9fx3dqyhg764ydn8if1n"; depends=[stringr audio]; };
 beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8vmcprss5ivgb0dlyly07jywj3vrf2z81yhy"; depends=[]; };
 benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
@@ -2341,26 +2365,27 @@ benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nz
 benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; };
 bentcableAR = derive { name="bentcableAR"; version="0.2.3"; sha256="0d20cc3zis3pc3r86z12cwcz013w0mglbg6xgv90wq912jjpkxk9"; depends=[]; };
 ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
-berryFunctions = derive { name="berryFunctions"; version="1.6"; sha256="0qar3mhplshxhlkci81hgsyfiprnpqmf011hkjvibsqm2s19w3qw"; depends=[]; };
+berryFunctions = derive { name="berryFunctions"; version="1.7.1"; sha256="1xpmpbls0vjyi51k7sd1v8s7lp4s1549javcg3yinmvxp9xhwfkx"; depends=[]; };
 bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
 betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
 betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
 betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[vegan ellipse]; };
 betareg = derive { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; };
+betas = derive { name="betas"; version="0.1.0"; sha256="0a8z8c4i2pbnmpylggdr7bv5iw5jmcjwfqlykdj7pfjkjadb8nj4"; depends=[robust]; };
 betategarch = derive { name="betategarch"; version="3.2"; sha256="0x3l1zvdp8r7mam7fvdlh1w3dwpjwj86n0ysfk8g824p4mn2wsgv"; depends=[zoo]; };
 bethel = derive { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
 bezier = derive { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; };
 bfa = derive { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
 bfast = derive { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[strucchange zoo forecast sp raster]; };
 bfp = derive { name="bfp"; version="0.0-27"; sha256="08hlr33dwwjc4ag8vfsa3w4rcsc2093j8zwb05xkkl5nwqsq3mq0"; depends=[Rcpp Rcpp]; };
-bgeva = derive { name="bgeva"; version="0.2"; sha256="178c2jkg5578mh1yq37713lwfbz98nbsc2p1bmacgmbxbqnkba3x"; depends=[mgcv magic trust]; };
+bgeva = derive { name="bgeva"; version="0.3"; sha256="0isijl43kmg4x7mdnvz0lrxr87f68dl4jx7gmlg70m8r6kk8cfqn"; depends=[mgcv magic trust]; };
 bglm = derive { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b0xxbvw1hcvangc0c0s314mrz"; depends=[mvtnorm]; };
-bgmm = derive { name="bgmm"; version="1.6"; sha256="04d06rhb8ax1q4ayl03cw18j4wk4g4690kwdgiyym9yi0gh8hjij"; depends=[mvtnorm car lattice combinat]; };
+bgmm = derive { name="bgmm"; version="1.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[mvtnorm car lattice combinat]; };
 biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
-bibtex = derive { name="bibtex"; version="0.3-6"; sha256="06v6pzwpx5dh3h4cf382hf0mszxchvzjsjaw880gfbgc9yl931z7"; depends=[]; };
+bibtex = derive { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; };
 biclust = derive { name="biclust"; version="1.0.2"; sha256="09w164zsnc48apf3r0yr6bfjxlpy4s2wqpzfhlg60c3c7bk1bf7v"; depends=[MASS colorspace lattice]; };
 bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp Rcpp]; };
-bigGP = derive { name="bigGP"; version="0.1-3"; sha256="1a81an1wkkvdv1jh6d41wl54ac8h4yal27v4m8zp9jmx3ch3y2wy"; depends=[Rmpi]; };
+bigGP = derive { name="bigGP"; version="0.1-5"; sha256="0hlfylwinkwz2s8wgqf6qwxrrdx5a02ln13y4arfwwlqi1kw0s4q"; depends=[Rmpi]; };
 bigRR = derive { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[hglm DatABEL]; };
 bigalgebra = derive { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[bigmemory bigmemory BH]; };
 biganalytics = derive { name="biganalytics"; version="1.1.1"; sha256="0g45b293c1z9n2z9ab66jsy8yaiqm7bbs2d6pglzwgmmdvwy03qd"; depends=[bigmemory BH bigmemory]; };
@@ -2369,9 +2394,9 @@ biglars = derive { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f
 biglm = derive { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
 bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[bigmemory_sri BH BH]; };
 bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
-bigml = derive { name="bigml"; version="0.1-1"; sha256="0x0gn5pyffc8s0z2hp9iqgc63mmb3q7fb8lafzz2x67z2gghxi77"; depends=[RJSONIO RCurl plyr]; };
 bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; };
 bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach bigmemory BH]; };
+bigrquery = derive { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[httr jsonlite assertthat R6 dplyr]; };
 bigsplines = derive { name="bigsplines"; version="1.0-4"; sha256="10i8scp048s7mdxccqq2wz7ffqljnpgbhki5hkyjp7i5lbhbmcax"; depends=[]; };
 bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory BH bigmemory]; };
 bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfchkk9h7yv73j0365srr1jxki44pm"; depends=[]; };
@@ -2393,8 +2418,9 @@ binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m63266
 bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
 bio3d = derive { name="bio3d"; version="2.1-3"; sha256="1iip34prynbib0aasrcxr1gck2vmal8vxwyrjx7ra9pq9zcnvjyq"; depends=[]; };
 bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
+biogram = derive { name="biogram"; version="1.0"; sha256="0xf9sn66wh4349hhy8jl5zg8b8apjjgcr5kyzmz82765zrdnf346"; depends=[slam bit]; };
 biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; };
-biomod2 = derive { name="biomod2"; version="3.1-48"; sha256="1qsxzgikzxvgfrvm3lqfbwk1fnd55z1jgi9d6nyjxxcmn65lgx5l"; depends=[sp raster reshape abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; };
+biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; };
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
 biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; };
 bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; };
@@ -2417,20 +2443,22 @@ blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddc
 blkergm = derive { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[network ergm statnet_common ergm]; };
 blm = derive { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
 blme = derive { name="blme"; version="1.0-2"; sha256="11m98j9xr6w0hfcss4bbx2aa34gnc5p9if9r8ilw9ify18by77np"; depends=[lme4]; };
-blockTools = derive { name="blockTools"; version="0.6-1"; sha256="10f2rkailk0bvg5hj9hxy0p3snknbpvsydx3cpsy0n6y5srwhrfr"; depends=[MASS]; };
+blockTools = derive { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs69rg73p5h09fi3vzagh845r00ivw4iv18anq40"; depends=[MASS]; };
 blockcluster = derive { name="blockcluster"; version="3.0.1"; sha256="1lxm20f8dhxfnm13j08sj7h3sfwc8limyqn8n87c3kl87066gdaq"; depends=[Rcpp Rcpp RcppEigen]; };
 blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
 blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
 blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
-blocksdesign = derive { name="blocksdesign"; version="1.2"; sha256="16xpknm5aw8py8wsgfw2kn96rxzjhkp7sp9sl60s5lfn957mbsrb"; depends=[crossdes]; };
-blowtorch = derive { name="blowtorch"; version="1.0.1"; sha256="19z2z2alq5lr3f4nmjzpmyxssxalwfkm437bsjnzyf0r3zvycy9c"; depends=[ggplot2 foreach iterators]; };
+blocksdesign = derive { name="blocksdesign"; version="1.4"; sha256="0ikpqrx7lwf13028drvrwni868a8gs9lw2w05hqz5a5yknks97lk"; depends=[crossdes]; };
+blowtorch = derive { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[ggplot2 foreach iterators]; };
+blsAPI = derive { name="blsAPI"; version="0.1.1"; sha256="1d9mzhhr9yrx1kca6mzrq3gqqismv2q5wf1zx76srqvpaja2wszq"; depends=[rjson RCurl]; };
 bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
 bmem = derive { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia MASS lavaan sem snowfall]; };
 bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda plyr functional]; };
 bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
 bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
-bmrm = derive { name="bmrm"; version="1.8"; sha256="1kw9i84v5larzy79aghp08760krp29xlwrjg4mh9fsa9nl9wxqda"; depends=[clpAPI kernlab]; };
-bnlearn = derive { name="bnlearn"; version="3.6"; sha256="0q5w5lsjgr7lgfgb7yhybq5ixaps2p91gx19l6dg2xlxw2m5fnab"; depends=[]; };
+bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[lpSolve LowRankQP]; };
+bnlearn = derive { name="bnlearn"; version="3.7"; sha256="0pn6q77qz0rk1hscrpjyqn0wn540i7d6zvhgnsjj9iijcpk4sh63"; depends=[]; };
+bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
 bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
 boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; };
 boilerpipeR = derive { name="boilerpipeR"; version="1.2.2"; sha256="0hcjlinzq2778zhwvsdyif099w8qjz5yidvpsyhphk4r6jyk4k2w"; depends=[rJava]; };
@@ -2438,17 +2466,16 @@ bold = derive { name="bold"; version="0.2.0"; sha256="06dnhhf2bmiqxizarsqd6l2dcs
 boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; };
 boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
 boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
-boot = derive { name="boot"; version="1.3-13"; sha256="0nkl3kbg23ch0jirrfm4033lhjwvay5j3gjd477kw0105zkalhcc"; depends=[]; };
+boot = derive { name="boot"; version="1.3-14"; sha256="0myi9s0h1dbsh55gf6k03cmx4z2bsv9nxmjklsk4665j4rnmj4wn"; depends=[]; };
 bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; };
 bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; };
 bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
 bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag586xliapp1ninz7qxczl8jmxa9sx9z89"; depends=[]; };
 bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
-bootfs = derive { name="bootfs"; version="1.4.2"; sha256="1qac7v0yzhxzqbdhkpgb4z1gqr6v6hjyb2y5lsxlq5dg1ka1cnb0"; depends=[pROC igraph ROCR gbm colorRamps gplots gtools pamr randomForest Boruta caret tgp mlegp penalizedSVM]; };
 bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; };
 bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
 bootstrap = derive { name="bootstrap"; version="2014.4"; sha256="1kf5jml03yfqz2868jbnjvy839x09ml0niyq85va503pq8gmj5br"; depends=[]; };
-boral = derive { name="boral"; version="0.5"; sha256="0abxb22s4cqz2bx1ggy78jjyfjj0plv8zgccyj06jgzqqciw2fr2"; depends=[coda R2jags mvtnorm fishMod MASS]; };
+boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl6j8fb6a28vfciykr2364mgmahp"; depends=[coda R2jags mvtnorm fishMod MASS]; };
 boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; };
 boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
 boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
@@ -2459,20 +2486,20 @@ bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm
 brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[rgl misc3d oro_nifti]; };
 brainwaver = derive { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
 branchLars = derive { name="branchLars"; version="1.0"; sha256="1adk9j77ynv7y8q04nvb468ik4nq4ff3j2nbxw596kgg5bg1ymz0"; depends=[lars]; };
-breakage = derive { name="breakage"; version="1.0-1"; sha256="1zn0hxkz4zqhrfny75gkp2sgc0fs4v3y940aw32fmjh4j8kl3n4j"; depends=[Imap]; };
+breakage = derive { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
 breakaway = derive { name="breakaway"; version="1.0"; sha256="1agigb3b2ff1p9lx9ndz4hs1sgyv1g2zjb41l5p23370i5gk1nbn"; depends=[]; };
-breakpoint = derive { name="breakpoint"; version="1.0"; sha256="0clmrad4ycpi0rxrvkh4agwixdayypjdnk3lfyb5g2w2hngrxv73"; depends=[ggplot2 foreach]; };
+breakpoint = derive { name="breakpoint"; version="1.1"; sha256="07k5d1jn5ahhml2q9ynpmwjm2ckyrr63qj7svh2ziyb41f5v7mfw"; depends=[ggplot2 MASS msm foreach doParallel]; };
 brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
 brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
-brnn = derive { name="brnn"; version="0.3"; sha256="0fpmjmxzcsxqv3vfy568r7js0zpydh2q70vw2s8yki2jzxl4gsl9"; depends=[Formula]; };
+brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
 broman = derive { name="broman"; version="0.48-2"; sha256="0w3fxs753ds2d4vzz7mck3cdjh4d1mjbwdbzqkb2rxdx5l4w2jp8"; depends=[assertthat]; };
-broom = derive { name="broom"; version="0.3.4"; sha256="0swmrd68p189pjl3kp7qmzsaqaq6w79wzigrgzdprlx4i5vk6ck4"; depends=[plyr dplyr tidyr psych]; };
+broom = derive { name="broom"; version="0.3.5"; sha256="0vzj797nr3ijn4wq8ri6inibdbsp980didk5ywqw2ankzlq3m7f2"; depends=[plyr dplyr tidyr psych]; };
 bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; };
 bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; };
 bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
 bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[rpart gbm]; };
-bsts = derive { name="bsts"; version="0.5.1"; sha256="0qzyrn8zbfxrplyw04yrcakig6lc1i8fpwl893vbzciyhwmrjlya"; depends=[BoomSpikeSlab zoo xts Boom Boom BH]; };
+bsts = derive { name="bsts"; version="0.6.1"; sha256="0hs2inbwwpafpcr6y51qnmxms121z8cy8mil6acjfhrfc27f1msd"; depends=[BoomSpikeSlab zoo xts Boom Boom BH]; };
 btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[Matrix coda Rcpp RcppEigen]; };
 bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[mda ncvreg mboost gbm earth elasticnet rms]; };
 bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
@@ -2480,15 +2507,15 @@ bvarsv = derive { name="bvarsv"; version="1.0"; sha256="0ak4nsrcvhkg0145ax5ib9lj
 bvenn = derive { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
 bvls = derive { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
 bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw29x9421xjc7gd964hx9xwvx4h8dis34rgd"; depends=[rootSolve deSolve]; };
-c060 = derive { name="c060"; version="0.2-3"; sha256="1lynkmdlqi41szrpqqa79d5i65lindqgi0dwqpvvw94yjnbnm6b3"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; };
+c060 = derive { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; };
 c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
 cAIC4 = derive { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; };
 cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; };
-ca = derive { name="ca"; version="0.55"; sha256="1mk6hias079ys4khlq0mb4z80mcqhml2n8fdiyfcxy61vj522yb8"; depends=[]; };
+ca = derive { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcinz5qv50g40dan0k75n7isb"; depends=[]; };
 caTools = derive { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; };
 cabootcrs = derive { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
 cacIRT = derive { name="cacIRT"; version="1.3"; sha256="1qd9qw47d9dmxhnva3ik62q5rfcw0pd1ha1y689345nl05wysjkh"; depends=[]; };
-cairoDevice = derive { name="cairoDevice"; version="2.20"; sha256="1v9sdv35a1sl42gsz1y9jw1p6fr19yny07cc2pwmcrb4vs5lhysf"; depends=[]; };
+cairoDevice = derive { name="cairoDevice"; version="2.21"; sha256="1g4glv80zj9mxi9hipkpxxcg3x0g3g7av17bhidb6h0s75v9jcvw"; depends=[]; };
 calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
 calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[emulator cubature]; };
 calmate = derive { name="calmate"; version="0.11.0"; sha256="1zy836nk607ra67q0x7yc4czkcn9ffzlipzhr4mhjk6l5d8sys2q"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; };
@@ -2498,25 +2525,25 @@ candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sg
 cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd qpcR Matrix igraph fdrtool shape]; };
 caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
 capm = derive { name="capm"; version="0.5"; sha256="1pal7v965zyl52fivdqn30w570gvhxjsnafml6jz16x4kszw5jar"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; };
-capme = derive { name="capme"; version="1.3"; sha256="0d4acwp4y8djcry8gr34dx3h8bn8sj3z2di5zl9657czw5289zm8"; depends=[lpSolve]; };
 capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; };
 capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
 car = derive { name="car"; version="2.0-22"; sha256="0jffyz0gv0isc9ww3mv1y40b16lkmh2skvljc93aff5q84plam78"; depends=[MASS nnet]; };
 carcass = derive { name="carcass"; version="1.3"; sha256="1psxdxdqlc999xylizj5vg1p1pzyrikg9gjqvpv4k0q9b5h0nrpj"; depends=[lme4 survival expm arm MASS]; };
 cardidates = derive { name="cardidates"; version="0.4.5"; sha256="1zw8c8jiq8bz748xppwj88z1882qk7k2r0k2gkrsvw7b6c9h35pb"; depends=[boot pastecs]; };
 care = derive { name="care"; version="1.1.7"; sha256="0lgas00qp1cvn3cbimxlli99czvkh6b9hxahzif5fgbnfik4d47y"; depends=[corpcor]; };
-caret = derive { name="caret"; version="6.0-37"; sha256="102rw6gw1mrbr00s8b1bnz2yh2nqk411qdhs6kncs6scalixjb5p"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; };
+caret = derive { name="caret"; version="6.0-41"; sha256="0dwh6j1gvyd34my88kykrpifmnj3slp8q1if5vi428hp1p151cz7"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; };
+caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools pbapply ggplot2 digest plyr lattice gridExtra]; };
 caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
 caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
 caschrono = derive { name="caschrono"; version="1.4"; sha256="1l9hmsacynh73kh14jrp7a42385v78znn9ll1jchzgkyz2x4dibw"; depends=[forecast Hmisc its timeSeries]; };
 caseMatch = derive { name="caseMatch"; version="1.0.1"; sha256="0r8z0dfhaqc5wmcrd1mgq1bn71h41fhk5q3ihffg0s9qsix4pk7j"; depends=[]; };
 cat = derive { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
 catIrt = derive { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
-catR = derive { name="catR"; version="3.3"; sha256="0gmdnavazswrvhj6cphpbbxbgfc9xhs4xr6ndljrjw2rqdp2pys3"; depends=[]; };
+catR = derive { name="catR"; version="3.4"; sha256="0rgzcnqp18wb8m7f3m8mm7pv04a1irlknkrsrr4hhnzs0phf06yz"; depends=[]; };
 catdata = derive { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
 catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; };
 cati = derive { name="cati"; version="0.8"; sha256="0kz58dyq5jacf2w2nvhyh3dvk0vgcrm7fjfirywykbrbh5srfw2a"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume]; };
-catnet = derive { name="catnet"; version="1.14.3"; sha256="099vxi3fy5y4w635mqmbzsyqiswsw76kz3l5vgg8ckrj1cqshh5z"; depends=[]; };
+catnet = derive { name="catnet"; version="1.14.5"; sha256="1h5azkl5b1a25a9fianab4nc4qwwlrmsvhjpfsn91k5mq8449ah0"; depends=[]; };
 catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
 causaleffect = derive { name="causaleffect"; version="1.0"; sha256="1xg0dczqk10nnybm3i9rcnsqr34y86dngb7p6vl1n7bhxrn580jf"; depends=[igraph XML]; };
 causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; };
@@ -2525,7 +2552,7 @@ ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma
 ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[Rcpp pcaPP robustbase RcppArmadillo Rcpp RcppArmadillo]; };
 cccd = derive { name="cccd"; version="1.04"; sha256="0mhqv9hzvw3w6wp23kvw4py54ij6x9r19b87i97wwgqr5rhhh1f3"; depends=[igraph plotrix proxy]; };
 cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[nlme gdata]; };
-ccda = derive { name="ccda"; version="1.0"; sha256="13wxzwpld55rbpbslrgm2f7gamvkbmkaic7xrp1nn4l3lvg236dy"; depends=[MASS]; };
+ccda = derive { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; };
 ccgarch = derive { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; };
 cclust = derive { name="cclust"; version="0.6-19"; sha256="11lzzpr65jw7s0419bdy3w7cq97ysvv52ijb1wgqpa48wh1qbqqd"; depends=[]; };
 cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr Rcpp RcppArmadillo]; };
@@ -2533,7 +2560,7 @@ cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d
 cdcsis = derive { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
 cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.3"; sha256="1fc833ji557y2vb6snlxh90gz1n7fxjfkwjmdcmasj1sfzaalsjy"; depends=[]; };
 cec2013 = derive { name="cec2013"; version="0.1-4"; sha256="199r6b1gkay9a7v1x7v2w8xmxmafvizdyb1dkiq3qylsqvhq994d"; depends=[]; };
-celestial = derive { name="celestial"; version="1.1"; sha256="19yxaa63px9byn5k2k2qr89f5vy73cqb5l4zq4qj1v27g06k5dy7"; depends=[]; };
+celestial = derive { name="celestial"; version="1.2"; sha256="1bwxr37vkgxavl230jmvk1yp3acnkcpc8im10fsxh1nfxys254ap"; depends=[]; };
 cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; };
 cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; };
 censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
@@ -2541,60 +2568,60 @@ censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47v
 cents = derive { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
 cepp = derive { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[trust randtoolbox]; };
 cfa = derive { name="cfa"; version="0.9-3"; sha256="0pl1mxv6jxn3mvlh75gr8as0daklyr7gkh37fcgmn2bwi973sspy"; depends=[]; };
-cg = derive { name="cg"; version="1.0-1"; sha256="0qi3xzjwx303b9m1sddyvz1raw78m5gy9bxqy08hyja2gqj8v855"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; };
+cg = derive { name="cg"; version="1.0-2"; sha256="1rgbk4kvjaw4mbqa19hbnhlinqd4bw4fn2znlxr8wfhzj6648cl3"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; };
 cgAUC = derive { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp Rcpp]; };
 cgam = derive { name="cgam"; version="1.2"; sha256="14vl608bf223jclaxfb6i7irfn9g2dqp76fhw82j4h7w4l47i1c3"; depends=[coneproj]; };
-cgdsr = derive { name="cgdsr"; version="1.1.30"; sha256="0c8n2c6gqhk5klrxmmyf77czn2zwmm1f9cbp8n8yrhdcdqminznm"; depends=[R_oo R_methodsS3]; };
+cgdsr = derive { name="cgdsr"; version="1.1.33"; sha256="0y8cn386jifg2ilml0cp9cafjxaa0xkvjnja1fgarlyf07k3cpcs"; depends=[R_oo R_methodsS3]; };
 cggd = derive { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; };
 cgh = derive { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
 cghFLasso = derive { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
-cghseg = derive { name="cghseg"; version="1.0.2"; sha256="0nz52wlgpl9r9pa41lz7nzk35fvcn3zr0gyliiw8q1nyxl2m0q1s"; depends=[]; };
-cgwtools = derive { name="cgwtools"; version="1.1"; sha256="11ryc20iqz0xwpq0cfjy37f6mnyrwvhf7kkf574j0v9fn6zg2jic"; depends=[]; };
-changeLOS = derive { name="changeLOS"; version="2.1"; sha256="1bld2phnvcwfpqbkg1ycjci4i4dc4di8gjckbqjp997zyr42nnay"; depends=[survival]; };
+cghseg = derive { name="cghseg"; version="1.0.2"; sha256="1x7j62aq5c1xj8ss3pys5160y6vny4pa1wvf6xh59ak2zr4xjm9h"; depends=[]; };
 changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; };
 cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
 chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; };
-checkmate = derive { name="checkmate"; version="1.5.0"; sha256="0zvz2sy7ykx94dc7h8g67vmkphd6x6b133fqcm8xznfxq6kfd972"; depends=[]; };
+checkmate = derive { name="checkmate"; version="1.5.1"; sha256="014wpncs7j488wm0b0ibvz9160mbz8n383wksqp7xk1cp7kpp0qg"; depends=[]; };
 checkpoint = derive { name="checkpoint"; version="0.3.3"; sha256="1pxmaxbm6x1k3c82z2lng869jg9szxi3yn8kxni5w52whihb67xj"; depends=[knitr]; };
 cheddar = derive { name="cheddar"; version="0.1-626"; sha256="16dl267zbqnix739827mvdgchg5xzgz5q14hh8cw2fq089frjlz9"; depends=[]; };
 chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
-chemometrics = derive { name="chemometrics"; version="1.3.8"; sha256="0vd5p2qhd17hr9psk6pg4jvcadz2pjffkjaffva4spa7m7qpp5ss"; depends=[class e1071 gclus lars MASS mclust nnet pcaPP pls rpart robustbase som]; };
+chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[rpart class e1071 MASS nnet pcaPP robustbase som lars pls mclust]; };
 chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; };
 cherry = derive { name="cherry"; version="0.5-10"; sha256="0fs4p5k1lwwlin5fj9z91aw59ybp60phjk293imizg6vpai5h39p"; depends=[bitops lpSolve Matrix]; };
 childsds = derive { name="childsds"; version="0.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; };
 chillR = derive { name="chillR"; version="0.54"; sha256="1qcwspww5nvp6nh26ly6ckqd0jzq4fkq5svjj5a55pvk04xk9frs"; depends=[pls Kendall spam fields]; };
 chipPCR = derive { name="chipPCR"; version="0.0.8-3"; sha256="1qslzbxirpbiqlfcvjrs7z6i4a86a04b9fgfm3ngmkv32ai0zajz"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
-chngpt = derive { name="chngpt"; version="2014.5-29"; sha256="0i8hz8cixy3fx9cpprraqpadrs835zna8y64irp85xhckdrv9xzv"; depends=[kyotil MASS]; };
+chngpt = derive { name="chngpt"; version="2014.12-2"; sha256="1bg2hm5clvq1rj1mnj5fasbwmq0xayj327kwclajami4zcwjwqj5"; depends=[kyotil MASS]; };
 choiceDes = derive { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; };
 choplump = derive { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
 chords = derive { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; };
-choroplethr = derive { name="choroplethr"; version="2.0.0"; sha256="14h07q2plw561dh7q20869yw7rvyhdv1vrcmficqcpy0xw0lhjix"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; };
+choroplethr = derive { name="choroplethr"; version="2.1.1"; sha256="1d7i5lk3j37n4fs4k41jdh829n4qyx85h0sr7h3fb313an3aqhd2"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; };
+choroplethrAdmin1 = derive { name="choroplethrAdmin1"; version="1.0.0"; sha256="1pnj5155h809sh9mp703y72348mi7mxnwid07kp1s489512ysfwr"; depends=[ggplot2]; };
 choroplethrMaps = derive { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; };
+chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[dplyr httr data_table]; };
 chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; };
 chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; };
 cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
-circlize = derive { name="circlize"; version="0.1.3"; sha256="100jzq1r2m3h34vlpgkhdrvw5hkgb6prhpynda5mbzyan185ag2q"; depends=[GlobalOptions]; };
+circlize = derive { name="circlize"; version="0.2.1"; sha256="04wrk515gx2ccmniimddpqbjc6y8x3b12w0n93j7lizmck4zsrzj"; depends=[GlobalOptions]; };
 circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
-cit = derive { name="cit"; version="1.2"; sha256="1mk3bgac8qhc48vm0z8fhygsrrd5mqznyblbfv03y4rjiyh7f2qs"; depends=[]; };
+cit = derive { name="cit"; version="1.3"; sha256="05gr9pb01l4rs79rpgcj8mds61n3kv50fgcw2bcibzs1d1za33ig"; depends=[]; };
 citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
 citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
-cjoint = derive { name="cjoint"; version="1.0.2"; sha256="1zhgz5ckh45wrmiijdvhyrzic3x1ibm23nidci2a7wwvxzly8nbj"; depends=[sandwich lmtest ggplot2]; };
+cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[sandwich lmtest ggplot2]; };
 clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[cluster class]; };
 cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp Rcpp RcppArmadillo]; };
 class = derive { name="class"; version="7.3-11"; sha256="1j6wqirih9x6q50vq21543np4i99ia6ih2ffriiw1gms8xmdfrsk"; depends=[MASS]; };
 classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[]; };
-classInt = derive { name="classInt"; version="0.1-21"; sha256="1sld7bw1x2i8qqj0fbavifl9ni8724fg2wrwjyg657ib8f2yqj5z"; depends=[e1071 class]; };
+classInt = derive { name="classInt"; version="0.1-22"; sha256="0r9940bv6n43i6vlcgc19bvmcv3zlw0bi9zfs3scvah68rdb7v7l"; depends=[e1071 class]; };
 classifly = derive { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
 classify = derive { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[Rcpp plyr ggplot2 lattice R2jags reshape2 Rcpp]; };
-classyfire = derive { name="classyfire"; version="0.1-1"; sha256="19ps6ny2l8iawfgn9dnq4wrqkrmhg77y3jpxd1sjvffd0i5yhp31"; depends=[snowfall e1071 boot neldermead ggplot2 optimbase]; };
+classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[snowfall e1071 boot neldermead ggplot2 optimbase]; };
 clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp Rcpp RcppEigen]; };
 clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 sp raster reshape2 plyr scales]; };
-clickstream = derive { name="clickstream"; version="1.1.2"; sha256="1l59411jsph6v4rkwanbjcgjcyknywl7ri0hh7z957v02h4m7as1"; depends=[igraph plyr reshape2 Rsolnp]; };
+clickstream = derive { name="clickstream"; version="1.1.3"; sha256="0vhwhklyxpirza6j7cq8rcv7mli2w1pkvld70ih8i1xb1dx3y19x"; depends=[igraph plyr reshape2 Rsolnp]; };
 climdex_pcic = derive { name="climdex.pcic"; version="1.1-4"; sha256="1jn4hzngmwag9jxhz6w45xzfn0cwiyiik6ylyns2zmil7avjplmr"; depends=[PCICt caTools Rcpp]; };
 clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
 clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
 clinfun = derive { name="clinfun"; version="1.0.6"; sha256="00prrdm6qm5p2sjjlhi99msvqpxcm492z378wgl65iwf0jywdnpw"; depends=[mvtnorm]; };
-clinsig = derive { name="clinsig"; version="1.0-4"; sha256="0w2qb9k6fkw9lqi0ib6kzi6pvpb5hpq78w9x2jjs0yyqsj0rydwv"; depends=[]; };
+clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; };
 clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp Rcpp]; };
 cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; };
 clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; };
@@ -2603,11 +2630,12 @@ clues = derive { name="clues"; version="0.5-4"; sha256="0pgd3vjfplvsfn3nw6sqlkfs
 clustMD = derive { name="clustMD"; version="1.0"; sha256="1i3c790k300a7y5xhqanp8f1bid2q3a0ajwgf5qsr6dv3ld4h7vj"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; };
 cluster = derive { name="cluster"; version="1.15.3"; sha256="014aycvxnw86rvzg8z6n9q2g7h5bzz6slz6l7vcaiiqpk9jxijj1"; depends=[]; };
 cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
+clusterCrit = derive { name="clusterCrit"; version="1.2.4"; sha256="150iq5gp5czb8m7niyi294jjy3dbfpwccgak7scahd5kz2vs07c7"; depends=[]; };
 clusterGeneration = derive { name="clusterGeneration"; version="1.3.1"; sha256="0lvkqqcshnaqk40s5y736r53y9yss3hlvgs6gs7p8ksk14vj7i2q"; depends=[MASS]; };
 clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
 clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
 clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-clusterSim = derive { name="clusterSim"; version="0.43-5"; sha256="07vdvhlvk31srnw1vwgwqgj2dimgbagp7mnz7n1rwcm1qxnndsmy"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; };
+clusterSim = derive { name="clusterSim"; version="0.44-1"; sha256="18l643w3zps3bhldc5z9zqa5sy1c459r0hrzb26ykydnh8xbahdy"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; };
 clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; };
 clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
 clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; };
@@ -2617,25 +2645,25 @@ clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4
 clustvarsel = derive { name="clustvarsel"; version="2.1"; sha256="0sj9065s604sjzmlziak9xxl0xhplmp1g3d5dl9smwf2x8bb80mw"; depends=[mclust BMA foreach iterators]; };
 clv = derive { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[cluster class]; };
 cmaes = derive { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
-cmm = derive { name="cmm"; version="0.7"; sha256="16pw9namrc3crcqnsn4ckk8m4r3af908wm2siw6fzbk6hwac17i6"; depends=[]; };
+cmm = derive { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7mbp70i1xsysfzki1z6xr19"; depends=[]; };
 cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
 cmprskQR = derive { name="cmprskQR"; version="0.9.0"; sha256="1vnrfhlmmyamkpd8lsfznfpcq0mspkiwn3j23yj4sarfx5n32s9a"; depends=[survival quantreg]; };
 cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; };
 cmvnorm = derive { name="cmvnorm"; version="1.0"; sha256="18aqjxr2rm4v813w25bp0jjm3110b22r8yskmnpspcw44666829v"; depends=[emulator elliptic]; };
-cna = derive { name="cna"; version="1.0-0"; sha256="1pyglciid1q22mlkdm1r2wc2sbwcl98m26hzdgwrjmkvdn4r4166"; depends=[]; };
-cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="1rgs7446qb40b4qi1i4m5c3111kbqap4z1g7s01pnbylil0m80fd"; depends=[rgl tcltk2 tkrplot]; };
+cna = derive { name="cna"; version="1.0-2"; sha256="06q335jr4kdydk79s8f1fg67wflhcb5ngl6gk1fqb096zkmhszxf"; depends=[]; };
+cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="0iwsaqqnh142syag91rzwwsc9n2qiw4xh5x1gjsgc74ywdm4g5fz"; depends=[rgl tcltk2 tkrplot]; };
 coalescentMCMC = derive { name="coalescentMCMC"; version="0.4"; sha256="115kvrk46hzhr83vkk57jn90dw2fvj1pl56w6mlja16i93yaz10h"; depends=[ape coda Matrix phangorn]; };
 coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
-cobs = derive { name="cobs"; version="1.2-2"; sha256="1g8qwnda7fqrqknz7lnlq47kqs5k83pg9qq205alm12jgx3180a1"; depends=[SparseM quantreg]; };
+cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[SparseM quantreg]; };
 cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; };
-cocor = derive { name="cocor"; version="1.0-0"; sha256="173kszv661hailav69khqh9c15y9m5n6l7crc9i6vf71yrig1vqs"; depends=[]; };
+cocor = derive { name="cocor"; version="1.1-0"; sha256="1qmpgs9krbyvr8803r4y0gxwz2wl5frkzyxaa9756q27bw2igyrp"; depends=[]; };
 cocorresp = derive { name="cocorresp"; version="0.2-3"; sha256="0r1kmcwnf476xbw7r40r3vbn6l1zgmaiq6cpgrvnyss7i5313q8s"; depends=[vegan]; };
 cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; };
 coda = derive { name="coda"; version="0.16-1"; sha256="0575pbx37jn7ljgjybl2v7rry55l6s6cb3a0m9znh4blln405q4i"; depends=[lattice]; };
 codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
 codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; };
-codetools = derive { name="codetools"; version="0.2-9"; sha256="0d3kfkk8xngjin825ynlcxp9xgcr4z33n1zbj239j04rpicxmsvc"; depends=[]; };
-coefficientalpha = derive { name="coefficientalpha"; version="0.3.2"; sha256="1mlcgzkpxijflzwqx6iq411j0m17d76w0vpj0mb3p8yz007mcyrv"; depends=[rsem lavaan]; };
+codetools = derive { name="codetools"; version="0.2-10"; sha256="0giqf14kmqps181jfb78mgii1852rp4kz0k96pabm4h0yv02b49j"; depends=[]; };
+coefficientalpha = derive { name="coefficientalpha"; version="0.3.3"; sha256="1r38jlcl3z16xc410bcgcw1ck6nnby1mqwx5sk6g0lm3jbjcka57"; depends=[rsem lavaan]; };
 coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; };
 coenocliner = derive { name="coenocliner"; version="0.1-0"; sha256="0hys1a4ai09pax5ydcaq39ll3rdjzyhgvz72z0iv9fwv4fbmwbr9"; depends=[]; };
 coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
@@ -2644,26 +2672,23 @@ cold = derive { name="cold"; version="1.0-3"; sha256="17nlqhp5415m8wjkb2ykmk1q3l
 coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; };
 colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
 colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
-colorscience = derive { name="colorscience"; version="1.0.0"; sha256="0429vlirc95nblmhs5lplh3lw9aay9qnkpib77rbmjzczv551m3d"; depends=[Hmisc munsellinterpol pracma]; };
 colorspace = derive { name="colorspace"; version="1.2-4"; sha256="1ppvkcclqjdj1b9j59sc2gda55kmwq9l00n5643ggjb15m2dm76h"; depends=[]; };
 colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
-colourlovers = derive { name="colourlovers"; version="0.1.3"; sha256="09hacmzcw6am8l6725wny2rrrzzn46vk2730ni7rgynk49b2wr9h"; depends=[XML RJSONIO png]; };
+colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[XML RJSONIO png]; };
 comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; };
 combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
 comclim = derive { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; };
 commandr = derive { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
 commentr = derive { name="commentr"; version="0.1"; sha256="0kyi7xd2f2b1avk78bmkbagyjqwwx21hca670n38k1a28kvnjpix"; depends=[stringr]; };
-comorbidities = derive { name="comorbidities"; version="1.0"; sha256="01aisxy4cx3jw37cg6mwvfj4nv10ndmwjxf8xsfv7s20hdb0gmqn"; depends=[]; };
 compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; };
 compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
-compare = derive { name="compare"; version="0.2-4"; sha256="0fhw7y7xwrv79wxvs9gy4xddjzc6hh97m81a10j64jssy4p291b6"; depends=[]; };
+compare = derive { name="compare"; version="0.2-5"; sha256="073apjmw5hwslhnjwhff0m8lwszv29n6vbqy0wxl39pyzg7q2x41"; depends=[]; };
 compareGroups = derive { name="compareGroups"; version="2.0.5"; sha256="1r07g5l0x8bkgm13qzw992aw0wn2q2wcadidr9444nqhk2l8809b"; depends=[Hmisc xtable gdata SNPassoc survival epitools HardyWeinberg]; };
 compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
 comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
 compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; };
 compendiumdb = derive { name="compendiumdb"; version="0.1.0"; sha256="1dvgkbrsj2fw3mr454mfqhjcz0lbhvz848hgj1ld76p10zhs2vyk"; depends=[RMySQL]; };
-complex_surv_dat_sim = derive { name="complex.surv.dat.sim"; version="2.0.0"; sha256="1x4whyq0bds0zblppcvv7lk6qy567c37x19n1r0xjgyl3id40f7c"; depends=[eha statmod]; };
-complmrob = derive { name="complmrob"; version="0.5.5"; sha256="1klabkx5q27h0na4987bbd3xs1v3nmy5nxc5izs7y0x2s8i324v1"; depends=[robustbase ggplot2 boot scales]; };
+complmrob = derive { name="complmrob"; version="0.5.8"; sha256="0hhn6w8kvwzs2qflqf8qiqac0n93pi4rkbh8idbcfn8shkhnjzjs"; depends=[robustbase ggplot2 boot scales]; };
 compoisson = derive { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
 compositions = derive { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[tensorA robustbase energy bayesm]; };
 compound_Cox = derive { name="compound.Cox"; version="1.4"; sha256="08sdkq040zk9mb1lcy4nm32gwab26vaig8brp2n3aizagx9fv3r9"; depends=[numDeriv survival]; };
@@ -2676,18 +2701,18 @@ condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqq
 coneproj = derive { name="coneproj"; version="1.5"; sha256="1xk6v5hp5v5hcxnl8fhb9ccv343yjpswrgm65p4046sw0b764pny"; depends=[Rcpp RcppArmadillo Rcpp]; };
 conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
 confidence = derive { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[knitr markdown plyr xtable ggplot2]; };
+conformal = derive { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret ggplot2 randomForest e1071]; };
 confreq = derive { name="confreq"; version="1.3"; sha256="0dxd7zdcrgj95f4x19izysqjixgpwi1xx752bwdc28d7h1ds2ym5"; depends=[gmp]; };
-conicfit = derive { name="conicfit"; version="1.0.0"; sha256="032a9ajrv1xl2i4p3a32fyzg6s76vngdcmwqnh2lgk72srlhryzj"; depends=[pracma geigen]; };
 conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
 conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
 constrainedKriging = derive { name="constrainedKriging"; version="0.2.3"; sha256="1hppfc0pv0jphmj7pip1cn65sfrcwvnpymlvpyp7sbn3nmy2qqrb"; depends=[sp spatialCovariance rgeos RandomFields]; };
 contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; };
-conting = derive { name="conting"; version="1.3"; sha256="1aw3hp88xif5s94388g4805xqnv21dj47wshgkbg33dn11lf2hwf"; depends=[mvtnorm BMS gtools tseries coda]; };
+conting = derive { name="conting"; version="1.4"; sha256="0ykyyzal2pcyrh8q65d4pab8a8nal9x276q2624jb9nhbb65vz4k"; depends=[mvtnorm BMS gtools tseries coda]; };
 contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
-convexHaz = derive { name="convexHaz"; version="0.2"; sha256="0lfksb01iilhyjbr9wj3w4s9nbkdcl649w86fp2mz6s6makmq84x"; depends=[]; };
+convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape geiger MASS phytools cluster]; };
 cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[reshape2 gmp ggplot2]; };
 cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[igraph optrees gtools]; };
-copBasic = derive { name="copBasic"; version="1.6.0"; sha256="1sqh61ln0ih731frdgisslll2qf8p3896abjap4f79fy1dn83p70"; depends=[lmomco]; };
+copBasic = derive { name="copBasic"; version="1.7.0"; sha256="1lqlxka3x5q17g9i9fzm9m2zssd5cm3dy56s7wm8rxgj30bxddm4"; depends=[lmomco]; };
 copCAR = derive { name="copCAR"; version="1.0"; sha256="0rq432w959p7drx73vsrdh5dhi2wy7dsjhhb4nh9wm36kkzki5ca"; depends=[numDeriv Rcpp spam Rcpp RcppArmadillo]; };
 copula = derive { name="copula"; version="0.999-12"; sha256="131wr6a7qxsdsl9f5amjkzj2wwgdwlg85a1pmd0bflzfi86dvrdf"; depends=[Matrix lattice gsl ADGofTest stabledist mvtnorm pspline]; };
 copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula vines mvtnorm truncnorm]; };
@@ -2709,7 +2734,7 @@ cosso = derive { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5k
 costat = derive { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; };
 cotrend = derive { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; };
 couchDB = derive { name="couchDB"; version="1.3.0"; sha256="153zxi2liv932r7mphhzgxw4wyizh5iyk62ad6x64av31kd2qzsn"; depends=[RCurl bitops httr rjson]; };
-countrycode = derive { name="countrycode"; version="0.17"; sha256="0rmmqh0x34bdnyb19r719rsm46q8193lf7wcynd5s3c2i4vbkx8n"; depends=[]; };
+countrycode = derive { name="countrycode"; version="0.18"; sha256="1by3xws2c43ryz4fnlq85yvgnwnvzmvjbd18cafirlwpl6liy2ic"; depends=[]; };
 covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; };
 covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; };
 covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; };
@@ -2725,9 +2750,10 @@ cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4
 cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; };
 cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie Matrix]; };
 cqrReg = derive { name="cqrReg"; version="1.0"; sha256="04hx7zysymw00dnfifk30cy1r63vnj6ycq37g25lgq38qr6bbbis"; depends=[Matrix Rmosek Rcpp Rcpp RcppArmadillo]; };
+cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m6maj2xr00adsab4c0c5rm7x2wf"; depends=[]; };
 crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; };
 cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
-crank = derive { name="crank"; version="1.0-6"; sha256="1v3xi29hslggdglb8j7qjb631pjc52ljkz2qi1ivqim654skzhwd"; depends=[]; };
+crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; };
 crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
 crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; };
 crayon = derive { name="crayon"; version="1.1.0"; sha256="03l7sw6ilr4hmahk921kkq4hlvlscginrq3mw8aypc4wb6y32qhm"; depends=[memoise]; };
@@ -2741,33 +2767,33 @@ crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3
 crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[survival nbpMatching]; };
 crossval = derive { name="crossval"; version="1.0.2"; sha256="1imqmrr86yr2ml9x8cycnlr7d8yymyyypi87kxqjc32s2r16s0cx"; depends=[]; };
 crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; };
-crqa = derive { name="crqa"; version="1.0.4"; sha256="05sp7dbi89wanhjlrbqb3ms9gl7s1h1iww26s4iy84i0pr0wg7br"; depends=[Matrix tseriesChaos fields]; };
+crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9mnhzi4dy08d810nm16wiqabkw4"; depends=[Matrix tseriesChaos fields pracma]; };
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
 crrstep = derive { name="crrstep"; version="2014-07.16"; sha256="15di36j44wxvwl7zhnz3s16lf65rnpj1bvgxf0glkkm0pw94ibrl"; depends=[cmprsk]; };
-crs = derive { name="crs"; version="0.15-23"; sha256="0psb0qaj7xxpfsxylzyzsc4pzfybrrzjzgmr974znaqqwkngdkl4"; depends=[boot]; };
+crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
 cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; };
 cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; };
-csn = derive { name="csn"; version="1.1"; sha256="1cv5pv6g1b635c5bamq43339vh1rxadwjl4vxyrx56991wyr36sl"; depends=[mnormt]; };
+csn = derive { name="csn"; version="1.1.1"; sha256="0ns92jqbsc7hnwwkph47mi8z53mj5ygrpys75l9n4d0qmdgpw0nn"; depends=[mnormt]; };
 cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
 csvread = derive { name="csvread"; version="1.1"; sha256="0bk6jjjv88d7l511a5fa1530i8pnzr3brambchl69mv9h6si14bq"; depends=[]; };
 cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; };
-ctv = derive { name="ctv"; version="0.8-0"; sha256="1rh38i872hmhj36lmpg7c2p0p7hcvy2kfr5bfl9w7mqn9d9n39qs"; depends=[]; };
+ctv = derive { name="ctv"; version="0.8-1"; sha256="1fmjhh4vr4vcvqg76dzp1avqappsap5piki1ixahikwbwirxcwvw"; depends=[]; };
 cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; };
 cubfits = derive { name="cubfits"; version="0.1-0"; sha256="0iylwxzz2aa70q1xqk8r1rkfiiscj3blwq7dshkwshh91l2fgzfw"; depends=[]; };
-cudaBayesreg = derive { name="cudaBayesreg"; version="0.3-15"; sha256="02akp2ib06hqb1vfqj27vj4y5m0pimy6qg69argq6g0bz5msrgp8"; depends=[cudaBayesregData oro_nifti]; };
+cudaBayesreg = derive { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; };
 cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
 cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
 cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
 cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
-curl = derive { name="curl"; version="0.2"; sha256="014mmchzngb3pwxf35127w72dn7fi8jh4d9dqi51lan5yszbsrn3"; depends=[]; };
+curl = derive { name="curl"; version="0.4"; sha256="0w9i527ww9603w25pqw7mawlsjxdpgqd8az6yppdxpvycci41j0f"; depends=[]; };
 currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[survival cmprsk]; };
 curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; };
 curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; };
 cutoffR = derive { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
 cuttlefish_model = derive { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
-cvAUC = derive { name="cvAUC"; version="1.0.2"; sha256="0472hy9pmkfbdqns5cha23qqxp236n5yfzapysi0gbwqqy0jk824"; depends=[ROCR]; };
+cvAUC = derive { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[ROCR data_table]; };
 cvTools = derive { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase lattice robustbase]; };
 cvplogistic = derive { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q7665r64rdslxp35b7drdss4mys42ks54xdydcminns9"; depends=[]; };
 cvq2 = derive { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
@@ -2779,17 +2805,18 @@ cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bf
 cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
 cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
 d3Network = derive { name="d3Network"; version="0.5.1"; sha256="1nc5gca9jsny5jj8m37081l3rwvmp1cxqpqaimzyr475j6cac40r"; depends=[plyr rjson whisker]; };
-dae = derive { name="dae"; version="2.1-7"; sha256="0wchpq8hg2s33nm86dj6vqqvajg2062gbrxg6z7n9i2r6s1hmdjv"; depends=[lattice]; };
-daewr = derive { name="daewr"; version="1.0-10"; sha256="09ra3zkmvxdxn0fvrbzixvvgddb066bba9q5zih5kifc8kd0a5xp"; depends=[FrF2 BsMD]; };
+dae = derive { name="dae"; version="2.4-0"; sha256="1gf3x751if3g2p7yy8jsvpn612w36mjhkz8qkh0y0kajm0nipzkb"; depends=[ggplot2]; };
+daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; };
 dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
 dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
 dagbag = derive { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; };
 dams = derive { name="dams"; version="0.1"; sha256="0h0chh9ahsfvqhv1a0dfw88q7gdl1d0w11qcw0w4qmc2ipsl52i6"; depends=[RCurl]; };
 darch = derive { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n0kgcl50yw4w3i9sdd9k20glvwpsx"; depends=[futile_logger ff]; };
 darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
+dashboard = derive { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
 data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; };
 dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
-dataRetrieval = derive { name="dataRetrieval"; version="2.0.0"; sha256="11385x2yp6fv5mqa47q58ijxfb895himcjk1ac3pkhbqzkwqzphx"; depends=[XML RCurl reshape2 lubridate plyr httr]; };
+dataRetrieval = derive { name="dataRetrieval"; version="2.1.0"; sha256="1ncackbcf3vqnaf01g5xcbdyjghkfn0gilmrdp2gzfgkd3jp4lx2"; depends=[XML RCurl reshape2 lubridate plyr]; };
 datacheck = derive { name="datacheck"; version="1.0.4"; sha256="1ns5cmsvmqswzpa33mqcmj92b4j3l32v29ki3crg0kayrpdmyrbw"; depends=[Hmisc shiny stringr]; };
 dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; };
 datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; };
@@ -2801,30 +2828,29 @@ dataview = derive { name="dataview"; version="2.0-9"; sha256="0519h2c33v04vwdd8n
 date = derive { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; };
 dave = derive { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; };
 dawai = derive { name="dawai"; version="1.1"; sha256="0icf8iys980z0agyba94xa16400p2vdvg8hg52vvlgfc85ikqfkx"; depends=[mvtnorm ibdreg boot]; };
-db_r = derive { name="db.r"; version="0.1.0"; sha256="0mw7zi25wkdpq8xa59fk0xszvncychfz3k8n8bgp4sclz1m8j0m2"; depends=[DBI rjson stringr]; };
+db_r = derive { name="db.r"; version="0.1.3"; sha256="1zjsj0rxg9wysl1gzm7ggphd5mi02mj0bn80kmbx1vb7aa7bnxxh"; depends=[DBI rjson RSQLite stringr]; };
 dbConnect = derive { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[RMySQL gWidgets]; };
 dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
 dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
 dbarts = derive { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; };
 dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
 dbmss = derive { name="dbmss"; version="2.1.2"; sha256="0rvmxlpy3745y4zfcf6wi6z2nb3vwd92cliyvh6k0ppgq6r7l2q0"; depends=[spatstat Rcpp cubature Rcpp]; };
-dbstats = derive { name="dbstats"; version="1.0.3"; sha256="1l7yy6m98pkkrzycxcajjjw2h0crbm0fazyq9xg8875ar29i291p"; depends=[cluster pls]; };
-dcGOR = derive { name="dcGOR"; version="1.0.3"; sha256="1qv4c9kqvm7rig573d4mb5iccz9wp6nmynd8kpf3d9ipijf9p365"; depends=[Matrix igraph dnet]; };
+dbstats = derive { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; };
+dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[Matrix igraph dnet]; };
 dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; };
 dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; };
 dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; };
 dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
 dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-ddalpha = derive { name="ddalpha"; version="1.0.6"; sha256="1scfmq6zsbd15n6mnnplj0c4a0yl8bp7nqqh91cvvycggb5y0a1v"; depends=[MASS class robustbase BH]; };
-ddepn = derive { name="ddepn"; version="2.2"; sha256="1zwz664jq6qvf1lcwyfn6kyn6dwxhh2nnyirayx0vqs9c6xzpir7"; depends=[lattice coda igraph gam gplots]; };
+ddalpha = derive { name="ddalpha"; version="1.1.0"; sha256="0kij4s24v4zchlfk4za5373ispapd1yzkp9ld2bwv4w562amnl5w"; depends=[MASS class robustbase Rcpp BH Rcpp]; };
 ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; };
 deSolve = derive { name="deSolve"; version="1.11"; sha256="014fbrgzlarg2w27kq9qy7631hvhlf7ldrn5g8x2xibb260832s1"; depends=[]; };
-deTestSet = derive { name="deTestSet"; version="1.1.1"; sha256="1qc8sj44zlndyr9k5r179pmy8kyq0wawz7q2xgdmnx27j2rjls43"; depends=[ReacTran]; };
+deTestSet = derive { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vakiks04rz7hgv9b5j6s77acavd5s5mpi51ysh7"; depends=[deSolve]; };
 deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
 deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
 debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
 decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; };
-decompr = derive { name="decompr"; version="1.2"; sha256="0fklg2xv4xbd9bxvmgm2gz0gc3pb4g54xl5gb28r80cm29vg1js4"; depends=[]; };
+decompr = derive { name="decompr"; version="1.3.2"; sha256="1d8i2qjxwspqqwlmiykpq8nk13kmxbfdhaxg3jmp70876hsxjp73"; depends=[]; };
 decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
 deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; };
 deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
@@ -2844,7 +2870,7 @@ denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmkn
 densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; };
 denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
 depend_truncation = derive { name="depend.truncation"; version="2.1"; sha256="1b13mqm8pjw0r0z5h7vizz15nzhslxhcn4cb8pzadyq98mcmk4g2"; depends=[mvtnorm]; };
-depmix = derive { name="depmix"; version="0.9.12"; sha256="0brs6cskrk52dn41zaqa59dxz377sl9lnh89457d3ykbj4jbc97c"; depends=[MASS]; };
+depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; };
 depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; };
 depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; };
 depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
@@ -2856,13 +2882,12 @@ desirability = derive { name="desirability"; version="1.6"; sha256="17g998fmps4y
 desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
 detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; };
 detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
-devEMF = derive { name="devEMF"; version="1.2"; sha256="14nqx1gy6hlkmzrrayd7kgljla9flxx4xm329436znd66184sass"; depends=[]; };
-devtools = derive { name="devtools"; version="1.6.1"; sha256="0aza8y80bb9cv8i9vx1w2511qzf0anssig5xry0mnnpdipk7gjb5"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite]; };
+devtools = derive { name="devtools"; version="1.7.0"; sha256="0d1hic61niw4fkjw9jnzslc25jcvprjn8mn6wapfpxpkm63499ff"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite roxygen2]; };
 df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
 dfcomb = derive { name="dfcomb"; version="1.0-1"; sha256="159lgcsanhxiip18f9cgsska1nij7yg9rrxfnyhyk3l7d8vf1liq"; depends=[BH RcppProgress Rcpp]; };
 dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; };
 dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
-dfmta = derive { name="dfmta"; version="1.0-3"; sha256="1nv9wdvj4lc3zs05v99fksdsjrjhx0b10p06ah8jbb76qh9p4v3r"; depends=[RcppArmadillo BH RcppProgress Rcpp]; };
+dfmta = derive { name="dfmta"; version="1.1-0"; sha256="0sxxiqj7in4g1hah0kmslh3bcj3grrb7slq7lh9xbgf0cfw5j7sr"; depends=[RcppArmadillo BH RcppProgress Rcpp]; };
 dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; };
 dglars = derive { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; };
 dglm = derive { name="dglm"; version="1.8.1"; sha256="12q49nf30ji4c7vysf2s48bif7crwlmqn8cx0wy23xlhj5x2p4b3"; depends=[statmod]; };
@@ -2876,12 +2901,14 @@ dichromat = derive { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3m
 dicionariosIBGE = derive { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
 dielectric = derive { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
 difR = derive { name="difR"; version="4.5"; sha256="0qlaqpywyjggw74h5y5r2aivcyknc6b7l8b1p69g3lyx4d2hz8wp"; depends=[lme4 ltm]; };
-diffEq = derive { name="diffEq"; version="1.0"; sha256="17b6yw5xhlk70wvv58348hy1237sjwkxfrgkyw876piy50dxmnz8"; depends=[deSolve rootSolve bvpSolve ReacTran diagram deTestSet scatterplot3d]; };
+diffEq = derive { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[deSolve rootSolve bvpSolve ReacTran deTestSet shape]; };
 diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; };
 diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; };
+diffeR = derive { name="diffeR"; version="0.0-1"; sha256="06gfff2108g81h5x3g0mzda64hvpzz92y5vh3qgxfr8dbldcvmvn"; depends=[rgdal raster ggplot2]; };
 diffractometry = derive { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
 diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[scatterplot3d igraph Matrix]; };
-digest = derive { name="digest"; version="0.6.4"; sha256="06xbklq6laffv609hsfqyj04fhdnr9bgjh6ala7253h9vvkjch1k"; depends=[]; };
+digest = derive { name="digest"; version="0.6.8"; sha256="0m9grqv67hhf51lz10whymhw0g0d98466ka694kya5x95hn44qih"; depends=[]; };
+digitalPCR = derive { name="digitalPCR"; version="1.0"; sha256="0gjxlw0f2msh2x5jpzkpq8xc67zpv560q4vql5nwifm44dwar753"; depends=[]; };
 dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp Rcpp]; };
 dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
 diptest = derive { name="diptest"; version="0.75-6"; sha256="158azvdf76h5mp26lw2mjzwp4hwc2psqd9kn5989y4a1jmzxp2bg"; depends=[]; };
@@ -2889,12 +2916,12 @@ directPA = derive { name="directPA"; version="1.0"; sha256="16bllp7afb83y73zr5wx
 directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; };
 dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
 disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
-disclapmix = derive { name="disclapmix"; version="1.5"; sha256="03y1ajaz52kar5wj8csh66kdm8ywin9jpwnj40mkz6fjqi50lhb1"; depends=[Rcpp disclap cluster Rcpp]; };
+disclapmix = derive { name="disclapmix"; version="1.6"; sha256="0g1yg4n4pfy0295faw2scfh45m978ymmlx9bl3h8849kfaizkysi"; depends=[Rcpp disclap cluster Rcpp]; };
 discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
-discreteRV = derive { name="discreteRV"; version="1.1.2"; sha256="1mq05an70m7k36ip22igbmb2i63gxxf7y9ivb5wn25yx0fynarpk"; depends=[]; };
+discreteRV = derive { name="discreteRV"; version="1.1.3"; sha256="1xsy596w080p3gzxrhvyzs1amic5xmqygzialyhz8mywywir4s57"; depends=[plyr]; };
 discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
 discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
-diseasemapping = derive { name="diseasemapping"; version="1.1.2"; sha256="0sl8cxd0iq0cb1qqkhqcxikzwq361k4891vig15n3z8aj39vn0dw"; depends=[sp]; };
+diseasemapping = derive { name="diseasemapping"; version="1.1.5"; sha256="1v1pbsi15dizclmpqqjiwkwfv55ai4hky71rza4nfmyffjznwdz8"; depends=[sp]; };
 diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; };
 dismo = derive { name="dismo"; version="1.0-5"; sha256="1zzzj4r96a35ghngszym1dg1wbr8mvinn7cvmqwnnjn3c2zq4w0g"; depends=[raster sp]; };
 disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; };
@@ -2917,7 +2944,7 @@ distrTeach = derive { name="distrTeach"; version="2.5"; sha256="0a7qfqpirzcd94dv
 distrom = derive { name="distrom"; version="0.3-1"; sha256="17x58lx411wlb153rv1nlmf1g528w1az8nsswvwscv15n7bvdkdf"; depends=[Matrix gamlr]; };
 divagis = derive { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; };
 diveMove = derive { name="diveMove"; version="1.3.9"; sha256="0782b8fvh676g6fy05g1da52q398rxmgz46vk6yxwrmnvg78wcq5"; depends=[caTools KernSmooth quantreg geosphere]; };
-diveRsity = derive { name="diveRsity"; version="1.9.5"; sha256="0rybnjkkxsam0fhsfcxb2h00p65169iw8kb7xgzzgzdfi258zp9s"; depends=[ggplot2 shiny qgraph Rcpp Rcpp]; };
+diveRsity = derive { name="diveRsity"; version="1.9.73"; sha256="07lln4fkphwk8kgvw4hsi7rghpwza8967z2gkb2265l28irv7ffm"; depends=[ggplot2 shiny qgraph Rcpp Rcpp]; };
 diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[deSolve ape subplex Rcpp Rcpp]; };
 dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[splancs spatstat]; };
 dkDNA = derive { name="dkDNA"; version="0.1.0"; sha256="1waqj8l48yqlzi3rb3ilxyx79n5d4w0sp02flvynwaxck6jvh8gc"; depends=[]; };
@@ -2929,51 +2956,54 @@ dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a
 dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; };
 dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
 dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[igraph Matrix]; };
-doBy = derive { name="doBy"; version="4.5-12"; sha256="0ivrkvpwvvfd3sfsqlw4hwvzg87bdx227xv0jyzs31j2z18bw1v3"; depends=[survival MASS Matrix]; };
+doBy = derive { name="doBy"; version="4.5-13"; sha256="07ppghcf381wc9s9igsi3viy6p86b5bmpfm1s8iwq7ca4j89qw42"; depends=[survival MASS Matrix]; };
 doMC = derive { name="doMC"; version="1.3.3"; sha256="0g5psgk92b2zk9fkap3a86haay2y0kfz75cyk3d1ila9m7cd2cn4"; depends=[foreach iterators]; };
-doMPI = derive { name="doMPI"; version="0.2"; sha256="0cvws4zwbjj9ji0s69qy1843404a221pyxg9y35ihfcrjknfjc0l"; depends=[foreach iterators Rmpi]; };
+doMPI = derive { name="doMPI"; version="0.2.1"; sha256="1d2pkxsap656l7h88q37ymy1jw0zd4n9h892511a1a230dxwc0xh"; depends=[foreach iterators Rmpi]; };
 doParallel = derive { name="doParallel"; version="1.0.8"; sha256="1z6cwqnjvqsbck44padqkv4r75cy32p5vrlkkan4mq84cc8062nx"; depends=[foreach iterators]; };
 doRNG = derive { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach rngtools iterators pkgmaker]; };
 doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[rredis foreach iterators]; };
 doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; };
-docopt = derive { name="docopt"; version="0.3"; sha256="1qiivvbqx9mirzqqg3wbj7mi5fdw5xjsq983pq4fpms6fpx4j9kq"; depends=[stringr]; };
+docopt = derive { name="docopt"; version="0.4.2"; sha256="0x2n79iw1818qsmdvyjyglaa8jzp91nahrijd9aijdqxdhb1mp8r"; depends=[stringr]; };
 documair = derive { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
 domino = derive { name="domino"; version="0.2-1"; sha256="1ix7m8khlxdn1axxc1jxvjmqd0np2h2z5nb9i188jk3zzpdw11ka"; depends=[]; };
 dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; };
 dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiazlgllvd3hhk4gqjd2wizr2jc5dkwfl4qn"; depends=[]; };
 dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[magrittr falsy]; };
 downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; };
-dpa = derive { name="dpa"; version="1.0-3"; sha256="0chkbbqxpq5fmqzr74jvflls9h0i2y25jp8gvlg3pfam9j07w7i5"; depends=[sem igraph]; };
-dpcR = derive { name="dpcR"; version="0.1.3.1"; sha256="0nlzjq3b9i76l1ngvcd32c8jl3z6cwn2fhg75lrgrwl6fl2v46jb"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; };
+dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[sem igraph]; };
+dpcR = derive { name="dpcR"; version="0.1.3.2"; sha256="04njbh1jjhj869wi5c3nr6kffn166libi9wcycf26d7hann8frwz"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; };
 dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
-dplR = derive { name="dplR"; version="1.6.0"; sha256="1rjb10adhycp16xav7z5c93jfcjwpcrp8cdiyab8skrijgzbp0vx"; depends=[gmp digest lattice stringr XML]; };
-dplyr = derive { name="dplyr"; version="0.3.0.2"; sha256="1b4bpr80qvi6k2m27qz4w78hp8hnh9395hcr38zyni5zj469fprw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; };
+dplR = derive { name="dplR"; version="1.6.2"; sha256="1w8p4pfzpvarwx9an3zm158pybif6p86k87gxqr2m2fgjsxzf9nb"; depends=[gmp digest lattice png stringi stringr XML]; };
+dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; };
 dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; };
-dr = derive { name="dr"; version="3.0.8"; sha256="0plvdkk041giqx8cgph4vdcabq9nv5bvjwz0pvjmhvb3z7q15cgj"; depends=[MASS]; };
+dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; };
 drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
 drc = derive { name="drc"; version="2.3-96"; sha256="0yrxa7rnsi7w4zdxd713m0l8bfsqnhcypzr091yazlahk33mybxf"; depends=[car gtools MASS magic plotrix lattice nlme]; };
 drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; };
 drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; };
 drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
 drmdel = derive { name="drmdel"; version="1.3"; sha256="0yflpja6r8cm4yv07ac1wic8w2iv0pwqpgh3ls2pjwv3vqzg7jrm"; depends=[]; };
+dropR = derive { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
 drsmooth = derive { name="drsmooth"; version="1.0"; sha256="1cxhj28dkll704kif040vqnp9grb61v891rswvyx7aa9216156px"; depends=[car clinfun mgcv multcomp pgirmess DTK segmented mvtnorm]; };
 ds = derive { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
 dsample = derive { name="dsample"; version="0.91.1"; sha256="0nxx3x55zj089aq2shk7cg9bgh6xw7jnrr2qmlaq6bflwn58wn1q"; depends=[]; };
 dse = derive { name="dse"; version="2014.11-1"; sha256="0fl1av8zd0csbsk6fplcxgqsb50qr1baasw2jrqv6h83j2xwph2l"; depends=[tfplot tframe setRNG]; };
 dslice = derive { name="dslice"; version="1.1.4"; sha256="0srqw1kznbjl1v6dpgh7vsrpf9k3zj7j55zw9k50jsbw2z4xqzfw"; depends=[Rcpp ggplot2 scales Rcpp]; };
 dsm = derive { name="dsm"; version="2.2.5"; sha256="0sfsfzcsqnvjkc5l7h5xq8p2jsgwxfzds75sqs58a0kzagcm1b05"; depends=[mgcv mrds nlme ggplot2 statmod]; };
-dti = derive { name="dti"; version="1.2-0"; sha256="01z51x1fpsc79b298gsx5fq2y5w3pwiq58a13pm96a4mkyzzwhk7"; depends=[awsMethods adimpro rgl oro_nifti oro_dicom gsl]; };
+dst = derive { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; };
+dti = derive { name="dti"; version="1.2-0.1"; sha256="09ad7mwa53dk1jlddkql3wm1s2diyqij7prd5klh59j21kvkf0hy"; depends=[awsMethods adimpro rgl oro_nifti oro_dicom gsl quadprog]; };
 dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
 dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; };
 dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; };
 dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
 dummy = derive { name="dummy"; version="0.1.0"; sha256="004w6ymfah608c4rqjnzjy2kyxmcq6gxbh0zhqd82ljv7cah52my"; depends=[]; };
-dunn_test = derive { name="dunn.test"; version="1.2.0"; sha256="0r83x8qsazzkpnv6mbdzakhiacydd42sfgazzpx5536dwcvlb486"; depends=[]; };
-dupiR = derive { name="dupiR"; version="1.1"; sha256="01yhwgqm2y6znxds3p2admcyayvjj5xw7vvc9djd7b6ywsivb8sa"; depends=[plotrix]; };
+dunn_test = derive { name="dunn.test"; version="1.2.2"; sha256="0n7z2nimkpbh7d745yrcq2swrkpccncb5vhprm2isbkwig763a6a"; depends=[]; };
+dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
 dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
 dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; };
+dygraphs = derive { name="dygraphs"; version="0.3.3"; sha256="1fp3c968mri1iyxkj106prj75vmlkny7r51cj2q8wdv83jxrd63f"; depends=[magrittr htmlwidgets zoo xts]; };
 dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; };
-dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.1"; sha256="1xngcr8r48yigm7gg5a06c9xl6zaj6s59izqrni1874x5ji39ql3"; depends=[tcltk2 tkrplot]; };
+dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.2"; sha256="1lcd164lxrrmzxr3rp3xwvwsnpa7am6c916vrbwy74ccg2bpbv7m"; depends=[tcltk2 tkrplot]; };
 dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
 dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; };
 dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
@@ -2984,13 +3014,12 @@ dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4
 dynsim = derive { name="dynsim"; version="1.0"; sha256="0w4brs8kcps6gkamkic57nj61iz7zdxq972jwzs17i43wfcrw32c"; depends=[ggplot2 gridExtra MASS]; };
 dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[survival reshape plyr nleqslv ggplot2 BH]; };
 e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; };
-eHOF = derive { name="eHOF"; version="1.5.4"; sha256="0f4cf0zyln46kdzfnvz0i5rwmbvg1f79aqz0ci5b4q6kiaiiylcw"; depends=[mgcv lattice]; };
-eRm = derive { name="eRm"; version="0.15-4"; sha256="0x05vsf8kp0z422w1b1wqayada2vbl7jh4ifa52sqlq7ygsmnmi1"; depends=[MASS Matrix]; };
+eHOF = derive { name="eHOF"; version="1.5.7"; sha256="05xvhnq0c8ddpq4x7mncspwy2lh54pl76yz6y38ibw5p8c0gazbs"; depends=[mgcv lattice]; };
+eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[MASS Matrix lattice]; };
 eVenn = derive { name="eVenn"; version="2.1.6"; sha256="1kxxaj2ia1v5p0d0yi3vq7rkiajsdsg97k3yg0iqb9v4vbj8mc1y"; depends=[]; };
-eaf = derive { name="eaf"; version="1.06"; sha256="1v0sw52wsnhqfg9i2zhmkl0w5ikcd4zdmz4fy03scjx5impiww7a"; depends=[modeltools]; };
+eaf = derive { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
 earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; };
-earth = derive { name="earth"; version="3.2-7"; sha256="1j9w03i4pvz8a6s9rkfssj7bqz5sql0g7rzwpmis33kvi0d7wihn"; depends=[plotmo plotrix]; };
-easingr = derive { name="easingr"; version="1.0.1"; sha256="0sisqryqlymkk9v1wq0v1db3g9sx5vaqxxkw1470c75ix5s2n5s3"; depends=[xts lattice latticeExtra]; };
+earth = derive { name="earth"; version="4.2.0"; sha256="11fkjl8bvzsalrwc0v6vmk2xkzd1np7z2frygckpy5kyr9zs9l5l"; depends=[plotmo plotrix]; };
 easyanova = derive { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
 easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
 ebSNP = derive { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
@@ -3001,13 +3030,13 @@ ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk2
 ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
 ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
 ecoengine = derive { name="ecoengine"; version="1.6"; sha256="1dbg9y8hz7z385ml102y3akfffphg0llnyqg5iqblqann7nrzpsn"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; };
-ecolMod = derive { name="ecolMod"; version="1.2.5"; sha256="07dr3q17vd60569w34apylpsv81qcf31l7v0bqdycb5mlaifdahz"; depends=[rootSolve diagram deSolve]; };
+ecolMod = derive { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[rootSolve shape diagram deSolve]; };
 ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; depends=[]; };
 ecoretriever = derive { name="ecoretriever"; version="0.1"; sha256="1iwds81pyn9c04fmnjfsri7rjanrfki8hngdwpqcx3dkbsg76ii6"; depends=[]; };
 ecosim = derive { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; };
 ecospat = derive { name="ecospat"; version="1.0"; sha256="1pnyiy89smr0cnw1z5cv83b7dybzs5h2kfyxis2k3rlx26rzczfv"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; };
 ecoval = derive { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[utility rivernet]; };
-ecp = derive { name="ecp"; version="1.6.0"; sha256="1xzawnqk8maxk9ha4cms5xvylwb4m1mkxps88p5xh7grgpcw6drn"; depends=[Rcpp Rcpp]; };
+ecp = derive { name="ecp"; version="1.6.2"; sha256="0j416ns93m7vrb7dnyr4prqm213cg19hbgffvscnb67y3qwj6lic"; depends=[Rcpp Rcpp]; };
 edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
 edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
 edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table]; };
@@ -3017,13 +3046,13 @@ eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5f
 eegkit = derive { name="eegkit"; version="1.0-1"; sha256="171jfd4lq8xqqd1iajf9ljr3y77faidb0wpv6jasvwf4cb7lyasn"; depends=[bigsplines eegkitdata ica rgl]; };
 eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
 eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; };
-effects = derive { name="effects"; version="3.0-2"; sha256="1a5h3qjxwwwzzg5n3zxls6sl802vz25hs63x944nvmh8kb1zz3km"; depends=[pbkrtest lme4 nnet lattice colorspace]; };
+effects = derive { name="effects"; version="3.0-3"; sha256="10v99rv18jl10q0zhd4rvkx7dgab3b8w46jv1npqk9lx172iaf1y"; depends=[pbkrtest lme4 nnet lattice colorspace]; };
 effsize = derive { name="effsize"; version="0.5.2"; sha256="0xhrq1a7vjcbipvmslmkw4widnp0scfcir80sr5npcx5pvxagsq3"; depends=[]; };
 ega = derive { name="ega"; version="1.0.0"; sha256="1825lwr9bii16nbaj1ryh82gwg2p1r5dhn41cp3l728cfpz5gvlz"; depends=[ggplot2]; };
 egcm = derive { name="egcm"; version="1.0.2"; sha256="17fzxl34vc38308wbvjp5xdv1q48k4lf6gsw7ax27zc4chqlmqfz"; depends=[ggplot2 tseries zoo MASS]; };
 eggCounts = derive { name="eggCounts"; version="0.3"; sha256="0rsw0610jppnxvw22dj33sn1xq5wf44nsgszwi0jxcd45n1n2k8x"; depends=[coda actuar boot]; };
 egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
-eha = derive { name="eha"; version="2.4-1"; sha256="1znxpcrwp8fllr3m14gbxwgp7yln55jwvkilmbsqldz00za6xn0w"; depends=[survival]; };
+eha = derive { name="eha"; version="2.4-2"; sha256="0n3j9zl4xs5pc87j01symnj4yz523fng1gysrj8pz4wra4zlg83m"; depends=[survival]; };
 eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; };
 eigeninv = derive { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
 eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; };
@@ -3040,7 +3069,7 @@ elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3
 elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
 embryogrowth = derive { name="embryogrowth"; version="5.1"; sha256="1irdx1zkp1k4hqi9c9hrckiy647nld2n9mgw9kx8gp771963n5rq"; depends=[deSolve phenology Hmisc]; };
 emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; };
-emdbook = derive { name="emdbook"; version="1.3.6"; sha256="1ipy3v0pwarnfn4mhpiq7nbn6ab7fk1mb3k1afzfwnh3ji28yw1q"; depends=[MASS lattice plyr rgl coda bbmle]; };
+emdbook = derive { name="emdbook"; version="1.3.7"; sha256="134j9mkf975h1bh4bjg5kl3gjzfii9acj4a20k1c4jnbz5v272a1"; depends=[MASS lattice plyr rgl coda bbmle]; };
 emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
 emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7aysbwashfs6whnsi7f9dbigw6cd"; depends=[]; };
 emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; };
@@ -3048,15 +3077,14 @@ emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sj
 emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
 empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0"; sha256="0vv104jgdwp5bg72v29614j831ndbw3sv105hkj9z3hi4ax16b5f"; depends=[]; };
 emplik = derive { name="emplik"; version="0.9-9-6"; sha256="0qrrsws9hnb9f2zv50q4v9zx467n6hm83g841h3ba511iwjpp32r"; depends=[quantreg]; };
-emplik2 = derive { name="emplik2"; version="1.10"; sha256="19s19jhcaqnh6vjfgrsgjvjlrsm5fa1mgwc5v36hzdf2mv1xhr3q"; depends=[]; };
 emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
 enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; };
-enaR = derive { name="enaR"; version="2.8"; sha256="0gs6w43rfz89czpk83kdwxlap5lzhinhzwg3csjhwz4mqabpc9fy"; depends=[MASS stringr sna network gdata]; };
+enaR = derive { name="enaR"; version="2.8.1"; sha256="1p2vhqd1zxwar5fb16ibvwrzrxl7c574ls6747bkdjzlx7vznrn1"; depends=[MASS stringr sna network gdata]; };
 endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
 endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; };
 energy = derive { name="energy"; version="1.6.2"; sha256="008yf4r6546mzk9q515zliqxyjx6w0z19g5wlarg7f4lrzsmqiaw"; depends=[boot]; };
 english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3vl4gvrwlgmjpc2djzv5bllbnc4a4dgj24"; depends=[]; };
-enigma = derive { name="enigma"; version="0.1.0"; sha256="0k7shqs8lvx2nxvfdnp56wfhvnxrdg64y3s3b8aj6871r00pasa8"; depends=[httr jsonlite plyr]; };
+enigma = derive { name="enigma"; version="0.1.1"; sha256="1309w9nwh7kd1iivj5kq6sgi10k9ac69n3yl6a52ajqnm9rsg3lm"; depends=[httr jsonlite plyr]; };
 enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[pls foreach doParallel]; };
 enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
 ensembleBMA = derive { name="ensembleBMA"; version="5.0.8"; sha256="1wv1g1iwpmxhcgxgx78jc4w5kcbbzjxljj7pbfykgq7hjpkb109f"; depends=[chron]; };
@@ -3065,13 +3093,13 @@ ensurer = derive { name="ensurer"; version="1.0"; sha256="07bjiq9sk5njksb1dyi5kq
 entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; };
 entropy = derive { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
 enviPat = derive { name="enviPat"; version="1.9"; sha256="0xm23gv4ixmsal9rf0cbq0lwvlpagpmapskz3c4d8qzvhr8qrl3b"; depends=[]; };
-enviPick = derive { name="enviPick"; version="1.2"; sha256="1ir8aqnbf470x0n5bqhb13aclkv13z8ha80dfhxx4ik5k65papcg"; depends=[shiny readMzXmlData]; };
+enviPick = derive { name="enviPick"; version="1.3"; sha256="01wkijvhr8wqjzrhgkvxbnnmb9qsnq0lhkgw93s8nrf8yr3z3awj"; depends=[shiny readMzXmlData]; };
 epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
 epi2loc = derive { name="epi2loc"; version="1.0-1"; sha256="16abk1v177sg7gmaw42ldf6hf20l7dvyq295zwbq76nxj467khdv"; depends=[pwr]; };
-epiR = derive { name="epiR"; version="0.9-59"; sha256="0x0k7s2kl9mj7x2vnrj1bc586jkvc6sb34jsgjhwk3gyh9prp57q"; depends=[survival]; };
+epiR = derive { name="epiR"; version="0.9-62"; sha256="04r0inaa04pc4nj5dippl2qxa4nysk0sabdgp4bzp5zxw33mf55v"; depends=[survival]; };
 epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
 epicalc = derive { name="epicalc"; version="2.15.1.0"; sha256="11x9q990hc7rf5xfvba47axdy7vld76xcf3kd9lkr0c8nbl5ss9v"; depends=[foreign survival MASS nnet]; };
-epinet = derive { name="epinet"; version="2.0.8"; sha256="09vggvkj4yjhfiwy7mqyqn8n4sr9ar0wj5j680sy900sybvxpw25"; depends=[]; };
+epinet = derive { name="epinet"; version="2.0.9"; sha256="071svl1zcjjb3gvk3vg8xf660bvlz0ypkxy88n3d3f3ir2k26s7b"; depends=[]; };
 episplineDensity = derive { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
 epitools = derive { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; };
 epoc = derive { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[lassoshooting Matrix irr elasticnet survival]; };
@@ -3083,7 +3111,7 @@ equateIRT = derive { name="equateIRT"; version="1.2"; sha256="07qh5awa12d1bcm504
 equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f46bmm6wzmp0g2lg7d0j9mlrfnkzxnlvmspwksc0zl"; depends=[lattice boot PairedData]; };
 erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; };
 erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[lmtest systemfit tseries urca ggplot2]; };
-ergm = derive { name="ergm"; version="3.1.3"; sha256="0g4cap1gx0l57l0aix29wz9lspnxv2vqkkdlcghbdv41fdddvdlm"; depends=[statnet_common network robustbase coda trust Matrix]; };
+ergm = derive { name="ergm"; version="3.2.4"; sha256="004d3wrv271i0czqkp7abz9lba8g68z350b21f94ad0xfp0cwlp2"; depends=[statnet_common network robustbase coda trust Matrix Rglpk]; };
 ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[statnet_common ergm network ergm]; };
 ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.2"; sha256="1wfk8kh4rqw1f7dg4vsjq8nirgwyyk21r0x7x2hrd4v4ci0mcz6j"; depends=[statnet ergm]; };
 ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common ergm]; };
@@ -3092,13 +3120,13 @@ erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppq
 esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; };
 estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
 etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; };
-etasFLP = derive { name="etasFLP"; version="1.1.1"; sha256="0p24f4ycf7vckcwcmn6rkrdvv96q7w94gjp3h2k2s3v1yawgn152"; depends=[mapdata rgl fields maps]; };
-etm = derive { name="etm"; version="0.6-1"; sha256="00sm4cib1r4wcn71v1ry3asszshks4f6br7s5xzm8d5ngxdlsxda"; depends=[survival lattice]; };
+etasFLP = derive { name="etasFLP"; version="1.2.0"; sha256="0h81fm71q8qb2h0gz669cvqpzcd8jwq5yk2b8vwsiv4jlgfiq85g"; depends=[mapdata rgl fields maps]; };
+etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[survival lattice]; };
 eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; };
 evaluate = derive { name="evaluate"; version="0.5.5"; sha256="15i6bkzrzkgsdlgf2pcx8b3gcjh1rplzhimy310845pfgkldcq9b"; depends=[stringr]; };
 evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; };
 evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
-eventInterval = derive { name="eventInterval"; version="1.0-1"; sha256="0vcp40rsb2pazn4p44dsaxjai7qhjwzrh9lf0q84fcayrnk51dqv"; depends=[MASS]; };
+eventInterval = derive { name="eventInterval"; version="1.2"; sha256="15g934n7flkl1g5q8qhxv60iakx8i9ndpx88yiqqr3n38hcnifrs"; depends=[MASS]; };
 events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
 eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; };
 evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
@@ -3108,13 +3136,13 @@ evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4
 evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; };
 evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
 evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
-exCon = derive { name="exCon"; version="0.1-0"; sha256="02zanw79ix0gqks7svblm6bysf81yvxc4s49sq2cac4xc5hfpjj8"; depends=[jsonlite]; };
+exCon = derive { name="exCon"; version="0.1-3"; sha256="0z09nwv721ld3dbi7c14rd2pjz96kj9pniljmwy9r41fhz36i4yf"; depends=[jsonlite]; };
 exact2x2 = derive { name="exact2x2"; version="1.4.0"; sha256="1yzigyyvzs3aq3sl3birs9bzir1l8b30qfbhfg5aw80w6a5p0hb1"; depends=[exactci ssanv]; };
 exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
 exactRankTests = derive { name="exactRankTests"; version="0.8-27"; sha256="0ygy3ygdnrrcggps5zh5r7kqfa9vj6gfgdyli63n8cwdimfyndhn"; depends=[]; };
 exactci = derive { name="exactci"; version="1.3-0"; sha256="03mhgpyrgm3cb0hw908wxhi6pxrvcsw4r1lmbx95xn44j1p9zpzk"; depends=[ssanv]; };
 exactmeta = derive { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
-exams = derive { name="exams"; version="2.0-0"; sha256="0w3hnwnwcvl2i0y08qw96fkhfy31hx3pvw2qjxi95vhna5987k0h"; depends=[]; };
+exams = derive { name="exams"; version="2.0-2"; sha256="1cv01wa3zs31zdc1qk6rsnimbs6m31r0j56syg6yjicfxiwxxm0v"; depends=[]; };
 excursions = derive { name="excursions"; version="1.1-20140610"; sha256="0x7rk00abf7fw9h2qqp6s2snkm1snkl35mgmxvgwv0a0jm3q56ls"; depends=[Matrix]; };
 expands = derive { name="expands"; version="1.5"; sha256="14m5fzh302v0nchf875i4nwrr25wk7hych405psgfidq058pr985"; depends=[rJava flexmix matlab mclust moments ape permute]; };
 expectreg = derive { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[mboost BayesX quadprog]; };
@@ -3127,16 +3155,16 @@ expp = derive { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9
 expsmooth = derive { name="expsmooth"; version="2.02"; sha256="1l9k4llzkqwzmrr1l68qr58ngzs3ql67hxrr5fcrcwwnaa1zinyj"; depends=[tseries forecast]; };
 exptest = derive { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
 exsic = derive { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[stringr markdown]; };
-extRemes = derive { name="extRemes"; version="2.0-3"; sha256="0aiigqyay3i4nlmmr1k7fs2nw6vqxf1q321p6s0ip8aq2awlgnjl"; depends=[Lmoments distillery car]; };
-extWeibQuant = derive { name="extWeibQuant"; version="1.0"; sha256="0l20x33nh50jfrkwm8d0n824d400lnjia8ymdwr10sgj3v1x7vp1"; depends=[]; };
+extRemes = derive { name="extRemes"; version="2.0-4"; sha256="016jvifkwh0n1zfak1y963d1ixklc8f6glak627fmjldik67w4iv"; depends=[Lmoments distillery car]; };
+extWeibQuant = derive { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
 extfunnel = derive { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
 extlasso = derive { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
 extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
-extraTrees = derive { name="extraTrees"; version="1.0.4"; sha256="0yv58azaqmla3mmqk7q6z1ijqk94s80jfqxb21mc6mi66kr6md1d"; depends=[rJava]; };
+extraTrees = derive { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
 extracat = derive { name="extracat"; version="1.7-1"; sha256="1vgxr9j812jjr0i188vv7c1l0d7b73aakvfgsm0agwv7vj8k0rhi"; depends=[colorspace hexbin scales ggplot2 reshape2 plyr TSP]; };
-extrafont = derive { name="extrafont"; version="0.16"; sha256="0ml1a7m28cdx1a6qcmg8840v95lmhl39ad51q1k3bnqzbxfgqncl"; depends=[extrafontdb Rttf2pt1]; };
+extrafont = derive { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
 extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
-extremevalues = derive { name="extremevalues"; version="2.2"; sha256="162j6kqnd1ak2w2m6y5dbxcya1ap4648hvc83ibq33bxk98rh7sb"; depends=[]; };
+extremevalues = derive { name="extremevalues"; version="2.3.0"; sha256="1nn67kgf3qd41nmizkbc2cy3128kajsxbxg03fhfgkjdqa0781lq"; depends=[gWidgets gWidgetstcltk]; };
 eyetracking = derive { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
 ez = derive { name="ez"; version="4.2-2"; sha256="1dk4ig137ridr4pw4afp3flm22s8l38yrgxabld1zv46slndc8mm"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
 ezglm = derive { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
@@ -3160,10 +3188,9 @@ fNonlinear = derive { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3
 fOptions = derive { name="fOptions"; version="3010.83"; sha256="01yr3hrfiq4hjhidl5pl1gcqg0myg4acmnipjhq70l3q50cfjm8l"; depends=[timeDate timeSeries fBasics]; };
 fPortfolio = derive { name="fPortfolio"; version="3011.81"; sha256="1rmyp2dv1jgrfj76mnggvi98ffa0yr8d9dlxxmg5pc6pdy2g4q4c"; depends=[timeDate timeSeries fBasics fAssets fCopulae robustbase MASS Rglpk slam Rsymphony Rsolnp kernlab quadprog rneos]; };
 fRegression = derive { name="fRegression"; version="3011.81"; sha256="1qyacwwa2mjq9szwwwfdnny4np68bj1j4bvfkywl7q7x44p4n5b4"; depends=[timeDate timeSeries fBasics lmtest mgcv nnet polspline]; };
-fSRM = derive { name="fSRM"; version="0.6"; sha256="1f7kp35cy7r1z4anmab2x6h27laf001spc950qj7mi9ffal7v1r4"; depends=[lavaan plyr reshape2 ggplot2 scales foreign tcltk2 gridExtra]; };
+fSRM = derive { name="fSRM"; version="0.6.1"; sha256="0d545i4sqkmimy42jgryyafzxayr62prwa47x11v5kkd63gmn3j2"; depends=[lavaan plyr reshape2 ggplot2 scales foreign tcltk2 gridExtra]; };
 fTrading = derive { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[timeDate timeSeries fBasics]; };
 fUnitRoots = derive { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[urca timeDate timeSeries fBasics]; };
-factas = derive { name="factas"; version="2.3"; sha256="015lpxf37z8vx4h7a8lavksd7i0gc4x7a7ja63wi9h1czdjsc28k"; depends=[plotrix FactoMineR Matrix]; };
 factorQR = derive { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
 factorplot = derive { name="factorplot"; version="1.1-1"; sha256="1l8pabf32dr12l7b4dgv5jaxpsjymgdxc51miv72zczrx8adc7da"; depends=[multcomp nnet]; };
 factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RJSONIO RCurl]; };
@@ -3175,7 +3202,7 @@ fanc = derive { name="fanc"; version="1.13"; sha256="08qw4vhms8q2jyqqp2vlq8xdg7y
 fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; };
 fanplot = derive { name="fanplot"; version="3.3"; sha256="0bv7x3xrsg0pmp9gmck30jypv8cwc03bv753m49dfpgs2p9srcmc"; depends=[]; };
 faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; };
-far = derive { name="far"; version="0.6-3"; sha256="0i7c0zrz33abwkml1zdjf5m61bxpfndwziqjbh6wyhdz8msp2kmf"; depends=[nlme]; };
+far = derive { name="far"; version="0.6-4"; sha256="166lhswdd1shx591wvx8a3lwzjini60mc37rbb3qvm6fxrb6fl55"; depends=[nlme]; };
 faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; };
 farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
 fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; };
@@ -3186,7 +3213,7 @@ fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5
 fastR = derive { name="fastR"; version="0.8-1"; sha256="08p03i72zn0cbwjsxpnsknk0148dx3pfwkw740x7f52c3jgbb1gi"; depends=[mosaic lattice mosaicData]; };
 fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; };
 fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbqgkfw4l9mw32sg4p5pvcg4v24z1q44pgnwn4y"; depends=[lattice igraph MASS Matrix]; };
-fastcluster = derive { name="fastcluster"; version="1.1.13"; sha256="0hkml8ggmq5gqw9indqh6rb5x922qq8chd9s35fkxdcgzw58253a"; depends=[]; };
+fastcluster = derive { name="fastcluster"; version="1.1.15"; sha256="1xw1jswx9sm080346hwqdvkib4jqg022vxaq907jzg71kxcfd0c0"; depends=[]; };
 fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; };
 fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; };
 fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; };
@@ -3195,8 +3222,8 @@ fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0
 fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; };
 fclust = derive { name="fclust"; version="1.0.1"; sha256="1xl8mw4wfwp9n9fmfmzxz8k8qyrk62qr77j085b3kgp7a85dp8ma"; depends=[]; };
 fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; };
-fda = derive { name="fda"; version="2.4.3"; sha256="19a7jylpr8sh1yz9ljyk889ksfd0xwagbvg83vy6vfsi82q1910g"; depends=[Matrix]; };
-fda_usc = derive { name="fda.usc"; version="1.2.0"; sha256="1ifp94i0px3683ph90f7c3z1gh92c33nlfk1f2drr4s0fyb1kzy3"; depends=[fda MASS mgcv rpart]; };
+fda = derive { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
+fda_usc = derive { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; };
 fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp Rcpp RcppArmadillo]; };
 fdakma = derive { name="fdakma"; version="1.1.1"; sha256="0y70ckgxkns6p45gv9w02krrr96vzs8f838s5vk02c2m6ynp4prs"; depends=[]; };
 fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; };
@@ -3221,6 +3248,7 @@ fields = derive { name="fields"; version="7.1"; sha256="0wxm8pq4j5clz1hcgdlajasg
 fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; };
 filehash = derive { name="filehash"; version="2.2-2"; sha256="0766wrc42qh7r99bd2zy50vvdnqlz0vkzplskzkm5f4g63qdhjxh"; depends=[]; };
 filehashSQLite = derive { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[filehash DBI RSQLite filehash DBI]; };
+filenamer = derive { name="filenamer"; version="0.2"; sha256="0f2xvqp75b8v59707z26y746vvag3f2mcykafqp5cy8cqrf7x61j"; depends=[]; };
 financial = derive { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
 findpython = derive { name="findpython"; version="1.0.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; };
 fingerprint = derive { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rglqh2y27bjlwkk6z312gavli7g8xvqfx1lisijrjk"; depends=[]; };
@@ -3230,16 +3258,16 @@ fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdsz
 fishmethods = derive { name="fishmethods"; version="1.7-0"; sha256="0kgfv78f8a460nfvpfrrqfiy3ipbl3775axydal3vm1zf4l6k2z3"; depends=[MASS boot bootstrap]; };
 fishmove = derive { name="fishmove"; version="0.2-1"; sha256="1b8drjvslmpqnq5v3axrshrl2xq87h3x5cgfnibbhn4slrxw55v9"; depends=[ggplot2 plyr]; };
 fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; };
-fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="1xy334svv7cc3xh2j33q6icnibxl46yvnxw8bd4xrpclg4xchc1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; };
+fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; };
 fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
 fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
-fitdistrplus = derive { name="fitdistrplus"; version="1.0-2"; sha256="1m35zicxm5gfc9wgp7lx7ymy06nr4s9fcwc07iky40xh65kps0s5"; depends=[survival]; };
+fitdistrplus = derive { name="fitdistrplus"; version="1.0-3"; sha256="11v2qiiyfqrlkmc8y48nfzm6s98xabq3ipgkrzb3n8ylwqakdwdq"; depends=[survival]; };
 flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; };
 flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[lattice MASS Matrix igraph]; };
 flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
-flexCWM = derive { name="flexCWM"; version="1.1"; sha256="0vxzf3ifmpg7l13bvbmv6h5a3gmn2h1xvkq354lvy4s8znk643c4"; depends=[numDeriv mnormt mclust ellipse mixture Flury]; };
+flexCWM = derive { name="flexCWM"; version="1.3"; sha256="1hrp7lqh5gmn0mlda9mix0b1dkylrydkmhm6ipajy3kgqkxih6pi"; depends=[numDeriv mnormt mclust ellipse mixture Flury adehabitat MASS statmod]; };
 flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; };
-flexmix = derive { name="flexmix"; version="2.3-12"; sha256="1qp1q4cz5ixprqvm98i0w6rhlhlafm96qy2as7qcsah8vas5jdp1"; depends=[lattice modeltools nnet]; };
+flexmix = derive { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; };
 flexsurv = derive { name="flexsurv"; version="0.5"; sha256="0a0mhnz9xayb0pjx4glq09yiz8jplynkq8aniw9saxdik8zd1srg"; depends=[survival muhaz mvtnorm deSolve]; };
 flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp Rcpp RcppArmadillo]; };
 flora = derive { name="flora"; version="0.2.3"; sha256="03n2as362fcz7jbkprwqr2rs86njbkywczsf8cjfa2akwh93gj7s"; depends=[shiny]; };
@@ -3255,11 +3283,11 @@ fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0
 foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
 forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; };
 foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
-forecast = derive { name="forecast"; version="5.6"; sha256="16dwbqqhjvn7q6zj4h0p3amjs3wlc0krpjaqmhk8p6ny11qaj70c"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
-foreign = derive { name="foreign"; version="0.8-61"; sha256="0r994z3ihvrbfhzpvp2dkxbfgkbmccgrryfaxmy1vi56v59n73w8"; depends=[]; };
+forecast = derive { name="forecast"; version="5.8"; sha256="1f8qfh9z02fhgarhfjp7j25fvsirly08ln8l91a3cg1y2vzi18sv"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
+foreign = derive { name="foreign"; version="0.8-62"; sha256="0niwi5fvj82l2arsqbpiwhidn3wfxjvciav0il8r118p7ivghvr9"; depends=[]; };
 forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; };
-forensim = derive { name="forensim"; version="4.3"; sha256="1j92imykw48cciay0r6n1aq1jrdb2b1grrz6lpc4kgbnbd7mk0qm"; depends=[tcltk2 tkrplot]; };
-fork = derive { name="fork"; version="1.2.4"; sha256="1sb4xypirmrknhrc872ky845kym58dmakn6c2crsbp67wpg63m4l"; depends=[]; };
+forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
+forestplot = derive { name="forestplot"; version="1.0"; sha256="1sv50zqsszkldwq87c2am4547lqqm8fp29ql1z0bdqi6j6mzjkc6"; depends=[]; };
 formatR = derive { name="formatR"; version="1.0"; sha256="18wv05ijdymipnyxy5h34y3nbx42ifk79qiapfgx5fjjzpspq6q5"; depends=[]; };
 formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; };
 fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
@@ -3277,7 +3305,7 @@ fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8k
 frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
 frailtypack = derive { name="frailtypack"; version="2.7.2"; sha256="07vhpz757argz9k15lxnn2iad1gybnnjgw6n9pp7sghh5bynx5j1"; depends=[survival boot MASS survC1]; };
 frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; };
-frbs = derive { name="frbs"; version="2.2-0"; sha256="13m8hm2925h1mz2wgbsxiqls5gy7sgvp0rsdcsy2sm7czjnl2z7n"; depends=[]; };
+frbs = derive { name="frbs"; version="3.0-0"; sha256="0v2l8s5jla8jsl9izqfpxhcd1dnrxsa0czlhq1wmx5k06jvbvpdw"; depends=[]; };
 freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; };
 freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
 freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; };
@@ -3289,12 +3317,13 @@ frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3
 frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; };
 frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
 frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
-fscaret = derive { name="fscaret"; version="0.8.6.3"; sha256="0qfla027lwgyblfbl5x9i5d3i547z2g8cwpn06ly61zy1ck6j619"; depends=[caret gsubfn]; };
+fscaret = derive { name="fscaret"; version="0.9"; sha256="082k67fd666hjcarsxmhn8hbscv5l8l0n84kv5asqjjshgz0nzwz"; depends=[caret gsubfn hmeasure]; };
+fsia = derive { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; };
 fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40kfjnf108nmkrwndvwl864i99w"; depends=[stringr oro_nifti matrixStats]; };
 fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
 ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
 fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo BH]; };
-ftsa = derive { name="ftsa"; version="4.0"; sha256="0phqsw3zq0bq6sdqdacyajk1xk7ns66nd3rpszl96gi7jw5m5bf8"; depends=[forecast rainbow colorspace]; };
+ftsa = derive { name="ftsa"; version="4.1"; sha256="02m4w7yb26gcg9226h118jj75pwcc6r23p96c1kbsg5fccrfw8ff"; depends=[forecast rainbow colorspace MASS pcaPP]; };
 fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
 fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp Rcpp]; };
 fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
@@ -3312,7 +3341,7 @@ fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfi
 fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-5"; sha256="1g09506bbpk05a2r2wxjynjs8dmjd2q7x74d83vjscg1kdk4kazq"; depends=[]; };
 fwdmsa = derive { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
 fwi_fbp = derive { name="fwi.fbp"; version="1.5"; sha256="08ngg70vi2fca5yblm2gf1lkjjmb6m39d8q6429n7i3jn6ca5nzf"; depends=[]; };
-fwsim = derive { name="fwsim"; version="0.3.2"; sha256="0yg3bpvf83ahy26fj1nfhfrblmr0i7i18kmnphi8w1bcqjwz6n8h"; depends=[Rcpp Rcpp]; };
+fwsim = derive { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp Rcpp]; };
 fxregime = derive { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[zoo strucchange car sandwich]; };
 g_data = derive { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
 gCat = derive { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; };
@@ -3332,7 +3361,7 @@ gSeg = derive { name="gSeg"; version="0.1"; sha256="0qnv3c0rla0g2fb4s4x1i0zdp3dl
 gWidgets = derive { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; };
 gWidgets2 = derive { name="gWidgets2"; version="1.0-5"; sha256="1y6vm6ds77yr1qiqlcaixbsarbwx5w53ba343svla7wva80ajbpl"; depends=[digest]; };
 gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-2"; sha256="1pzcpjz5cdizvj0ih2r4i3ll6flm45q8ym6sz0wqbg4j3ir0l5kh"; depends=[memoise RGtk2 gWidgets2]; };
-gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-2"; sha256="1dzrc8yry4l2afpijr35irnqmvfpd22vlb3lih4pk14n52690y0h"; depends=[digest memoise gWidgets2]; };
+gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-4"; sha256="1c9vfnr6j4lvshvdzp88a45pjrdl0dfhr1rxlpz95d3cks9rfq1f"; depends=[digest memoise gWidgets2]; };
 gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[RGtk2 gWidgets cairoDevice]; };
 gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[gWidgets digest]; };
 gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
@@ -3340,8 +3369,8 @@ galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgg
 gam = derive { name="gam"; version="1.09.1"; sha256="09p83ki821x57kc74klh6i1h8bz3acsrvibz3mzzcgq6sa8gzr5i"; depends=[]; };
 gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; };
 gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; };
-gamboostLSS = derive { name="gamboostLSS"; version="1.1-2"; sha256="1my718gp5wnzrpy50r9cjcjy4kbxvy0q1867n21dll6rhbxz0yil"; depends=[mboost]; };
-gamboostMSM = derive { name="gamboostMSM"; version="1.1.5"; sha256="1n6ngbxx9f3p98jfiq4x21y0rqmhy18zyv13y8mkrz7hrchh835f"; depends=[mboost]; };
+gamboostLSS = derive { name="gamboostLSS"; version="1.1-3"; sha256="1gdsrizr4q5zyfs2g8c8fdwriqz0xrpq9vyy4wd2ywdh5lbi995b"; depends=[mboost]; };
+gamboostMSM = derive { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
 gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0m2a4x4a8qwfixbaq4gd22rn1xpbsdnfw3"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; };
 games = derive { name="games"; version="1.1-1"; sha256="05x27vivz2acp7darja0x21l29ddlav6ch6l89a9s60v52zqflik"; depends=[maxLik Formula MASS stringr]; };
 gamlr = derive { name="gamlr"; version="1.12-1"; sha256="17vfb3kac5y3xfw8s1m8czm5bq5z6x6lc43f2szj5lv84mf2r6y7"; depends=[Matrix]; };
@@ -3357,6 +3386,7 @@ gamlss_spatial = derive { name="gamlss.spatial"; version="0.1"; sha256="0lsq3lfv
 gamlss_tr = derive { name="gamlss.tr"; version="4.2-7"; sha256="0f0vmspknkg8039dnrxkjqwjqbl34vjb5sgkcdvy5g8x8dlb5h3w"; depends=[gamlss]; };
 gamlss_util = derive { name="gamlss.util"; version="4.2-7"; sha256="1c8xc0qf387cd9d6k9fzlwvj9735y7v6njsb5fls2fimpnd5vsik"; depends=[gamlss colorspace Matrix MASS rgenoud zoo gamlss_add spam]; };
 gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[Matrix lme4 mgcv]; };
+gammSlice = derive { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; };
 gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
 gap = derive { name="gap"; version="1.1-12"; sha256="1760jwfrlfmb8crk8kba0swpazcznlv80c6j8fiyd9zxjhnq7zf5"; depends=[]; };
 gapmap = derive { name="gapmap"; version="0.0.2"; sha256="0xykpy3cmbiwwa3s8f4777585r7l441qb9ks6ajym01scqcj3nwl"; depends=[ggplot2 reshape2]; };
@@ -3366,7 +3396,6 @@ gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6l
 gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
 gbm = derive { name="gbm"; version="2.1"; sha256="1a150ksvdbdv8b5f4j62q7v68sbgjvvq0izm4d877izp6d8qd99g"; depends=[survival lattice]; };
 gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; };
-gcExplorer = derive { name="gcExplorer"; version="0.9-4"; sha256="1ig5m278n8mp93z1c8z39mf1zwwlkl38csn6d6ykpnrfpa3kk65a"; depends=[flexclust flexclust modeltools]; };
 gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; };
 gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
 gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
@@ -3375,32 +3404,30 @@ gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz
 gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; };
 gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; };
 gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; };
-gdimap = derive { name="gdimap"; version="0.1-8"; sha256="1za5aixb5q89b3347rb4590l1qrnslp681qmmz0y8y4x47jqfppr"; depends=[rgl Rniftilib gridExtra colorspace geometry gsl abind movMF]; };
-gdistance = derive { name="gdistance"; version="1.1-5"; sha256="12877mg0ih346h62xa087xwbrqrjvdh0fs8avrvyy4qpqls2s7qn"; depends=[raster igraph Matrix sp]; };
-gdsfmt = derive { name="gdsfmt"; version="1.1.0.1"; sha256="051b0d8i5g3w0i1r95md0334vj1qrclf9n5zzw20fqjbias1z3rs"; depends=[]; };
+gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; };
+gdistance = derive { name="gdistance"; version="1.1-6"; sha256="1cla8gc6ffx0cd25w8v8wi3w306wld4kj6bcar0q6d7hd018kpir"; depends=[raster igraph Matrix sp]; };
 gee = derive { name="gee"; version="4.13-18"; sha256="0zfxmjajbgr7999gbnqppq43zzk901kqra7b1d5fa2qn8js6h1ng"; depends=[]; };
-geeM = derive { name="geeM"; version="0.7.1"; sha256="0pzvy0ga17g5v5dd2q4q7fmcwj3nws0p1cg5s0dz3azmrj7n4s31"; depends=[Matrix]; };
+geeM = derive { name="geeM"; version="0.7.2"; sha256="0qxamrkmiy70g9kkncrwgh3gx8dq5ixfwbcl8k4dgf5i5051giw9"; depends=[Matrix]; };
 geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; };
 geesmv = derive { name="geesmv"; version="1.0"; sha256="1xxsiz6rwqxx113vmlddx89g190nmv1yaimmibz8ai0sam5hqnp9"; depends=[nlme gee matrixcalc MASS]; };
 geigen = derive { name="geigen"; version="1.4"; sha256="0k7h3farw9a3sxh0q4gilwqlgz1gqr4al6jbr70j2y5p6sbkvabd"; depends=[]; };
 geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; };
 gems = derive { name="gems"; version="0.9.5"; sha256="15n3xfhifcxmhsmc2p4ijgfd9l1pmzqj0zmh0xxi8y10ax68f524"; depends=[MASS msm mstate plyr data_table]; };
-gemtc = derive { name="gemtc"; version="0.6"; sha256="03aw5r62577fizvbl7wpl7k3m8bxji21h8a41gl8yr4fpj0353yj"; depends=[coda igraph meta XML]; };
+gemtc = derive { name="gemtc"; version="0.6-1"; sha256="1da5z1gvad5rgc5cm3w69x58qjqfg7x65z71h91g89f5nvwxkl2c"; depends=[coda igraph meta XML]; };
 gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; };
-genMOSS = derive { name="genMOSS"; version="1.1"; sha256="08d6j0iwfah1ianqdr884hh6bg04vfk4kml3clmf7vzx8wfmliy5"; depends=[]; };
+genMOSS = derive { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; };
 genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
 genSurv = derive { name="genSurv"; version="1.0.2"; sha256="0hvkrlcl8jrj0x0ixrl34484p9kxlwxfaa64ynz6jf3dcyghp9l0"; depends=[]; };
 genalg = derive { name="genalg"; version="0.1.1.1"; sha256="0f6j3zj9frnjhs4rrcn05z2bmp6c7d1blpwjqg7ckfwk46x61app"; depends=[]; };
 genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; };
 gendata = derive { name="gendata"; version="1.0"; sha256="1hyyf9kpf8f0xxwwvirxlz6nw6wf2wqq5vvjnyikq5dwa7a3ngmw"; depends=[]; };
-gender = derive { name="gender"; version="0.4.1"; sha256="1k14vdk8n4n1xsvjb4p8wk2wbb7qkfx06c230q5fb1bzf8grlxi2"; depends=[devtools dplyr httr jsonlite]; };
+gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; };
 geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
 geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; };
 genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
 genetics = derive { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
 genlasso = derive { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[MASS Matrix igraph]; };
 genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5gk0qzszp81x52lpwpk3z4cg0bgxi9zbwmw467"; depends=[ade4]; };
-genomicper = derive { name="genomicper"; version="1.3"; sha256="0fpvf286x0rf2mg9x82668kg5fx90arz5vf3731qinmdnnvrpziv"; depends=[]; };
 genpathmox = derive { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[plspm quantreg mice diagram]; };
 genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; };
 gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
@@ -3412,44 +3439,46 @@ geocodeHERE = derive { name="geocodeHERE"; version="0.1.1"; sha256="1j7xw3ca9cly
 geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
 geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; };
 geomorph = derive { name="geomorph"; version="2.1.2"; sha256="1pv7fjsfhnj85y3bmvbr9yirnr0a7sgyc3kljbi60z1ypr5294np"; depends=[rgl jpeg vegan ape geiger phytools]; };
-geonames = derive { name="geonames"; version="0.997"; sha256="1lywi5fxbw9ky3rf3q72iknl9as86c8d5dkrqwzhxn5nbxiwbpsc"; depends=[rjson]; };
+geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
 geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; };
 georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; };
 geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; };
 geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; };
 geosphere = derive { name="geosphere"; version="1.3-11"; sha256="0gsbzbx7x4ly7dfh8ld3fa795ysf4sl8a1jg3jc12nrrx85cwl74"; depends=[sp]; };
 geospt = derive { name="geospt"; version="1.0-0"; sha256="11gs2g7gxrzzridlhgbvpgjv55zfxy7y3d24dr3zf9ssa2z8v4v2"; depends=[gstat genalg MASS sp nloptr fields gsl plyr TeachingDemos sgeostat]; };
-geostatsp = derive { name="geostatsp"; version="1.1.5"; sha256="0150qybwd7w570isfxn0vn29gwpcf7p0w43ryn53mvqwhaa0sxmb"; depends=[Matrix raster sp abind numDeriv pracma]; };
+geostatsp = derive { name="geostatsp"; version="1.1.8"; sha256="1j8g7qw9mlc268wfjkfjrg54j857zy32f7vbigs8s156bix7k0df"; depends=[Matrix raster sp abind numDeriv pracma]; };
 geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
 geotopbricks = derive { name="geotopbricks"; version="1.3.5.4"; sha256="065h5dd7qxjydblgkgj2amz8krscgf7ds61b923w3b4biin4s4q4"; depends=[raster stringr zoo]; };
 geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; };
 getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; };
-gets = derive { name="gets"; version="0.1"; sha256="1dibbbg02hrdh062br51f51576jwd01dn1y4vg2hwcah6pg9hh2s"; depends=[zoo lgarch]; };
-gettingtothebottom = derive { name="gettingtothebottom"; version="3.0"; sha256="0n3d8xx4pwh4bps6jkfj4g8mpknj0lsfk03bayhvil744r5jnrn7"; depends=[ggplot2 Matrix lpSolve reshape2]; };
+gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; };
+gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
 gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; };
 ggHorizon = derive { name="ggHorizon"; version="0.1"; sha256="0k617qnfqdl9w2hdwppkrgl51krnwpdf0gahzvivcwzynbmywc37"; depends=[ggplot2 plyr RColorBrewer proto]; };
 ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
-ggRandomForests = derive { name="ggRandomForests"; version="1.0.0"; sha256="173k0l8grsl3lvvhiflj98fqy1rdh9yiq14c81irm39dxai801xn"; depends=[ggplot2 randomForestSRC reshape2 survival dplyr]; };
+ggRandomForests = derive { name="ggRandomForests"; version="1.1.3"; sha256="0yz25imvlpblrw2v9b5s39na9diljh2g93mmcv9gljad40iy34va"; depends=[randomForestSRC ggplot2 survival dplyr reshape2]; };
 ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; };
 gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; };
-ggm = derive { name="ggm"; version="2.1"; sha256="1m2p5cn7lfy4757rspp3d3jnphjp5vh3lvrim1lxlda577kpdmnf"; depends=[igraph]; };
+ggm = derive { name="ggm"; version="2.2"; sha256="12j904rmmhjmqzl9j12cxcjpxaqql8ncv39wgclwhifnwhzbw7zm"; depends=[igraph]; };
 ggmap = derive { name="ggmap"; version="2.3"; sha256="0sl3jkifba3q0khl5sg2nf08kgn1pirw5a1xag07za51sqda5b5q"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj]; };
-ggmcmc = derive { name="ggmcmc"; version="0.5.1"; sha256="17pmb2kfrjc2s538my8finr029vy1npzk44626xvznf6bf6bv895"; depends=[plyr reshape2 ggplot2]; };
+ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr tidyr ggplot2]; };
 ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 reshape2 plyr]; };
 ggplot2 = derive { name="ggplot2"; version="1.0.0"; sha256="138rxp8zr0x945ajmhg35x35xs0ci743iqhffqy90c7hcn0gpvz6"; depends=[plyr digest gtable reshape2 scales proto MASS]; };
 ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
 ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; };
 ggtern = derive { name="ggtern"; version="1.0.3.2"; sha256="05nh8610l5lw41wkidl2m78nqyfbc7faiawpc442lin3qxrj64bq"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; };
-ggthemes = derive { name="ggthemes"; version="1.7.0"; sha256="1wfqh3mq4hyyfgvw99bq1s8qxvl3qasa8qcikfhbp2ky898w5npb"; depends=[ggplot2 colorspace proto scales]; };
+ggthemes = derive { name="ggthemes"; version="2.1.0"; sha256="1gcl0mw3yq4yskwq1yjjx4bs9hv47s9apxgpjlciaih0b5zw2461"; depends=[ggplot2 colorspace proto scales]; };
 ggvis = derive { name="ggvis"; version="0.4"; sha256="09q7ccg5lsj0qqixpiq4xccpqckr7g4ws7ysr5mac3sgl8hm9r87"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; };
 ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; };
 giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
 gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
+gimme = derive { name="gimme"; version="0.1-1"; sha256="1snzlwq6d86ygpn778m3inlfqpymp0l05pdlrdkm8ip4wgir0hvs"; depends=[lavaan qgraph]; };
+gistr = derive { name="gistr"; version="0.1.0"; sha256="1izas53whxa4n8gdkifv1a9c8f3fpi21vs81kn2dk51xmhs8qhh2"; depends=[jsonlite httr magrittr knitr]; };
 gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; };
-glarma = derive { name="glarma"; version="1.3-0"; sha256="0r8c6c6q3jd2nv83jfws2skfji4zp9ia134k6wd4f535j7jqv2kw"; depends=[MASS]; };
+glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf9mg4sklcmqi0gdn8nxm1pkdpb86rba"; depends=[MASS]; };
 glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
 glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[mvtnorm glasso huge]; };
-glcm = derive { name="glcm"; version="1.0"; sha256="0i1i4dwswy0pi6fj78qffgk90pcrpzbr2dn87siq52kl7i66c2ny"; depends=[Rcpp Rcpp RcppArmadillo]; };
+glcm = derive { name="glcm"; version="1.2"; sha256="00bkhd4arvg7ahdr5kfvran46b2sywv9i0rlwalx9pmyvjwnzm5b"; depends=[Rcpp Rcpp RcppArmadillo]; };
 gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; };
 gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
 glinternet = derive { name="glinternet"; version="0.9.0"; sha256="0qihlzdb9ifqlyx5l34vkwi6z59xd7wbl72a3pj725n9kkk7bmig"; depends=[]; };
@@ -3466,7 +3495,6 @@ glmnet = derive { name="glmnet"; version="1.9-8"; sha256="1ndaq6qbn8vxs7ha4x9k0q
 glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; };
 glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; };
 glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; };
-glmperm = derive { name="glmperm"; version="1.0-5"; sha256="1m6nxk9k5qjmq4kvv1nv7n51hagwxi97pd5a3wgiky3wml4aa2nw"; depends=[survival]; };
 glmulti = derive { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; };
 glmvsd = derive { name="glmvsd"; version="1.1"; sha256="0qljc8drvc8xdcrs1vchby1zng1v228zp5v01pznfq1rb1knd15c"; depends=[glmnet ncvreg MASS]; };
 glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[MASS Formula lmtest sandwich]; };
@@ -3474,8 +3502,9 @@ globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0
 globalOptTests = derive { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
 globalboosttest = derive { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
 glogis = derive { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[zoo sandwich]; };
-glpkAPI = derive { name="glpkAPI"; version="1.2.11"; sha256="194j9v4cpgqgw0zixzi3p73prkr7s7pi1ldrvxyw9j3176lylm0v"; depends=[]; };
-gmailr = derive { name="gmailr"; version="0.5.0"; sha256="1jr3xf561y08wi1a9ysdbra7vf85hp14ybjn457c5mhhyfvxav49"; depends=[httr base64enc magrittr jsonlite]; };
+glpkAPI = derive { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
+glrt = derive { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
+gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[httr base64enc magrittr jsonlite mime]; };
 gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; };
 gmm = derive { name="gmm"; version="1.5-0"; sha256="071i2bk73z606yb6a3vrv4cfyvgfwkrirm09i7bg2l3y2is1dfgj"; depends=[sandwich]; };
 gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; };
@@ -3490,15 +3519,14 @@ goft = derive { name="goft"; version="1.0"; sha256="061x6mnzidmnza9q7z2ikik9zrn4
 goftest = derive { name="goftest"; version="1.0-2"; sha256="11xw0cfj71z5smywsds9ijbhf3glxkqnhxmwwdqkv4gjrrr2y1bv"; depends=[]; };
 gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fGarch fastICA]; };
 gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; };
-googlePublicData = derive { name="googlePublicData"; version="0.12.05"; sha256="01wilag2h55zdxxim2h06k0l93csi2nl7iqjnmk4yf9ayz226bc8"; depends=[XML XLConnect]; };
-googleVis = derive { name="googleVis"; version="0.5.6"; sha256="1gv8j4k5529i8gwqi4jk4gqlhbs8hykh5g6q6yqdmx27hz5dq1yn"; depends=[RJSONIO]; };
+googleVis = derive { name="googleVis"; version="0.5.7"; sha256="1z26b3zzrnlvy27sxj28nsrvdkjbsqcdmkj15wq5gks53rhsb0ia"; depends=[RJSONIO]; };
 goric = derive { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[nlme quadprog mvtnorm MASS Matrix]; };
 govStatJPN = derive { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
 gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode lattice vcd MASS colorspace]; };
 gpclib = derive { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
 gpk = derive { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
 gplm = derive { name="gplm"; version="0.7-2"; sha256="0pr39fbkv61iwd110lq76p2fi4dvx9qz6mjsvg6bpja9pfbb6wc0"; depends=[AER]; };
-gplots = derive { name="gplots"; version="2.14.2"; sha256="1ydb294qpz971kn44f9jq876wqxg58xisxm8y14v0kpl151yzclc"; depends=[gtools gdata caTools KernSmooth]; };
+gplots = derive { name="gplots"; version="2.16.0"; sha256="19xz8225ckjw0a44mwvfj0gk8m47x2xkgnxjqrxsbjg5qiqwl9nh"; depends=[gtools gdata caTools KernSmooth]; };
 gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[isotone plyr ggplot2 foreach]; };
 gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
 gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[Matrix fields]; };
@@ -3507,21 +3535,21 @@ grImport = derive { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqd
 grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
 gramEvol = derive { name="gramEvol"; version="1.2-1"; sha256="12lixsczgy5ypriv6vwfv8ymfa72pxqhh58dc7n41wcl0zhgfzb4"; depends=[]; };
 granova = derive { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
-granovaGG = derive { name="granovaGG"; version="1.2"; sha256="0gy8ba1zlm62f458sxrph3cyz4c6nqkaddm6nwj54nyicxqah32h"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; };
-graphicsQC = derive { name="graphicsQC"; version="1.0-5"; sha256="1h0qrf47r16np1ysymvlvvb95a8w86brh440kk20ajhbr5njp6kz"; depends=[XML]; };
+granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5zx6wbpws62dmp7n905gnp17n8cl8c6w2jp9"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; };
+graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; };
 greport = derive { name="greport"; version="0.5-2"; sha256="0lmska9m29hsz9f4myix6my6mg53awr5abigg642i3i2axv7cjd7"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; };
 gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
 gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; };
 gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; };
 gridGraphics = derive { name="gridGraphics"; version="0.1-2"; sha256="1ddgfjxvqd7kv4xax71v1srvq8887nvxsc5rn0px57w5fkdl69sh"; depends=[]; };
 gridGraphviz = derive { name="gridGraphviz"; version="0.1"; sha256="14zcr0w2c9cgdw6ij93w52k3bkmgdmx809snh9jjf2amy08p2gbg"; depends=[]; };
-gridSVG = derive { name="gridSVG"; version="1.4-0"; sha256="0ch1waz2z60a7ivn63nf1418kgypr0nv8vr3ak3my0i7gdgny2pc"; depends=[RJSONIO XML]; };
+gridSVG = derive { name="gridSVG"; version="1.4-2"; sha256="1h96jv7c60r1f4syappv6dn5f929rr8x3bm6blaxy4jy8bx52xmh"; depends=[RJSONIO XML]; };
 grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
 groc = derive { name="groc"; version="1.0.4"; sha256="1v32gwr8ghv47dmzp1x02n3aaqv3cfywh7xzx2486v4p960s42gc"; depends=[rrcov pls mgcv robust robustbase MASS]; };
 grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; };
 grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
 growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat Rcpp RcppArmadillo]; };
-growfunctions = derive { name="growfunctions"; version="0.1"; sha256="0r11grbxbmdx2yg2jh22rf0frg7jz0w7n5d7mbhn16fwnkm3y9mw"; depends=[Rcpp Matrix spam mvtnorm ggplot2 reshape2 scales Rcpp RcppArmadillo]; };
+growfunctions = derive { name="growfunctions"; version="0.11"; sha256="087qpykjj46a5zp48dx59k51mdyqckc39zgmrnhc5rhgm5df8sv3"; depends=[Rcpp Matrix spam mvtnorm ggplot2 reshape2 scales Rcpp RcppArmadillo]; };
 growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
 growthrate = derive { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[Matrix clime mvtnorm]; };
 grplasso = derive { name="grplasso"; version="0.4-4"; sha256="1l27fbdf08xj6flvbyvq9pc9v0hv9xpwpxxgcalv1l7rnvbq42jm"; depends=[]; };
@@ -3529,7 +3557,7 @@ grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwls
 grpreg = derive { name="grpreg"; version="2.8-0"; sha256="1mfd3hzzv720zhl8s6ghw0vfpqkz8q050dwnvmmb0smhdvahd2zj"; depends=[Matrix]; };
 grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; };
 gsDesign = derive { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 xtable stringr RUnit plyr]; };
-gsalib = derive { name="gsalib"; version="2.0"; sha256="0yk39ca7yrsksga73ma2pdqfy3s1xpp07y8622x44b9cazv6rdy4"; depends=[]; };
+gsalib = derive { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
 gsarima = derive { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; };
 gsbDesign = derive { name="gsbDesign"; version="0.96-2"; sha256="0sk4a66z9bqi3aa2ky9472p9znfm93kc9p5igdmvii4dr0syyfxd"; depends=[gsDesign lattice]; };
 gset = derive { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc mvtnorm MCMCpack]; };
@@ -3537,17 +3565,18 @@ gsg = derive { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bn
 gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; };
 gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; };
 gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
-gss = derive { name="gss"; version="2.1-3"; sha256="07bp60fhax8v4nyzcgadadi1kfwgwk5r08y6ifsgim500jbw7apk"; depends=[]; };
-gsscopu = derive { name="gsscopu"; version="0.9-1"; sha256="0qg4ra7zvp0j6wjbb14sqajfq745bza3v50s0c5xxnddblqi4hcc"; depends=[gss]; };
-gstat = derive { name="gstat"; version="1.0-19"; sha256="1yhrp1dgkl11hr8jy1kmsiaf8avf02m85wcnvf34vlbil24hy7py"; depends=[lattice sp zoo spacetime FNN]; };
+gss = derive { name="gss"; version="2.1-4"; sha256="0vmyz3q7b2chzmvrwx6bk2yj5kmaxym6lznyrddxgf7xzjipvlii"; depends=[]; };
+gsscopu = derive { name="gsscopu"; version="0.9-2"; sha256="0hg2ry9rhnn51g368fg1zxswx826y3m0yn2wjb2g5rw4a4zn1frr"; depends=[gss]; };
+gstat = derive { name="gstat"; version="1.0-21"; sha256="0zxai0r9hmmdy7xvf5f6hzlyw9rmy90ddkfckdapsw88pr10ww1n"; depends=[lattice sp zoo spacetime FNN]; };
 gstudio = derive { name="gstudio"; version="1.3"; sha256="1ddifizswm41y4sxnnfw8j90clba6zf022x0z4xipccaznim2gy9"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; };
 gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
+gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; };
 gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; };
 gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
 gte = derive { name="gte"; version="1.2-1"; sha256="0h6c5n9wz8b4b5pmqfbc8ivqpg2jh4k6x94wns1l33kiah70pmjd"; depends=[survival]; };
 gtools = derive { name="gtools"; version="3.4.1"; sha256="0d5v864v3qnmmxas8xf74aarli9nr3l16bwj9qzs2s9k498q6azs"; depends=[]; };
 gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
-gumbel = derive { name="gumbel"; version="1.04"; sha256="0fl44i4kz9wbba1iv4fy1b74nf25axdkifhczgrgpy5d81ky43v6"; depends=[]; };
+gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; };
 gvcm_cat = derive { name="gvcm.cat"; version="1.7"; sha256="0wgras21wzx1magcayz9nra8licrbx8aglmc272wrw3nqiagh0fi"; depends=[Matrix MASS]; };
 gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
 gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
@@ -3574,7 +3603,7 @@ hcci = derive { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3
 hcp = derive { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; };
 hda = derive { name="hda"; version="0.2-12"; sha256="11z9p35dvhi7bdw09d2yawh46nxk8axw76b51vk089g12nr2b9x7"; depends=[e1071]; };
 hddplot = derive { name="hddplot"; version="0.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS]; };
-hddtools = derive { name="hddtools"; version="0.2.2"; sha256="0ldasm8aqzcc0lfmgdbvljz103g11ydw01g4mv7wzysjvw6zlwfl"; depends=[sp rgdal raster RCurl XML zoo]; };
+hddtools = derive { name="hddtools"; version="0.2.4"; sha256="001cm07jvbxzsp64mkjymnsncyrd6r1nxwhjqkk2mb5ldz0541ir"; depends=[sp rgdal raster RCurl XML zoo]; };
 hdeco = derive { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; };
 hdi = derive { name="hdi"; version="0.1-2"; sha256="19lc2h34jlj198gchnhbfbb8igwlan2b977a47j8p3q6haj5bcv1"; depends=[glmnet linprog MASS scalreg]; };
 hdlm = derive { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[glmnet foreach MASS iterators]; };
@@ -3585,14 +3614,14 @@ heatmap3 = derive { name="heatmap3"; version="1.0.7"; sha256="037aw51ynhi45yzsdd
 heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; };
 heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; };
 helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
-helsinki = derive { name="helsinki"; version="0.9.20"; sha256="0jlyvj8cyzb0si2gqwik4jzbmwfawwnap9k6jl1z2nw2rz5w1k3c"; depends=[maptools rjson RCurl]; };
+helsinki = derive { name="helsinki"; version="0.9.24"; sha256="1ljqgwcmvcmir8fq3izym4k8ljakwqpgq94wfhrdxp0q393zb8rq"; depends=[maptools RCurl rjson sp]; };
 heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; };
-hergm = derive { name="hergm"; version="1.3-11"; sha256="1kfh7ry84smxf3d0ykjr7d0ckh2dk9y63761f4pmskfxqx12w98a"; depends=[ergm]; };
+hergm = derive { name="hergm"; version="2.1-1"; sha256="0d2y4zkd5xv1r4ynkwwaj4kj54m5avlrnk60m3xsfbwcbbblf2fx"; depends=[ergm latentnet network sna]; };
 heritability = derive { name="heritability"; version="1.0"; sha256="08hlj6blqp70812llaxx5m18qn1v65csfz6d0lhhab2pir7arlg8"; depends=[]; };
-hermite = derive { name="hermite"; version="1.0"; sha256="11daz0lwlr6klbqkc4bkkmghfm0p2pqmpclrp6dj5v3403h3yksh"; depends=[]; };
+hermite = derive { name="hermite"; version="1.0.1"; sha256="0y49dj905y9x4pjrx6iki3mk5kkppbd1c6dk0yvvh7sisapnphjx"; depends=[]; };
 het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
 hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; };
-hexView = derive { name="hexView"; version="0.3-2"; sha256="19s87qxz9rjvzr64pv51wfd26jy5f00i8lwv39hhr6rh0jwngdly"; depends=[]; };
+hexView = derive { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; };
 hexbin = derive { name="hexbin"; version="1.27.0"; sha256="0fs5nsaalic6fj7b347yjczws310y3q2v37yr8sg74yq8wqzsdj8"; depends=[lattice]; };
 hflights = derive { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; };
 hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; };
@@ -3608,18 +3637,21 @@ hierarchicalDS = derive { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pw
 hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[gtools ade4]; };
 highD2pop = derive { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
 highTtest = derive { name="highTtest"; version="1.0"; sha256="0iyr47nid147m9m8bsjjxc9kvjv68rgay4naxldwisyscqp8jl0m"; depends=[colorfulVennPlot]; };
+highfrequency = derive { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; };
 highlight = derive { name="highlight"; version="0.4.4"; sha256="03mch5waqkzb9pb4llgalbxdfn3h6adh05f3i43kscssc67bs30l"; depends=[]; };
 highr = derive { name="highr"; version="0.4"; sha256="18qfh6v5h29g6y2fkgd4qnkl1ijzzjh369gvn9pzcgaapm6s2wpf"; depends=[]; };
 hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
 hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
 hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; };
 histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
-hitandrun = derive { name="hitandrun"; version="0.4-2"; sha256="143aj926mx0v26f8dsagr90ggzk23lfms57agzrnqfvddla7ng9c"; depends=[rcdd]; };
+historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
+hitandrun = derive { name="hitandrun"; version="0.5"; sha256="1f7h963hqyhir3c26dyi0gvv5pf0a7x8sw2km3wh4ncwx2barfzq"; depends=[rcdd]; };
 hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pkl20rm24wxnf1y1xv695v3j58ibd"; depends=[rJava XML]; };
 hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; };
 hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
 hmm_discnp = derive { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; };
 hmmm = derive { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[quadprog MASS mvtnorm]; };
+hnp = derive { name="hnp"; version="1.0"; sha256="1sxbgz57js1vxhz309dnj6jhw4y6c0pzk0a9xk8avacicnv0bxhr"; depends=[MASS]; };
 hoardeR = derive { name="hoardeR"; version="0.0-2"; sha256="1k9a469h6fmr1br93dsk4q14h2bw8225l0v5sfp2wyr8sfpwm1dg"; depends=[httr XML stringr]; };
 holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
 homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[rgl ape scatterplot3d]; };
@@ -3629,22 +3661,26 @@ hot_deck = derive { name="hot.deck"; version="1.0"; sha256="11dxj676y55p4n0c27l7
 hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[lattice ineq]; };
 howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
 hpcwld = derive { name="hpcwld"; version="0.4"; sha256="1vh5jvq9nbghsl59fi6v3nmsh0jmxq7pzbs3fgasz8c3jmjw50kp"; depends=[]; };
-hpoPlot = derive { name="hpoPlot"; version="1.0"; sha256="0jd0imbhsw74gziafkzn7hrxz79llmpksspbnxnslm1mifl81www"; depends=[functional plotrix Hmisc]; };
+hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr]; };
 hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
 hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
 hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
 hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
-hsphase = derive { name="hsphase"; version="2.0.0"; sha256="04zhqnrrzhg1kqxf251q7iglazsj28dqqvhvch472925xf7dnap3"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; };
+hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; };
+htmlTable = derive { name="htmlTable"; version="1.0"; sha256="08qj94n6inib27mr47bwln2daizhdp5zghsndp3x3ykkvi1972ys"; depends=[stringr magrittr Hmisc]; };
+htmltab = derive { name="htmltab"; version="0.5.0"; sha256="1c5bcx00wgh2xvghg91jyv7086y5ya0bil4igfsqjqsn0lfcjxpg"; depends=[XML]; };
 htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; };
+htmlwidgets = derive { name="htmlwidgets"; version="0.3.2"; sha256="1r0n3c2xvj9k7x892nbqyclpc66lq5wyxc2y0nybs5wcz3jx9s2p"; depends=[htmltools RJSONIO yaml]; };
 hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; };
 httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
 httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp Rcpp]; };
-httr = derive { name="httr"; version="0.5"; sha256="074z78zv3nif53lsmn2k6hwv3yz4xr21wacb53s3f6hnmms8qvfp"; depends=[RCurl stringr digest jsonlite]; };
+httr = derive { name="httr"; version="0.6.1"; sha256="111l6ygwnrzcqwny6ds62np0r2f6x0il7abapq00j1y86nk4p6l6"; depends=[digest jsonlite mime RCurl R6 stringr]; };
 huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[Matrix lattice igraph MASS]; };
 humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
 hwde = derive { name="hwde"; version="0.64"; sha256="1is39zknssqm98577sdjg8gn3h9wsraih19a9nd6n8mxdcsqivh4"; depends=[]; };
 hwriter = derive { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
-hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="06hq493v702hy2mv73glav4az2wphzy3lqqkxjkpjpab00xc42d5"; depends=[hwriter TeachingDemos]; };
+hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
+hwwntest = derive { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
 hybridEnsemble = derive { name="hybridEnsemble"; version="0.1.1"; sha256="1hn6zfz22mgxv5qpwdgmn7a9snha7hdkbbqq3xicy37j8xypsab5"; depends=[kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch glmnet]; };
 hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; };
 hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
@@ -3652,33 +3688,34 @@ hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizy
 hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc sp lattice zoo lhs]; };
 hydroTSM = derive { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[zoo xts e1071 gstat automap sp]; };
 hydrogeo = derive { name="hydrogeo"; version="0.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; };
-hydrostats = derive { name="hydrostats"; version="0.2.1"; sha256="07pi1q4g5bhjq9vd31rvakqbrspk1yxhysds904b0cmax9wwlqlx"; depends=[]; };
+hydrostats = derive { name="hydrostats"; version="0.2.3"; sha256="1hd4jcdkdl546kqvx9swnqn7gjvd7ppz034cqflpckhn68rc62g7"; depends=[]; };
 hyperSpec = derive { name="hyperSpec"; version="0.98-20140523"; sha256="1ypmq5xgcjqrq9i8f08csjqffv9qfpfkvrbawlf1ds7i49h6jq28"; depends=[lattice mvtnorm]; };
 hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; };
 hypergea = derive { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; };
 hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp4wd5jiy05rx5bj93c7bplx68j3c68c9f1q"; depends=[elliptic contfrac]; };
-hypervolume = derive { name="hypervolume"; version="1.0.2"; sha256="051623cxlqs7h4zf2a4adhcyqawsap8xszv6naj6m2zss33b4md3"; depends=[Rcpp rgl MASS geometry igraph Rcpp]; };
+hypervolume = derive { name="hypervolume"; version="1.1.2"; sha256="1d4c5lfvr32w5mdrll6kg7frykhc8wfg3i5v3a93s0df02yprc4s"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; };
 hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
-hypred = derive { name="hypred"; version="0.4"; sha256="08nqgw0h3zh4vyhfd1cngr6snz5n7skj3d9rg2qccz9pnjp7j1ab"; depends=[]; };
+hypred = derive { name="hypred"; version="0.5"; sha256="07jxpzh53qmv1vs2yhgnvxwcwkwpp6a12861i4a5n6pvwivw220d"; depends=[]; };
 hysteresis = derive { name="hysteresis"; version="2.0"; sha256="1g9d91djwi9k2q10zqak8fpmywnwmha1pm18g2hmwzrqrwnr6dh9"; depends=[car msm nlrwr]; };
 hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; };
 iBATCGH = derive { name="iBATCGH"; version="1.1"; sha256="0nl5l17pm92ns40qzkmayc48a6i4j8w0562sp5jxyi95y4vb4aiy"; depends=[Rcpp msm Rcpp RcppArmadillo]; };
 iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[R2WinBUGS gWidgetsRGtk2]; };
-iC10 = derive { name="iC10"; version="1.1.1"; sha256="1awmg2m9f7lq5p16mzlmz2sw680vbi70j4ksxx8d385rhmy6v5w6"; depends=[pamr iC10TrainingData]; };
+iC10 = derive { name="iC10"; version="1.1.2"; sha256="1ncxdjw9ary0bs3fvnvyqp356gi4wa177sllkizq71fzn75a03x3"; depends=[pamr iC10TrainingData]; };
 iC10TrainingData = derive { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
 iCluster = derive { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[lattice caTools gdata gtools gplots]; };
 iDynoR = derive { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[XML vegan]; };
 iFad = derive { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[Rlab MASS coda ROCR]; };
+iFes = derive { name="iFes"; version="1.0"; sha256="0in6wy6w567188gylnlvcsk3r3w2nln9h60rj7ng1qwqawrvgwxp"; depends=[ROCR doParallel foreach]; };
 iGasso = derive { name="iGasso"; version="1.2"; sha256="123487slizsmw5b0imwqll8n03navx30kvawr6jfibbjfdd8vfn7"; depends=[lattice CompQuadForm]; };
 iRefR = derive { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[igraph]; };
 iRegression = derive { name="iRegression"; version="1.2"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; };
 iRepro = derive { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; };
-iScreen = derive { name="iScreen"; version="1.0"; sha256="09iyimzrx7510xamhl6w1f7p6j096wh5yck9zgwbk87mvabqynmg"; depends=[maptree]; };
 iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
 ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[lpSolve MASS car lsmeans multcompView]; };
 ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
 ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[fields deldir rgeos sp spdep]; };
 ibelief = derive { name="ibelief"; version="1.0"; sha256="1mcmq1zpj1f6alhnsznb27iknp7dzdsd25di8a64hw5c3cnx3xay"; depends=[]; };
+ibmdbR = derive { name="ibmdbR"; version="1.34.3"; sha256="0b0v61sf033fmhp2vn6g5vgy3irsqlpqgiz8j0h068p4fr2q660v"; depends=[RODBC MASS]; };
 ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; };
 ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[quadprog mvtnorm boot kappalab]; };
 ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
@@ -3703,7 +3740,7 @@ iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r
 ilc = derive { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[demography rainbow forecast date survival]; };
 imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[RCurl httr png jpeg]; };
 imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
-imputeLCMD = derive { name="imputeLCMD"; version="1.0"; sha256="0avgl8wwwsz27z439y415lv4h33af58db084mjr236y1z9sfhdyw"; depends=[tmvtnorm norm]; };
+imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[tmvtnorm norm]; };
 imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
 imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret reshape2 glmnet pls rda Cubist ridge gbm mboost rpart]; };
 imputeYn = derive { name="imputeYn"; version="1.2"; sha256="08i3bwzmd4cn3cbwbrcjh3b75m7xms9m3dpmym99g08282cmljwx"; depends=[quadprog emplik mvtnorm survival]; };
@@ -3716,7 +3753,7 @@ indicspecies = derive { name="indicspecies"; version="1.7.4"; sha256="1b9fgdsprh
 ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
 inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
 inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; };
-influence_ME = derive { name="influence.ME"; version="0.9-4"; sha256="1smvhr72vnds20x71986idk6rak69g28dddlf9g2ivg0ajkji5q9"; depends=[lme4 Matrix lattice]; };
+influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lme4 Matrix lattice]; };
 influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwmhh9qx0yc5fy8b3g4i4cfqbg6sfzbmn39si2z34wrxw"; depends=[lavaan]; };
 infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; };
 informR = derive { name="informR"; version="1.0.04"; sha256="0s40hlilk8fjld2m43f2m50a3764qgnv07y5jwv60a8d0nf4gpa2"; depends=[abind relevent]; };
@@ -3727,24 +3764,25 @@ inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723w
 insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve nlme lattice]; };
 insol = derive { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
 insuranceData = derive { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; };
-intReg = derive { name="intReg"; version="0.1-2"; sha256="1sm7v4fnfsdhyqr3q8dms0ifwb00hzf3x1g0fpm7xldlqc3wf6pr"; depends=[maxLik sets sets]; };
+intReg = derive { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[miscTools maxLik sets]; };
 intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; };
 intamap = derive { name="intamap"; version="1.3-37"; sha256="17l1bifks0vsk0a3bj2g4w8qrvhmdh0p145kmd09223x9yc4mc9v"; depends=[sp gstat automap mvtnorm MASS evd]; };
 intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[intamap spcosa spatstat automap gstat]; };
 intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; };
 integrOmics = derive { name="integrOmics"; version="2.55"; sha256="1c9vkhvnndhs3h9qzcg3pvizjk9rhgk8gccaxh33spgr4rql8vcw"; depends=[]; };
 interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[shiny knitcitations RCurl mvtnorm knitr]; };
-intergraph = derive { name="intergraph"; version="2.0-0"; sha256="0y5cd7y08p86fxm4zqraj81sj5a5h7725wvzcyxd8p1q3ky2sj9f"; depends=[network igraph]; };
-interpretR = derive { name="interpretR"; version="0.1.0"; sha256="015rz4lm116ijx6hq1nz76f22fv21b8yyk1bb9qalmpyxk2lbgrz"; depends=[randomForest]; };
+interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
+intergraph = derive { name="intergraph"; version="2.0-1"; sha256="03ycay3x4wd3j7r0mad9qgi4h77krapg613ans3jf9qa4ys2njlv"; depends=[network igraph]; };
+interpretR = derive { name="interpretR"; version="0.2.0"; sha256="1wbsyaw6n89is3gw8na92axads7lp8z2bsdrvxg14nzknl9nsr3q"; depends=[randomForest AUC]; };
 interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; };
 intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; };
 interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
 intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
 introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[nnet genetics RColorBrewer]; };
-intsvy = derive { name="intsvy"; version="1.4"; sha256="0c50ivmy9g99zaqrm2qv915gwzlwd66baiqhlv0fcz50pqs3z4zk"; depends=[memisc foreign plyr ggplot2 reshape]; };
+intsvy = derive { name="intsvy"; version="1.6"; sha256="1bv8qap3d8yssfm80ilrn6wg3207hiy34sd92wl64bwpvqyi6i7p"; depends=[memisc foreign plyr ggplot2 reshape]; };
 invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[survival optimx]; };
-investr = derive { name="investr"; version="1.1.2"; sha256="1nz6vkpf409vdz5jn4cni8x6ic9nqxdg5xjknqvf137pz1bs2dqx"; depends=[nlme]; };
-io = derive { name="io"; version="0.1"; sha256="1yvyxp45y1v1lrksga5gfjqb2w509l3v817830ya5f740h517l74"; depends=[]; };
+investr = derive { name="investr"; version="1.2.1"; sha256="1gz709zfcf85rchjpi85pzki3a0ibvwhnxickcxsj07knklc4a6d"; depends=[nlme]; };
+io = derive { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmnnsq3hcs2pyphws6hgdmwwh"; depends=[filenamer stringr]; };
 ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[]; };
 iosmooth = derive { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; };
 ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
@@ -3763,9 +3801,9 @@ irtrees = derive { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fm
 isa2 = derive { name="isa2"; version="0.3.3"; sha256="0czviglmbb7hmhghrg4hla4xhbjr98a5ivqkbq70rnfmqzffcxcz"; depends=[]; };
 isdals = derive { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
 isingLenzMC = derive { name="isingLenzMC"; version="0.2.1"; sha256="1g1rz8p9vw2jnx6qw9mb614fpkv5bd7cndwcz0mva33y5shhnibl"; depends=[]; };
-ismev = derive { name="ismev"; version="1.39"; sha256="0z5pam5lq72jv13gy40l35nvpk5hfcg3sq14mwhjqd129670gjbv"; depends=[mgcv]; };
+ismev = derive { name="ismev"; version="1.40"; sha256="1isxgq62q6dk50c3w1l0j4nfgwsj6c2wnx2sm3ncxzlqml0ih6jn"; depends=[mgcv]; };
 isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; };
-isopam = derive { name="isopam"; version="0.9-12"; sha256="16zkw6y57i46w6v6z8zh0p2mapqry35ibl54vpb5mwp6six2hklk"; depends=[vegan cluster]; };
+isopam = derive { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[vegan cluster]; };
 isopat = derive { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
 isotone = derive { name="isotone"; version="1.0-2"; sha256="0qcad691c1dk61a75813hxbc61jllvfc3j21gn85f0kcf4hn6dnz"; depends=[]; };
 isotonic_pen = derive { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
@@ -3789,14 +3827,18 @@ jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as
 jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2 Rcpp]; };
 jackknifeKME = derive { name="jackknifeKME"; version="1.1"; sha256="1bzwgyyc2zcm27qahbbf5iqx24q0ddwlzwg7h4h866rlwzb4xf1b"; depends=[imputeYn]; };
 jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
-jiebaR = derive { name="jiebaR"; version="0.2"; sha256="1x1vh773rsm927n9npgx4q1zp3y0r09r4c5f056b7s3j4pnp8hj3"; depends=[Rcpp Rcpp]; };
+jagsUI = derive { name="jagsUI"; version="1.3.1"; sha256="18g755dxmlwv5abjdv3sip5qxpd13sx79f85wb0ji5i4fjax26ky"; depends=[lattice rjags coda]; };
+jiebaR = derive { name="jiebaR"; version="0.4"; sha256="0vm41z2kc5zvvqmamwfqacc1ndpa0npk515zn7v4bd6gv6dw2lgn"; depends=[jiebaRD Rcpp Rcpp]; };
+jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
 joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; };
 jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
 jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
+jomo = derive { name="jomo"; version="0.1-2"; sha256="1d5bqcxbl5zpy3lqmf8k2khbwislf7smw9fknlgb99sf5p3w9ca0"; depends=[]; };
 jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
-jsonlite = derive { name="jsonlite"; version="0.9.13"; sha256="1l8l6a6l9427z4gkpgq718yfd3h4pbj7d2lazhpnb286ipp82w21"; depends=[]; };
+jsonlite = derive { name="jsonlite"; version="0.9.14"; sha256="1dshp8c0a6mfn401s20jlab86jd86bb0fcfswcyjdm39y8sd81fz"; depends=[]; };
 jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; };
 jvmr = derive { name="jvmr"; version="2.11.2.1"; sha256="0h76b1596zil2m6fbhp38gchxwif942sldbfc6sgbn3ig9mz8zw5"; depends=[rJava]; };
+jwutil = derive { name="jwutil"; version="1.0.2"; sha256="01c2mjg719bqjzca1a0ac6q0af2jc95jb292smvrq4bx1bd5nwpi"; depends=[]; };
 kSamples = derive { name="kSamples"; version="1.0"; sha256="0a4kl6508isjsbv8g7b8g9c2kmai90lwdjn0576i7l4hnqvi532b"; depends=[SuppDists]; };
 kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
 kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; };
@@ -3808,7 +3850,7 @@ kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd
 kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[ltm equateIRT]; };
 kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; };
 kernelFactory = derive { name="kernelFactory"; version="0.2.0"; sha256="1ihghqrrndgif6kh6n0f4g3bfy5miskn3mk5ynxfcnnrfvp9h3xj"; depends=[randomForest AUC genalg kernlab]; };
-kernlab = derive { name="kernlab"; version="0.9-19"; sha256="0caqp5dp1irhwpq8lyram35r8x16qlfp6f5wzqyi5rzcz27d03sg"; depends=[]; };
+kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; };
 kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
 kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
 kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; };
@@ -3827,18 +3869,19 @@ kml = derive { name="kml"; version="2.2"; sha256="1g8wgmvs31r3hp7y8n9pkxc9qy5fxv
 kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y5xpaclmfjr8fkwairqz5nnmgbv"; depends=[clv rgl misc3d longitudinalData kml]; };
 kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
 knitcitations = derive { name="knitcitations"; version="1.0.5"; sha256="1a9lw9gdb31akdwiif5xzbs4s0s9xkhm3n735xnkiyc9n6afwzn3"; depends=[RefManageR digest httr]; };
-knitr = derive { name="knitr"; version="1.8"; sha256="0sysgb0adlr6av8xhzywjl43dwvj9p4hglzwr5wnpyfay84ylhni"; depends=[evaluate digest formatR highr markdown stringr]; };
+knitr = derive { name="knitr"; version="1.9"; sha256="17kwz14n16c3zjrpvm3c6rfn501gwlzgiikzwmc6krxvxafghik9"; depends=[evaluate digest formatR highr markdown stringr]; };
 knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
 knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
 knnIndep = derive { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
+knockoff = derive { name="knockoff"; version="0.1.1"; sha256="0jn8k807frwd8n9clf9xccxwg1rp7qjf3xsl56mphb4h8g7i59nb"; depends=[glmnet RJSONIO]; };
 koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; };
 kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[plyr reshape ggplot2 MASS emdbook coda]; };
 kofnGA = derive { name="kofnGA"; version="1.0"; sha256="1h50dkysydk2nk90xi0lw6qyc15131xh2m4vh0gkfch8sd2gwqiw"; depends=[]; };
 kohonen = derive { name="kohonen"; version="2.0.15"; sha256="1mamn6lwnd54jw7bbxgrxj511abn9wg5rxrm9fac7jndf00kjaim"; depends=[class MASS]; };
 kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; };
 kpodclustr = derive { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; };
-kriging = derive { name="kriging"; version="1.0.1"; sha256="0ppkhjrz09x4b8syp6j2xjdv5gi4mjkvnqdfxv3pqcm3c7zqfdrs"; depends=[]; };
-krm = derive { name="krm"; version="13.11-03"; sha256="05yy06ib879j1gcgqgljkfw79a3vg2ij71w7zah4ixl7di0301la"; depends=[]; };
+kriging = derive { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
+krm = derive { name="krm"; version="2014.12-1"; sha256="0lf506q6975vihkd75wwndqaa86ci4d4k4ijjzpvv31xw2kkbwb6"; depends=[kyotil]; };
 ks = derive { name="ks"; version="1.9.3"; sha256="077sx9kms8nkgg6c4bg24n0j6a7bf253bp26hybyilbagp7k6pin"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; };
 kselection = derive { name="kselection"; version="0.1.1"; sha256="18l8a00v8ldpzvbzi5ph7hmgrlsydkynfzqn3vs1i84zvwrh1fz5"; depends=[]; };
 kst = derive { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; };
@@ -3871,8 +3914,8 @@ laser = derive { name="laser"; version="2.4-1"; sha256="1f6j3xdks0w63fqjj9q8ng2m
 lasso2 = derive { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; };
 lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
 lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
-latdiag = derive { name="latdiag"; version="0.2"; sha256="11fahajwky3cfbd8y5xfaiz24qf7bkifbzcnvhv7daan4gsha04z"; depends=[]; };
-latentnet = derive { name="latentnet"; version="2.5.1"; sha256="0jzdgsw3i0s0rn8199m7g4x2gwbbrc5nd7fzimhxmib99pyzvrjf"; depends=[statnet_common network ergm sna mvtnorm abind coda]; };
+latdiag = derive { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; };
+latentnet = derive { name="latentnet"; version="2.6.0"; sha256="0aw184r1w28d4lmznnx4hp8kwws0r13fmbx1wlsbg3zagmwwjn8d"; depends=[statnet_common network ergm sna mvtnorm abind coda]; };
 lattice = derive { name="lattice"; version="0.20-29"; sha256="0ip6qw1kry68dqj97bh8ddpq6gfsxf3n3axc6pn3zv2n1mfv6s9s"; depends=[]; };
 latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; };
 latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; };
@@ -3884,7 +3927,7 @@ lawstat = derive { name="lawstat"; version="2.4.1"; sha256="142plbzpvi5xy7j5m5wi
 lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
 lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
 lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4wnq7hfw9qcx1s0y4c34lbxwly2wyrvzjhxybl"; depends=[Hmisc survival]; };
-lazyeval = derive { name="lazyeval"; version="0.1.9"; sha256="1qqm9pvjh32h9c9g7wnrsa2lc15azqkq1vwq1knlyksyvwh3rbpl"; depends=[]; };
+lazyeval = derive { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; };
 lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp Rcpp]; };
 lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
 lcd = derive { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[igraph MASS ggm]; };
@@ -3895,16 +3938,18 @@ lda = derive { name="lda"; version="1.3.2"; sha256="1iizsksp8wz34ji7p2kc6npxz9rz
 ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
 ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
 ldr = derive { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
+leaderCluster = derive { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
 leafletR = derive { name="leafletR"; version="0.3-1"; sha256="1jgmjm4f91saq2cjfgi240zz3i1r1nfb267i0gj15k2nak6ng86j"; depends=[brew jsonlite]; };
 leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; };
 leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
 lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape picante geiger fBasics SDMTools vegan]; };
-leiv = derive { name="leiv"; version="2.0-6"; sha256="18cf050653qrwyma23r50i66irjpdbp03nc96pirji5sl4dr9q7x"; depends=[]; };
+leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
 lessR = derive { name="lessR"; version="3.1.1"; sha256="0cx5bvwfkrfy5im7x718ixf45aw22561b9w0vv0qp97y7xyjqja5"; depends=[car leaps MBESS foreign gdata triangle]; };
 lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
 letsR = derive { name="letsR"; version="1.0"; sha256="1far1vil7g4ymvmhzb0dgfng5d1nkcb4rr1sp7yi72lz60h3g9hk"; depends=[maps raster XML geosphere maptools sp]; };
-lfe = derive { name="lfe"; version="1.7-1404"; sha256="1pjjm7a770la4zwajw3qc4wpaydbj9dwm4wd28jjpi01wcb07cli"; depends=[Matrix Formula xtable]; };
+lfe = derive { name="lfe"; version="1.8-1441"; sha256="0ahcrb1wx2zcigvcijsnj3x9wb8mba1gciyalikkiyrh3bljp8lz"; depends=[Matrix Formula xtable]; };
+lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; };
 lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; };
 lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
 lgarch = derive { name="lgarch"; version="0.5"; sha256="01y5p3w4i1yfxb647pkdazqn9yac1p6jp7rk92ddxnvvjb6fdp59"; depends=[zoo]; };
@@ -3912,7 +3957,7 @@ lgcp = derive { name="lgcp"; version="1.3-6"; sha256="04khs0knax3g20hgi5ykny1ck4
 lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
 lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
 libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; };
-lifecontingencies = derive { name="lifecontingencies"; version="1.1"; sha256="0rjiqmhqiliy8zbprxnr63r0wvwzs825gd6rrz4skwxcwpl4d0sh"; depends=[]; };
+lifecontingencies = derive { name="lifecontingencies"; version="1.1.5"; sha256="0v4rdq4ajd12ri1agn9i57nigxpgvg67clpskks761b7n1b6l77v"; depends=[markovchain]; };
 likeLTD = derive { name="likeLTD"; version="5.4.0"; sha256="09h1a4pn1i3vm3116yxvx07b62cbqmq84svpkbxykl4jmlqmwg8x"; depends=[DEoptim ggplot2 gtools rtf gdata]; };
 likelihood = derive { name="likelihood"; version="1.6"; sha256="11p7k6wpr7ypas414qir0hracy0960j8g3nwlhjbmynwmfzpkq1r"; depends=[nlme]; };
 likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb3m5irvw6yivirrj45wscxn3kz5s1"; depends=[ggplot2 xtable psych reshape gridExtra plyr]; };
@@ -3920,24 +3965,25 @@ limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj
 limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
 linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
 lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[qtl class]; };
+linkR = derive { name="linkR"; version="1.0.0"; sha256="1l936i74h1s42w1d7nn220rjygc6n0jkjidvix1df2wlacnswzpg"; depends=[svgViewR]; };
 linkcomm = derive { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[igraph RColorBrewer dynamicTreeCut]; };
 linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
 linprog = derive { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
 lint = derive { name="lint"; version="0.3"; sha256="0lkrn5nsizyixhdp5njxgrgwmygwr663jxv5k9a22a63x1qbwpiq"; depends=[plyr harvestr stringr dostats foreach]; };
+lintr = derive { name="lintr"; version="0.2.0"; sha256="14jaghvd0kz271j6wl8j0y31h48ajvgzd68drdi6pv9nrxqs046n"; depends=[rex crayon codetools stringdist testthat digest igraph]; };
 liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[MASS Iso]; };
 lisp = derive { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
 lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
-list = derive { name="list"; version="7.0"; sha256="07i8gixsi34yq17832md2qgsnxgnbwq31bc5h8bwdxb08ndg8qlm"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; };
+list = derive { name="list"; version="7.1"; sha256="1avbps4di6rhy6rvfyky336zqab65ibfjw2hwp1r713psbmf9z16"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; };
 llama = derive { name="llama"; version="0.7.2"; sha256="115j944891mf6sba2bk1lhb8ksdw2halncjvf1j9wsjb6d41liha"; depends=[mlr plyr rJava parallelMap]; };
 lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; };
 lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[data_table combinat VGAM plyr]; };
-lm_beta = derive { name="lm.beta"; version="1.5"; sha256="1f7bmfjmz90snfjkvx54knwgav3r6fr85wayi19bwljh1d57wv1i"; depends=[]; };
+lm_beta = derive { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
 lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp Rcpp]; };
 lmSupport = derive { name="lmSupport"; version="2.9.1"; sha256="11c86ji7srv80zlrp6c8ark312xzvajig8flc5qm77dgacik8daq"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; };
-lmbc = derive { name="lmbc"; version="0.9.1"; sha256="0pxm29n8rhcy7g8kia0bgz78w5nr851dhhrb7nn13szw6j13ji8x"; depends=[mseq lars]; };
 lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr Rcpp RcppEigen]; };
 lmeNB = derive { name="lmeNB"; version="1.2"; sha256="0xgw1kmq3krz8z0ickjg6qkj3bq2bkbwcd79c5fkl6fa3hp035mh"; depends=[numDeriv statmod lmeNBBayes]; };
-lmeNBBayes = derive { name="lmeNBBayes"; version="1.2"; sha256="0zpxdgqv5yhpwl2jfrxx37b126pgrflynmw9i4vmcvzx830d084l"; depends=[]; };
+lmeNBBayes = derive { name="lmeNBBayes"; version="1.3"; sha256="0zvbliryh821hxxzr2d5irbjp50vkhdmrkzgphv9jnzqh7rr3hvm"; depends=[]; };
 lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
 lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; };
 lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
@@ -3947,16 +3993,16 @@ lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3
 lmm = derive { name="lmm"; version="0.9"; sha256="0gs68iwk9gajb5af5ibgg9k5280ixqki8vxyp3cq5lrk96gcmqpr"; depends=[]; };
 lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; };
 lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
-lmmot = derive { name="lmmot"; version="0.1.1"; sha256="134rw5sy6ibpp5cn3hayym4l2s5cr0123ygk2rjf54j5mf52szm3"; depends=[maxLik MASS]; };
+lmmot = derive { name="lmmot"; version="0.1.2"; sha256="1c7cn1g1fl8nwjzm78a8qgw9da170f1q0z5vxl446f167ix5ppkp"; depends=[maxLik MASS]; };
 lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93grwrv9n7vpgp5wp1hj4d1s8c"; depends=[nlme lmeSplines reshape gdata gplots ggplot2]; };
 lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
 lmom = derive { name="lmom"; version="2.4"; sha256="04mfp7fcw1696qn34pxdffspwy0xalig3p7mqcj49v6kdxclpx1p"; depends=[]; };
 lmomRFA = derive { name="lmomRFA"; version="3.0"; sha256="188i2fk2csqwdmw3x1wwigaajbvwfd9dwd8q3pmx7ha4smp49amk"; depends=[lmom]; };
 lmomco = derive { name="lmomco"; version="2.1.1"; sha256="0q58g13j7h8pag3yj96qpnsa2m77hrrjkc24f6x847vlsn39md80"; depends=[]; };
 lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; };
-loa = derive { name="loa"; version="0.2.15"; sha256="137l90qz87xrid28knbj8997pjqgqf6769cwfj82cm57m98bda91"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; };
+loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; };
 localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
-localgauss = derive { name="localgauss"; version="0.33"; sha256="1xgcwlgkzkxws771zig4x6v0m6flf9vlcgpa80ajr0vmjhlplbly"; depends=[ggplot2 MASS foreach matrixStats]; };
+localgauss = derive { name="localgauss"; version="0.34"; sha256="04bn777kcxaa5s4zf0r9gclar32y9wpzqnx2rxxhqrxyy419gw37"; depends=[ggplot2 MASS foreach matrixStats]; };
 localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
 locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
 locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[wavethresh igraph]; };
@@ -3964,7 +4010,7 @@ locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm
 loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; };
 log4r = derive { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; };
 logbin = derive { name="logbin"; version="1.0"; sha256="17vabb348kczn839mhwshn20qgrdnpd0ll81hb8bcsricm6dqhna"; depends=[glm2]; };
-logconPH = derive { name="logconPH"; version="1.3"; sha256="1fmv2zp48pvyimyz3czfr13q09f8hj4pjdf1fh53rfdir8gvgv5g"; depends=[]; };
+logconPH = derive { name="logconPH"; version="1.5"; sha256="05fkibgh5nzs8c4f39kzg4zyh2dfhg1k69hlx7l8p442snajsg92"; depends=[]; };
 logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
 logcondens = derive { name="logcondens"; version="2.1.2"; sha256="0lnsyjl77l9024pqncyxwivmj05f5mfa3563jql47jajaai0my8y"; depends=[ks]; };
 logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[logcondens distr]; };
@@ -3974,7 +4020,7 @@ logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lh
 logitchoice = derive { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; };
 logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; };
 loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
-logmult = derive { name="logmult"; version="0.6"; sha256="1r8i2zgmgm44dhg2z2k7cqy10hldp1p91idjiyg9pmi8dfch8xki"; depends=[gnm qvcalc]; };
+logmult = derive { name="logmult"; version="0.6.1"; sha256="1wa6srl7fk2cpgszxa0nsd8dqrjk3ksyzm3yfna841l3rss823qv"; depends=[gnm qvcalc]; };
 logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp92whgxgn7w87cadgxr65pp7nv6m5pvj130i3p"; depends=[]; };
 lokern = derive { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; };
 lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
@@ -3982,7 +4028,7 @@ longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj40795
 longitudinal = derive { name="longitudinal"; version="1.1.10"; sha256="1mnviq4v040kbcsca04gzfx2lfz2ipv3nbmqgkbp9v45w96qymq9"; depends=[corpcor]; };
 longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; };
 longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
-longpower = derive { name="longpower"; version="1.0-10"; sha256="0907s9807c1vcxac8xf6aqbw2fi7pdqfjs14nxl7wf0r0wi9jgw2"; depends=[Matrix lme4 nlme]; };
+longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[Matrix lme4 nlme]; };
 loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
 lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; };
 lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
@@ -3990,17 +4036,17 @@ lpSolve = derive { name="lpSolve"; version="5.6.10"; sha256="0hrgac5gfihhk4spy5s
 lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-14"; sha256="1ffmb9xv6m25ii4n7v576g8xw31qlsxd99ka8cjdhqs7fbr4ng5x"; depends=[]; };
 lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
 lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
-lpme = derive { name="lpme"; version="1.0.0"; sha256="0nl64hgkdk435dz8hs4gns325gdsjd266ypg66j5r57nisnf4mmm"; depends=[Rcpp Rcpp RcppArmadillo]; };
+lpme = derive { name="lpme"; version="1.0.1"; sha256="0f0xphlxl0ma3s2miadl74cb1l20cikqgk3nc1dg5ml05cqzhyxr"; depends=[Rcpp Rcpp RcppArmadillo]; };
 lpmodeler = derive { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
 lpridge = derive { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; };
 lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
-lqmm = derive { name="lqmm"; version="1.5"; sha256="12fggqka00y2hwknxwfa2326r2r17mdn2qd213n7xs3pn7v0rg18"; depends=[SparseGrid nlme]; };
+lqmm = derive { name="lqmm"; version="1.5.1"; sha256="1myv2v2059vlni1npxyv6ii846aiqz1mvyz9r9n5vpzgz92abizi"; depends=[SparseGrid nlme]; };
 lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; };
 lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; };
 lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
 lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; };
 lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
-lsmeans = derive { name="lsmeans"; version="2.13"; sha256="0bcbya714d8sak0r1jkdyb9lrr10vfqbibkx4b7gp5qg9wnl0mgr"; depends=[multcomp plyr Matrix]; };
+lsmeans = derive { name="lsmeans"; version="2.14"; sha256="1js8k0cawc297yyqv6415agjy84x5znf4cd7qwqf36iyg0pzzxq1"; depends=[multcomp plyr Matrix mvtnorm]; };
 lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
 lsr = derive { name="lsr"; version="0.3.2"; sha256="1ahcj3ja5hj7pc7hvzlvhmh62mql3a0awli8szsyld0fpn50wprz"; depends=[]; };
 lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
@@ -4028,21 +4074,21 @@ maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcq
 maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; };
 maboost = derive { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[rpart C50]; };
 mada = derive { name="mada"; version="0.5.6"; sha256="10vw138ykfz0s8c2q39fd4vipran85w04jmr1fni4z8x0i67iak2"; depends=[mvtnorm ellipse mvmeta]; };
-mads = derive { name="mads"; version="0.1.0"; sha256="0m04f61xm54pczq91cq64sfq4q12785jls7ylskc4qnnl7zkwkz8"; depends=[mrds]; };
+mads = derive { name="mads"; version="0.1.1"; sha256="070948j1r1dpymg2smgciz87nzpkv5fwvfsfppf0jrgfncivav1l"; depends=[mrds]; };
 madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; };
 magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; };
 magicaxis = derive { name="magicaxis"; version="1.9.3"; sha256="0dxlqpxw82v9cxfp475ppd02ywvlg96b1cfj02fjvs04xfprhar0"; depends=[MASS plotrix sm]; };
 magma = derive { name="magma"; version="1.3.0-2"; sha256="0hgwjq30ksx2qg4q9fj57m27i96sci8hrfrqc2lw4hz18b6kkph4"; depends=[]; };
 magrittr = derive { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
 mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
-mailR = derive { name="mailR"; version="0.3"; sha256="0m23npg5zsdwflw4744v30ypnpa6f8ddflwh3mpabxrxw4scb547"; depends=[rJava stringr]; };
+mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[rJava stringr R_utils]; };
 makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
-malaria_em = derive { name="malaria.em"; version="2.0"; sha256="1n34ahifggpdlpmigy010zysana0fg9c8ji0khk8g3il2gmzmgim"; depends=[]; };
 mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
 managelocalrepo = derive { name="managelocalrepo"; version="0.1.4"; sha256="060r9wkrn2v6wij926l7qlxlw8k2zbgrmwf2awf1x6llfs4vaiby"; depends=[stringr assertthat]; };
+manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
 mapStats = derive { name="mapStats"; version="1.17"; sha256="1jnqchrrn2v1smzk1c3laycr2fs8x59c9mb8lhs4bxqbhhwgmi8p"; depends=[survey lattice maptools RColorBrewer Hmisc quantreg classInt sp colorspace reshape2]; };
 mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
-mapmisc = derive { name="mapmisc"; version="1.0.0"; sha256="0y4p1fs6kqiwlp41kn7r5z2222xcqgzdnl9q4v0dlawfck2kbzcw"; depends=[sp raster]; };
+mapmisc = derive { name="mapmisc"; version="1.1.1"; sha256="0q30y243dava7zq2gz2dn5kbxc5m55cylhyzcwchrv2ax677x8yz"; depends=[sp raster]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
 mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
 maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; };
@@ -4052,12 +4098,10 @@ maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwv
 mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
 marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[shape seacarb]; };
 marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
-margie = derive { name="margie"; version="1.0"; sha256="1jkhg15xdiqjvpzbbc39l8jlfw0yrbarnd3zbgb3p0rh733x5g4j"; depends=[]; };
-marginalmodelplots = derive { name="marginalmodelplots"; version="0.4.2"; sha256="0d7m7sddz9rp1mkvirhcmk7hlbxsag3nm3vqfampnr7l2h158baa"; depends=[locfit]; };
 markdown = derive { name="markdown"; version="0.7.4"; sha256="09bqwv75mvfnjwbsz4v0zr9mmjdccwwgayiv7f6db48lngijng4f"; depends=[mime]; };
 marked = derive { name="marked"; version="1.1.6"; sha256="0f9sa4mdkiq1fn99sczb0glf5xfm17a3x8dq9ycf0l39fyg582d0"; depends=[lme4 R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr Rcpp]; };
-markovchain = derive { name="markovchain"; version="0.0.9.5"; sha256="06fsfrfm7xyba97yfxcp85vqamavbinvm8wr2darafn20ggahrck"; depends=[igraph Matrix matlab expm]; };
-marmap = derive { name="marmap"; version="0.9"; sha256="0vabxk1j866m5bxgk3327sifvlm4f6yp0gmgvfnqn4jp6sviwdvk"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2]; };
+markovchain = derive { name="markovchain"; version="0.1.0"; sha256="1x299ila4s5bg9a2a87j4d8bpfajgxad5x9l3hjlghciki69080x"; depends=[igraph Matrix matlab expm]; };
+marmap = derive { name="marmap"; version="0.9.1"; sha256="1yldq55rgbx4immjg1j5d6110fr2rwpl2v4m6fwdqlhim1hqh82k"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA]; };
 marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
 matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; };
 matchingMarkets = derive { name="matchingMarkets"; version="0.1-2"; sha256="02hx8q13n0l2880480vfkizlz6i1l78q95kn08c4mnnqd0jglifv"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo]; };
@@ -4065,18 +4109,18 @@ mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlr
 matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; };
 matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
 matpow = derive { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
-matrixStats = derive { name="matrixStats"; version="0.10.3"; sha256="1qskky9m217cv9pa5dyi31fa8isdg9cwadq80q85vn3p24rap5l4"; depends=[R_methodsS3]; };
+matrixStats = derive { name="matrixStats"; version="0.13.0"; sha256="074cjqc11sz38xdwi5rpf96b5ldqmck9xz9hddwkli8j54sajqv3"; depends=[R_methodsS3]; };
 matrixcalc = derive { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
-matrixpls = derive { name="matrixpls"; version="0.4.0"; sha256="0vd8k7rkv2xwh8rx1ra9im9xqlal5r29gzbvxd2b33xwngvg89m2"; depends=[assertive matrixcalc psych lavaan MASS]; };
-maxLik = derive { name="maxLik"; version="1.2-0"; sha256="1vgq2pjy8244ccdjcrrgri4sn2kcwqyfwskh885ci5aw01121d36"; depends=[miscTools sandwich]; };
+matrixpls = derive { name="matrixpls"; version="0.5.0"; sha256="0r1qpfbvaq24d30ck5c5zwsss4rqhl12g3hhmij3cn55hmv26azq"; depends=[assertive matrixcalc lavaan psych MASS]; };
+maxLik = derive { name="maxLik"; version="1.2-4"; sha256="1b2qr16s2w76nxqdlq3hflpg0sjnn8mlzas7082y8xpxw3cknpdz"; depends=[miscTools sandwich]; };
 maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp Rcpp]; };
 maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; };
-maxstat = derive { name="maxstat"; version="0.7-20"; sha256="171xsq96qdclb7ndpmv8652gh372ncxfkn5yfngvjv1fb12dq8jx"; depends=[exactRankTests mvtnorm]; };
-mbbefd = derive { name="mbbefd"; version="0.1"; sha256="0m24q679b7a27hw7v370p21w9bq18zc225q2df319hdrya3aygf2"; depends=[]; };
+maxstat = derive { name="maxstat"; version="0.7-21"; sha256="0c83ykazj7np35sln8i87z29hg6dx1vsayfirc2pj533dzhhh9a8"; depends=[exactRankTests mvtnorm]; };
+mbbefd = derive { name="mbbefd"; version="0.5.0.1"; sha256="08sq482cqa3jgbannvg16fqwadivg7lxigyfvwhagibv3764j8z4"; depends=[]; };
 mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; };
 mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
 mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
-mboost = derive { name="mboost"; version="2.4-0"; sha256="1rv16vg7zfj9pl8pkzfh4pr79bsdnxhacv8pysf8bbr17hrvm8yn"; depends=[stabs Matrix survival lattice nnls quadprog]; };
+mboost = derive { name="mboost"; version="2.4-1"; sha256="14lfsmhi9vg87ah19vi5xdf7nyrlvm6ha0nyr0alwz49pjkhygjw"; depends=[stabs Matrix survival lattice nnls quadprog]; };
 mc2d = derive { name="mc2d"; version="0.1-15"; sha256="1kp2l1gvw3caplq9916s1dmpmfp6fb2xscys9gj6dykl6gi4h4hb"; depends=[mvtnorm]; };
 mcGlobaloptim = derive { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; };
 mcIRT = derive { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp Rcpp RcppArmadillo]; };
@@ -4092,12 +4136,12 @@ mclust = derive { name="mclust"; version="4.4"; sha256="1xwk5w3nzwmwavn1ni53bnhf
 mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
 mcmcplots = derive { name="mcmcplots"; version="0.4.1"; sha256="0japi78j1a9q6mb7j74d81lj45j8878mdby7765yz8xnjzwjpslb"; depends=[coda sfsmisc colorspace denstrip]; };
 mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
-mco = derive { name="mco"; version="1.0-15"; sha256="0mbhc98f4gy5d5mhf06w036bp7syfzy0nv5xzlsygjkdpgzkwpm2"; depends=[]; };
+mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
 mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; };
 mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
 mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; };
 mda = derive { name="mda"; version="0.4-4"; sha256="18a12fnhcx911ii8wfqkyi8yxrhbiw2pi6mhywgxzsl3a09g8ghh"; depends=[class]; };
-mdatools = derive { name="mdatools"; version="0.5.3"; sha256="00zv97asyxp6m4fckkrzba2v1b24a3qzdh4f03nbv5nxdkmbpv4a"; depends=[]; };
+mdatools = derive { name="mdatools"; version="0.6.0"; sha256="13pfzr3lvqifln9lzdd0dpnygdibxp9ka7zwfisxjrw21m8mhmm3"; depends=[]; };
 mded = derive { name="mded"; version="0.1-1"; sha256="1r2sjg661abzsbqdyq2mlyacnv5rd60jfg2156cq5qyknxkin01m"; depends=[]; };
 mdscore = derive { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; };
 mdsdt = derive { name="mdsdt"; version="1.0"; sha256="0ngf2p6lm32124qyfh18zlgf0dipj3njn6d0m8f192563kp50q0p"; depends=[ellipse mnormt polycor]; };
@@ -4105,7 +4149,9 @@ measuRing = derive { name="measuRing"; version="0.1"; sha256="1nlsxrld6dsqv4cyss
 meboot = derive { name="meboot"; version="1.4-5"; sha256="1h33f3dpx906q5nmd57hhkq07mbs2kg8mv6mi4imaa2zpr5vc4py"; depends=[dynlm nlme]; };
 medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
 mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; };
+medflex = derive { name="medflex"; version="0.4.0"; sha256="0qmq01761955zb3fs649mfclg8j82lg07a7rkvfwillkg3ls5k56"; depends=[multcomp boot]; };
 mediation = derive { name="mediation"; version="4.4.3"; sha256="1m3q7zw1wsl6nnfjigbp3yg8mjnqxzawbgdrj7diclz8s6f07b4x"; depends=[MASS Matrix mvtnorm sandwich lpSolve Hmisc]; };
+medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[plyr reshape2 hash]; };
 mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; };
 mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; };
 megaptera = derive { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc315kwrhxcjisxfq23l4sm7m2011k5nrjmv37"; depends=[snowfall ips ape seqinr RPostgreSQL XML]; };
@@ -4117,20 +4163,21 @@ memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3x
 memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; };
 merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; };
 metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; };
-meta = derive { name="meta"; version="4.0-1"; sha256="1h0d2803z1yzzyiyz1yq2gy7zyx8ji2ya2mk8lrl3d83lrx4psw8"; depends=[]; };
+meta = derive { name="meta"; version="4.0-3"; sha256="0c5by24381vsfqin8y5swakyp162izxa2i3j1bxwqf34m8crwpl6"; depends=[]; };
 metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; };
 metaMA = derive { name="metaMA"; version="2.1"; sha256="1hwhj3m4n48qb9vqix2qazsy1xnmwk8x37zm826xx9j0n5j2ilac"; depends=[SMVar]; };
 metaMix = derive { name="metaMix"; version="0.1"; sha256="15vw8cwsy56fhq0q9w99799bnkj2ji2ns0ljfkg1p7wwhfrj689f"; depends=[data_table Matrix gtools Rmpi ggplot2]; };
 metaRNASeq = derive { name="metaRNASeq"; version="0.4"; sha256="14xqgxvlip6il1gx9xvv37683qm7zmyswklbcgqw9rgqifi0plal"; depends=[]; };
-metacom = derive { name="metacom"; version="1.3"; sha256="12asmqwaihm9j6p6qp79m1j93gfcj6rkwmpywhi6nv4g85c1shll"; depends=[vegan lattice]; };
+metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots]; };
+metacom = derive { name="metacom"; version="1.4.2"; sha256="1vb8qyilwvqb6b5sxqlmbw25r12q8f5h0mqbh3mbcmr0zarb35ql"; depends=[devtools vegan lattice]; };
 metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; };
 metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS Rcpp RcppArmadillo]; };
 metafor = derive { name="metafor"; version="1.9-5"; sha256="1ayvkm57c7s91m9kcsdax0fk61v0kvsbgaymlzg1sgsxkgnwcgj4"; depends=[Matrix]; };
 metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; };
 metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; };
 metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; };
-metaplus = derive { name="metaplus"; version="0.6-1"; sha256="1fk6sphjjcazd6v5k9dm5491487g0wzglzd0hg2pfy029bllx0a8"; depends=[bbmle metafor boot numDeriv]; };
-metasens = derive { name="metasens"; version="0.1-0"; sha256="0hrrzn6p14p2vs7bllkh9yxg0a3x87dmniglhq05p23g4lymcmbl"; depends=[meta]; };
+metaplus = derive { name="metaplus"; version="0.7-1"; sha256="17wn2x8dnfzm98bd007axq9ak38hphx08vqpk6ba0jahlfvqqdiz"; depends=[bbmle metafor boot numDeriv lme4 MASS]; };
+metasens = derive { name="metasens"; version="0.2-0"; sha256="13mncikxzg8cnpbw78ird1xkrjlivmjibhrk700vdx1hygzwi6x0"; depends=[meta]; };
 metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
 meteoForecast = derive { name="meteoForecast"; version="0.43"; sha256="1fpbxkdkgi50xbx3n26apdm6i29a2302vabfz0z3czafd76wkwg7"; depends=[raster sp zoo ncdf rjson]; };
 meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
@@ -4142,7 +4189,7 @@ mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs
 mgcv = derive { name="mgcv"; version="1.8-4"; sha256="18hd5b4p2k941f4lg18a73671hqdf2gh4z4vw08lkab10zpl59sa"; depends=[nlme Matrix]; };
 mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; };
 mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
-mhsmm = derive { name="mhsmm"; version="0.4.12"; sha256="0k8qm447fcgfc5fmqn478dszr76jmin85k51ccqmhgk14jiz64bf"; depends=[mvtnorm]; };
+mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; };
 mht = derive { name="mht"; version="3.0.11"; sha256="1d1ca3jp5q9xmnlnjsqi247vz6gm25bb8x5lzwd6z0n87lv26n1k"; depends=[glmnet]; };
 mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; };
 mi = derive { name="mi"; version="0.09-19"; sha256="1r3b6mm3pr95lb52m2vynmg0l2wy80hznjq2rff1qwplbq1pl04n"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS]; };
@@ -4173,8 +4220,9 @@ minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3d
 minqa = derive { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp Rcpp]; };
 minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
 minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
-mirt = derive { name="mirt"; version="1.6.1"; sha256="0wc085dcr59rkfj6ssmpdg50s76ilxcgh2jyin7f7028xwyy40a2"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; };
-mirtCAT = derive { name="mirtCAT"; version="0.2"; sha256="0n81wx5mvbkgk1ybk0n3slp6qg15gw8y7lmfrsbgjx7bcs80b8ky"; depends=[mirt shiny lattice]; };
+mipfp = derive { name="mipfp"; version="1.0"; sha256="16gy2krldhg08xqblk3wc2qxia7zy0q8s1mn2yifz53xm0xlghlr"; depends=[]; };
+mirt = derive { name="mirt"; version="1.7"; sha256="0bh173gk667848x4pj95g19g90gyviii1y4hwyhxfyd90jsqikzz"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; };
+mirtCAT = derive { name="mirtCAT"; version="0.3"; sha256="1z83d0f35az5gh3vx8cdr1v4qcmnvqxkxs5jplcx26vh318byaaw"; depends=[mirt shiny lattice]; };
 misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
 miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
 miscFuncs = derive { name="miscFuncs"; version="1.2-6"; sha256="1302k6pvf74a0b9bkdjdr2j1xl98842rbq7137h8hwldl50g48i7"; depends=[roxygen2 mvtnorm]; };
@@ -4192,16 +4240,15 @@ mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvd
 mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
 mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
 mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
-mixedQF = derive { name="mixedQF"; version="0.3"; sha256="037376k13qh0c5nw1nxx3fvffisl9kcdyjz5d4i6vn3gfj0yqccc"; depends=[nnet MASS]; };
-mixer = derive { name="mixer"; version="1.7"; sha256="0as9l0s646snli5pykh0i6zpz168f8i5wmxk07l5rhxnb74m0id2"; depends=[]; };
-mixexp = derive { name="mixexp"; version="1.1.8"; sha256="0spjvwnv9xg3sbh17d5b52spwfznka7g25vxbyqpabnbg42iik2b"; depends=[gdata lattice daewr]; };
-mixlm = derive { name="mixlm"; version="1.0.7"; sha256="14bhwl11cyhwfdx0vf9iw8labmrs1zff0n2987zysjmv63kxacgi"; depends=[multcomp pls pracma leaps lme4 car]; };
+mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
+mixexp = derive { name="mixexp"; version="1.1.9"; sha256="1qr6gad3fjwxjngjb7iqhspkkwzj1c77v140ap2vdrcygsd6ncd1"; depends=[gdata lattice daewr]; };
 mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; };
+mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88iz4nkv7sykxaygjq7zfcdrdivxz6n"; depends=[]; };
 mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
 mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; };
 mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; };
 mixtools = derive { name="mixtools"; version="1.0.2"; sha256="0x809m6lbzprd5kq6wqk528x9apaj5df3sidzk9jiw06qklngwg8"; depends=[boot MASS segmented]; };
-mixture = derive { name="mixture"; version="1.1"; sha256="09hp28fh1y2kllny6l0zciwbhhnjjgyipsx1vs55rq7rr0s94pkn"; depends=[]; };
+mixture = derive { name="mixture"; version="1.3"; sha256="0shjr6ia148lrhx2y61zl4bq2mf70z0pgrp3q6c01k52wg7wgp77"; depends=[]; };
 mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; };
 mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[Rcpp raster sp Rcpp]; };
 mkin = derive { name="mkin"; version="0.9-34"; sha256="0g0r30hs5ja2x1mwj336x8y3p0b33asfql076w2krmw38xkpla44"; depends=[minpack_lm rootSolve FME deSolve]; };
@@ -4219,6 +4266,7 @@ mlmmm = derive { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4s
 mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula maxLik statmod zoo MASS lmtest]; };
 mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; };
 mlr = derive { name="mlr"; version="2.2"; sha256="1l1ng2k3iyz3x1237kshcana6f8dds79dzs703c95wrzvfsrim89"; depends=[ParamHelpers BBmisc checkmate codetools ggplot2 parallelMap plyr survival]; };
+mlxR = derive { name="mlxR"; version="2.1.0"; sha256="0b9ws7p4ibbawyaa1fjl6lgs2lywnvg43ba4vzbicm2aqi8qhdyh"; depends=[ggplot2 XML Rcpp]; };
 mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; };
 mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
 mmcm = derive { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; };
@@ -4242,17 +4290,18 @@ modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xka
 moduleColor = derive { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut]; };
 mokken = derive { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; };
 mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dpnps7w0ld35lav19ff86kccspw1rg"; depends=[mvtnorm ncvreg actuar mgcv survival]; };
-moments = derive { name="moments"; version="0.13"; sha256="05pa4gkmpmp744a5rsr2arqh7y5bgalwrwdn731jg6waqiniy024"; depends=[]; };
+moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
 mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
 monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbca9ahdra9cid1piidwhjc4f6vqsbkp479"; depends=[tuneR]; };
 monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
 monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; };
 monreg = derive { name="monreg"; version="0.1.2"; sha256="0qah7yw1xwk3pig413r7l8hhh645d45706mndv614fir738bv9pk"; depends=[]; };
+moonBook = derive { name="moonBook"; version="0.1.1"; sha256="04fcnbypwb5md1r6szc8nbd97maxps7dhxzb87marqw5s3gb61qr"; depends=[nortest survival]; };
 moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
 mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
 morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
 morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03qa4qqkncaalzhph3wr9w4jvxpxn5"; depends=[plyr]; };
-mosaic = derive { name="mosaic"; version="0.9.1-3"; sha256="1flnzg2hwzlvhkn167y8chc0prrhijb96y0sr87rssbcy5zyzhzr"; depends=[car dplyr lattice ggplot2 mosaicData MASS reshape2 plyr latticeExtra gridExtra ggdendro]; };
+mosaic = derive { name="mosaic"; version="0.9.2-2"; sha256="1fx3nbndvvif1pwl013clh91s229yg7fnr0kp842jyx03hkcinba"; depends=[car dplyr lattice ggplot2 mosaicData MASS reshape2 plyr latticeExtra gridExtra ggdendro]; };
 mosaicData = derive { name="mosaicData"; version="0.9.1"; sha256="0gxnw3x806pm97x1043qq3qf1cwn1z1771cayp3xlh5khn5bijk7"; depends=[]; };
 moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; };
 movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[skmeans clue slam]; };
@@ -4273,38 +4322,37 @@ mra = derive { name="mra"; version="2.13"; sha256="1x282nzdz5bd3yji26mnzlvrkxszx
 mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
 mrds = derive { name="mrds"; version="2.1.10"; sha256="0gbivbawvzpg9s9yrfnil44h8ng9k8gf8swfgmlzibi9ixrv90lb"; depends=[optimx mgcv Rsolnp]; };
 mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
-mritc = derive { name="mritc"; version="0.4-0"; sha256="02a8h1x3pk406zpn89gl5wkcd74qm5gqz8gqpckk3nv881pkayaz"; depends=[lattice misc3d fmri AnalyzeFMRI]; };
-msBP = derive { name="msBP"; version="1.0-1"; sha256="136s1az62zq0z92ahzywld7lnpjknxklmlh56dhgxif52b81vq0p"; depends=[DPpackage]; };
+mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; };
+msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; };
 msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class lattice]; };
 msap = derive { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
-msarc = derive { name="msarc"; version="1.3.4"; sha256="0rgbrgdwjsybqcbfpf71b9z6qwwn8ph87z4hp0c1gmjrv8b9byld"; depends=[gplots]; };
+msarc = derive { name="msarc"; version="1.4.3"; sha256="0yzzmaw1cvwclggyvg05vqqp3jxpkwbyz4hgaa2dlmad516fw5rb"; depends=[gplots XLConnect wordcloud RColorBrewer]; };
 msda = derive { name="msda"; version="1.0.1"; sha256="0bd9am0dyrs9x8xj6rccgqcx15ddag1fakjzpyw43n3zi0h24fa6"; depends=[Matrix MASS]; };
 mseapca = derive { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
-mseq = derive { name="mseq"; version="1.2"; sha256="0h1wdnmlw7raqyy7844zl5k942d6glhv0lihd4h3gcv5is0if66w"; depends=[gbm]; };
 msgl = derive { name="msgl"; version="2.0.125.1"; sha256="1k2n8yn9j5sknw95saq2zgl3jfanyp3c2xyj49wqgawhwsw81jdh"; depends=[Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH sglOptim]; };
 msgpackR = derive { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
 msgps = derive { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
 msir = derive { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; };
-msm = derive { name="msm"; version="1.4"; sha256="1x7ys6695jarwfkh3xv607mwm5l2y2gzq2mczjfdcs9mla2l96a5"; depends=[survival mvtnorm expm]; };
+msm = derive { name="msm"; version="1.5"; sha256="12vw5qmrvmpvg371fx4g55ydwa83y433z6v25b7pnl5hcbc8kfj4"; depends=[survival mvtnorm expm]; };
 msme = derive { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[MASS lattice]; };
 msos = derive { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; };
 msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if87087gan8nqz4w7d8nxp693s7"; depends=[Matrix class glmnet e1071 rgl RColorBrewer colorspace]; };
 mstate = derive { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[survival RColorBrewer]; };
 mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[stringr XML sensitivity lhs rgl]; };
 mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
-muRL = derive { name="muRL"; version="0.1-9"; sha256="0711hxq8l0zc8w8k3aj4f9sq8xl5mqqx70dvq0m66kahkh2pnhgb"; depends=[maps]; };
 muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
 muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
-multcomp = derive { name="multcomp"; version="1.3-7"; sha256="1g9vzhh2m5vh957n6mhn9ikmgn0kwjwvrcra1flqhqq2zhqsh75x"; depends=[mvtnorm survival TH_data sandwich]; };
+multcomp = derive { name="multcomp"; version="1.3-8"; sha256="0bywqyv9fvl08bggz36x24p9qqbwzvqmcik901x5yi99062xg7dl"; depends=[mvtnorm survival TH_data sandwich]; };
 multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
 multgee = derive { name="multgee"; version="1.5.0"; sha256="1wa4pfvn4q77j4h6drvzysr3syni92z2yp2nppvzfpd29aib1fyd"; depends=[gnm VGAM]; };
 multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; };
 multiPIM = derive { name="multiPIM"; version="1.4-1"; sha256="0r69gkl8k6dd2rafrwvrdkpz4jlffz1g6czspsi908jf9dyw8y72"; depends=[lars penalized polspline rpart]; };
-multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="0klslbj1v0j10hv8xgyxgp4d2rkm3l4gr0gyrr1g8lyj0gf43sb3"; depends=[rgl tkrplot RODBC]; };
+multiband = derive { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; };
+multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl tkrplot RODBC]; };
 multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; };
-multicon = derive { name="multicon"; version="1.3"; sha256="0qc7szww7fmzckvkfa368pqphw0gfnv28r1wy6n8kaps6dm2r8li"; depends=[psych abind foreach mvtnorm sciplot]; };
+multicon = derive { name="multicon"; version="1.5"; sha256="0ds0nkjb4zd8j7bj59vvpy7m4srmvmh3gya9n9d09lxwh6ipih7q"; depends=[psych abind foreach mvtnorm sciplot]; };
 multicool = derive { name="multicool"; version="0.1-2"; sha256="1rs7q93lcr1crrx433zgil2db1rb3n4qw62r52nvpllqfwfx98dc"; depends=[]; };
-multigroup = derive { name="multigroup"; version="0.4.2"; sha256="0wnxql8mhz1sk82mrc2rvs96g91azcxzhsas3pfygk162lild035"; depends=[MASS]; };
+multigroup = derive { name="multigroup"; version="0.4.3"; sha256="153pg27dz61igagn1yq4xl7m7vjb5vfc9ps1xhgzvmbvmnbcr004"; depends=[MASS]; };
 multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; };
 multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 xtable PSAgraphics plyr psych reshape proto party]; };
 multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
@@ -4315,14 +4363,13 @@ multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i
 multisensi = derive { name="multisensi"; version="1.0-7"; sha256="1sq0jxkp33wsv6id27nka0764mr1jskqzsr2nhmqc4c8l312bkp6"; depends=[]; };
 multispatialCCM = derive { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
 multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; };
-multitaper = derive { name="multitaper"; version="1.0-8"; sha256="1x0a4nrngh1hs44h4gnmjfhx57kgxmkyzm431i5k288ydv57vvx0"; depends=[]; };
+multitaper = derive { name="multitaper"; version="1.0-9"; sha256="1brx35jbhvcx0384wgnd958qa8yc64aaabb2i3y4d7qcfdj787g7"; depends=[]; };
 multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; };
 multiwayvcov = derive { name="multiwayvcov"; version="1.2.1"; sha256="15gxcrg2i1aqbxkif5dmdz81yzqj7a4hq0dcd0narzsvm5b4w9py"; depends=[sandwich boot]; };
 multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
 muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; };
 munfold = derive { name="munfold"; version="0.3-1"; sha256="0rjicbyhxp0xr375ryg7kb2a4rvh3giw62ypws63nc3l8iwsig2m"; depends=[memisc MASS]; };
 munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; };
-munsellinterpol = derive { name="munsellinterpol"; version="1.0.1"; sha256="0q3n4z1z8sbqslzp97jw9xmdnypi66073g64ppk65r1aiq41hvac"; depends=[geometry]; };
 muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; };
 musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
 mutoss = derive { name="mutoss"; version="0.1-8"; sha256="13x49dk1xyn697yindg6m00nqbn2cb12544v2k14ckmnw07mp1gq"; depends=[mvtnorm plotrix multcomp]; };
@@ -4341,29 +4388,29 @@ mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8m
 mvmeta = derive { name="mvmeta"; version="0.4.5"; sha256="0faczanbz6i7794sqxm21a6v52cs5hrjjzdypdvi23bkl4mkxjrb"; depends=[]; };
 mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; };
 mvnfast = derive { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8gka0qjwcsixn5faclf17sr5bx7l5b62np"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
-mvngGrAd = derive { name="mvngGrAd"; version="0.1.3"; sha256="1c0rwywsa2dzhhphwc9prdxv6jyk1qdc655zvzyxif6ay3wnganf"; depends=[]; };
+mvngGrAd = derive { name="mvngGrAd"; version="0.1.4"; sha256="0vipdmbakr1r25jx87cz1xlvrajfzvm9aq1gzg3npz5140pgc3m2"; depends=[]; };
 mvnmle = derive { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; };
 mvnormtest = derive { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
 mvoutlier = derive { name="mvoutlier"; version="2.0.5"; sha256="1n12wy2i9jkb6brrqc0ibw3wiyd25dm5jhyapf05cj8wi06jfrsf"; depends=[sgeostat robCompositions robustbase]; };
-mvpart = derive { name="mvpart"; version="1.6-2"; sha256="1ddamzkv3j3a1niwqrrdpajn10v48s4li69n63mwlanrw9gdyzhn"; depends=[]; };
 mvprpb = derive { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
 mvrtn = derive { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
 mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[nortest mvnormtest]; };
 mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
-mvtnorm = derive { name="mvtnorm"; version="1.0-1"; sha256="132k88pm5k2yib81f10734z17l6ksw008f6bfddajv2w27h79a2j"; depends=[]; };
+mvtnorm = derive { name="mvtnorm"; version="1.0-2"; sha256="0v4a05i92g70vf8xkh6as7566zgjcnpzr1ghhyszqk1f0maw9gxc"; depends=[]; };
 mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
-mwa = derive { name="mwa"; version="0.3.2"; sha256="123xvm4vrwl7vfc9sas4jj7fn38m37c6h38j0aczpmygmx54bbmr"; depends=[cem rJava MASS]; };
-mwaved = derive { name="mwaved"; version="1.1.0"; sha256="1d06b0yxhrqx190qqisgaj2c6mx47bpj1h89jgbk9zdww9pqnvq4"; depends=[Rcpp shiny Rcpp]; };
+mwa = derive { name="mwa"; version="0.4"; sha256="0ig8p34d1v7jzdjp7yy5f6jv6najlnj5xk198fy6dcwmzgm4pjl5"; depends=[cem rJava MASS]; };
+mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny Rcpp]; };
 mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-myTAI = derive { name="myTAI"; version="0.0.1"; sha256="0xmc0nj4yw5vlrplqp18ig4ybpy8hbjandvjy0p3rdg6x6jj671j"; depends=[Rcpp nortest fitdistrplus foreach iterators Rcpp]; };
+myTAI = derive { name="myTAI"; version="0.0.2"; sha256="1qnnlf8c8qkcvl5sh9qd19drlfmjhmy3grxhlnlbz7v11zcbvah8"; depends=[Rcpp nortest fitdistrplus foreach doParallel dplyr Rcpp]; };
 mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
 mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
 myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
+mztwinreg = derive { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[rms mclogit]; };
 nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql110wrxbfdjm3fwa6qhvnpj89w9ph9nr4ad8gf"; depends=[]; };
 nCal = derive { name="nCal"; version="14.11-8"; sha256="0cgn56alv4qrb0dv7g3v3nx0y4bqgxyxrkbml7rqfz95s3rvm2dh"; depends=[drc gdata gWidgets kyotil]; };
 nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; };
-nabor = derive { name="nabor"; version="0.4.3"; sha256="10h6pf44db75y956h5wfkfwh7lm5lxpz33p8h60802sg0nvs8src"; depends=[Rcpp Rcpp RcppEigen BH]; };
-nacopula = derive { name="nacopula"; version="0.8-1"; sha256="1g1kcs6vqagq0nisyc43040ri3a9iy3fv4bnjjjc5zrla52a20w5"; depends=[copula copula]; };
+nLTT = derive { name="nLTT"; version="1.0"; sha256="0yvsjfrsx48p2gyisdyvisplz61d7kkaw1bkdkj3q11g3xq84hx9"; depends=[ape coda deSolve]; };
+nabor = derive { name="nabor"; version="0.4.4"; sha256="0465wkyggz4665b2ph1qpyxsmak0arfzpxaci1r0lrf5ddyp0n6y"; depends=[Rcpp Rcpp RcppEigen BH]; };
 nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; };
 namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
 nanop = derive { name="nanop"; version="2.0-4"; sha256="0795kksw6yry9il8xj21iq13xw6jipqcv5vjs3k7s19dbah2k8pi"; depends=[distrEx rgl]; };
@@ -4373,7 +4420,7 @@ nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3
 nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256="06vqnrwcara4ljkf5wbwqbsfx1ypd8xsv8pbrs5x6hyj5jxnnvaz"; depends=[rgl nat]; };
 nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; };
 naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
-nbpMatching = derive { name="nbpMatching"; version="1.4.0"; sha256="0ncw8xihdh24cfz0rhcvvp2l5mhm2z7hllnkf45bhdhpams6yryp"; depends=[Hmisc MASS]; };
+nbpMatching = derive { name="nbpMatching"; version="1.4.4"; sha256="0dnj97aj2x81yppw3rayxxaf2bb68l5x5f2852l5xmvpxb73w478"; depends=[Hmisc MASS]; };
 ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
 ncdf = derive { name="ncdf"; version="1.6.8"; sha256="0600qh0diw1j47w8b7gpk1wkpvinpvf3g9v3hlp3f8hcwpdn3s0y"; depends=[]; };
 ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; };
@@ -4387,42 +4434,45 @@ ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykac
 neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
 needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
 negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; };
-neldermead = derive { name="neldermead"; version="1.0-9"; sha256="144liymq0cnd80cp2vn2d1j22g0izipnchc90r526gfpm2gklh7n"; depends=[optimbase optimsimplex]; };
+neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
 nephro = derive { name="nephro"; version="1.0"; sha256="0dv6gj1q6qrg9y6cpf230q1mksqk3nvzj3afavhrwz1fcz2w22f4"; depends=[]; };
 netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; };
+netgsa = derive { name="netgsa"; version="1.0"; sha256="1f70wpwj0gdc4k9cm7glz5jfd1xdij9bxkaqd8lpjxmarap00w6x"; depends=[cvTools corpcor glasso glmnet igraph]; };
 netmeta = derive { name="netmeta"; version="0.6-0"; sha256="0cwlwd4bms0kf6nicx7crjjighzrzjgfgmx5yl5v7am4v7kwhz2g"; depends=[meta magic]; };
 nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; };
 nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[rootSolve dtw WGCNA Matrix minerva combinat igraph]; };
 netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[igraph]; };
-network = derive { name="network"; version="1.10.2"; sha256="1qdlwdhqyv1z4vhcbyqfx4iw207m76gly87pgyb85wqif4fifk0x"; depends=[]; };
-networkDynamic = derive { name="networkDynamic"; version="0.6.3"; sha256="0yb536q7v16wx491c5dmw7sf7h4f2rxs39bsdi0sknizgnmsqlv0"; depends=[network statnet_common]; };
+network = derive { name="network"; version="1.11.3"; sha256="1sp55dzf2g5znybppd1w3bmkxfx8vqh98pws438r5wwln2pjdcs2"; depends=[]; };
+networkD3 = derive { name="networkD3"; version="0.1.1"; sha256="1xslcq3a7m8l9d0jdxf4mylwyhxpxm6rnacnfmdzxsafb7bc78nk"; depends=[htmlwidgets plyr rjson]; };
+networkDynamic = derive { name="networkDynamic"; version="0.7.1"; sha256="0iv4lyfxmjllxk0cx09gdrg7zf2myf57wd3a2gqymids5gvpsy2d"; depends=[network statnet_common network]; };
 networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[networkDynamic network]; };
 networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
 networkreporting = derive { name="networkreporting"; version="0.0.1"; sha256="1vfvx5gf90p31gy6kcv7l2ibzbfl382gffa79dl8gascbsg6s8z8"; depends=[functional ggplot2 plyr reshape2 stringr]; };
 networksis = derive { name="networksis"; version="2.1-2"; sha256="05x0mp9ig7nff1js0zv7hq8p7jr7dqscs46zlbrxrrcy1waydb0s"; depends=[ergm network]; };
-neuRosim = derive { name="neuRosim"; version="0.2-10"; sha256="1h6hhzf3rl8fnvdv8vw3lzzd23pbnv1shd9d8gpk41fgigjnxp1v"; depends=[deSolve]; };
+neuRosim = derive { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
 neural = derive { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
 neuralnet = derive { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; };
 neuroblastoma = derive { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
 neuroim = derive { name="neuroim"; version="0.0.3"; sha256="0n5jkyvdaiigv51s5bb508w5xkh0qkd1zbs67nnms14s1664fhiz"; depends=[stringr hash iterators abind Matrix yaImpute]; };
 ngram = derive { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; };
 ngramr = derive { name="ngramr"; version="1.4.5"; sha256="1cqapla0lknxl669w5x3av9nr4vy9qrfznznqj22xlqaj0p53c18"; depends=[httr RCurl plyr rjson stringr reshape2 ggplot2 scales]; };
-ngspatial = derive { name="ngspatial"; version="1.0-4"; sha256="0nxqjhlgp8jx7p6mcxcb2nz7m65jkraib8ffkf90kbd8xqz42wf1"; depends=[Rcpp batchmeans Rcpp RcppArmadillo]; };
+ngspatial = derive { name="ngspatial"; version="1.0-5"; sha256="0dd7gm6irq08054ndj2gykz4nnfqfq3wbivg6fmlkdnn18kbckkk"; depends=[Rcpp batchmeans Rcpp RcppArmadillo]; };
 nhlscrapr = derive { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[RCurl rjson biglm bitops]; };
 nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; };
 nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
 nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; };
 nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[stringr numDeriv]; };
 nleqslv = derive { name="nleqslv"; version="2.5"; sha256="1p9m9ryp58xca9arl798cmslfjvxb3w5hdg3bs62yham1q951a48"; depends=[]; };
-nlme = derive { name="nlme"; version="3.1-118"; sha256="1lr78gyplxr4g0m3qpv62l4qp1b4nrhgk7lz1v3m0xd70y2l9j6c"; depends=[lattice]; };
+nlme = derive { name="nlme"; version="3.1-119"; sha256="0p8f45d857k8zpapp15diqnhkwlrkg01akm9iwzyqqwc58kjd4a8"; depends=[lattice]; };
 nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; };
 nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
-nlmrt = derive { name="nlmrt"; version="2013-9.24"; sha256="1nqcxfgl5iplmar58015ixir2c7agdw91i0ndn2imdx0il1x2hra"; depends=[]; };
+nlmrt = derive { name="nlmrt"; version="2013-9.25"; sha256="0z2ih61rpqzk64qagiwbx396vwb28jhqk8b4kxchca0il3fzqqav"; depends=[]; };
 nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; };
 nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; };
-nlrwr = derive { name="nlrwr"; version="1.1-0"; sha256="1j9wfcjimvfhxiwxsxcp5dni70i7bj5iizd8dq3kamzp7319mryv"; depends=[alr3 car drc HydroMe lattice lmtest MASS NISTnls nlme nls2 nlstools NRAIA sandwich]; };
+nlrwr = derive { name="nlrwr"; version="1.1-0"; sha256="0yrngp1gx7l9rwva9rqjlklkfiwklz20zj6sbgckrm68qw4rcvab"; depends=[alr3 car drc HydroMe lattice lmtest MASS NISTnls nlme nls2 nlstools NRAIA sandwich]; };
 nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
 nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; };
+nlsem = derive { name="nlsem"; version="0.1"; sha256="1nw8df9asb1f0713s3ll7ldw28jw8h6gvyy6d8bjlvz2qhjnlh8d"; depends=[gaussquad mvtnorm nlme]; };
 nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
 nlstools = derive { name="nlstools"; version="1.0-0"; sha256="04y3yzpipr82fgafppp09fbi6invmwyalljirmmh01qnrzfimwna"; depends=[]; };
 nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[EbayesThresh adlift]; };
@@ -4431,20 +4481,19 @@ nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfb
 nnet = derive { name="nnet"; version="7.3-8"; sha256="0nhbprhwkpnhzw6jls8y76xskfh9gq491kg8q8wnamjv3gnngfa5"; depends=[]; };
 nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
 nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; };
-nodiv = derive { name="nodiv"; version="0.9.3"; sha256="0pn2hbr3ab5d6f79anzgaaizsp2ymsvamcs8wc25b7xlmv5cc0y5"; depends=[picante raster ape sp vegan]; };
-noia = derive { name="noia"; version="0.96"; sha256="0f5gfb78vaj9iklj7gq3g85v78xh5izghjc7v3827jr1irfjivap"; depends=[]; };
+nodiv = derive { name="nodiv"; version="1.0.1"; sha256="07qx08s7nn7priwm5x5k3ycacfa4ibd20c759x9qhzqaigjmrh42"; depends=[picante raster ape sp vegan]; };
+noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
 noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
 nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.1"; sha256="1pq93g25arnc68kyvv6ymywdvbqv6620dvqzv1l43c1xssw364bc"; depends=[Matrix rgl tseries TSA]; };
-nonnest2 = derive { name="nonnest2"; version="0.1-1"; sha256="1qp7z3pr7q3cbqm3kvdw3kciz9a52r1j21gh2w2gv0wnaq5msdk3"; depends=[CompQuadForm mvtnorm sandwich]; };
+nonnest2 = derive { name="nonnest2"; version="0.2"; sha256="0z2ihnhphf6c9cklj1l81kqgyz1h9wl2ziwx7s0ssn3dfgw4fnp7"; depends=[CompQuadForm mvtnorm sandwich]; };
 nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[lpSolve gdata Hmisc rms geometry psych pwt]; };
 nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
-nontarget = derive { name="nontarget"; version="1.5"; sha256="1b9hvsm0pzaxlrl1w9n6dw7vf9474nxq9nsan00a07kd40x3rssi"; depends=[enviPat nontargetData mgcv]; };
+nontarget = derive { name="nontarget"; version="1.7"; sha256="1hnqkb8bpp89y42gjrfh7m3lxhif9dyhcmr6yfss8x3lzf018gk2"; depends=[enviPat nontargetData mgcv]; };
 nontargetData = derive { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; };
 nopp = derive { name="nopp"; version="1.0.4"; sha256="00wn0pnqpy9xll0aa8ah45ldgk1ziw464x8zkc8iq4l2a22lgn4v"; depends=[mlogit]; };
 nor1mix = derive { name="nor1mix"; version="1.2-0"; sha256="1s92bwpwq9p0d06adclm43yqq0k7ifv8lknn1scxg8nj4g03qjhs"; depends=[]; };
-nordklimdata1 = derive { name="nordklimdata1"; version="1.0"; sha256="0l50g09c102r8fz8ks42dfywg2vh2ad8lhqi7n3gc8nhad8rapqr"; depends=[]; };
 norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; };
-normalp = derive { name="normalp"; version="0.6.9"; sha256="1a2m7agcnqmf69mgbkjmmp7mvpx9r4gk13x98yfkg1dyh3b48rri"; depends=[]; };
+normalp = derive { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; };
 normtest = derive { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
 normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
 nortest = derive { name="nortest"; version="1.0-2"; sha256="010i9cxjaq6jjdnw8fggvinakrxi3pv4098r9i4jh62vlfwqbjpb"; depends=[]; };
@@ -4456,7 +4505,7 @@ npRmpi = derive { name="npRmpi"; version="0.60-2"; sha256="10gify91m9jsbghdgkwjz
 nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
 nparcomp = derive { name="nparcomp"; version="2.5"; sha256="0s865cqy29m5wiwndbmw3sl6m86f3zjbjr41924zd4alxkhm1wbi"; depends=[multcomp mvtnorm]; };
 npbr = derive { name="npbr"; version="1.0"; sha256="12s25vn4f0373y2ijmpam0an4p64xr3m71xgf20g5przmr77bm0a"; depends=[Rglpk Benchmarking]; };
-npcp = derive { name="npcp"; version="0.1-0"; sha256="1kkz7qnvmbbl2yfar8s23cn2jh2cqjwnrgjqw5a0wzli5ky613nl"; depends=[]; };
+npcp = derive { name="npcp"; version="0.1-1"; sha256="0b2mqx0zrvai5aw6b47qpi4bwcfjrv0bh8ahrgx7n1sf045grm3a"; depends=[]; };
 npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
 nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
 nplr = derive { name="nplr"; version="0.1-1"; sha256="0br7flriqbig8frq0j4lxiv6i8bwgsj422faln85ga93hnlky0a1"; depends=[]; };
@@ -4466,13 +4515,12 @@ nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4
 npsm = derive { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[Rfit plyr]; };
 npsp = derive { name="npsp"; version="0.3-6"; sha256="1wiv4gp3y1c26xaq8zssias3j3h8mpb6izcmcarghvnfhj32l8jb"; depends=[quadprog]; };
 npst = derive { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
-nricens = derive { name="nricens"; version="1.2"; sha256="17h0vckchqlvcsa604cgbcw1akaxl30yx24x1d8201svyz9n0hhb"; depends=[survival]; };
 nsRFA = derive { name="nsRFA"; version="0.7-12"; sha256="182zshwyg0l6shb5wcwibqygxs8qmgma9c4s683za8q3f9l94aqj"; depends=[]; };
 nscancor = derive { name="nscancor"; version="0.6"; sha256="1wkk08h8yz2mzgvmq0vr30iiczpbp0304vjwxqgsa3h240m4awsm"; depends=[]; };
 nsga2R = derive { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
 nsgp = derive { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; };
 nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; };
-nullabor = derive { name="nullabor"; version="0.3.0"; sha256="0bpqqn56x04kplgdlchwvi7gvs3hbc2xyza4kr8nxlj7wsh95pk3"; depends=[ggplot2 MASS plyr dplyr moments fpc]; };
+nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[ggplot2 MASS plyr dplyr moments fpc]; };
 numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; };
 numOSL = derive { name="numOSL"; version="1.7"; sha256="1hgyjjxpirgf2vmn273s861mnpyq2363kaafnkzgbcg0s08xxj1r"; depends=[]; };
 numbers = derive { name="numbers"; version="0.4-5"; sha256="0z69samkj7fvbk0wj2nbnkcw17y1sdha7hghkc7yhgkwx2z1pana"; depends=[gmp]; };
@@ -4490,25 +4538,27 @@ obliqueRF = derive { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26
 obs_agree = derive { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; };
 obsSens = derive { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; };
 oc = derive { name="oc"; version="0.95"; sha256="1zmy34fsqcd4rq0v72r514k6gm3jmf9a5zv4m6kj09hl89xvqsci"; depends=[pscl]; };
-occ = derive { name="occ"; version="1.0"; sha256="1gn8rg6k5lwwb6axfby7hiss5m64j2rh3hsmwwij58j5xda3jlbx"; depends=[]; };
+occ = derive { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; };
 oce = derive { name="oce"; version="0.9-14"; sha256="03vp83504pwjk6wbx5l4s31qvxfyd3g38snvfvp8b0pvnlv8f2fh"; depends=[mapproj]; };
 ocean = derive { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
 ocedata = derive { name="ocedata"; version="0.1.2"; sha256="0kic6m09a66zc5fxh9fkqk7rp3mnpf0p6i1qy2irh3bj9ccmdkvk"; depends=[]; };
 odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
 odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
 oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp Rcpp RcppArmadillo]; };
-okmesonet = derive { name="okmesonet"; version="0.1.4"; sha256="1fq17v1wx8hxvlk489vp6nlsx8ifs4491099zhikhn1fj7b1m346"; depends=[plyr]; };
+okmesonet = derive { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
 omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
 oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
 onemap = derive { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; };
 onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; };
+onlinePCA = derive { name="onlinePCA"; version="1.0-1"; sha256="0gca0ijcc30b3z5i390n1yk6c7sc15z8d0zpxpfb3hh99g7vinx4"; depends=[rARPACK Rcpp Rcpp RcppArmadillo]; };
+onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89rap0pql9h181s7i68wa20xdg05z"; depends=[minpack_lm]; };
 opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
-openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1d609hv24sxjppxpkgfvsl7p8vsajj0ivczcjixlnrly09j9ajrh"; depends=[NLP openNLPdata rJava]; };
+openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1hbw9gfc95b379if23wc0jv6lgf6ilb10gpwfs8nm3jc3by2zsx4"; depends=[NLP openNLPdata rJava]; };
 openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; };
-openair = derive { name="openair"; version="1.0"; sha256="04swl74189ccbak0qw55gyw66v07ia0wg8xwiak81233wc0ins42"; depends=[plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer Rcpp Rcpp]; };
+openair = derive { name="openair"; version="1.1-0"; sha256="129m41ivg74ss3cakpzyarcx0dcqysgf7d6ryz82mb061wgn3lik"; depends=[maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapdata mapproj hexbin RgoogleMaps Rcpp Rcpp]; };
 opencpu = derive { name="opencpu"; version="1.4.5"; sha256="1nbrj0jqg1hjpgj7vwj5d1yqzc6h6498saib8gcmps558gj94fj8"; depends=[evaluate httpuv knitr jsonlite devtools httr brew pander openssl]; };
 openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
-openssl = derive { name="openssl"; version="0.2"; sha256="1gryl49a6jaj5wj6alxw6jd0r07kj347jnb7gby4z8xfz2skqpvp"; depends=[]; };
+openssl = derive { name="openssl"; version="0.3"; sha256="0h71jc1w99qg4y01q6j3yhmjhwf06r9pv150id2ls5f1z3hr0l6p"; depends=[]; };
 opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; };
 openxlsx = derive { name="openxlsx"; version="2.2.1"; sha256="0wcvyl5gzkh28v2y40ckzp4prp9ygby01pm66rp902xhjqz0vnw1"; depends=[Rcpp Rcpp]; };
 operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; };
@@ -4519,14 +4569,14 @@ ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nf
 optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
 optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; };
 optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; };
-optextras = derive { name="optextras"; version="2013-10.27"; sha256="0898dgl8div4hdhb4wyj39vak94nm2311x550b8k8ljbx0nmp9gh"; depends=[numDeriv]; };
-optiRum = derive { name="optiRum"; version="0.33"; sha256="1324wmi6b2y9whacf9883k1f86bs9gvxp46gksiga1dwab53nlhv"; depends=[data_table]; };
+optextras = derive { name="optextras"; version="2013-10.28"; sha256="1sm025xwrpm5c63l4kiqfndxb7rwq2bcmidy4k2b24g5a8x7cpfv"; depends=[numDeriv]; };
+optiRum = derive { name="optiRum"; version="0.35"; sha256="0hfby5791jmzpacd8a4jj45b6sr5fph9g24kv6sr9db35y07ca36"; depends=[data_table ggplot2 AUC knitr plyr scales stringr XML]; };
 optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
 optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
 optimx = derive { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[numDeriv ucminf BB Rcgmin Rvmmin minqa setRNG dfoptim svUnit]; };
 optiscale = derive { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
 optmatch = derive { name="optmatch"; version="0.9-3"; sha256="16mhrhdpyqrj1g24mwc3fl0qyqq1kna8z6cj239fpbjhqb1mirjb"; depends=[digest]; };
-optparse = derive { name="optparse"; version="1.2.0"; sha256="064grlajnmbcbyhmfgx58mbbmv94sxdkxdqqww0cbi7dg441sli2"; depends=[getopt]; };
+optparse = derive { name="optparse"; version="1.3.0"; sha256="02sy28imvssr49pngdbg9qbx1h1fyjl11j7nql55m10a7cdzhwd4"; depends=[getopt]; };
 optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; };
 optrees = derive { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
 orQA = derive { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[Rcpp gtools nlme Rcpp]; };
@@ -4539,22 +4589,22 @@ ordPens = derive { name="ordPens"; version="0.2-1"; sha256="1kcxjfr2ncnqg293ph50
 orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
 orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; };
 orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[Matrix Iso quadprog ggplot2 reshape2]; };
-ordinal = derive { name="ordinal"; version="2014.11-14"; sha256="012bpzxgqpq8b8jfi9m832pkjzr7klya0zafhgpip6hf9ihhdjps"; depends=[ucminf MASS Matrix]; };
+ordinal = derive { name="ordinal"; version="2014.12-22"; sha256="1ymdvh9g8jm0qsqqbr7wcay2h1lgbfg6p8k8cx06dfcb5zpvswbi"; depends=[ucminf MASS Matrix]; };
 ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; };
-ore = derive { name="ore"; version="1.0.4"; sha256="0nminl02rxlwg68zdv12aq2baagv1p06x7bgpmfq2v4a01dxmfa5"; depends=[]; };
+ore = derive { name="ore"; version="1.0.6"; sha256="14ks8ypjlmdiysaayyz1syb8vrcfp2v79wfx191fz05ckgww4dyy"; depends=[]; };
+orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[ggthemes ggplot2 lubridate data_table stringr]; };
 orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
 orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; };
 orloca_es = derive { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; };
-oro_dicom = derive { name="oro.dicom"; version="0.4.1"; sha256="0mxjqk7b0k4srkk5yqm21b2x67c5hyd7nwf3b1qlb9rvnfjhqyhk"; depends=[oro_nifti]; };
-oro_nifti = derive { name="oro.nifti"; version="0.4.0"; sha256="1pragzjdldzgiaj4rbx37ki0930wfxj3kvan43vijd11a8ij1g5l"; depends=[bitops]; };
+oro_dicom = derive { name="oro.dicom"; version="0.4.3"; sha256="1n0rvinq14fbylg11h8a3ijqwyl9xlzs2ygwh38wrpi2z60afl18"; depends=[oro_nifti]; };
+oro_nifti = derive { name="oro.nifti"; version="0.4.3"; sha256="1sr91x0fzl7zc6m5mndhql7abmmsckyjl7s45rj4n3g8qzbqn790"; depends=[bitops]; };
 oro_pet = derive { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; };
 orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; };
-orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.5"; sha256="060g2z8zx5gkk8v31cs0c6v5jzkd7hc9l2syx6hmvj6przr2cxi4"; depends=[]; };
 orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
 osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
 osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; };
 ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; };
-outbreaker = derive { name="outbreaker"; version="1.1-3"; sha256="0ahkzcgicdlk6g8fd7rnni0n333wrixlfpck5wpznp4a1ny44zn4"; depends=[ape igraph adegenet]; };
+outbreaker = derive { name="outbreaker"; version="1.1-4"; sha256="1vvgkvrijrzabj50w36pgqd90krnp18grml5m3gvhnnm0y1ghry5"; depends=[ape igraph adegenet]; };
 outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
 overlap = derive { name="overlap"; version="0.2.4"; sha256="1pp3fggkbhif52i5lpihy7syhq2qp56mjvsxgbgwlcfbzy27ph1c"; depends=[]; };
 oz = derive { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; };
@@ -4572,7 +4622,7 @@ packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0
 packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; };
 packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; };
 packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; };
-packrat = derive { name="packrat"; version="0.4.1-1"; sha256="17c91ivyrxzq1mj3yw3kxlrl0rvq2072q0ivckfxhlgl1qlpk4fx"; depends=[]; };
+packrat = derive { name="packrat"; version="0.4.2-1"; sha256="0p0syic6n7iq652r7jhrp11f584h1hrvqw6nnc8xkxlfg1rabs7n"; depends=[]; };
 paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
 pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
 pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
@@ -4582,14 +4632,15 @@ palaeoSig = derive { name="palaeoSig"; version="1.1-2"; sha256="0f5y69zzb32zi3kd
 paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; };
 paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; };
 paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[raster maps rjson gtools RCurl plyr scales]; };
-paleofire = derive { name="paleofire"; version="1.1.4"; sha256="16mqfsb435hp777ymk2dbsavx1dd4n07zm8xpmzqpfs8k2gdd024"; depends=[GCD rworldmap locfit gtools caTools Imap raster rgdal ggplot2 lattice RColorBrewer plyr sp pscl agricolae]; };
-paleotree = derive { name="paleotree"; version="2.2"; sha256="01gjmi4ji8356cl2ifyq8d18avmac60013xnd2rl0akycprv5l9z"; depends=[ape phangorn]; };
+paleofire = derive { name="paleofire"; version="1.1.5"; sha256="18ymcybsq4hqxyrqslaqda8n2pyf4yl45mgs3yzl1gbw77zas1bl"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; };
+paleotree = derive { name="paleotree"; version="2.3"; sha256="0zfav7s7x6g7rndbl6jg186fyxsq200b6z0l1zdvcm9528svv9wp"; depends=[ape phangorn]; };
 palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; };
 pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; };
 pamr = derive { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
 pan = derive { name="pan"; version="0.9"; sha256="1payx5bzs0hp3f176ia56y4a9pym8p4h7ap5wag2symlvprzppah"; depends=[]; };
 pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; depends=[digest Rcpp Rcpp]; };
 panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
+panelaggregation = derive { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; };
 papeR = derive { name="papeR"; version="0.5-0"; sha256="1j366644scrsq2sjl9vip0ids97y9m6c8fyx16qlismrfcfbapyz"; depends=[car gmodels]; };
 parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
 parallelMap = derive { name="parallelMap"; version="1.1"; sha256="1h3im52ia29m1qv4dcvw1zxciv3v9b9fq2difg6cs9apdn0fvlz8"; depends=[BBmisc checkmate fail]; };
@@ -4603,26 +4654,27 @@ parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq
 parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; };
 parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
 parsedate = derive { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; };
-partDSA = derive { name="partDSA"; version="0.9.5"; sha256="0zblwjzwhalcnbmgwnqxpq7ixf4xhgx9lpf0lk3krry3di537s0q"; depends=[survival]; };
 partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
 partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
 partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
 partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; };
 partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-party = derive { name="party"; version="1.0-18"; sha256="034l6kxj7c0cn8zhz6fr12b6w05j2j77vbmbj8995bn2ivhzzmrp"; depends=[zoo sandwich strucchange modeltools survival coin]; };
-partykit = derive { name="partykit"; version="0.8-2"; sha256="1yygbf3kj60r1h6afl82if73mzn2pampyiicfhav6l7za93z7qzw"; depends=[survival]; };
+party = derive { name="party"; version="1.0-19"; sha256="1k5416xz7r1m34gd80d69p1b08j7ncmyxv83kgn7isnj97r2dybh"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; };
+partykit = derive { name="partykit"; version="0.8-4"; sha256="18xpffvf5a44gkfqdjapw2l5c9xrr7z3dkmhd7fl69gz27mnqmwy"; depends=[survival]; };
 parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
 pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; };
 pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
 pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; };
 patchDVI = derive { name="patchDVI"; version="1.9.1601"; sha256="0vv1rmmd78n2r14dsl9fx25v6ym9mav557ya0aagr548wqcajf0m"; depends=[]; };
 patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
+patchSynctex = derive { name="patchSynctex"; version="0.1-0"; sha256="1r9lk3shk9gg5xyiv20sbpzak1dby93q6jzaa6vx1abawjdkmz0c"; depends=[stringr]; };
 pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; };
 pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
 pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
+pathological = derive { name="pathological"; version="0.0-3"; sha256="1zl5vid1i6ijzjdqpvrm5c9yl6nh08cmmdqk50s65wggwmm0iw4l"; depends=[assertive plyr stringr]; };
 pauwels2014 = derive { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
 pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; };
-pawacc = derive { name="pawacc"; version="1.2"; sha256="1a9dzym02rfymjqw1rnp0hri50ysdnax171x5whi5j7fmvmc9rk5"; depends=[SparseM]; };
+pawacc = derive { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; };
 pbapply = derive { name="pbapply"; version="1.1-1"; sha256="1dshpnnmq1g2v223qy7pgbxydy9sqj04zwqxvzylm4mqc91ks4n2"; depends=[]; };
 pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[survival rootSolve]; };
 pbdBASE = derive { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[rlecuyer pbdMPI pbdSLAP]; };
@@ -4631,7 +4683,7 @@ pbdDMAT = derive { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305c
 pbdMPI = derive { name="pbdMPI"; version="0.2-5"; sha256="0g21zyl8dck5mxjsg4iif62ngrigj58hr8mzdvr47r1b081abzb4"; depends=[rlecuyer]; };
 pbdNCDF4 = derive { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
 pbdPROF = derive { name="pbdPROF"; version="0.2-3"; sha256="0vk29vgsv7fhw240sagz0szg0wb649sqc05j1aj027zvz931vfl8"; depends=[ggplot2 gridExtra reshape2]; };
-pbdSLAP = derive { name="pbdSLAP"; version="0.1-9"; sha256="118fy8316p3ahshq0wcwqj20v019dgbgx9wlz7vq35zg5i2fwccw"; depends=[rlecuyer pbdMPI]; };
+pbdSLAP = derive { name="pbdSLAP"; version="0.2-0"; sha256="06q9k8y7k604wa2zfspjg2v3fybn5my1vyr7zsg6j66n9g4z6039"; depends=[rlecuyer pbdMPI]; };
 pbivnorm = derive { name="pbivnorm"; version="0.5-1"; sha256="18ry0qz0ryazplv5iwdvbfngn0zv7frqp16nc2x70s0wf3izxkwr"; depends=[]; };
 pbkrtest = derive { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1jjhhgs41irbf0z5nrv454g9qwhbvfgiay5"; depends=[lme4 Matrix MASS]; };
 pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
@@ -4639,14 +4691,13 @@ pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg
 pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
 pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; };
 pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; };
-pcaPA = derive { name="pcaPA"; version="1.2"; sha256="1acfhv6225r0d8m45z7dlx78lmypdlh1cg4irvf8b3av0qv12g5x"; depends=[polycor ltm ggplot2 mc2d]; };
-pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="10mwgykpp05d7qsbli0pr99i6arhq5aladsbp1gnb67lasbx4fs5"; depends=[mvtnorm]; };
+pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
 pcalg = derive { name="pcalg"; version="2.0-3"; sha256="1vfrqm8hjdprsdqpik6a4zhv4yxyqyqa3dr2226qkm5ijblrcmwx"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp Rcpp RcppArmadillo BH]; };
 pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
 pcnetmeta = derive { name="pcnetmeta"; version="1.2"; sha256="18ha74i6azgkb8wzjgs8c55fi386a1z9n5bm1llb8mk089h2gx8j"; depends=[R2jags network runjags]; };
 pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; };
 pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
-pdR = derive { name="pdR"; version="1.1"; sha256="1nizjvrhcg7x4cd12jvgyg4vqxcpfli64z48gw99n53gjbjnb6sq"; depends=[]; };
+pdR = derive { name="pdR"; version="1.2"; sha256="0dgw6i623a6w18q54b46fnbp38941hqdvjpcnxrbqwvcgk024pr6"; depends=[]; };
 pdc = derive { name="pdc"; version="1.0.2"; sha256="0d7p65rkwrh39njhszdrbv25z4jz27746y1qyhqmhkxmvkx6g1fl"; depends=[]; };
 pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
 pdfetch = derive { name="pdfetch"; version="0.1.6"; sha256="1j3fdjnmfj84pfd5bc37ssbs83ya3ma0hj5iy1a0bg9wb5xqap13"; depends=[httr zoo xts XML lubridate jsonlite reshape2]; };
@@ -4654,17 +4705,17 @@ pdist = derive { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch
 pdmod = derive { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
 peacots = derive { name="peacots"; version="1.1"; sha256="042644i8x0s4nd425lp8v1i4jspib3qxkgvprgapdhgqcp6cabk0"; depends=[]; };
 pear = derive { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
-pearson7 = derive { name="pearson7"; version="1.0"; sha256="0dz5zf3k6bwj460gna6ak7hwdrsjinhv2ckkgqrycilfsx1w5h44"; depends=[]; };
-pec = derive { name="pec"; version="2.3.7"; sha256="16mw9waz4lizac3vdcvrpnznn00h4lf9q50k02iqvmw26q4rrx81"; depends=[prodlim foreach rms survival]; };
+pearson7 = derive { name="pearson7"; version="1.0-1"; sha256="0li32my02gv5yaf4q1w48pjbmij2njkpd15135n9mzjc5ibvf5kh"; depends=[]; };
+pec = derive { name="pec"; version="2.4.4"; sha256="110v8jb6l79prbkm8vp1qgrdks598q3ygmqj2yyv1d5plmsj9dh6"; depends=[prodlim foreach rms survival]; };
 pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[MasterBayes MCMCglmm kinship2]; };
 pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[Matrix CompQuadForm survey kinship2]; };
 pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[Matrix HaploSim reshape]; };
 pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
-pedometrics = derive { name="pedometrics"; version="0.3-0"; sha256="1fwbs2fhi7dqnhfyc0z45sy1jpr46lymdaykapcyxsmj9a0hxhj0"; depends=[car gstat lattice latticeExtra MASS moments plyr pbapply rgeos sp spsurvey stringr VecStatGraphs2D xtable XML]; };
+pedometrics = derive { name="pedometrics"; version="0.4-1"; sha256="0pzkkjp126g64q6avlk7bqrhcl6y5zz8vmfrq68k4yck34c1gn16"; depends=[car fields gstat lattice latticeExtra MASS moments plyr pbapply Rcpp sp spsurvey xtable Rcpp]; };
 pegas = derive { name="pegas"; version="0.6"; sha256="142hcc5h52sil1wp3m315y07wa6aqvx8igf2pywdz56ydwk2rwpk"; depends=[ape adegenet]; };
 penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; };
-penMSM = derive { name="penMSM"; version="0.97"; sha256="0jpmsc950mgnjwlbzy00zsw0xihmmml56nmlgmrxpfzaxq0657ay"; depends=[]; };
-penalized = derive { name="penalized"; version="0.9-42"; sha256="160ypgfcbdxcrgrhq99rgxl1wgn7854y64820nkvmfpc0ady7s4q"; depends=[survival survival]; };
+penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp Rcpp]; };
+penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; };
 penalizedLDA = derive { name="penalizedLDA"; version="1.0"; sha256="1ib33l5nqmvi6qn9ykybkdpc0pp55k1b6x4vqpklzp3dgckg0lp6"; depends=[flsa]; };
 penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[e1071 MASS corpcor statmod tgp mlegp lhs]; };
 pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[lattice fda quadprog latticeExtra]; };
@@ -4672,10 +4723,10 @@ pendensity = derive { name="pendensity"; version="0.2.7"; sha256="1f7v0dqcip6mvz
 pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[penalized MASS]; };
 peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
 peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; };
-peptider = derive { name="peptider"; version="0.1.5"; sha256="1jlvzfm1i7yyplwgsp08x3sx07gmkv24ri8jrlkz6jspj9w90dwq"; depends=[discreteRV plyr dplyr]; };
+peptider = derive { name="peptider"; version="0.1.6"; sha256="089m3pwjkxy0lb2lgmkj4naxawn8jy0iqdxh74a2r56r2yl22n88"; depends=[discreteRV plyr dplyr]; };
 pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[ggplot2 car]; };
 perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; };
-performanceEstimation = derive { name="performanceEstimation"; version="0.1.1"; sha256="1km2ljsy8hj9x6xr9am0f4wzihlhbyxhcss7kcxbimxvcv0a479n"; depends=[ggplot2]; };
+performanceEstimation = derive { name="performanceEstimation"; version="1.0.0"; sha256="176crk5vf9fw52qwsbwcwyp0l9v0kg27jwz2krx295d8kq22ygrj"; depends=[ggplot2 foreach doParallel]; };
 perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
 permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[RUnit foreach survival]; };
 permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; };
@@ -4706,10 +4757,9 @@ phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02
 phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; };
 phonR = derive { name="phonR"; version="0.4-2"; sha256="15hi15minbd756vplmcyf0987ppanr44kds13nny0v1h5yyv8kyx"; depends=[]; };
 phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; };
-phreeqc = derive { name="phreeqc"; version="1.0-8877"; sha256="0w529qpqrjcn619bqinkdd8f02vigiwy799h7i33p7iwbf15jvzj"; depends=[]; };
+phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; };
 phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
 phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; };
-phyext = derive { name="phyext"; version="0.0.1"; sha256="07hmjgp4qb3x95rbgm83sh9zwhsxjl1v5rvs39m565sc0fax1qdi"; depends=[phylobase ape]; };
 phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m55sl1w7ifmc98v74iq9p8xa15sdci"; depends=[]; };
 phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[phylobase NHPoisson ape igraph]; };
 phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp Rcpp]; };
@@ -4719,6 +4769,7 @@ phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951sc
 phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; };
 phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; };
 phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
+physiology = derive { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
 phytools = derive { name="phytools"; version="0.4-31"; sha256="1dmwjkd2c16amz7v4nwyd0006kydy3snrb1wkjd69n6qnfwmr7ba"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
 pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; };
 picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; };
@@ -4736,8 +4787,8 @@ plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6g
 planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[dielectric Rcpp statmod cubature reshape2 plyr Rcpp RcppArmadillo]; };
 planor = derive { name="planor"; version="0.2-0"; sha256="0mvlkrggwgrc9fmp935kihj2v7gfnghw7smpkbb3pbrrv9zhjlgi"; depends=[conf_design]; };
 playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; };
-plfm = derive { name="plfm"; version="1.1.1"; sha256="0vsbva2clkjn8ddinmihq1gzd8g8yjiwd11rl7xzbyabjxkp95n1"; depends=[sfsmisc abind]; };
-plgp = derive { name="plgp"; version="1.1-5"; sha256="04kxiixm6p9s42fs775lrh8112v2m7akjp78r46l0rd8fzp3zyiq"; depends=[mvtnorm tgp]; };
+plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[sfsmisc abind]; };
+plgp = derive { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
 plm = derive { name="plm"; version="1.4-0"; sha256="13y9s7gyrgqmnzafhn4c1zkz6gdawc8nr5nbrx0pn2mbw3fqfrjh"; depends=[Formula MASS bdsmatrix zoo nlme sandwich]; };
 plmDE = derive { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[MASS R_oo]; };
 plmm = derive { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[sm Formula nlme]; };
@@ -4746,20 +4797,20 @@ plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inl
 plot3D = derive { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; };
 plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; };
 plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.1"; sha256="1hymq35va75grxsjhd8sk7x4xfqsyfk5r5i1l3drwrajl1sx8b1a"; depends=[sp spacetime rgdal maptools lattice raster]; };
-plotKML = derive { name="plotKML"; version="0.4-5"; sha256="1w8dxwx57a9lis775xis44c0s1qfzc0h9b43wygcbzndkcn1dsh7"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; };
+plotKML = derive { name="plotKML"; version="0.4-8"; sha256="0vi7rh13w9p6xhf350f76dj0f6hkg42q4jvbc6ymj47ldz2r0gmh"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; };
 plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
 plotROC = derive { name="plotROC"; version="1.2"; sha256="0x9wpj65cr6k97irwpx0b5zhljgzdii048nmz4xansazvmh04mgj"; depends=[ggplot2 gridSVG shiny]; };
 plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; };
-plotmo = derive { name="plotmo"; version="2.0.0"; sha256="10034lz1g21slg51hik8jagcffccva4mbly8dynr95r12wkpy2n9"; depends=[]; };
-plotpc = derive { name="plotpc"; version="1.0-2"; sha256="0z73wyhdnz5qv2jy8c0sby6sbjr1q9026h0bk2ykjkjvckggnabc"; depends=[]; };
-plotrix = derive { name="plotrix"; version="3.5-10"; sha256="1x1398cy2cji5g5jgqlw23dw9bvsmyam4r1lyha9mj0481af0zh8"; depends=[]; };
+plotmo = derive { name="plotmo"; version="2.2.1"; sha256="1kgsw7xfqmzsyybhj21a42ynci1y7gm8gas1jqsbgh0vydfbzzh5"; depends=[]; };
+plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; };
+plotrix = derive { name="plotrix"; version="3.5-11"; sha256="01vb3i7hkc3krvl9v4f8fnpfcv62p4ci2vbm2qs5w593h70bys7c"; depends=[]; };
 pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
-plsRbeta = derive { name="plsRbeta"; version="0.1.8"; sha256="1gfwl659pmwjkif8n1vz7ljij3r8akzrlf389qwmhy57d6lhyb6w"; depends=[mvtnorm boot Formula plsdof MASS plsRglm betareg]; };
-plsRcox = derive { name="plsRcox"; version="1.7.0"; sha256="08cnxbqgxwmvbyhp8hwa7b30bznxvj7qcpq9p8jgcfnrxwslv2k6"; depends=[survival plsRglm lars pls kernlab mixOmics risksetROC survAUC rms]; };
-plsRglm = derive { name="plsRglm"; version="1.1.0"; sha256="0bh88rdlk09hh2zaiqgpv05d5kn656ckn3g0wfzhkb445xb84pqq"; depends=[mvtnorm boot bipartite]; };
+plsRbeta = derive { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[mvtnorm boot Formula plsdof MASS betareg plsRglm]; };
+plsRcox = derive { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[survival plsRglm lars pls kernlab mixOmics risksetROC survAUC rms]; };
+plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[mvtnorm boot bipartite car]; };
 plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
 plsdof = derive { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; };
-plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="0f0pns20hd8hfc3v9m9vb8sng8qib6cry1k49nqs9gn09hhh26w9"; depends=[MASS]; };
+plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="1yif4h556xjadlfp31nm6aqhd3md983sppwmbh7mg95dffxnd3im"; depends=[MASS]; };
 plspm = derive { name="plspm"; version="0.4.1"; sha256="00ibz69vhf0x3c73khkg57mzw49c3vq20yiqdqm9cpkdr9fczn2n"; depends=[amap diagram tester turner]; };
 plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
 plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
@@ -4799,10 +4850,10 @@ polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2
 polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[miscTools foreach Formula glmnet iterators Matrix ncvreg Rcpp stringr Rcpp]; };
 pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
 pomp = derive { name="pomp"; version="0.53-5"; sha256="1bfb2b1fdj673b43jnq9pzh36h1hfb8dsarf1dq6pwain7dnqjyp"; depends=[subplex nloptr mvtnorm deSolve coda]; };
-pooh = derive { name="pooh"; version="0.2-1"; sha256="1h8b5zwawhvq6h29dfznnhdb33al06hkvy05dphsmycd1lsha0jm"; depends=[]; };
+pooh = derive { name="pooh"; version="0.3"; sha256="1wcv77vjjp62c5l1mplnkk4vhy2scjrq96cjx58w5jdj46lban2h"; depends=[]; };
 popKorn = derive { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
 popRange = derive { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
-popReconstruct = derive { name="popReconstruct"; version="1.0-3"; sha256="1m4gj43bzsz8y4jay0bc5mvdfwqx5agha4l2r0svm6qg8cfl4lza"; depends=[coda]; };
+popReconstruct = derive { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; };
 popbio = derive { name="popbio"; version="2.4"; sha256="12hvxkgbr6snypplxv404sj0ass6ab9i969bb00ipy10gny1w4ww"; depends=[quadprog]; };
 popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7dpahmpf453a6gwp3yljkvmfl0bfv1g1ng"; depends=[expm]; };
 popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
@@ -4817,7 +4868,7 @@ potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrpp
 poweRlaw = derive { name="poweRlaw"; version="0.20.5"; sha256="03s4kn01q4v2wx2y5pglqycjr37076g9alp9kz915h0ckfv1i42f"; depends=[VGAM]; };
 powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
 powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
-powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.0"; sha256="08xf7dvwz2md2y8j4bjlfr5vs7y2wxssdfpkdl0h39cdrz8y1pv2"; depends=[mvtnorm pwr]; };
+powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.1"; sha256="0xwyqlblhdnnv6pd2jpmz11s95zg7ylh1wa2q03zj8df330jcl70"; depends=[mvtnorm pwr]; };
 powerMediation = derive { name="powerMediation"; version="0.1.7"; sha256="1nysqyz5rbpn25k1pi9g7gwiarm8ncyw5xxal972wv8c70lsn4ir"; depends=[]; };
 powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
 powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
@@ -4827,7 +4878,7 @@ ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabs
 pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
 pqantimalarials = derive { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[reshape2 RColorBrewer plyr shiny]; };
 prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot lme4 Hmisc]; };
-prabclus = derive { name="prabclus"; version="2.2-4"; sha256="1p4hhs002cyrmnmfc2s11zia2jcnafidmy41dl3bd8mqyq3d193z"; depends=[MASS mclust]; };
+prabclus = derive { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; };
 pracma = derive { name="pracma"; version="1.7.9"; sha256="1yxahsr7sln6c6d777vs5iwa5wyp2zfyd5iq2hnqf2z05whc72ks"; depends=[]; };
 pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
 praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
@@ -4838,7 +4889,7 @@ predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqn
 prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; };
 preseqR = derive { name="preseqR"; version="1.0.1"; sha256="0plwhgs6fgvra2w5xcjrr260fra0nl2cpsn5r1z701q7b8nbm257"; depends=[]; };
 prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
-prettyR = derive { name="prettyR"; version="2.0-8"; sha256="1wz802mmsbm4011jskdvifm9p5vqjiq7x2cmxyvc6fi2g8s224rw"; depends=[]; };
+prettyR = derive { name="prettyR"; version="2.1"; sha256="0q6w51758yaxa3l276vqvkvry6v4xz33lx8791b5hyrq837ypx8z"; depends=[]; };
 prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; };
 prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; };
 prevalence = derive { name="prevalence"; version="0.3.0"; sha256="0hg4vpw89pyx2i9za3zg666kyi016sn4jpbk2sp0s435fzqp74dp"; depends=[rjags coda]; };
@@ -4849,7 +4900,7 @@ princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6a
 prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
 prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; };
 probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
-prodlim = derive { name="prodlim"; version="1.4.5"; sha256="0p2b01i01k9qbj91sp73wg998d07cv6ppragvizz6r185m10ip35"; depends=[survival KernSmooth lava]; };
+prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; };
 profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
 profileModel = derive { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
 profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbaim2g75ab1ziyvpbrkb4k21966m54zjk9kka"; depends=[ggplot2 MASS RColorBrewer reshape plyr]; };
@@ -4863,17 +4914,17 @@ prospectr = derive { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl
 protViz = derive { name="protViz"; version="0.2.9"; sha256="0kn2dd3za8mmb6476v3wqnymhihyavw2qsh98i4q3xdiz1g77vql"; depends=[Rcpp]; };
 proteomicdesign = derive { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
 proteomics = derive { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[plyr reshape2 ggplot2 foreach]; };
-protiq = derive { name="protiq"; version="1.2"; sha256="00hv6hmfba4is2q1s9h5csx42s7ry2qdmi7vasgcafp8s4fc999l"; depends=[mvtnorm]; };
+protiq = derive { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[mvtnorm]; };
 proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; };
 protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
-protr = derive { name="protr"; version="0.4-1"; sha256="09hl9q34qsmcz6rrsp05zy9zhgjxl3hp9g8ag6501sxlk470y80x"; depends=[]; };
+protr = derive { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; };
 proxy = derive { name="proxy"; version="0.4-13"; sha256="1lqkv2m9xryi6504mxxgw1xmvvz5qbh887ak38aqkf8cyzc10mi1"; depends=[]; };
 pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp Rcpp]; };
 psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; };
 psbcGroup = derive { name="psbcGroup"; version="1.0"; sha256="1l28sy0jys1g3nyfls9nl9vx9b6qh405a2nhx0qgxwb24l67x56n"; depends=[bayesm LearnBayes SuppDists mvtnorm]; };
 pscl = derive { name="pscl"; version="1.4.6"; sha256="13bdmnm4g36x32r0vzzcvlgks9yx44lphvm9k80m24l45mlh7sby"; depends=[MASS lattice]; };
 psd = derive { name="psd"; version="0.4-1"; sha256="1knfpgvmhrispfvlv94rnpbrjkyggqrmng65bjdjjigq83hhzywm"; depends=[fftw RColorBrewer signal zoo]; };
-pse = derive { name="pse"; version="0.3.4"; sha256="1ni4rwskcr326x5z81hsh36nkcrpq5d7pkqh6xyh4fjm57wjwzbp"; depends=[Hmisc boot]; };
+pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[Hmisc boot]; };
 pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; };
 psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat Rcpp RcppArmadillo]; };
 psidR = derive { name="psidR"; version="1.2"; sha256="14cpxk7z0inrpvhsdb3z6r5nrpyb4v8bv77mygxcf51rxihigzvj"; depends=[data_table RCurl foreign SAScii]; };
@@ -4881,28 +4932,28 @@ pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f
 pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
 pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; };
 psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-psych = derive { name="psych"; version="1.4.8.11"; sha256="110j5d7xdaviklf3mv9jlnli3l4n5g4mxasgxdj6kw7f66fqh634"; depends=[]; };
+psych = derive { name="psych"; version="1.5.1"; sha256="18nlxv15dh16326jj754bclrp6nnaiw04jsklshm8i2p3m5nzr4k"; depends=[mnormt]; };
 psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; };
 psychomix = derive { name="psychomix"; version="1.1-1"; sha256="0p3kidbsmfm09s7c3p8nlj069wcyln1cxmjmj5nj7f618c407zyf"; depends=[flexmix psychotools lattice Formula modeltools]; };
-psychotools = derive { name="psychotools"; version="0.3-0"; sha256="0iwk1sqsbilh4k80n0kh2pv44dd9fgn6zhfl94hqgm1bbrqf9qgc"; depends=[]; };
-psychotree = derive { name="psychotree"; version="0.14-0"; sha256="18kmiqqxfhc0ydqx18561j05xawrhg8gshw7hr8zh4j6ymga23fh"; depends=[partykit psychotools Formula]; };
+psychotools = derive { name="psychotools"; version="0.4-0"; sha256="17qwlxj00i0aqwf39hwr6mmxa6jy0j6dxfrp9p1xskbgi5cnvslk"; depends=[]; };
+psychotree = derive { name="psychotree"; version="0.15-0"; sha256="08mq4gssrhydn106zm6xxwb1kk43hdzw6jqclx1ya0g8xfri2rrd"; depends=[partykit psychotools Formula]; };
 psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
 psytabs = derive { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv099ii4l55a8bj1mhgr54838ins0gg7"; depends=[psych plyr rtf R2HTML mokken lavaan semTools]; };
 pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl9hpwm7j2nzg3plv6i1fz"; depends=[]; };
 ptinpoly = derive { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; };
 ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; };
-pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.2"; sha256="0r3n4116z3f4yf3rglq3r34qfv2qcb01hwgmzm7d7q07cx9p5lqk"; depends=[RCurl XML NCBI2R boot R2HTML]; };
+pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.3"; sha256="08bhhylyh6smxq6zyn6fz4jb1r96vk9ag9jgvyndqyzx8rvyk24m"; depends=[RCurl XML NCBI2R boot R2HTML]; };
 pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; };
 pushoverr = derive { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; };
-pvar = derive { name="pvar"; version="2.0"; sha256="0ab6pk9iwd45vkqpa6jdwcicxq62swy732hai1gq3l8j6bbm382d"; depends=[Rcpp Rcpp]; };
+pvar = derive { name="pvar"; version="2.2"; sha256="1f58czx14shd02ijyxhn46yrvfh44wrpifja8cjv522gbkrcr7yf"; depends=[Rcpp Rcpp]; };
 pvclass = derive { name="pvclass"; version="1.2"; sha256="099lk0x24h7g77lpr22mzpl22q2b0nr466ljgm6jcdyjbkzgx237"; depends=[Matrix]; };
-pvclust = derive { name="pvclust"; version="1.3-0"; sha256="1cm1m6ps90qn7lyi16vjnjwllzd6lmvwpipmdwnbq6zgnwjcn2iz"; depends=[]; };
+pvclust = derive { name="pvclust"; version="1.3-2"; sha256="0w9cxr0bc591icbyn8239f76ypb2nwv9fa5b1ix05wh55d1h0rgc"; depends=[]; };
 pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[XML nnet httr]; };
 pwr = derive { name="pwr"; version="1.1.1"; sha256="1is6kqqjf3bzsddj4advj8qcp30rz2zlqc0g98072m96nmq5ywgn"; depends=[]; };
 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
 pwt8 = derive { name="pwt8"; version="8.0-0"; sha256="12cgyban6waj0cxz9gb35s5v0v29rmx67ipzalzdnrjp5nsmy431"; depends=[]; };
 pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[stringr reshape2 RJSONIO plyr]; };
-pxweb = derive { name="pxweb"; version="0.5.2"; sha256="1h81kw0aprrdjxhp3gz8w29fvw9lnbsna3qbngpq4kgvc1gb1nha"; depends=[data_table plyr stringr RJSONIO httr]; };
+pxweb = derive { name="pxweb"; version="0.5.3"; sha256="0slqxn1yqss77c078adlmp4q4a08vd867gcz1nn7f61czb9wpf56"; depends=[data_table plyr stringr RJSONIO httr]; };
 pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[sp maptools rgeos]; };
 pyramid = derive { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
 qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
@@ -4913,25 +4964,27 @@ qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9
 qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
 qdap = derive { name="qdap"; version="2.2.0"; sha256="0lbc38x4gvh6q2sb6d524ksfhpvxm8knfy85bmwbf6d3q4s0b6q4"; depends=[ggplot2 qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; };
 qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.2"; sha256="0s1dqp3hjllkvq638hvggcbfsdwks91r0ymynl7cdh7dr5pg91bc"; depends=[]; };
-qdapRegex = derive { name="qdapRegex"; version="0.1.2"; sha256="1fn6rsjh76qh4kscb43gld06bs5k3v6hkn4viccw0ixzv3x6pq7k"; depends=[stringi]; };
-qdapTools = derive { name="qdapTools"; version="1.0.3"; sha256="15ba12vk923l71lbhdhqq2pv6nqrdgm3ljsq7k818l40j7z1376a"; depends=[chron data_table RCurl]; };
+qdapRegex = derive { name="qdapRegex"; version="0.2.0"; sha256="0hypa3xax02k61kwh59wb4r7y8s0g6hfhaih0kj9n442xqvrym5h"; depends=[stringi]; };
+qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; };
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
-qgraph = derive { name="qgraph"; version="1.2.5"; sha256="1jgjxfds28kk03qrk01r8dla4xjpbqcqdwa1ifay2vqahwlkpz65"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge]; };
+qgraph = derive { name="qgraph"; version="1.3"; sha256="08arc3f3rici1r1r0nm42fv7g01fn3xixfh6y3lg8q3mr53fqhdm"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool sendplot d3Network ggm gtools]; };
 qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[Matrix MASS]; };
 qicharts = derive { name="qicharts"; version="0.1.1"; sha256="1aisbm9h7jdzkgnfh679wi5hfzxw1asgr62z7l51zk9yw7p7mjaw"; depends=[lattice latticeExtra]; };
 qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
 qlcMatrix = derive { name="qlcMatrix"; version="0.9.2"; sha256="1d8953bj69d0nia3qh3s1djf9m7wkvfdxqd234026gh1d3qchkr2"; depends=[Matrix]; };
 qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; };
 qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
-qmethod = derive { name="qmethod"; version="1.2.2"; sha256="02qa8vnn5p4zqkak8m7j7n35pkn9m8y5n6g70wdmkklnmj2nzgzs"; depends=[psych GPArotation]; };
-qmrparser = derive { name="qmrparser"; version="0.1.4"; sha256="1lw8sn4qsdv4bxf5p7gnkm0vmiymyj03svbl232zyyb0fh97i7nk"; depends=[]; };
+qmethod = derive { name="qmethod"; version="1.2.4"; sha256="0s3s1vasppbnzq78xf7klqppg91c4qvq59dka9dj7zl8zlr6hx3r"; depends=[psych GPArotation]; };
+qmrparser = derive { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
 qp = derive { name="qp"; version="0.3-2"; sha256="1964bj2ggmpaqz0rnmc2zx5hyrzawlmawz3mh046cx1pdzlsqfwh"; depends=[]; };
 qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; };
 qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; };
+qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgvlpxgk5lngfp989hq2a830kyxz1ds"; depends=[MASS]; };
+qrLMM = derive { name="qrLMM"; version="1.0-9"; sha256="0dfxgasmz6c7z8px070d2r9j5rwjg1sxdymdj13g9d33xrlwic5j"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; };
 qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; };
 qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
 qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; };
-qtl = derive { name="qtl"; version="1.34-17"; sha256="0i5pqsrka0s1a5ak782a0vg5852waazq11cyfhf3ck6lgqbba462"; depends=[]; };
+qtl = derive { name="qtl"; version="1.35-3"; sha256="1p679lalb50h8zsnb2439m3lsq6kh2fncw6k0kq5szcgm6zaxi94"; depends=[]; };
 qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
 qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; };
 qtlbook = derive { name="qtlbook"; version="0.18-1"; sha256="09b4w7kqdlmpf0vsjgwbi9sraafzchvk18yzrx72gs151v03nxlm"; depends=[qtl]; };
@@ -4947,13 +5000,13 @@ qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cp
 qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl8pjx47z1y20lcygrf5cb6m4ifw"; depends=[KernSmooth]; };
 qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; };
 quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-quantmod = derive { name="quantmod"; version="0.4-2"; sha256="02krcvm320pb4wlzq7x34a605cwlnizc42ar64i8sif49hin1agj"; depends=[xts zoo TTR]; };
-quantreg = derive { name="quantreg"; version="5.05"; sha256="07djmdlmij9add2sgdsb1p6521hlnsfmll8lqs3x0z9gmr2wyx4f"; depends=[SparseM]; };
+quantmod = derive { name="quantmod"; version="0.4-3"; sha256="1x9h7ydifvs8mpcd4r83qz17pixxw1466262hh2j0xi259i1ds0k"; depends=[xts zoo TTR]; };
+quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; };
 quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; };
 quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; };
 quantspec = derive { name="quantspec"; version="1.0-2"; sha256="09x3wg7msj11b5kpxbxbbhgw4v05alxaw06gyx076kdnbi9mv0bm"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; };
 questionr = derive { name="questionr"; version="0.4.2"; sha256="04s9g1njfmsnay3szfnmxw72z60mz0gp8yapwv1hi0p63rr5hv5r"; depends=[shiny highr classInt htmltools]; };
-queueing = derive { name="queueing"; version="0.2.2"; sha256="1db8w9pzy4krgcc4xahfs9aw45gvvyl6kqm1hkklw21pfc0ka09f"; depends=[]; };
+queueing = derive { name="queueing"; version="0.2.3"; sha256="1gcnd96vqygbhpa1mfls8adjdhkqy8c8427jf2qqq49s3vgzc08y"; depends=[]; };
 quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; };
 quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; };
 qvcalc = derive { name="qvcalc"; version="0.8-8"; sha256="0xmbn6p7ryr43yf978pqpdnlxdq84v965hxbff8dviqhxwgqv4aq"; depends=[]; };
@@ -4963,8 +5016,8 @@ r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmp
 r2stl = derive { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
 r4ss = derive { name="r4ss"; version="1.22.1"; sha256="1rjnglwa3i8rlzyqqr5h8yh7vglrh8zpd3829qcc1vfi4swcwwqw"; depends=[coda corpcor gplots gtools maps pso RCurl]; };
 rARPACK = derive { name="rARPACK"; version="0.7-0"; sha256="1r1ypa56wkxvll9yqr50f3x2krimi22lwyrkksf5zf6laksmiq1w"; depends=[Matrix Rcpp Rcpp RcppEigen]; };
-rAltmetric = derive { name="rAltmetric"; version="0.3"; sha256="0jq5w5yd1cps4npbm9wmrjb5vc36y89ib986ggqycd9jalmshxjd"; depends=[plyr RCurl reshape2 png ggplot2 RJSONIO]; };
-rAverage = derive { name="rAverage"; version="0.4-10"; sha256="1lyjbh068gfs5m6sncfb47p3ldysw97y02f7g7lmk6135hymfrgv"; depends=[]; };
+rAltmetric = derive { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vlaimk38rmc2h1315bphx7v1rd6g4gypgx4ym15"; depends=[plyr RCurl reshape2 png ggplot2 RJSONIO]; };
+rAverage = derive { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; };
 rAvis = derive { name="rAvis"; version="0.1.2"; sha256="0m5dl8as0vmmsd3j0z0xwcpq55yfax42fa67qn4lsnaglyqmd4lm"; depends=[stringr XML RCurl scrapeR gdata scales rgdal maptools raster sp]; };
 rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
 rCMA = derive { name="rCMA"; version="1.0.0"; sha256="16d3cdxiaq65lwbvq8wjcp89vrfdp9kwrdl2jy9fynsg0v2lasvp"; depends=[rJava]; };
@@ -4972,50 +5025,54 @@ rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5
 rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; };
 rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
 rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[stringr RCurl XML rjson tm]; };
+rDEA = derive { name="rDEA"; version="1.0-2"; sha256="1npknid10w6by7ka7dham4vdbx6hyy09dvakq8mp5vfysxf5akf3"; depends=[slam truncreg truncnorm maxLik]; };
 rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
 rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
 rEMM = derive { name="rEMM"; version="1.0-8"; sha256="1d8nwranqfvr9c0g2ny7akawgqk5hjnr1mclk87gmbmwn9iwik34"; depends=[proxy MASS clusterGeneration igraph]; };
 rFDSN = derive { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
-rFerns = derive { name="rFerns"; version="1.0.0"; sha256="1rxqq4p1yzij6pf46l3hy00k7wqhy41zdiyqx3c57xld57dv3lfb"; depends=[]; };
+rFerns = derive { name="rFerns"; version="1.1.0"; sha256="00ddb9zwf4hqkx9qmrndz182mg69mb5fyg0v0v4b32sy4sixnps5"; depends=[]; };
 rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
 rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
 rHpcc = derive { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
-rJPSGCS = derive { name="rJPSGCS"; version="0.2-6"; sha256="1x6mwy6232kjl8ssvkbamhfvxsc3rqbjsrlrprj0bprssm3pcr2g"; depends=[rJava]; };
+rJPSGCS = derive { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8mqa6q822rpfphj00dlmj50rgwk02pfc69"; depends=[rJava]; };
 rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
 rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
 rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
 rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.4"; sha256="1qs8f4sv044bxrf45wzfj444plkcq3i61353881x8shn13h3awas"; depends=[plyr]; };
 rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
-rNOMADS = derive { name="rNOMADS"; version="2.0.4"; sha256="181f514apvdx2hyfmlpd0gdybrmm00n72vhz9zwbci039azbb582"; depends=[scrapeR stringr fields XML GEOmap MBA RCurl]; };
+rNOMADS = derive { name="rNOMADS"; version="2.1.2"; sha256="1ww9jyzpk5r1glq407xz0ab80n0lj9gp4v4zfm2myfch3bjkcn9h"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; };
 rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; };
-rPref = derive { name="rPref"; version="0.3"; sha256="1lhxbmg0f3jdlslrvh8q2sb4m89gzc2zzmqkkmamncyipi1pijpp"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; };
+rPref = derive { name="rPref"; version="0.4"; sha256="0w1cfcqngyympp8xh72rc2w7njjf0y4bilvmfiamp90ykv1yd0vn"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; };
 rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; };
 rSCA = derive { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; };
-rSFA = derive { name="rSFA"; version="1.03"; sha256="0bgapvlx5n0984ryyh1is0w88lhxj49gcar8gkwiw455jbzx7isp"; depends=[MASS]; };
+rSFA = derive { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
+rSPACE = derive { name="rSPACE"; version="1.0.4"; sha256="1vps3cf7szbkl87warp99fx4laivylwq3ihg8z7iincd2x072xgw"; depends=[raster RMark ggplot2 tcltk2 sp plyr]; };
 rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
 rTensor = derive { name="rTensor"; version="1.2"; sha256="1qikicdi8d5yhw43660m8v587f5xzs2k2lpmbhfw037n0liivay2"; depends=[]; };
+rUnemploymentData = derive { name="rUnemploymentData"; version="1.0.0"; sha256="1gbmr3kcv3wv4lmr7171sd76p95nhsa104955yi7y6wd5h0hk1ba"; depends=[stringr choroplethr rvest]; };
 rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr plyr rgdal jsonlite reshape2 sp]; };
 rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RJSONIO reshape2 RCurl]; };
 race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
+radar = derive { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
+radir = derive { name="radir"; version="1.0"; sha256="1aiy92r854h1l9fsa8j65w495hj7hll7k1csfnvb92h0wh0bxyzy"; depends=[hermite]; };
 rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz1kfsjng3lzfrfb3czsxg1kvll5d275xsrhz5ix"; depends=[igraph expm reshape ggplot2 Hmisc fdrtool snowfall]; };
 rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; };
 raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
-rainfreq = derive { name="rainfreq"; version="0.2"; sha256="0ryvgfi685lpsm7lqz1rnpsapw308pjxs47nvfg1nd6vp63vq3qk"; depends=[RCurl SDMTools]; };
+rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
 ramps = derive { name="ramps"; version="0.6-12"; sha256="128lqfkgmcbcfvs210j14h54spqjcr4jdhk2rqgrwcjp5wjv209w"; depends=[coda maps Matrix nlme fields]; };
 randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
-random = derive { name="random"; version="0.2.2"; sha256="0h3vmd581i0srf9lfdgjv8kkinxf1kjg8aia0dhr5adghqvf5dck"; depends=[]; };
+random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; };
 random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; };
 randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; };
-randomForestSRC = derive { name="randomForestSRC"; version="1.5.5"; sha256="1n1zpcppx1x3q871ynyx083397h86zrp5c0ldbv6b4wsz6ja6lv1"; depends=[]; };
+randomForestSRC = derive { name="randomForestSRC"; version="1.6.0"; sha256="1fd2hlihqkrx5cg91cfiibxw7h3gca5asf8a9nnm7ldafsamczy5"; depends=[]; };
 randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; };
-randomLCA = derive { name="randomLCA"; version="1.0-1"; sha256="0v20hqpm4l62v4g8xwhlli0254cwzqzc12r8v7kbcq3r8gd26hq4"; depends=[lattice boot fastGHQuad]; };
+randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjdwh9nb0lljhc7kdly4p1v2a9jypjil6kk5ibc"; depends=[lattice boot fastGHQuad]; };
 randomNames = derive { name="randomNames"; version="0.0-6"; sha256="18fyxpqj6xv933nyv4s59wv7pgl4wra123qmf0fa68gk1zj9l153"; depends=[data_table]; };
-randomSurvivalForest = derive { name="randomSurvivalForest"; version="3.6.4"; sha256="1k08q43rxlz822rqzz3nvy40646764c8ds25ylsvg6daan2qzzmv"; depends=[]; };
-randomUniformForest = derive { name="randomUniformForest"; version="1.1.0"; sha256="1gjm8v5qf845122lg5fjjhkw2w5jdm4xwd57gk2rdp5cli1a92jn"; depends=[Rcpp doParallel iterators foreach ggplot2 pROC gtools cluster MASS Rcpp]; };
-randomizationInference = derive { name="randomizationInference"; version="1.0.2"; sha256="1qxl88r5xai7z4sh0xxv225fzmslrbzfgrqx1ab5zm1i1w8g55yv"; depends=[permute matrixStats]; };
+randomUniformForest = derive { name="randomUniformForest"; version="1.1.2"; sha256="16nrw4vican3clnbs4zn4n1zmnfx8mnx3lp70knj0fc1w0rfq2yw"; depends=[Rcpp doParallel iterators foreach ggplot2 pROC gtools cluster MASS Rcpp]; };
+randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[permute matrixStats]; };
 randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; };
 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
-randtoolbox = derive { name="randtoolbox"; version="1.15"; sha256="02knvk0ln6x0hlpbvvpll0dnb5d7s3n6zn5kdxih792y5yihiwbh"; depends=[rngWELL]; };
+randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; };
 rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; };
 rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
 rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; };
@@ -5027,36 +5084,38 @@ rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4
 raster = derive { name="raster"; version="2.3-12"; sha256="13h3glha5q1j3kvms0l8lbkm1vy49w675s83fxh0fyfh4rh0lrb7"; depends=[sp]; };
 rasterVis = derive { name="rasterVis"; version="0.32"; sha256="040cg1v30ixkjkibqjpvz94wz486ffsrsnpfgzlp302xvvsmb3dk"; depends=[raster lattice latticeExtra hexbin sp zoo RColorBrewer]; };
 rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
-raters = derive { name="raters"; version="1.1"; sha256="0djpax59qvvqklph847wh4m2231y3zrzv2i7maq43pr8pyw9f2md"; depends=[]; };
+raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
 rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
-rattle = derive { name="rattle"; version="3.3.0"; sha256="0qjlfjpklq94ifgrywc6ldq9n7b06k4pcrkmvv9npary4pkb44bf"; depends=[]; };
+rattle = derive { name="rattle"; version="3.4.1"; sha256="1ql7zppca6p9cph0wca5wxhhn5f8spzpxa8r65372mvigg0iw6k3"; depends=[]; };
 rawFasta = derive { name="rawFasta"; version="1.0.0"; sha256="0krvs8d1r8hggjg84n7g3ncdkifa3hipbma98f49kf81fzn2npip"; depends=[]; };
 rbamtools = derive { name="rbamtools"; version="2.10.0"; sha256="00y5393nac4x1vz9m5li0053cr679dj29v7ss6njgph8q27mv19c"; depends=[]; };
 rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[XML RCurl rjson wordcloud rtematres RColorBrewer]; };
 rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
 rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr XML RJSONIO plyr]; };
-rbiouml = derive { name="rbiouml"; version="1.4"; sha256="03zpchcwq4sn8cymcrzw6r6fkxh85b8mivy42jkd0knm6i7f9aa6"; depends=[RCurl RJSONIO]; };
-rbison = derive { name="rbison"; version="0.4.3"; sha256="1d9f1p17rfxw8nzj8ffnjlpgibh6fdk8gmpizac7j2idhs6k26fw"; depends=[plyr httr mapproj ggplot2 gridExtra maptools sp dplyr jsonlite assertthat]; };
+rbiouml = derive { name="rbiouml"; version="1.5"; sha256="1q0n207lhb2jj1s5qb4jslxaxj7xj49l487v0mlncnlf6217j3pz"; depends=[RCurl RJSONIO]; };
+rbison = derive { name="rbison"; version="0.4.5"; sha256="1bvirsil4674r5xb0ksmzdrg0km988rsmq93mr0q6a089zw9lhna"; depends=[plyr httr mapproj ggplot2 gridExtra maptools sp dplyr jsonlite]; };
 rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RJSONIO RCurl]; };
 rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
-rbounds = derive { name="rbounds"; version="2.0"; sha256="19xxz5dzzh706pp9391fq4v0g1fsd442x6mqqdvhkm51a9x0ih3p"; depends=[Matching]; };
+rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
 rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
 rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
 rcbalance = derive { name="rcbalance"; version="1.2"; sha256="0880bvzbnq9gak2n70iwdk6n86bn1glg67lb7fby6fhipkgfxcp2"; depends=[MASS plyr]; };
 rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; };
 rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
-rcicr = derive { name="rcicr"; version="0.2.5"; sha256="0afgmdzs3npsy3cjz0n4msnyvhpaklbjr6jlzh3zgcp8jsjn34bp"; depends=[matlab aspace jpeg]; };
+rcicr = derive { name="rcicr"; version="0.2.6"; sha256="1dgk86cagga9ax0cabp6396iy03hysmjli20z5rq4f0r8kg172qk"; depends=[matlab aspace jpeg]; };
 rclinicaltrials = derive { name="rclinicaltrials"; version="1.4"; sha256="1jh4jn52hcwbycvwvfn7wb1h0r7makkli3hvxg17dbalrxky9xgq"; depends=[httr XML plyr]; };
 rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
+rcrossref = derive { name="rcrossref"; version="0.2.1"; sha256="19l3z2rfs1wj9z5myrskzbgsdpqya231wkiagvr6fynjdf2wcl9q"; depends=[jsonlite XML httr plyr bibtex dplyr]; };
 rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
 rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[zoo RCurl RJSONIO]; };
 rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; };
 rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
 rdrobust = derive { name="rdrobust"; version="0.70"; sha256="1zfsgzyi648v5zzbjjw01vvznws6yv30n981ljn996g4y2qy7gp4"; depends=[]; };
 rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; };
-readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.1"; sha256="14ks9dnxrgfc51l8xd05pzszimr1902pklapcghm8jxmcvahh8xm"; depends=[]; };
-readMLData = derive { name="readMLData"; version="0.9-6"; sha256="15rb8hm60fc30xgxjwxl7v5blzf02s6cb8pk0p26cgn9liiavjhb"; depends=[XML]; };
+readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; };
+readGenalex = derive { name="readGenalex"; version="0.4.1"; sha256="02rdx5ya06wpn0r6709aw6f86hk2xivfvjq5mggmm4dmlzgkwg0x"; depends=[]; };
+readMLData = derive { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; };
 readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fkc30m6gx6pzmrxr31s80d1qgpcakspjza53qn6fjb16"; depends=[base64enc digest XML]; };
 readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; };
 readbitmap = derive { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; };
@@ -5066,18 +5125,21 @@ rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjf
 rebmix = derive { name="rebmix"; version="2.6.2"; sha256="1cib2xwxv2pzhhc1fw7dfnjmk7s8fvxpn7025fvisg0gx5533978"; depends=[]; };
 recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; };
 reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; };
-recluster = derive { name="recluster"; version="2.5"; sha256="1hyq3nxbkah9jmly9a7ykzrf72r8yyd5ra5hf6d8fcprg15h8gg2"; depends=[vegan ape picante phangorn phytools cluster]; };
+recluster = derive { name="recluster"; version="2.7"; sha256="0kgq3bm5zh4iskm4ydpnsxmy9vcgxjk9iz7d1f1didlvxg3piys7"; depends=[vegan ape picante phangorn phytools cluster]; };
 recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2la4wnlxx5h8cjni4i978hdssr041zrg851lpjrkbxmxfsi"; depends=[Matrix registry arules proxy]; };
 recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; };
 recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; };
+reconstructr = derive { name="reconstructr"; version="0.5"; sha256="0lffi30grk88na2jmkbhs62xf3d8mzrmjsiajrpp7dsaxa650bf0"; depends=[Rcpp Rcpp]; };
 recosystem = derive { name="recosystem"; version="0.2.4"; sha256="19d8c98wkzaxmzkg5z3ry6klcqgbcmb8ycwh52l9mvvy2k1ybkw6"; depends=[Rcpp Rcpp]; };
-redcapAPI = derive { name="redcapAPI"; version="1.1"; sha256="1wjhagb02zphnlcvmg8mil4pp3wrznrhb8h0fb6xmwwyjhfgvgwq"; depends=[chron Hmisc httr stringr]; };
+redcapAPI = derive { name="redcapAPI"; version="1.2"; sha256="10d4pjcap1pcabzb2jjp0c9n0k8zpcz8cb0fmsqwfisjsyda7slk"; depends=[chron DBI Hmisc httr stringr]; };
 ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
 refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[doBy RSQLite DBI]; };
 referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot extremevalues car outliers]; };
+refset = derive { name="refset"; version="0.1.0"; sha256="0yj87sp6ghxv20hz5knmw3d7way1hsggk759wqxsbfprd38y6khd"; depends=[]; };
 refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7352v98divna6az1dxsdn7lvw6cmph6y"; depends=[fda lattice boot mgcv MASS glmnet magic nlme wavethresh Matrix gamm4 matrixStats lme4 RLRsim]; };
 refund_wave = derive { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; };
 regRSM = derive { name="regRSM"; version="0.4"; sha256="1rg74jqj8rw69q6my0n4alflx7mgfwng35ff72bxwjhn9ghhj347"; depends=[]; };
+regexr = derive { name="regexr"; version="1.0.2"; sha256="1mr8qmiz9bgq5v6f065z40aj9zllidsv6gg8mjc28zxmkz5zn6gp"; depends=[]; };
 registry = derive { name="registry"; version="0.2"; sha256="1ifv9sql70kylfj12cdb1j1zpk3ix728m8qj46sf1zyc5mhll01s"; depends=[]; };
 reglogit = derive { name="reglogit"; version="1.2-2"; sha256="0nq60s8l860z6nd52l6c77vamis7hl2j667gkxry0jir2pxsk4jp"; depends=[mvtnorm boot Matrix]; };
 regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7wksyng2g71mz2z9nb2zqdak794l1n44"; depends=[denpro]; };
@@ -5097,31 +5159,30 @@ relevent = derive { name="relevent"; version="1.0-3"; sha256="054x4kmc0h0s6a4svj
 reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
 relimp = derive { name="relimp"; version="1.0-3"; sha256="1isn2ns3qiz985wrg7992dmmqxwdq75a9yhfqnb64xhnzzpcpszq"; depends=[]; };
 relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; };
-remMap = derive { name="remMap"; version="0.1-0"; sha256="03jbrnk8nbaj6l8g428il5h6p2sszndd2bl4rvg8347pw7cp4kk1"; depends=[]; };
 remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; };
 remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; };
 rentrez = derive { name="rentrez"; version="0.3.1"; sha256="1awamp0730wzpxzbdr9rhy4xb06b25xrmk2pj3h6kj75k4k7h5vs"; depends=[XML httr]; };
 repfdr = derive { name="repfdr"; version="1.1"; sha256="1k85y27k42kw5zmbrnnqb62x3djjzdm4zrvm2g4dl8ykdlnaikv9"; depends=[]; };
 replicationInterval = derive { name="replicationInterval"; version="0.2"; sha256="1hs5alhpdnhwn86wrlqhbf1cpy96hh6rffkmcpbxxpcv3fhzgz7b"; depends=[MBESS]; };
-repmis = derive { name="repmis"; version="0.3"; sha256="11z931vcz4z85w03y32zs3iyh40abnmlnkdd6h1q93b3m14k0ykj"; depends=[digest httr plyr R_cache xlsx]; };
+repmis = derive { name="repmis"; version="0.3.3"; sha256="1jyrablh5wkj43dgkq61f5jz2vh4riwdcbd33j1kjamyca92kvyh"; depends=[digest httr plyr R_cache xlsx]; };
 repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
 reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; };
 reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
-reports = derive { name="reports"; version="0.1.2"; sha256="14w9dlhvk4080sq03ad3dhcww7c213f8ygbnxm7kxcpk36j71yjn"; depends=[knitr knitcitations]; };
+reports = derive { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
 reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; };
 repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; };
 represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
 resample = derive { name="resample"; version="0.2"; sha256="1p6hyd0wi037bsz0xd9gkw28sp4nkj1zmqs9h0lzkxbspn6h0q7j"; depends=[]; };
 resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; };
 reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
-reshape2 = derive { name="reshape2"; version="1.4"; sha256="0i3bim4clwyfdwwrmszsn9ga5gm4a2sh1i0jmpji3afbxc151yjp"; depends=[plyr stringr Rcpp Rcpp]; };
+reshape2 = derive { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr stringr Rcpp Rcpp]; };
 reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[reshape2 plyr gWidgets gWidgetsRGtk2]; };
-restlos = derive { name="restlos"; version="0.1-3"; sha256="0lqkvxczclg7ab8n0rd8b27ycrakw3pf379n1js49fwvvvqkymdg"; depends=[som rgl geometry igraph]; };
+restlos = derive { name="restlos"; version="0.1-3"; sha256="03bsakp9kd8i468wz7xhdjqb6ck6p9wci3gk2b2bykv73c0g6n95"; depends=[som rgl geometry igraph]; };
 restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; };
 retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
+retistruct = derive { name="retistruct"; version="0.5.9"; sha256="0m8dk9fcvj6idd17gswv65shz3sjm4xw4n023gb97ccgvvf1la65"; depends=[foreign RImageJROI png ttutils sp geometry RTriangle rgl R_matlab]; };
 reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; };
-revealedPrefs = derive { name="revealedPrefs"; version="0.1"; sha256="1akinhrvw3rmsxircnj2ymfphsca50j2jda5v4kqcprpigf1i8j1"; depends=[Rcpp Rcpp RcppArmadillo]; };
-review = derive { name="review"; version="2.5"; sha256="0qk4n6g0hp49rjqhpipgja777namdafk6yf4kcxdld1cghdikw31"; depends=[XML Hmisc]; };
+revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp Rcpp RcppArmadillo]; };
 reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
 rex = derive { name="rex"; version="0.2.0"; sha256="1q9dkk94w152naw1lpd2l2v08ikrfgilqx9v5z14dyqaascqbmva"; depends=[magrittr lazyeval]; };
 rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp Rcpp]; };
@@ -5130,7 +5191,7 @@ rfUtilities = derive { name="rfUtilities"; version="1.0"; sha256="020wwrbpfzi7pl
 rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; };
 rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; };
 rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; };
-rfoaas = derive { name="rfoaas"; version="0.0.4"; sha256="1p6sd197jbrccckpmpkicvdzy56a5p91mddiaw3384krqn3q3lb1"; depends=[]; };
+rfoaas = derive { name="rfoaas"; version="0.1.1"; sha256="17rp14s6gclk48cv47i3k4xgl5wjydx9z9apw1xmmsw5hvyzsz0p"; depends=[httr]; };
 rfordummies = derive { name="rfordummies"; version="0.0-2"; sha256="01wbhn8wpwkwvkafx4m8l5zj2xjbvwjlzbnwkd4i7g2nrvw29wsx"; depends=[]; };
 rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp Rcpp]; };
 rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
@@ -5141,25 +5202,24 @@ rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizq
 rgdal = derive { name="rgdal"; version="0.9-1"; sha256="1jq6z4z0q00djfmm2nsr5cn7idall5pfqp2p88ah9g24k928v3gf"; depends=[sp sp]; };
 rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
 rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; };
-rgexf = derive { name="rgexf"; version="0.14.3.11"; sha256="16mil1csyzkaywcdrjzz5r60n4xhhinxawg30skc7d9awkf26qfa"; depends=[XML Rook igraph]; };
 rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
-rgl = derive { name="rgl"; version="0.95.1158"; sha256="0gb2ybi452hp31llfi54kk7jc2mgagczbjj0f8rv4wbjaxxr82xx"; depends=[]; };
+rgl = derive { name="rgl"; version="0.95.1201"; sha256="0vd2zww17p2lcdipv7ijclbisy6ms6d1a4qnwpj1y1kbkhcplw1j"; depends=[]; };
 rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; };
-rgpui = derive { name="rgpui"; version="0.1-1"; sha256="0hp1z00n6jzi45j61hlp5qj26wpjvbzjz3nvpxvmcjdmkk3vjfyp"; depends=[rgp shiny emoa]; };
-rgr = derive { name="rgr"; version="1.1.9"; sha256="1fs8f0g1wm6virwjzlgabp1i89n8jpdiwnkvk5w1lggs36xc8q59"; depends=[MASS fastICA]; };
+rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[rgp shiny emoa]; };
+rgr = derive { name="rgr"; version="1.1.10"; sha256="1gmr4px70dwz45zb4w1vqddqpw1idln2rids9cdh2fxppdf9m9x8"; depends=[MASS fastICA]; };
 rgrs = derive { name="rgrs"; version="0.3"; sha256="19whlp3i0jps4pdif03h6z79zliw4shiqh7ackhk2gwq5c28jsql"; depends=[questionr]; };
-rhosp = derive { name="rhosp"; version="1.05"; sha256="1d1a4dc8hgvjmfb21s7j19yadbi1a9qp06prd80izbhvj2hni573"; depends=[]; };
+rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; };
 ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
 rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; };
-ridge = derive { name="ridge"; version="2.1-3"; sha256="0pdmybygf730dw73a5ncl9fw3kjnnpqqkanqxi97aj9n4cfcjn7z"; depends=[]; };
+ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; };
 rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; };
 rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
 ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; };
 ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; };
 rio = derive { name="rio"; version="0.1.2"; sha256="0h80msbj1qcc9m4408qcckw238ydqdzzgr9frlmmc7qi4dyba4i4"; depends=[stringr foreign testthat]; };
-rioja = derive { name="rioja"; version="0.8-7"; sha256="1164sxwv9wafqmprnkr9sdsd109ss8w2l1j8ir7kq8ya071k3zbl"; depends=[vegan]; };
+rioja = derive { name="rioja"; version="0.9-3"; sha256="0r164072g4mxq4lznvh72y5r6hnygmd6rwra9whn9s8p31w3g803"; depends=[vegan mgcv lattice gdata]; };
 ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp Rcpp]; };
-riskRegression = derive { name="riskRegression"; version="0.0.8"; sha256="0bjxwj4wrlcqkm1zf25p39h3jwf0f11zspzsk4b41axr3adlvmdw"; depends=[prodlim rms pec rms cmprsk survival]; };
+riskRegression = derive { name="riskRegression"; version="1.1.1"; sha256="1qjy2wmbfalbxszjfplisqrdca0n0yccr0wvdf1kbzxblba82mx6"; depends=[prodlim rms pec cmprsk survival randomForestSRC]; };
 riskSimul = derive { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
 risksetROC = derive { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[survival MASS]; };
 rite = derive { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[tcltk2 RCurl knitr markdown]; };
@@ -5171,42 +5231,43 @@ rjags = derive { name="rjags"; version="3-14"; sha256="1hfsa8jl5imk2j2qnafa5q95z
 rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
 rjson = derive { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
 rjstat = derive { name="rjstat"; version="0.2"; sha256="1ylwp6d3cc8xb8129yr49grx9vb4xyp62ig0qa7vzkbdplba2zr2"; depends=[jsonlite assertthat]; };
-rknn = derive { name="rknn"; version="1.2"; sha256="1c92cv3462f00p237fkh06hl66j912ssiav4hpc4jphvs01g30kz"; depends=[gmp]; };
 rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4hhkmf4ln7xlp0zinmmhym9m"; depends=[]; };
 rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; };
 rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
 rlist = derive { name="rlist"; version="0.3-2"; sha256="11br13s7frwz9ix7lgb4qpgcnvbqrzx0l0mx5kdg4pbvlbhjd4ij"; depends=[stringdist data_table yaml jsonlite]; };
 rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp Rcpp]; };
 rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; };
-rmarkdown = derive { name="rmarkdown"; version="0.3.3"; sha256="0i3wdis931s91fzy9n2lkfslxiw7wayyfbkygl0mgs1dhldhgk4m"; depends=[knitr yaml htmltools caTools]; };
-rmatio = derive { name="rmatio"; version="0.10.0"; sha256="1p1gsv7fj14hynna4a7nnxbchd0i1db03yxah4pcz3sd3a9hqw0f"; depends=[Matrix lattice]; };
+rmarkdown = derive { name="rmarkdown"; version="0.4.2"; sha256="1spmzlc3q997xyyikzl9kr853q2nrr6vzrxh9bjmswv7qzbc3izz"; depends=[knitr yaml htmltools caTools]; };
+rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[Matrix lattice]; };
 rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
 rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ape ade4 gtools]; };
 rmgarch = derive { name="rmgarch"; version="1.2-8"; sha256="19q35kzyzzs19b4xgslrnl8ihlx1wlmrwfdimnq8racfx0y46lm5"; depends=[rugarch Rsolnp MASS Matrix zoo xts Bessel ff shape pcaPP spd Rcpp Rcpp RcppArmadillo]; };
 rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1xx6dwia1ms4hrcpnpz3kb8f6ydda"; depends=[kknn plotrix lattice nnet pls MASS mda rpart randomForest adabag party Cubist kernlab e1071]; };
-rmngb = derive { name="rmngb"; version="0.5-1"; sha256="0xlkf0ar14d06pxsrzakhvb0yqx13fwvlal3mwmvz4r0wg8c1vyc"; depends=[]; };
+rmngb = derive { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
 rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; };
 rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; };
 rms = derive { name="rms"; version="4.2-1"; sha256="078i2x88r8p81mz83l0nwkhh7v0zv6229rff6lgkdv4x6qbn11x0"; depends=[Hmisc survival lattice SparseM quantreg nlme rpart polspline multcomp]; };
 rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
 rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
-rnbn = derive { name="rnbn"; version="1.0.0"; sha256="1f3yv8cvrwlnzyk8g5b5sg5pvp6f15mi6bhfff44d0v1m6nwnp01"; depends=[RCurl RJSONIO]; };
-rneos = derive { name="rneos"; version="0.2-7"; sha256="0vsifj6zfrdij1gjdp1dlh41cckwd04h41q30m7ard4pgyl9n7za"; depends=[RCurl XML]; };
+rnbn = derive { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; };
+rncl = derive { name="rncl"; version="0.2.0"; sha256="0z4sv5gmvklds8ml9gay4kqpg8c2a2rwlqvb9fzn0xb5vby6q31d"; depends=[Rcpp ape Rcpp]; };
+rneos = derive { name="rneos"; version="0.2-8"; sha256="0cg88l1irqkx7d72sa5bfqcn5fb5rapvimi1gw15klci39w0s43q"; depends=[RCurl XML]; };
+rngSetSeed = derive { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; };
 rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; };
 rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[pkgmaker stringr digest]; };
-rngwell19937 = derive { name="rngwell19937"; version="0.5-4"; sha256="1c6p0v673n328sdynvv780911yqxk2ayimb93k1f1h3ci915pixy"; depends=[]; };
-rnoaa = derive { name="rnoaa"; version="0.2.0"; sha256="1v1yiwzsaqk95yxxla277bfdxs397p99y17yzh8z2m2xz54pn6sh"; depends=[httr lubridate plyr ggplot2 scales sp rgdal rgeos maptools stringr XML data_table assertthat jsonlite]; };
+rngwell19937 = derive { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
+rnoaa = derive { name="rnoaa"; version="0.3.3"; sha256="12iwyl0nr6d8xpl5vcqwli4rlh79y8l13sfj34457klqdzmrg126"; depends=[httr lubridate plyr ggplot2 scales sp RCurl rgdal rgeos maptools stringr XML data_table jsonlite digest]; };
 rnrfa = derive { name="rnrfa"; version="0.1.5"; sha256="0lpa0gmf9j9adq0p41jgayzcwg6220bihnsfqj55d217mfalbhnd"; depends=[XML2R RCurl zoo rjson rgdal sp stringr]; };
 robCompositions = derive { name="robCompositions"; version="1.9.0"; sha256="0kplw0zlszfarkhsk2hrakf649c3sl1ig8l8xhknj1v2qwkblbx2"; depends=[robustbase rrcov GGally MASS pls]; };
 robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
 robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
-robfilter = derive { name="robfilter"; version="4.0"; sha256="1mj50531xjncg9lfidxzlyqrzwjm7pdsky88s3syspf70cjq6mg8"; depends=[robustbase MASS lattice]; };
-robumeta = derive { name="robumeta"; version="1.3"; sha256="0b4w9gv1sjcpds4i7hsqmbrc4b4x7cbv26snvzy60ng23dpyc8aq"; depends=[]; };
+robfilter = derive { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[robustbase MASS lattice]; };
+robumeta = derive { name="robumeta"; version="1.5"; sha256="0c3mpzgm5y9bzjb50gp3l32xph6b6xinjdj4phxrkwaclvxx13yz"; depends=[]; };
 robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models MASS lattice robustbase rrcov]; };
-robustDA = derive { name="robustDA"; version="1.0"; sha256="0yp18kskj46jfhkrn96nsf9a5dw0vy52h5m23w4xrln8b6l9g978"; depends=[MASS mclust Rsolnp]; };
+robustDA = derive { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
 robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS Rcpp RcppArmadillo]; };
 robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; };
-robustbase = derive { name="robustbase"; version="0.92-2"; sha256="1z9fjbq7ig63zqwvxvbpcz3ga1ddjrwhvc9lhb6p6sglq301q90z"; depends=[DEoptimR]; };
+robustbase = derive { name="robustbase"; version="0.92-3"; sha256="0b7rld5pa9nrnqj7600ybvzy74lxz6s41dibamwdssh36mx6ayvb"; depends=[DEoptimR]; };
 robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
 robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase Rcpp RcppArmadillo]; };
 robustlmm = derive { name="robustlmm"; version="1.6"; sha256="18lhbnmcd6nc0qr23a19mhw9k9r30li6z92g600dil6ll8s5m54z"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; };
@@ -5216,24 +5277,25 @@ robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih
 rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
 rockchalk = derive { name="rockchalk"; version="1.8.86"; sha256="0rdp9dmgz2wjac1ahvivpb8fzjamr8v1vszgsjpfiyc9l90zv4bk"; depends=[lme4 car MASS]; };
 rococo = derive { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp Rcpp]; };
+rodd = derive { name="rodd"; version="0.1-1"; sha256="0x7w7v04nqb1gl4h32a674gwc68h6p9pff2piisyd74cgx90sm1b"; depends=[numDeriv quadprog Matrix rootSolve matrixcalc]; };
 rootSolve = derive { name="rootSolve"; version="1.6.5.1"; sha256="02ydj4ydgljs80nrrrxb4dhfa7m12rw65xy79d7g71w97326w8p2"; depends=[]; };
 ropensecretsapi = derive { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RJSONIO RCurl]; };
 ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; };
 rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; };
-rotations = derive { name="rotations"; version="1.2"; sha256="13z5ysjqz3qkiw4nrp9dgy55kbmff5j7m3hfp2h0sj8x1saglf66"; depends=[ggplot2 Rcpp Rcpp RcppArmadillo]; };
+rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp rgl sphereplot Rcpp RcppArmadillo]; };
 rowr = derive { name="rowr"; version="1.1.1"; sha256="1bpx9vd6i2ljwww3gp4c1fxbv9lsdxh3jdwkmrqqj2s18bkf0a7a"; depends=[]; };
-roxygen2 = derive { name="roxygen2"; version="4.0.2"; sha256="1rn43rssbgamnfd4ipsq50mrgki5h63z898v9fjd7kr9rrrbpidm"; depends=[stringr brew digest Rcpp Rcpp]; };
-royston = derive { name="royston"; version="1.0"; sha256="1hhb1v1aqvvlzirxiyhv6zahz82w2pq4d6yp3rcakq0sw7dhawn6"; depends=[nortest moments]; };
+roxygen2 = derive { name="roxygen2"; version="4.1.0"; sha256="0jpaqrnkb6qfs6jly637j8sbng6r1gzw15phwkifsh0fgqbi61ap"; depends=[stringr brew digest Rcpp Rcpp]; };
+royston = derive { name="royston"; version="1.1"; sha256="19sfjb8z1h0k28rh65xiaf5w5dsmlvxcxmlnnahh1rc2xxhpcfhg"; depends=[nortest moments]; };
 rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
 rpart = derive { name="rpart"; version="4.1-8"; sha256="1vhmwvb7hsh75lvmsjmkab2zl136irca1dhr6p57s1yhmpw4cys0"; depends=[]; };
-rpart_plot = derive { name="rpart.plot"; version="1.4-5"; sha256="005wnmbk1bgrgr4wljljyfhn4kadx8ly3r6hf5rxvrzmvrcjk4ia"; depends=[rpart]; };
+rpart_plot = derive { name="rpart.plot"; version="1.5.1"; sha256="1qzps1h53i81dwsj384npya23wmns95iwdhanlvqd8rkcsswkddn"; depends=[rpart]; };
 rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
 rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
 rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
-rpf = derive { name="rpf"; version="0.43"; sha256="0zqhrk0q4c9ps44qi67an76n8wc6hr8jlcs0cgvnndd73ahfqfw9"; depends=[mvtnorm RcppEigen]; };
+rpf = derive { name="rpf"; version="0.44"; sha256="1q68lb7cw4p31mrjwxyn2bkpclmgfcnln8z0brs9pkkh70j0vii8"; depends=[mvtnorm RcppEigen]; };
 rpg = derive { name="rpg"; version="1.2"; sha256="13vvym3xf70fmm57nl56dc5wvvv9va9id2agxlzxd9yrhlxbcnhm"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; };
-rphast = derive { name="rphast"; version="1.5"; sha256="0r6bk0lbqpv60byhiv847ij5bxrflrs0nsla1zrn8ww7371czsgj"; depends=[]; };
-rplexos = derive { name="rplexos"; version="0.10.0.1"; sha256="1zqz5s5iixd7daw5wss7c12kdj2j5qrmybmhb7pgnn9zp57mxadg"; depends=[dplyr RSQLite Rcpp DBI data_table lubridate reshape2 stringi assertthat Rcpp]; };
+rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
+rplexos = derive { name="rplexos"; version="0.11"; sha256="07yxb274jszac5qxn1dhqrrqprrfw3w415bb0pwsgphdandf25x7"; depends=[dplyr RSQLite Rcpp DBI data_table lubridate reshape2 stringi assertthat Rcpp]; };
 rplos = derive { name="rplos"; version="0.4.1"; sha256="1v757v0b09mggdrgfzqmhvmf7yhqm3k42ml8sg8v4j74lscy653l"; depends=[ggplot2 RCurl RJSONIO XML plyr stringr googleVis httr lubridate reshape2 data_table whisker solr assertthat]; };
 rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
 rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
@@ -5244,9 +5306,9 @@ rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5
 rqPen = derive { name="rqPen"; version="1.0"; sha256="1vd2kjbqb5jqvbciagw03fp28ljswifznkdqj34q753kzvryblri"; depends=[quantreg]; };
 rrBLUP = derive { name="rrBLUP"; version="4.3"; sha256="0wydh4sx7b6rcrgb3qvqh0z46pixx63711q2nf8s3c32090a5g81"; depends=[]; };
 rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
-rrcov = derive { name="rrcov"; version="1.3-4"; sha256="0k2lqwsfb9ir053m4dbz8z57xq6mlfj63i1k64p1h5jdzbpyw1ks"; depends=[robustbase pcaPP mvtnorm]; };
-rrcovHD = derive { name="rrcovHD"; version="0.2-2"; sha256="03b1mpqqhfjxjzz9agx575mcgalb7jrsv843zjqv9jp4wszprs6z"; depends=[rrcov robustbase pcaPP pls spls]; };
-rrcovNA = derive { name="rrcovNA"; version="0.4-4"; sha256="0zrzgnl83wfsaz0rma07hgb5jlmhvqwv06q7zkm65xd6mfsalqv0"; depends=[rrcov robustbase norm]; };
+rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vqjp1z3wg74g8jvg2q28v1ysk68p1b"; depends=[robustbase mvtnorm lattice cluster pcaPP]; };
+rrcovHD = derive { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[rrcov robustbase pls spls pcaPP]; };
+rrcovNA = derive { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[rrcov robustbase lattice cluster norm]; };
 rredis = derive { name="rredis"; version="1.6.9"; sha256="00fgrhyj6bai0kc18c2m1fsk9ja5c9q7m6dpsb8wsn4gs79mw3sc"; depends=[]; };
 rriskDistributions = derive { name="rriskDistributions"; version="2.0"; sha256="0278426m4v7b8qb9ydzxqncayq8z25b36n4livqg40zpazp3hy85"; depends=[mc2d eha msm tkrplot]; };
 rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; };
@@ -5254,7 +5316,7 @@ rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvf
 rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
 rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
 rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
-rsdmx = derive { name="rsdmx"; version="0.4-2"; sha256="0z0di9fw1wd0ljji2n6ciyh8ppwf7dsr6x71zgg9mgzhibks26kq"; depends=[XML RCurl plyr]; };
+rsdmx = derive { name="rsdmx"; version="0.4-4"; sha256="1y72j4h2rx2mwzwmwsrv317cdiqpfn4qwsind3lsgd73w20wyi0d"; depends=[XML RCurl plyr]; };
 rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; };
 rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; };
 rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; };
@@ -5265,15 +5327,17 @@ rsnps = derive { name="rsnps"; version="0.1.0"; sha256="1wpbr2sjcw6hh9sq8h2jzgvc
 rspa = derive { name="rspa"; version="0.1-6"; sha256="0zwmcjakpir8mvy8cvy8j85gar4s7gmizxc3z4mdrc4iadps9gqd"; depends=[editrules]; };
 rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; };
 rsprng = derive { name="rsprng"; version="1.0"; sha256="1sfjwfm03pn73mcq4f2chsldjlhmpjxhqkpmaqf71jbmb7ph41ip"; depends=[]; };
+rstackdeque = derive { name="rstackdeque"; version="1.1"; sha256="1vvp8xsi7i0zds9pzh2a13nc1p73jkv9g4f24wv7a5qacymabv3k"; depends=[]; };
 rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
 rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; };
-rstudioapi = derive { name="rstudioapi"; version="0.1"; sha256="027482pbdxnfhcpdw2ns2qhpa18zri71nz8fk0svq6900m2237h8"; depends=[]; };
+rstudioapi = derive { name="rstudioapi"; version="0.2"; sha256="1ili2i71fmpbgavvva488vwy0qbrbiyl16za3a8d95ylwvpallmx"; depends=[]; };
 rsubgroup = derive { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[rJava foreign]; };
 rsunlight = derive { name="rsunlight"; version="0.3.0"; sha256="148byg8180657ny01xny28sdawbq87hf89f8c1rzfjl5qwcxmbqd"; depends=[httr plyr jsonlite stringr assertthat]; };
 rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
+rtdists = derive { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk31lsnbdzrmrk44widnxd19hxn4r05cs6"; depends=[evd msm gsl]; };
 rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[XML RCurl plyr gdata]; };
 rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; };
-rtfbs = derive { name="rtfbs"; version="0.3.2"; sha256="1v26znlispc8304xid0dsflphiwzil6nrxlsgj8dkp4prh6hdb34"; depends=[rphast]; };
+rtfbs = derive { name="rtfbs"; version="0.3.3"; sha256="0cias6w0cypzh26y3zgkwanccxi77d12i8a21f8mbrldskiakfp2"; depends=[rphast]; };
 rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; };
 rtkpp = derive { name="rtkpp"; version="0.8.4"; sha256="0v1n16hi1zvbdn6p737ryw8baflyw7aqjpnnzqr7rgwc518zhd1f"; depends=[Rcpp Rcpp]; };
 rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; };
@@ -5288,18 +5352,18 @@ rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn2
 rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
 rvalues = derive { name="rvalues"; version="0.2"; sha256="1zc4irq0s9mm7yz8pc3n9il0z508wwf2a2j741wyyw90f35fasi0"; depends=[]; };
 rvertnet = derive { name="rvertnet"; version="0.0-5"; sha256="1rj6csx2qb094wgkablrpzlbqb0hpzg5d29xrar2cy39gjmz40cj"; depends=[RCurl plyr RJSONIO httr ggplot2 maps]; };
-rvest = derive { name="rvest"; version="0.1.0"; sha256="1bv05yk4cw8sq5rng6gxvvbchmz4qx0i47bb2k0wg5vbp8xhrcrh"; depends=[httr XML selectr magrittr]; };
+rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr XML selectr magrittr]; };
 rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
 rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[sp maptools fields]; };
 rworldxtra = derive { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
 rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; };
 ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; };
 rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; };
-rzmq = derive { name="rzmq"; version="0.6.8"; sha256="0likcj1xivr0y42krnm5zynkr6slfc3yqq2nd90x79ldvbfdqxc6"; depends=[]; };
-s20x = derive { name="s20x"; version="3.1-10"; sha256="0hxi8d1pl0jgg66jxzz0z973sg3f4s1jf75smmizy99kd76rdnh0"; depends=[]; };
+rzmq = derive { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; };
+s20x = derive { name="s20x"; version="3.1-11"; sha256="1zk9a7jdinggznq5h17vvx155a29d4py64dr7h1bh8dq22nlzd0g"; depends=[]; };
 s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; };
 s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; };
-sBF = derive { name="sBF"; version="1.1"; sha256="11yjw6y1k0fi95p68bc4481gac25lympmmdykh71ljg0hnrm0s53"; depends=[]; };
+sBF = derive { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; };
 sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
 sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[Matrix fields]; };
 sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
@@ -5314,7 +5378,6 @@ safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sh
 safi = derive { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
 sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; };
 sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; };
-samplesize = derive { name="samplesize"; version="0.1-8"; sha256="0w4aa6p0j7l9xykhgqv7yps2nxx11q1mrgivdnv4si8fbkqx148n"; depends=[]; };
 samplesize4surveys = derive { name="samplesize4surveys"; version="2.1.0"; sha256="08vs1b4rwyd4yh3y2l1gkh8wpjhh2w52929p6b0sfj0iywp2dr03"; depends=[TeachingSampling]; };
 sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; };
 samplingEstimates = derive { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
@@ -5365,28 +5428,31 @@ sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di
 sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[MASS fda zoo]; };
 sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; };
 sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[GPArotation ggplot2 psych raster]; };
-sdnet = derive { name="sdnet"; version="2.01.3"; sha256="1sr60ca2dn182nacsi1ix02cdjygf45jv51dcfz5744hj7afcvws"; depends=[]; };
+sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
 sdprisk = derive { name="sdprisk"; version="1.0-3"; sha256="0v490zz2c1qa0w9nfd0xs5xbbvd9g8vp39fp8x7k7cy598vby4yx"; depends=[numDeriv PolynomF rootSolve]; };
 sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
-seacarb = derive { name="seacarb"; version="3.0.2"; sha256="0v32fwryfhc9hmri5p7x53vi6z6g2f2a4rgwrn5rjvbkkhndb7vv"; depends=[]; };
+sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; };
+seacarb = derive { name="seacarb"; version="3.0.5"; sha256="1k605jcr6l46lvvxyfb7m8l48rkj8ffv3fggf38nngnk9p0dxsy5"; depends=[oce]; };
 sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
 seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
-season = derive { name="season"; version="0.3-4"; sha256="0rcz1gd3wbk77289b2vblbs3hhzf5vszdfmjvw4byfsw2willa7n"; depends=[ggplot2 MASS mgcv survival coda]; };
+season = derive { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[ggplot2 MASS mgcv survival coda]; };
 seasonal = derive { name="seasonal"; version="0.70.1"; sha256="0vjyr864v5v1hxy00djzmbq38ajmywacp9k0zfv1q9nf64kg62l5"; depends=[]; };
 seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; };
-secr = derive { name="secr"; version="2.9.2"; sha256="124x58d3ggj0l1as3zb1vzg0j61cybmcvfpg2qyarfxi65s8313r"; depends=[abind MASS nlme sp mgcv raster]; };
-secrdesign = derive { name="secrdesign"; version="2.2.1"; sha256="1q3bc38js1qajsfcyz25cxs2j84qp8yw5l5746fh7kfqmah7ngn3"; depends=[secr abind]; };
+secr = derive { name="secr"; version="2.9.3"; sha256="1jy9phy6h9rf3l08gd5bxnjj37gdbnwbwy9flcyakcjlycj5smvb"; depends=[abind MASS nlme sp mgcv raster]; };
+secrdesign = derive { name="secrdesign"; version="2.2.2"; sha256="028d6kaf09fh2kkdawgjln2qlh3xd89p3pbqmqwwsdp6p43x0wxy"; depends=[secr abind]; };
+secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[secr sp igraph maptools MASS]; };
 seedy = derive { name="seedy"; version="1.0"; sha256="1p9mbnkgdz3rlaj5ygaai81g8kvs68y4zcgf7745gr17vflys8kf"; depends=[]; };
 seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; };
 seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
 seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj803lmdvg5p1fla685xb3s2a3if1q5zc5i"; depends=[fftw tuneR]; };
 seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
 segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp Rcpp]; };
-segmented = derive { name="segmented"; version="0.5-0.0"; sha256="13p259snxj96xysj05gy2c705n6brbf5dfba4n3riwwb8ngs69cd"; depends=[]; };
+segmented = derive { name="segmented"; version="0.5-1.0"; sha256="15bxn998n38hja7hbjfc8yjfbmqxsgh9xsp2l19b1w35r72hc3sd"; depends=[]; };
 selectMeta = derive { name="selectMeta"; version="1.0.7"; sha256="1ibiiddl9km8dahfc3kdpl42k43fx4mqgqibxgv5q8zbcp2829p9"; depends=[DEoptim]; };
-selectiongain = derive { name="selectiongain"; version="2.0.29"; sha256="0l0av8dw14yfnc5a17nknjimhbi0nw30h7m8la346kibcsmszyvr"; depends=[mvtnorm]; };
-selectr = derive { name="selectr"; version="0.2-2"; sha256="0hzj8ccs2jcfaqlpgrf59y6z7hrxsb2c85kkxflp6180rpqjrwq4"; depends=[XML stringr]; };
+selectiongain = derive { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; };
+selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[XML stringr]; };
 selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[spatstat ecespa]; };
+selfingTree = derive { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
 sem = derive { name="sem"; version="3.1-5"; sha256="093kklhl9fnawpwj3km1q0px6fm40kc3vg7kw93y3yb6hniwla35"; depends=[matrixcalc]; };
 semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[sem MASS matrixcalc]; };
 semPLS = derive { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
@@ -5397,8 +5463,9 @@ semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdq
 semisupKernelPCA = derive { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; };
 sendmailR = derive { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; };
 sendplot = derive { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
-sensR = derive { name="sensR"; version="1.4-0"; sha256="19yddfcql1w154v81fsdm50wl15vl3vcx44iz3ss7in4gj1g884m"; depends=[multcomp MASS numDeriv]; };
-sensitivity = derive { name="sensitivity"; version="1.10"; sha256="1by3ri79k45aiz5pv1vr2325c9ra91kg3nx75ng457apcixqza0v"; depends=[boot]; };
+sensR = derive { name="sensR"; version="1.4-4"; sha256="1c9dg9q4g7cpm1a8qk984vrkfv5f34nh7gi88w8ppkzmmm6c5q25"; depends=[multcomp MASS numDeriv]; };
+sensitivity = derive { name="sensitivity"; version="1.10.1"; sha256="1pszyf8lkp2jv773kfs1jmidq8dykiwhp592dnm4zhiy18sl7jl2"; depends=[boot]; };
+sensitivityPStrat = derive { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; };
 sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; };
 sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
 sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[Matrix gtools MASS]; };
@@ -5408,12 +5475,12 @@ seqDesign = derive { name="seqDesign"; version="1.0.2"; sha256="0v4g4r9y79vqf4i2
 seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[survival Matrix coxme CompQuadForm]; };
 seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
 seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
-seqinr = derive { name="seqinr"; version="3.0-9"; sha256="1m57nmpkxhka1mgfaq5clwdhipz36v795w1d51qr8zypdnxacfgq"; depends=[ade4]; };
-seqminer = derive { name="seqminer"; version="3.1"; sha256="15b63j15bgqzix4vp57q1vi9jnqn5an2p8kmvacg95ahrv8w0a0m"; depends=[stringr]; };
+seqinr = derive { name="seqinr"; version="3.1-3"; sha256="0bbjfwbqg74wsamb3iz01g0ssdpdpg65gh00y9xlnpk4wb990n4n"; depends=[ade4]; };
+seqminer = derive { name="seqminer"; version="3.4"; sha256="1fl7mmqs3y0vpfhqss7syafwli67jwha703fyailxixq7djvwf9f"; depends=[stringr]; };
 seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; };
-sequences = derive { name="sequences"; version="0.5.8"; sha256="1872737x77mknn2ay7qh8brd28hzsqzjqkx4shwkp0w7lk2p0rp0"; depends=[Rcpp Rcpp]; };
+sequences = derive { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp Rcpp]; };
 sequenza = derive { name="sequenza"; version="2.1.0"; sha256="0qnznw6gn5yfd64mib8h9y29vak40d3znzkqvhlpnn0da6aak1zv"; depends=[squash]; };
-seriation = derive { name="seriation"; version="1.0-13"; sha256="0k3m4x0msdynblcy1ign4p5qlsqmxk2p4vfjkv0fz3qjsbxfw61n"; depends=[TSP cluster gclus colorspace MASS]; };
+seriation = derive { name="seriation"; version="1.0-14"; sha256="0a7m1x6dhk00wh6djiz75x462y06fammr7fd2z8ks32migsbbvpp"; depends=[TSP cluster gclus colorspace MASS]; };
 servr = derive { name="servr"; version="0.1"; sha256="035pf1xg0jgjrba39wxwlrh7n43kp29ymagfv7yskxj31dh3b34i"; depends=[httpuv]; };
 sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; };
 session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
@@ -5423,7 +5490,7 @@ settings = derive { name="settings"; version="0.1.1"; sha256="00b69vh4r8f40v6rm1
 setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; };
 severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
 sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
-sfsmisc = derive { name="sfsmisc"; version="1.0-26"; sha256="0claxq1s1hkwwymx8iva650v51fjf4ly10zm17d42qhnn4b2whgd"; depends=[]; };
+sfsmisc = derive { name="sfsmisc"; version="1.0-27"; sha256="16hkm0ylwipc1zqsi8fiwyqvl9hpjgl7kyvgamibxlbp1y669qgm"; depends=[]; };
 sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; };
 sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; };
 sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; };
@@ -5436,11 +5503,12 @@ shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbz
 shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[scatterplot3d rgl MASS]; };
 sharpshootR = derive { name="sharpshootR"; version="0.6-3"; sha256="1dpcyd1wi022zcs9s48xg3wzy17dqcd0622ak0phvbwxgpwmz9j2"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; };
 sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; };
-shiny = derive { name="shiny"; version="0.10.2.1"; sha256="03figla0lm6fb51f0g3mvlpy2nsmywxkpila4x9lqh0hs6yw0v4v"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; };
+shiny = derive { name="shiny"; version="0.11"; sha256="0mki9dxlz9v6kpd4kahl4v2rvrf7mkk4rr5hy500jk3caiwqfx5k"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; };
 shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
 shinyBS = derive { name="shinyBS"; version="0.20"; sha256="1l95g2rzv53vwx5zcaqiqz8jirncwh1yb14y62x9phg4n5jfk9f8"; depends=[shiny]; };
 shinyFiles = derive { name="shinyFiles"; version="0.4.0"; sha256="147g9ah7p97wkn3zpfhn5fljpwy2v936r4jqbdm7fbh7zi3rb3k2"; depends=[shiny htmltools]; };
 shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
+shinythemes = derive { name="shinythemes"; version="1.0"; sha256="19qhbiyn8chchwj9w9vyi6q86l84amf2n0g5y310apw1hzsjnnr7"; depends=[shiny]; };
 shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; };
 shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
 showtext = derive { name="showtext"; version="0.2"; sha256="18pr03n0v2dg93pnp3saar3664dpina33wzmhw13hqcx6nfjgzw7"; depends=[sysfonts]; };
@@ -5457,10 +5525,9 @@ sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0
 sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[nleqslv ellipse]; };
 signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; };
 signal_hsmm = derive { name="signal.hsmm"; version="1.1"; sha256="0ifx7ahl5nj90id0pk4gpz0hdq72rsf53n05s17g6j275dzkmd0n"; depends=[seqinr shiny]; };
-sigora = derive { name="sigora"; version="0.9.2"; sha256="1s3c0xwxabr3n8sb6rjhzkkzbpvcczbgqq6b263yypwasqbg4mlb"; depends=[]; };
 simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; };
-simMSM = derive { name="simMSM"; version="1.0.1"; sha256="0lway32vjajlsnkvi7j9hcsaz7bmhzmi1w3r2gr28y5mbkpfkgb2"; depends=[]; };
-simPH = derive { name="simPH"; version="1.2.3"; sha256="1x773y7jblrv048vq1p99dzmb95wj2s4c01jgl0m7dg78z1hh5fl"; depends=[car DataCombine data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; };
+simMSM = derive { name="simMSM"; version="1.1.2"; sha256="08l2mwwa8sd5dsg846kpbhffipwr60kamr8c02j76r9ka4pkn4p8"; depends=[]; };
+simPH = derive { name="simPH"; version="1.2.4"; sha256="07cwa18hpyqax73yhxml7qhxhmgiqjdv246v7m7s91k26vb6kpd4"; depends=[car DataCombine data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; };
 simPop = derive { name="simPop"; version="0.2.6"; sha256="1cpi4bva7qpqlsl6xx6174hz3x5vk22i0y9am0ib0jdxampfz1v8"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; };
 simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; };
 simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; };
@@ -5473,16 +5540,17 @@ simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gq
 simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; };
 simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; };
 simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; };
+simrel = derive { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
 simsalapar = derive { name="simsalapar"; version="1.0-4"; sha256="035mimkia6q1yiz413pwbgfwk6cyad24kpvhmd6gp61njawwha19"; depends=[sfsmisc gridBase colorspace]; };
 simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp071b3d5v0br3093q394wzp22d816xk"; depends=[lavaan]; };
 siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; };
 sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; };
-sirt = derive { name="sirt"; version="1.1"; sha256="1m6sd41l723j0aa2f5pkgkwh3rs9jf946xkcyksywwxjmsflxcd7"; depends=[TAM CDM mirt combinat ic_infer sfsmisc sm psych pbivnorm gtools Rcpp qgraph lavaan semPlot igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; };
+sirt = derive { name="sirt"; version="1.3"; sha256="1m76jk45s60kzqasx5scq24lbn4mljdg8j8sxq9fs1r9yjz76f3k"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; };
 sisVIVE = derive { name="sisVIVE"; version="1.0"; sha256="1y6zq8dp5k9mx83x6fryjh0h5f5wyry1cbi33rj3h7sss8vi3vz0"; depends=[lars]; };
 sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; };
 sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; };
 sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
-sjPlot = derive { name="sjPlot"; version="1.6"; sha256="03fxmvl8c4f8xd3l5hzha6rpk84xcilygpldlry5fvg0lrjcx7ry"; depends=[ggplot2 MASS car foreign plyr psych reshape2 scales]; };
+sjPlot = derive { name="sjPlot"; version="1.6.5"; sha256="04hacshyfb1irm9zz70lng9h5g3yvzk1y0grmf0518196arrmrqc"; depends=[ggplot2 MASS car foreign plyr psych reshape2 scales]; };
 sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
 skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; };
 skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
@@ -5495,7 +5563,7 @@ sld = derive { name="sld"; version="0.3"; sha256="18xj57v9gg78d894cr1h6wp10i05hr
 slfm = derive { name="slfm"; version="0.1"; sha256="0s5q6ank6075sls9pkqhf7jlvi6gyvsbxa99c34d6ccrv88skyzq"; depends=[Rcpp coda Rcpp RcppArmadillo]; };
 slp = derive { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; };
 sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
-smaa = derive { name="smaa"; version="0.2-2"; sha256="1xd5yd63j67w9kb3sl3jbxkvd76270c1wlg9r3k85dm2mjd0l38v"; depends=[]; };
+smaa = derive { name="smaa"; version="0.2-3"; sha256="1vabxxyz2k10sbvrzdf51jlh59zlkjdq82vblk5s37ddmzgwnif9"; depends=[]; };
 smac = derive { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; };
 smacof = derive { name="smacof"; version="1.5-0"; sha256="06csyz9fvdicxm11wh9mp6i4mvlgxyiclhlyg45grag0kqjgg6ha"; depends=[rgl polynom scatterplot3d Hmisc colorspace nnls]; };
 smacpod = derive { name="smacpod"; version="1.1.1"; sha256="1pmgxvww24mcgrvv87axqvw457r5wl57scqy93inmzia2mgyva1p"; depends=[spatstat]; };
@@ -5510,6 +5578,7 @@ smdc = derive { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8
 sme = derive { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; };
 smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
 smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
+smnet = derive { name="smnet"; version="1.0"; sha256="185ihq44fp00qp03lp9hz821a1ddm1bd09k3j0ii715grc91nc49"; depends=[SSN spam dfoptim RSQLite igraph DBI]; };
 smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; };
 smoothSurv = derive { name="smoothSurv"; version="1.3-2"; sha256="11aq3yb7q4pilp00l7q8r3ywbmwnka63kkjpvakp27mvaqyr02qr"; depends=[survival]; };
 smoother = derive { name="smoother"; version="1.0.0.0"; sha256="0i4g19xh20v4ig9fcy1gvbawi0a92jkg2qwdcxvgcflvppnvbv22"; depends=[]; };
@@ -5518,7 +5587,7 @@ smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h
 smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; };
 sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; };
 smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
-sn = derive { name="sn"; version="1.1-1"; sha256="0nmwg1jqq42d4i7zhdlsjhja5wa2ily0n3d4vsri0f96cppnpkn2"; depends=[mnormt numDeriv]; };
+sn = derive { name="sn"; version="1.1-2"; sha256="0ik528c0nxcr7hc3x6xx4zpyjhpaaa55jrvz1141f9bggv6bwclh"; depends=[mnormt numDeriv]; };
 sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
 snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
 snht = derive { name="snht"; version="1.0"; sha256="12aw4d6n97g05qwwj8bk2pfg2b4b3k1hm9ihl17av3aicgvzmw3p"; depends=[MASS zoo plyr reshape]; };
@@ -5528,16 +5597,17 @@ snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79
 snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; };
 snp_plotter = derive { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
 snpEnrichment = derive { name="snpEnrichment"; version="1.6.0"; sha256="1wzzlvjrvp8bwjxa0rh7427j9d9fkvxx2q4rs9hq1sf51vj5986b"; depends=[]; };
+snpRF = derive { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; };
 snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace]; };
 snpar = derive { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
-snplist = derive { name="snplist"; version="0.12"; sha256="0jsf080pbpnsx2jygyqg0l14lsr4fvjzahgchdrawjhl2rky4nwl"; depends=[RSQLite Rcpp R_utils Rcpp]; };
+snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijyw04szxwn9c1dqnhaqn61a8yfkmmnxn8"; depends=[RSQLite Rcpp R_utils DBI Rcpp]; };
 sns = derive { name="sns"; version="0.9.1"; sha256="1knah4y3amv9j03djdm0kcwd50z8hdrpiknx1i35m3bdix85knsn"; depends=[mvtnorm]; };
 soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; };
 softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; };
 softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; };
-soil_spec = derive { name="soil.spec"; version="2.1.3"; sha256="17fm4hyx8g6pj7qv11xlnx459x1s41fapz6ck4my9br734gcm4ns"; depends=[KernSmooth wavelets hexView pls]; };
+soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[pls KernSmooth wavelets hexView sp GSIF]; };
 soilDB = derive { name="soilDB"; version="1.3-2"; sha256="0rpkj9rjk75nz4dp0hkp4xjmd5s4lwppabbdqppwc5xs0565rdb6"; depends=[RODBC aqp plyr Hmisc]; };
-soilphysics = derive { name="soilphysics"; version="1.2"; sha256="0n1w211dkgacahna8b62v2mk813nma66m0y4krwydcbsnwhs4k30"; depends=[rpanel MASS]; };
+soilphysics = derive { name="soilphysics"; version="2.0"; sha256="0gsxpndin79n8ygwjzdaf8njkqrf6y805m3gd19cyyz9iz6g9yfb"; depends=[rpanel MASS]; };
 soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
 soiltexture = derive { name="soiltexture"; version="1.2.19"; sha256="0nw72913qb1hpifjqv0s1z5sxhgavhbalqhjczxg8b66fwqzrs7l"; depends=[sp MASS]; };
 soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
@@ -5556,25 +5626,26 @@ sorvi = derive { name="sorvi"; version="0.6.23"; sha256="070g6kxnacqwzl4djhbb5zj
 sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; };
 sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; };
 sotkanet = derive { name="sotkanet"; version="0.9.03"; sha256="1h8jmwv99hcrl5hkd99ypphvl8hx6k765vb8aphzp8a0vh42pkl1"; depends=[ggplot2 rjson]; };
-soundecology = derive { name="soundecology"; version="1.1.1"; sha256="0md33ipcqcsbl361s242c4wk9szsl8sywks6ikzljabrfpjy3bkp"; depends=[pracma oce ineq vegan tuneR seewave]; };
+soundecology = derive { name="soundecology"; version="1.2"; sha256="0vxnkqn9ibz1il687rn5fygyl9hrqbf646r1kwdiksw3qz6a16r2"; depends=[pracma oce ineq vegan tuneR seewave]; };
 source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
-sp = derive { name="sp"; version="1.0-16"; sha256="1g65kwf4c7wip91q36d0i7ir52vlgpsrahw2phgkn37k25nwzxs3"; depends=[lattice]; };
+sp = derive { name="sp"; version="1.0-17"; sha256="02j0q2b0i7j4p7i5l19n4dq92iv7dspwwg3jx2qkv3481p5dq25q"; depends=[lattice]; };
 sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
 spBayes = derive { name="spBayes"; version="0.3-8"; sha256="0pmriffqnblqyd1332a2pqrjr7y3wllb17swb403h7c9dph6mzzv"; depends=[coda magic abind Formula]; };
-spBayesSurv = derive { name="spBayesSurv"; version="1.0.1"; sha256="1c23f73hzzdpz5cbjixgdg7b5xj6d9ch45hf71skr2rd79a39sqi"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; };
-spMC = derive { name="spMC"; version="0.3.4"; sha256="0s04vdj7xi2zayxy6qx918fqsp0p8hixx6a101b0w0a3db9gshv5"; depends=[]; };
+spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; };
+spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; };
 spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; };
-spTimer = derive { name="spTimer"; version="1.0-3"; sha256="0ys1apara63l3a6sx07hgb1v67yq02lm9w8x70f1ixisilhw6q39"; depends=[coda sp]; };
+spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; };
 spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
 spaMM = derive { name="spaMM"; version="1.4.1"; sha256="1dz6kx64g69i8fv87ws74a3j33hssshii15qf99brrs5dsd16jfz"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp nlme Rcpp RcppEigen]; };
 spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; };
 space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
 spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; };
 spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
-spacetime = derive { name="spacetime"; version="1.1-1"; sha256="1c5bkc2dih30frzv2qbzmjvd0vy6n1d4ajp8r84kag2ync3hsdqd"; depends=[sp zoo xts intervals lattice rgeos]; };
+spacetime = derive { name="spacetime"; version="1.1-2"; sha256="1mmb3q4gmn0bs56242y01d3zbddg85g610ws6pc6s2k7i08xkxvb"; depends=[sp zoo xts intervals lattice]; };
 spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp Rcpp]; };
 spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; };
 spam = derive { name="spam"; version="1.0-1"; sha256="033s5ka05kg97fmc3l1li3z6x5225rwhrdxh57wwn4axrjwy1nyy"; depends=[]; };
+spanr = derive { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; };
 sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
 sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
 spareserver = derive { name="spareserver"; version="1.0.0"; sha256="0vaql5v3337xh1ifjziav3v7fkjff4zhrz557mgy75ham554gs7c"; depends=[assertthat pingr httr]; };
@@ -5603,46 +5674,50 @@ spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lr
 spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[SocialNetworks mvtnorm]; };
 spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix spdep mvtnorm tmvtnorm]; };
 spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
-spatstat = derive { name="spatstat"; version="1.39-1"; sha256="0z5vma9mk2laf33sqqvbcachs41niqdxvggzk6bk9fjnqbr85520"; depends=[mgcv deldir abind tensor polyclip goftest]; };
+spatstat = derive { name="spatstat"; version="1.40-0"; sha256="1pxmfh401zcssp10g3wcsbiq63vi4b9c95g3ir394m1hqf122qhc"; depends=[mgcv deldir abind tensor polyclip goftest]; };
 spatsurv = derive { name="spatsurv"; version="0.9-8"; sha256="1dsqkcmhka8yzl13jfn19ywq1bk7788amj4nrl1bz05q3vz3drpp"; depends=[survival sp iterators RandomFields fields rgl Matrix stringr]; };
 spc = derive { name="spc"; version="0.5.0"; sha256="0bh4a3dpavczckhpwqax1h5w73ai3mkf0nwq9nhlvkdrh6k6j6cy"; depends=[]; };
+spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; };
 spcadjust = derive { name="spcadjust"; version="0.1-3"; sha256="1l6m4aisk780znpjr7lnlh0z42rbc2jyblv17hafbr1siymrasc2"; depends=[]; };
 spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[rJava ggplot2 sp]; };
 spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
-spcr = derive { name="spcr"; version="1.2"; sha256="0xixl6b4h3iawpbfgdni6z2v7ch3ydn7s9fyr8g0sjr4svzqbyiv"; depends=[]; };
+spcr = derive { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; };
 spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiya4vbdg3gshfs0mwg1qzrhxy9"; depends=[KernSmooth]; };
-spdep = derive { name="spdep"; version="0.5-77"; sha256="0l4qsfcjdmj1xpc53b0vhv50n533ijzjcg0lmm7w8pslyhkmq8hh"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; };
+spdep = derive { name="spdep"; version="0.5-83"; sha256="14j2sr6c225pmfclq2v8d3dfkib0vy3y8cawdilybd8s96zlbd8f"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; };
 spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[deSolve raster animation]; };
 spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
+speaq = derive { name="speaq"; version="1.2.0"; sha256="1af5ivics0sc69s11fabjs93g2yfjxcls4j2hnb9abksih9hvd2n"; depends=[]; };
 speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
 specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
 spectral_methods = derive { name="spectral.methods"; version="0.7.2.125"; sha256="06d7l3hv1yi887yd3ig63n2ajyxa7a0cpjaza8spif9yj5jia35d"; depends=[Rssa raster nnet abind RNetCDF ncdf_tools foreach JBTools DistributionUtils RColorBrewer]; };
-spectralGP = derive { name="spectralGP"; version="1.3.1"; sha256="1bc8y4wk09spsvbv8cn1iqq2y9qdlvrcnpqh2s0b8j4nxx262gyb"; depends=[]; };
+spectralGP = derive { name="spectralGP"; version="1.3.2"; sha256="0gzkwi3npb97y06gvsidaq75h8lg1cvkq8mr9hxp9n7ib6n924v9"; depends=[]; };
 speedglm = derive { name="speedglm"; version="0.2-1.0"; sha256="13gjij9pb65j9c52d5cxl9n6fjmcwbhja4wdl4619dy5rj9vsyi4"; depends=[Matrix]; };
 speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
 sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; };
 sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; };
-spfrontier = derive { name="spfrontier"; version="0.1.10"; sha256="0x1f8g8lg1f5kp9m2pnj8qbv5pjk40kh40yd3s6iwgny4hjsmg60"; depends=[moments ezsim tmvtnorm mvtnorm Matrix]; };
+spfrontier = derive { name="spfrontier"; version="0.1.12"; sha256="1jy1604gppis7vbn55pv13bywy1aqwzshwj03bbfln0qxikzqzi0"; depends=[moments ezsim tmvtnorm mvtnorm maxLik spdep]; };
 spgrass6 = derive { name="spgrass6"; version="0.8-6"; sha256="0vpv2vycd6rdnwm1f73733x1nclhr2x4x1s5116szskni77b0pii"; depends=[sp XML]; };
-spgwr = derive { name="spgwr"; version="0.6-25"; sha256="03kddalnlis5vw9d8shmp2v8f057nqnsvh5qncx75hpbhrzvkmni"; depends=[sp]; };
+spgwr = derive { name="spgwr"; version="0.6-26"; sha256="02kwpg927r2d2zrnhb5cjp1p8j0pal344hzvzsl4d0hz0xcipp8f"; depends=[sp]; };
 sphereplot = derive { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
-sphet = derive { name="sphet"; version="1.5"; sha256="00hgzashw5qdv7j2q0cz433k595d8dzlxr89kvz1z2cpb87pfv54"; depends=[nlme spdep Matrix sp]; };
+sphet = derive { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[nlme spdep Matrix sp]; };
 spi = derive { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; };
 spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; };
-spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-7"; sha256="1hdclj3fq31n9hvyggj2rvz2m95kjszbcswa46vfi2vyiwbb2bia"; depends=[ggplot2 akima coda cluster gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
+spiders = derive { name="spiders"; version="1.0"; sha256="1n3ym9vc3vzjzm35z29sz4mz8sa25r761y0ph45srhq0lv7c66w6"; depends=[plyr]; };
+spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-8"; sha256="0h9b3hhnsqbxbxww7jhbkqf1wl72q347naxpjjbz3q5p2y8yli4z"; depends=[ggplot2 akima coda cluster gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
 spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
 splancs = derive { name="splancs"; version="2.01-36"; sha256="0m29zh91jyz69nh2a9iigzcaxd1mlhq3b7z40vgqib4jnbzkbyg5"; depends=[sp]; };
 splitstackshape = derive { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; };
-splm = derive { name="splm"; version="1.1-0"; sha256="1dhfasan5abr9gf6lfdl83cr47ckkj5sqjqgclnc6f6a2125q1fi"; depends=[MASS nlme spdep plm Matrix bdsmatrix spam ibdreg car lmtest Ecdat maxLik]; };
+splm = derive { name="splm"; version="1.3-7"; sha256="1bfi80vg129v8d0vp7sigbhskl227lmbry1vmklvcczrjqf2bh45"; depends=[spdep plm maxLik MASS bdsmatrix ibdreg nlme Matrix spam]; };
 spls = derive { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; };
 splus2R = derive { name="splus2R"; version="1.2-0"; sha256="0kmyr1azyh0m518kzwvvgz7hv1x5myj37xn7w2gfn0vbn5xl8pv1"; depends=[]; };
 splusTimeDate = derive { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; };
 splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; };
-spnet = derive { name="spnet"; version="0.9.0.1"; sha256="0fy19y155m1fmifdnsyb8y71xgnk3hyril28x68bwvn2v9d737k5"; depends=[sp shape]; };
+spnet = derive { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[sp shape]; };
 spocc = derive { name="spocc"; version="0.2.2"; sha256="0hy72nh29hkzgqhsbadx4708y4sswacn9z75kcrqd1krc5fqa926"; depends=[ggplot2 rgbif rinat rbison ecoengine rebird AntWeb plyr ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr XML rgdal RJSONIO leafletR data_table assertthat whisker]; };
 sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
 sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[rlecuyer ff randomForest boot e1071]; };
-sprinter = derive { name="sprinter"; version="1.0.0"; sha256="0g14hygc8hmm82vfkaxs2vhfsdkwfz3mklhz273jgvzhx0wzbmf7"; depends=[randomForestSRC CoxBoost survival LogicReg]; };
+sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost survival GAMBoost randomForestSRC LogicReg]; };
+sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[ggplot2 cvTools reshape2 pcaPP]; };
 sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
 spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
 spsurvey = derive { name="spsurvey"; version="2.6"; sha256="1s48acqi502mdabhymhn0jjsghnlh2w6wnrfaa9gv0a7xjvjkydq"; depends=[sp deldir foreign MASS rgeos]; };
@@ -5654,34 +5729,35 @@ sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5
 sqlshare = derive { name="sqlshare"; version="1.0.3"; sha256="1qy8vlzi6i4wsr53i71jlsv1b7ww254mbk2qzsvmcrranf42zbp8"; depends=[RCurl]; };
 sqlutils = derive { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[roxygen2 stringr DBI]; };
 squash = derive { name="squash"; version="1.0.6"; sha256="16iplngzzlif999z821a9bwx9jlmikdvwnk6p6d9w75b1fsbc0pz"; depends=[]; };
-sra = derive { name="sra"; version="0.1"; sha256="165r1aiv17gdhln2374724nx04wjcdpillxwwkxgshz3kjyvajvj"; depends=[]; };
+sra = derive { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
+srd = derive { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[plyr animation colorspace stringr survival]; };
 ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[plyr r4ss gtools lubridate reshape2]; };
 ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; };
+ssd = derive { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
 sse = derive { name="sse"; version="0.5-1"; sha256="0g0bwmgc585haqbb13366s3pv1vdh793hwwibz7im0avjs2ldsjq"; depends=[lattice]; };
 ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
 ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
-ssize_fdr = derive { name="ssize.fdr"; version="1.1"; sha256="00y00cb0bhsk0qcq9f96dcmmzmy88k1qyhx9ampws34n133cl509"; depends=[]; };
 ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; };
 sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
 sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
 ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
-ssym = derive { name="ssym"; version="1.5.1"; sha256="026qn8qaf0y7kwb82rqpbhhkc645s5a2s6r408h8hx6bppvg7i8y"; depends=[GIGrvg numDeriv normalp Formula]; };
+ssym = derive { name="ssym"; version="1.5.2"; sha256="0c3c4disiicavr8m2yvvi2k38gnw4akdqp0f1v6647i5zj160zkr"; depends=[GIGrvg numDeriv normalp Formula]; };
 st = derive { name="st"; version="1.2.3"; sha256="10wq705vyzarkgmfn3sblac979p20xv02hq01g75yp2krm1v8h3x"; depends=[sda fdrtool corpcor]; };
-stab = derive { name="stab"; version="0.1.8"; sha256="1rbwfxdbdqb1l91xmnnz5z5m353z4rjihr0c1f7r77a0zl7sa3zj"; depends=[MASS reshape]; };
+stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vdhv06kn229cmhqbr7dsz933vwwf"; depends=[MASS reshape]; };
 stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; };
-stabs = derive { name="stabs"; version="0.1-0"; sha256="0ira32jw8fdv7qcmvk6ai0vgwn7mh1srxb5m7v2v5aj29gd2zfcd"; depends=[]; };
+stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; };
 stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; };
 stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
 stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; };
 startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
 stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; };
-statar = derive { name="statar"; version="0.1.2"; sha256="1sy0nvpx9ji39bjjrlb23d46r2inyljzsk54lf1llmfjpy6pslkp"; depends=[data_table dplyr ggplot2 Hmisc lazyeval lfe lubridate matrixStats stringr tidyr]; };
+statar = derive { name="statar"; version="0.1.3"; sha256="1lkbp6ki4w0gm3l683xar44vrkw69883qvr73mc179bdh31znqli"; depends=[data_table dplyr ggplot2 Hmisc lazyeval lfe lubridate matrixStats stargazer stringr tidyr]; };
 statcheck = derive { name="statcheck"; version="1.0.0"; sha256="05hvwyy5fdy11v6dim0sm4n7qffhhkgpwg0120jhykjssyivimpx"; depends=[plyr]; };
 statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 scales gridExtra RColorBrewer]; };
 statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
 statmod = derive { name="statmod"; version="1.4.20"; sha256="11986yjry1lg28s09q6vv2671x51nnfin6j0mpscq2ygyi615jwz"; depends=[]; };
 statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[network ergm sna networkDynamic tergm ergm_count latentnet statnet_common]; };
-statnet_common = derive { name="statnet.common"; version="3.1.1"; sha256="1fs38f4dxrvgm60xvn04jr2wwyrjg25h3rbdwrx7dx24fj7sx6wl"; depends=[]; };
+statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1pyf6wfb86dwz6bkjli5qw6yz6dvlxwp5bpgkpg83aa9n7g"; depends=[]; };
 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
 stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
 stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; };
@@ -5693,35 +5769,36 @@ stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6
 stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh49a8ib263bzvjaqpi70mck49p"; depends=[matrixStats slam lda stringr Matrix glmnet]; };
 stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; };
 stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
-stochvol = derive { name="stochvol"; version="0.9-0"; sha256="1ziad5jdq4ilfrd3fkh83sz32k21cq7g982qnkdam9aly1rnrijf"; depends=[coda Rcpp Rcpp]; };
+stochvol = derive { name="stochvol"; version="0.9-1"; sha256="09v3b49p671i7y1xprija5m3pbcvry1axjxhgzyvb1bsivdlr4p3"; depends=[coda Rcpp Rcpp]; };
 stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
 stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
 stosim = derive { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[tcltk2 Rcpp Rcpp]; };
-stpp = derive { name="stpp"; version="1.0-4"; sha256="04xl2745xr5r7yirbdmxaxqvl4gp73wr6xl08w21mcccsnpc3d1s"; depends=[splancs KernSmooth spatstat]; };
+stpp = derive { name="stpp"; version="1.0-5"; sha256="1444dbwm0nyb5k8xjfrm25x984a7h9ln2vddrwjszfpmscv0iwm1"; depends=[splancs KernSmooth spatstat]; };
 stppResid = derive { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[deldir splancs cubature]; };
 strap = derive { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
-stratification = derive { name="stratification"; version="2.2-3"; sha256="0mjv5x47rc7ci4ca949pg6ixmv6bfdfph6yz31syqk5xrgm8zmxq"; depends=[]; };
-stratigraph = derive { name="stratigraph"; version="0.64"; sha256="1mi4s3wxbrmcxb7k18z02dy5dnvg7kka1dbg2hgyi4nm9y8casdl"; depends=[]; };
+strataG = derive { name="strataG"; version="0.9.2"; sha256="1yrq12aq3sb27pz8hxz48klp2rvnnz96b8yaaa3a65m3g5vcjrmd"; depends=[swfscMisc pegas ape MASS reshape2 Rcpp]; };
+stratification = derive { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; };
+stratigraph = derive { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; };
 straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
-stream = derive { name="stream"; version="1.0-3"; sha256="14l1fdqzbvy8vxq0rmrwm2afwd4h85khc0a22r6vk488355wn9ps"; depends=[hash proxy animation clue cluster clusterGeneration fpc MASS mlbench]; };
-streamMOA = derive { name="streamMOA"; version="0.1-1"; sha256="12x9i0cr56s54b2z3wfblrv6f36z8k2pgrr5gaqyshl8rgvyvrzz"; depends=[stream rJava]; };
+stream = derive { name="stream"; version="1.1-1"; sha256="0l9sywmajydmd0nkdlbhc4k5lf7qjrndjj6clw5j2mgw97cqaag5"; depends=[hash proxy animation clue cluster clusterGeneration fpc MASS mlbench]; };
+streamMOA = derive { name="streamMOA"; version="1.0-0"; sha256="176llkj9q0p5ym09iagaw5cag6ln94bw04pjl120jnxn6p7i22s2"; depends=[stream rJava]; };
 streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
 stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan numDeriv MASS]; };
 stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; };
-stringdist = derive { name="stringdist"; version="0.8.1"; sha256="0ry5v1cmxm7nsvvz0dm7fzrfgss7g7k9k89cp5jpyyxzksi9xrf1"; depends=[]; };
-stringi = derive { name="stringi"; version="0.3-1"; sha256="16jg0vq61p8qqylrsv9x2bnbjyz3nxcx7m087k4jx881rg4ahvds"; depends=[]; };
+stringdist = derive { name="stringdist"; version="0.9.0"; sha256="0304a3qyssq2l2c7da5a90fca32n3ph5jixqnqvb3jwzdb8dxm2f"; depends=[]; };
+stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i2h4vgddfspyrxwh3am33apv8r8vr4bnj"; depends=[]; };
 stringr = derive { name="stringr"; version="0.6.2"; sha256="0dv7dd0xsivlccnf9pr5kb7zirgqn9mc6lgw5hnmkbb0s1qrrz63"; depends=[]; };
 strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; };
 structSSI = derive { name="structSSI"; version="1.1"; sha256="0rmf3q65adrqh9nrc4apqm4ca7frpwqr6xh80b4mxiz0z4wfcv9q"; depends=[igraph rjson ggplot2 reshape2]; };
-strum = derive { name="strum"; version="0.4"; sha256="06y4bf2z55zl5k9snd7mgbrfx85irnbk316g9169m5mij4lca4g7"; depends=[pedigree MASS Rcpp Rcpp RcppArmadillo]; };
-strvalidator = derive { name="strvalidator"; version="1.3.1"; sha256="1d69qrs4wfx7wjbr5xy0wmf81lhih8asz9hwy861fxy7iak6gvlw"; depends=[ggplot2 gWidgets gridExtra gtable plyr scales gWidgetsRGtk2 RGtk2]; };
+strum = derive { name="strum"; version="0.5"; sha256="1mcfswy052nppaddy7y96fr2dx1z62qhr9d7drbrd1mlayyhdsd8"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; };
+strvalidator = derive { name="strvalidator"; version="1.4.0"; sha256="1zgfy5w4qwcm3jdqigahxi7xn8328jr568ssbj99ibzdj0m0hmfw"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; };
 stsm = derive { name="stsm"; version="1.4"; sha256="0j6kvsij6rsvkjc4q1m9vi9afvsib8x6zwjka1xwbp8g6fzamjq4"; depends=[KFKSDS stsm_class]; };
 stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
 stylo = derive { name="stylo"; version="0.5.8-2"; sha256="1vslcn0gnzvsznashivpfsh45z1kjzpx55lq58s2ryaz8hdigy41"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; };
 suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
 subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
 subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; };
-subrank = derive { name="subrank"; version="0.8.5"; sha256="0vcizby33aig56qhy19dyfx0bp7ha3j859yapqk8yq73cszj7mk9"; depends=[]; };
+subrank = derive { name="subrank"; version="0.9.1"; sha256="0ghfpvw7aflbnnisn3rq8vrpi134ghm6vnyb7md1gi730mqgxfxv"; depends=[]; };
 subselect = derive { name="subselect"; version="0.12-4"; sha256="0h56d68clsr4lmvn2a291di62xvjdypbwlpk2x1xjlyss10yhamh"; depends=[]; };
 subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
 subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
@@ -5741,10 +5818,10 @@ survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zb
 survAccuracyMeasures = derive { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[survival Rcpp Rcpp RcppArmadillo]; };
 survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
 survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; };
-survMisc = derive { name="survMisc"; version="0.4.2"; sha256="1mv503lrgjfbggasgsls2pqlxz3kj4hrw9qslgzxh3dizfqkb02c"; depends=[survival ggplot2 data_table rpart gridExtra combinat Hmisc zoo km_ci KMsurv gam]; };
+survMisc = derive { name="survMisc"; version="0.4.4"; sha256="0ir84sb2gj1aqglifrxx66sjirxgz3bkgyh1l2vcmyndnad871jr"; depends=[survival ggplot2 KMsurv combinat Hmisc zoo data_table km_ci gridExtra rpart gam]; };
 survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; };
-survSNP = derive { name="survSNP"; version="0.21-7"; sha256="0fanya7ghd61pw7a21xkaxz4mgzdwjwkh1wm41h40wq1c529dzph"; depends=[survival Rcpp lattice foreach xtable Rcpp]; };
-surveillance = derive { name="surveillance"; version="1.8-1"; sha256="08a876xzzca8q0rvcl5058z2rkj9qn24iqbhxwq481f27112k4v7"; depends=[Rcpp sp xtable polyCub MASS Matrix spatstat Rcpp]; };
+survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[survival Rcpp lattice foreach xtable Rcpp]; };
+surveillance = derive { name="surveillance"; version="1.8-3"; sha256="10d170l0ah92awpa9cafxshpvmj3d206fqn5sm7bd73q87mvbgdp"; depends=[sp xtable polyCub Rcpp MASS Matrix spatstat Rcpp]; };
 survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
 survey = derive { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; };
 surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; };
@@ -5753,7 +5830,7 @@ survivalMPL = derive { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd
 survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
 survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; };
 survsim = derive { name="survsim"; version="1.1.2"; sha256="1pnzkw0hr0gpwh0v26k4fh7qjl0c6ps9y8gmfd46h8wz2fb25vqx"; depends=[eha statmod]; };
-svDialogs = derive { name="svDialogs"; version="0.9-55"; sha256="0x1wzqypxir0322mr3zsax1v64y9jdz5sya98y20hc3619mpynwj"; depends=[svGUI]; };
+svDialogs = derive { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; };
 svDialogstcltk = derive { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; };
 svGUI = derive { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; };
 svHttp = derive { name="svHttp"; version="0.9-55"; sha256="0qxsh6ifk3fszgzz497qwia4pxzplwraf2qnn5cqlv5l79nja5yq"; depends=[svMisc]; };
@@ -5769,12 +5846,13 @@ svapls = derive { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22
 svcm = derive { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
 svd = derive { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; };
 svdvisual = derive { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
+svgViewR = derive { name="svgViewR"; version="1.0.0"; sha256="0js3mc5lxzfwbnc30mn9k9g9jiy2aivqs08x0zcg9dir5n7gs9sg"; depends=[]; };
 svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
 svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
 swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots MASS]; };
 sweidnumbr = derive { name="sweidnumbr"; version="0.2"; sha256="0zsijh9jf0pnil5n69ix408j3plbrnj0235whh9rch486ibyk779"; depends=[lubridate]; };
-swfscMisc = derive { name="swfscMisc"; version="1.0.1"; sha256="0ya0ng6973mix9i0k817mgvfqwshpfqjlnn5xbs6vz2cw2xm8g6g"; depends=[mapdata maps]; };
-swirl = derive { name="swirl"; version="2.2.16"; sha256="0wfm44nicrswszly7bwkb8z046x92p687ycglbjinvr73p4bmv0q"; depends=[stringr testthat httr yaml RCurl digest]; };
+swfscMisc = derive { name="swfscMisc"; version="1.0.3"; sha256="0ciwvxpafpc6an58r1ffkab8kj4np6l2kbpkijnqnfbf6cya0aim"; depends=[mapdata maps]; };
+swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[stringr testthat httr yaml RCurl digest]; };
 switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; };
 sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[Matrix lattice]; };
 sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
@@ -5791,13 +5869,13 @@ synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1
 synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
 synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; };
 synthpop = derive { name="synthpop"; version="1.0-0"; sha256="1ifdzfql2a9gn021l5f93qrx30db48hpq43c5zanmb2zdqb8zc16"; depends=[lattice MASS nnet rpart party]; };
-sysfonts = derive { name="sysfonts"; version="0.2"; sha256="15wzb7c89645xxbhn29bh0djys73iklq05228qnhd5gx5sr43dd0"; depends=[]; };
+sysfonts = derive { name="sysfonts"; version="0.4"; sha256="0y33ykcxynm90inq8s5phdg3mfkx30szqld75h0b2faykpv6q3r4"; depends=[]; };
 systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; };
 taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; };
 taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[taRifx sp rgdal RJSONIO rgeos RCurl]; };
 tab = derive { name="tab"; version="2.1.3"; sha256="0ypb11gvasx7mdkpysfjvxb61660sdaggp6l43iyp2grfrilkm7y"; depends=[survey survival gee]; };
 table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; };
-tableone = derive { name="tableone"; version="0.6.2"; sha256="0jmii05kqd01bllc4wi9r38qa0dpxqlcpk572d3m7c009izsz8zl"; depends=[e1071 gmodels]; };
+tableone = derive { name="tableone"; version="0.6.3"; sha256="0r91vzq3whz949kxg9q9bf413r41cxqsjvmicmb4najhwzhdr9fv"; depends=[e1071 gmodels]; };
 tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
 tables = derive { name="tables"; version="0.7.79"; sha256="05f23y5ff961ksx4fnmwpf6zvc9573if8s2cmz9bwki66h2g9xb7"; depends=[Hmisc]; };
 tabplot = derive { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; };
@@ -5807,46 +5885,49 @@ tagcloud = derive { name="tagcloud"; version="0.5"; sha256="0d6h54p20pjnh1y7bw38
 tau = derive { name="tau"; version="0.0-18"; sha256="10akzwf0fi05vplgy4njzrb4jdqa079zhycri4014w8sihb5msan"; depends=[]; };
 tawny = derive { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[lambda_r lambda_tools futile_logger futile_matrix tawny_types zoo xts PerformanceAnalytics quantmod]; };
 tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[lambda_r lambda_tools futile_logger futile_options zoo xts quantmod]; };
-taxize = derive { name="taxize"; version="0.4.0"; sha256="11wq690nkdgpssmm5sw85j2wb88bpjr5qiy3y2rg3xppf68xb5ib"; depends=[XML RCurl stringr plyr httr jsonlite foreach ape Taxonstand reshape2 data_table vegan assertthat bold]; };
+taxize = derive { name="taxize"; version="0.5.2"; sha256="1141ypz76nda9ij0fr63kgjagj9al63gnqwxa7ld7v9xzig8zgyp"; depends=[XML RCurl stringr plyr httr jsonlite foreach ape Taxonstand reshape2 data_table vegan bold]; };
 tbart = derive { name="tbart"; version="0.9.1"; sha256="1xpv9vfak57836c50n7rg9hrxd6iz6378jpddsd4zm7pvnzzhhim"; depends=[Rcpp sp Rcpp]; };
 tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-tcltk2 = derive { name="tcltk2"; version="1.2-10"; sha256="0m648n028xc6gi3ypih0nyswczh787pwfq7ky2hsxabp958faflb"; depends=[]; };
+tcR = derive { name="tcR"; version="1.1"; sha256="0z5v42yalza10bizl6kw54saiawj9y33g0jwzsqzzaxfdvsxd2gz"; depends=[ggplot2 dplyr gridExtra reshape2 Rcpp data_table gtable roxygen2 stringdist Rcpp]; };
+tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
 tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; };
-tdm = derive { name="tdm"; version="3.0.2"; sha256="06k2dp5gf2k9q23mpswn2yh0525xaz0zznx6r7gn0gim2l7msbqj"; depends=[rjags coda png deSolve]; };
+tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[rjags coda png deSolve]; };
 tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
 teigen = derive { name="teigen"; version="2.0.7"; sha256="0pyxpmmd4s6azq8lzn0lrg7jkr7g638xkhljx1w5bval6cq2bcwk"; depends=[]; };
-tempdisagg = derive { name="tempdisagg"; version="0.23"; sha256="1ym0cbvm8f1wvnkpdm34d5yzgbn3hig1kc3zv8b24pnx11ywv751"; depends=[]; };
+tempdisagg = derive { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; };
 tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
 tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
-tergm = derive { name="tergm"; version="3.1.4"; sha256="0w5s4ziacxp9zdylmb8f7xrwvql58c6c9jvv27wjxdxpaf9iyp8h"; depends=[statnet_common ergm network networkDynamic robustbase coda nlme ergm]; };
+tergm = derive { name="tergm"; version="3.2.4"; sha256="0ndkgkb31bwdy78nw6nq4wfhgzibxsixx3ylsgcs5rv3y0w1pczw"; depends=[statnet_common ergm network networkDynamic robustbase coda nlme ergm]; };
 termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo Rcpp]; };
 ternvis = derive { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[quadprog maps maptools mapdata dichromat]; };
 tester = derive { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
-testit = derive { name="testit"; version="0.3"; sha256="142q0zwlzx3w69j0fsd06s3pihr76kw9yg21596aalazh7c2yfgi"; depends=[]; };
+testit = derive { name="testit"; version="0.4"; sha256="1805i82kb2g08r0cqdk6dhfhwqjjdigdm1rqf88sp7435wksyv8i"; depends=[]; };
 testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3azfxb6xkdcmm6kjdv6ma47gv947m90ysnfk"; depends=[digest]; };
 testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; };
 texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; };
 texreg = derive { name="texreg"; version="1.34"; sha256="03w8fk5lkpgag22a63jnhf0cn3l5ryjh4pkfhxgqzrijvrr1v2cb"; depends=[]; };
 textcat = derive { name="textcat"; version="1.0-2"; sha256="0m8jbw8k8h6m9q9x25gvx0glzwhhpy73pjv4zivivna5zxapgi23"; depends=[tau slam]; };
 textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; };
-textometry = derive { name="textometry"; version="0.1.3"; sha256="1a0dp1flx3yh7wqn0cmb5pq83qqnz94ynkqkmj4kw9ha5j8kcnwx"; depends=[]; };
+textometry = derive { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
+textreg = derive { name="textreg"; version="0.1"; sha256="13pp9fqzka0vlqxy0brk1a637sy7yxlfhq6idrir3psskgxyqkmn"; depends=[tm NLP Rcpp Rcpp]; };
 tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
 tfplot = derive { name="tfplot"; version="2014.2-2"; sha256="1jrkzccvqmwghp6nhxay0m1qx8r5wa96zb9r8v6qihryi9m3amhs"; depends=[tframe]; };
-tframe = derive { name="tframe"; version="2012.8-1"; sha256="0m6kwwn7y4n0vkk9zvwixn2jg67rsv9f9s2xma2mxdxl1f5lnfvh"; depends=[]; };
+tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; };
 tframePlus = derive { name="tframePlus"; version="2013.9-1"; sha256="070ad1g7yv1d5by6xrvshgn43jjxpq8waa339xhzc1am2qzb6mqr"; depends=[tframe timeSeries]; };
-tgp = derive { name="tgp"; version="2.4-9"; sha256="0ghn7pmwipwmq6lch7jvzghks9mbj9jrdv5140550vq4w6mnf57q"; depends=[]; };
+tgp = derive { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; };
 tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
+thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27vc708xwz997pmxxhipw8449793zv6fw5aj47wcw1l5"; depends=[]; };
 thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; };
 threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
 threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; };
 tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; };
 tictoc = derive { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
-tidyr = derive { name="tidyr"; version="0.1"; sha256="1rcf2cmd0zbjkvazkdfiv4sy50rxzj0fs4ldgmkz89vlffy5kdgc"; depends=[reshape2 dplyr]; };
+tidyr = derive { name="tidyr"; version="0.2.0"; sha256="169i6xnr4bs5vqkv6dilj5j8v95giz0b7byhi06qk414gdlj2r8n"; depends=[reshape2 dplyr stringi lazyeval]; };
 tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
 tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; };
-tigerstats = derive { name="tigerstats"; version="0.1.6"; sha256="18gvmc4gfwi2x5nqj6jm7lddzlqmjvj0bf4h6r0yzvrp07wayvan"; depends=[lattice MASS]; };
+tigerstats = derive { name="tigerstats"; version="0.2"; sha256="1wj4z1jj7jg3885nvfh4l812cyybjcm5r66w3l41s4c0civl4z5b"; depends=[mosaic mosaicData abd MASS ggplot2 lattice]; };
 tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
-tikzDevice = derive { name="tikzDevice"; version="0.7.0"; sha256="12r6qk5qp4yvi3vqvdxp02799y6fhmg21qv6abp1s620n8hgva6d"; depends=[filehash]; };
+tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfal19giinrphra1kfcm2arfckql4rf2zsq13rw35"; depends=[filehash]; };
 tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; };
 timeDate = derive { name="timeDate"; version="3011.99"; sha256="1fav8pi305vpbr7gkvpj5y9pgmck8359ba6gviki6h5xxs8zxi0s"; depends=[]; };
 timeROC = derive { name="timeROC"; version="0.2"; sha256="1ikd2wr5cja784hihqdyk7mwky18czz58sl0xrvmzhc67153a4jz"; depends=[pec mvtnorm timereg]; };
@@ -5857,7 +5938,8 @@ timeordered = derive { name="timeordered"; version="0.9.7"; sha256="0mb2sa74var1
 timereg = derive { name="timereg"; version="1.8.6"; sha256="02whk0wqd1n2dzsfqvhs4plgkvrj04r1i83lvsa2j2qwjvbf831p"; depends=[survival lava]; };
 timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
 timeseriesdb = derive { name="timeseriesdb"; version="0.1"; sha256="1zwvjnx4b020avyxjx2nwg9n8p8bdrn038mfcl53y9cnxj3w5wsq"; depends=[DBI]; };
-timetools = derive { name="timetools"; version="1.6.1"; sha256="13hl9xp010dcwlcyhi62qw66cvd7k6w86ba3m543c9y4x79nw86b"; depends=[]; };
+timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; };
+timma = derive { name="timma"; version="1.2.0"; sha256="06ycki3x99nwaxqxbnw7h5b3sx6jznl1ahnzqw6vjyrl4dw6d1fl"; depends=[Rcpp QCA Rcpp RcppArmadillo]; };
 timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; };
 tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
 tis = derive { name="tis"; version="1.27"; sha256="1kgzc032qa005hzcimhbbhcs5kcvm88pfb48ac84k205f6xhdsir"; depends=[]; };
@@ -5865,7 +5947,7 @@ titan = derive { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762
 tkrgl = derive { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; };
 tkrplot = derive { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; };
 tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
-tlm = derive { name="tlm"; version="0.1.2"; sha256="1y2kz5xnq3x0c7jrrl4rw8azk2qhm62i3qsglvrdffiy898qa40j"; depends=[boot]; };
+tlm = derive { name="tlm"; version="0.1.3"; sha256="1jj8yihq4b13wavflkkv91m9ba2l5ar3vcwp1ss6iymyf3hzdgiv"; depends=[boot]; };
 tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
 tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; };
 tm = derive { name="tm"; version="0.6"; sha256="004hswgswz3gdrpa6j61hl4rls843bxnsp5qac5kyxvfmwalsgr8"; depends=[NLP slam]; };
@@ -5888,7 +5970,7 @@ topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6
 topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[gRbase fields]; };
 topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
 tosls = derive { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
-tourr = derive { name="tourr"; version="0.5.3"; sha256="0jsj2r9lhy0pa4kxnfb1cpf28c8q26rcprssax765n5ip1w9ycra"; depends=[]; };
+tourr = derive { name="tourr"; version="0.5.4"; sha256="11xg5slvx7rgyzrc0lzandw7vr7wzk3w2pplsnyrqq3d990qp40d"; depends=[]; };
 tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[tourr colorspace RGtk2 gWidgets Cairo]; };
 toxtestD = derive { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
 tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; };
@@ -5897,7 +5979,7 @@ track = derive { name="track"; version="1.0-15"; sha256="05v6p2mfms59p3cs4vwpzvi
 trackObjs = derive { name="trackObjs"; version="1.0-18"; sha256="0wwm9yx5wnmgvyd7zczkv8mdzixazb3kps112w19rdbnkiq1db3d"; depends=[]; };
 tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; };
 traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; };
-traj = derive { name="traj"; version="1.0"; sha256="0g8fmq3ndp8kdk9jrjakw5hbkw6nh2m0lw396xk42sa0rb4df5s6"; depends=[cluster psych pastecs NbClust GPArotation]; };
+traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; };
 trajectories = derive { name="trajectories"; version="0.1-1"; sha256="0vf1czc97bqq5snqdma9l1knb4bznyn8pcs8f1q6ssk0xfjrl3s3"; depends=[lattice sp spacetime rgdal rgeos]; };
 translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; };
 translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; };
@@ -5906,9 +5988,8 @@ trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xx
 treatSens = derive { name="treatSens"; version="1.0"; sha256="0g3v9b1kdndqls9h1ijp5v17ybb1710bdclid745y6lfkia1b71w"; depends=[]; };
 tree = derive { name="tree"; version="1.0-35"; sha256="1k8c2kjk53gix68frprlyx5ww7cm373vz1xg2r2jxbzxg1y4v691"; depends=[]; };
 treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; };
-treeclim = derive { name="treeclim"; version="1.0.7"; sha256="1l2m4pq5wcb3wkxy9mkay87vzdcn8rxgsknsb72ahdb3zim0yg0v"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot Rcpp RcppArmadillo]; };
+treeclim = derive { name="treeclim"; version="1.0.10"; sha256="0sn64a4jvb4xls34w9n3r8daydnn0kk6c0v3zb9kn9mfpc7sqkbd"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot Rcpp RcppArmadillo]; };
 treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
-treelet = derive { name="treelet"; version="1.0"; sha256="16g4lmp4yrfg328d0qwrp101y1qnwcrff7kna60cjmqdpvg3wm15"; depends=[]; };
 treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
 treethresh = derive { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; };
 triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; };
@@ -5932,6 +6013,7 @@ tsDyn = derive { name="tsDyn"; version="0.9-41"; sha256="1ssb0z35xmnwyrsvmk2jsxf
 tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
 tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
 tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
+tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; };
 tseries = derive { name="tseries"; version="0.10-32"; sha256="0jz8a3z3hx2ps7krmpg6m10jvz5ddgmcrmnd38jpxb6ndnhh3pzw"; depends=[quadprog zoo]; };
 tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
 tsfa = derive { name="tsfa"; version="2014.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; };
@@ -5949,7 +6031,7 @@ tumblR = derive { name="tumblR"; version="1.0"; sha256="01y4vx72p8fvc4nx0y8j8i7g
 tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; };
 tuple = derive { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
 turboEM = derive { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach numDeriv quantreg iterators]; };
-turfR = derive { name="turfR"; version="0.8-4"; sha256="0fqzwnrwxlighxbapmnarxzh91s6khjbb26xs8gqzz3f8xwmj9dy"; depends=[dplyr]; };
+turfR = derive { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; };
 turner = derive { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; };
 tvd = derive { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp Rcpp]; };
 tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f644i7a3h8xpd0k086sp1dg"; depends=[ggplot2 reshape2]; };
@@ -5968,48 +6050,50 @@ unbalanced = derive { name="unbalanced"; version="1.1"; sha256="0crkykmyxbag4ri2
 unbalhaar = derive { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
 uniCox = derive { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
 uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
-unittest = derive { name="unittest"; version="1.0-1"; sha256="08r4qpfj37mykbwd893m4nqyxzar0c3qal76jwsypv3gr7y0khd9"; depends=[]; };
+uniftest = derive { name="uniftest"; version="1.0"; sha256="12d246f8984p4hc69p5nr5yzxs1v247yjgpxx1f0mbhkyvwp6r67"; depends=[]; };
+unittest = derive { name="unittest"; version="1.1-1"; sha256="030li1c9qcl321arbzv52m6j9ss05z7sljsb2mmggxyb0r0m0y3b"; depends=[]; };
 unmarked = derive { name="unmarked"; version="0.10-4"; sha256="1mb9c6h51y476y50q4bh9v6wx6d91b2npf18a66gjs406nra3yck"; depends=[reshape lattice Rcpp plyr Rcpp RcppArmadillo]; };
 untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
 upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; };
 uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; };
 urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; };
+urltools = derive { name="urltools"; version="0.6"; sha256="0psi93pj1n3bv0r9h6bl1pi8462mxhilq7npnqqj3kqp1f8z64an"; depends=[Rcpp Rcpp]; };
 usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
 useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
 userfriendlyscience = derive { name="userfriendlyscience"; version="0.1-2"; sha256="1b2ypga0kzf8qsl160by1vfp8p6z2mczn3w1qgk042y83kiaiawx"; depends=[ggplot2 plyr psych pwr fBasics e1071 ltm MBESS foreign knitr xtable GGally lavaan]; };
 uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[tmvtnorm mvtnorm MCMCpack MASS]; };
-usl = derive { name="usl"; version="1.4.0"; sha256="12wrznlwdnapa4blq542s8jcb8wcsw8h0c6jgq0n4jzxxp9k14n4"; depends=[nlmrt]; };
+usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; };
 ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; };
 utility = derive { name="utility"; version="1.3"; sha256="0ng7jc45k9rgj9055ndmgl308zjvxd2cjsk2pn57x44rl1lldcj5"; depends=[]; };
 uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; };
 vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; };
 varComp = derive { name="varComp"; version="0.1-317"; sha256="16nmhipi0nlh0igc3g9jbv1pqvigmgxy8f395xx6hbzyg87x2ha9"; depends=[quadprog Matrix MASS CompQuadForm RLRsim SPA3G mvtnorm nlme]; };
-varSelRF = derive { name="varSelRF"; version="0.7-3"; sha256="11am1hdcaxh58mqa1v16siip6adg61pjxhdyl8mlgnnmffslnpq9"; depends=[randomForest]; };
+varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; };
 varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; };
 varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
 vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; };
-vardpoor = derive { name="vardpoor"; version="0.2.0.14"; sha256="08knzndbidg50z35lxh91x06krycifps1r2hycl4pi92bmzwkmq5"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; };
+vardpoor = derive { name="vardpoor"; version="0.2.4"; sha256="1wjwg86kv4q00mhngjybsvi9zzxpdxv2vycdilkjyckmqy5miwrx"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; };
 vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; };
 vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
 vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
 vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
 vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; };
-vcdExtra = derive { name="vcdExtra"; version="0.6-3"; sha256="1zpgr4ykcys1gc0cicrdl5w02mr2f5bm60cpm3r3mqs718nsjxkv"; depends=[vcd gnm MASS]; };
-vcrpart = derive { name="vcrpart"; version="0.2-3"; sha256="1w1kiykddk3sha4c3fqdc38yd3x4y7sxq5jdclnm8nq8z9widcbj"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; };
+vcdExtra = derive { name="vcdExtra"; version="0.6-5"; sha256="0z2xyvmxka1awx0bnqvp6d16zj8gb6jhj0q4xil7r8ya4hqqmmac"; depends=[vcd gnm MASS]; };
+vcrpart = derive { name="vcrpart"; version="0.3-1"; sha256="1msnwiz8xdlzaks5xwn6wricqayfmqfqprnys3x4f2z95anai214"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; };
 vdg = derive { name="vdg"; version="1.0"; sha256="1agikw9w9rnn3b2q8lp9y3bxjrf8vx24j624wf19bvx5s3ghqc36"; depends=[ggplot2 quantreg proxy]; };
 vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; };
 vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
 vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; };
 vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[foreach doParallel]; };
-vegan = derive { name="vegan"; version="2.2-0"; sha256="1wr3jy86mg6dvhdrbp4r0idai9w7dch6m797zb8l7sfzm4irgaja"; depends=[permute lattice MASS cluster mgcv]; };
+vegan = derive { name="vegan"; version="2.2-1"; sha256="06rq9qrcf180isjrczscl84m3jvygz5w2gz5nc4rm1pg89rf6lrd"; depends=[permute lattice MASS cluster mgcv]; };
 vegan3d = derive { name="vegan3d"; version="0.65-0"; sha256="0c75hybhwqv56f2zpskr99rr9k6hw6rbv29bcxn0fciw5jqk01m3"; depends=[vegan rgl scatterplot3d]; };
 vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; };
 vegdata = derive { name="vegdata"; version="0.6-7"; sha256="0k680sq5dk95alzzwmixvxm856scr5cnf8gfr1k0z8cbz0gzawd2"; depends=[foreign XML]; };
 vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
 venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
-verification = derive { name="verification"; version="1.40"; sha256="19nhpv41s024cqd3qzx0d2sc9234x73s6k8nfj6wf5jvbc5z0xv4"; depends=[fields boot CircStats MASS dtw]; };
+verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[fields boot CircStats MASS dtw]; };
 vetools = derive { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[sp stringr tis lubridate maptools plyr xts scales]; };
-vines = derive { name="vines"; version="1.1.0"; sha256="1cf06i2vci0hwszdlpcig90klxgd7l2k79dln71lc9y0xrzxz9lf"; depends=[copula ADGofTest cubature TSP]; };
+vines = derive { name="vines"; version="1.1.1"; sha256="1dxmrz2nh75h77f1rrkz8vyqkfxppqrs5v6bsxkbh10gsnga9hgl"; depends=[copula ADGofTest cubature TSP]; };
 violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
 vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
 viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
@@ -6018,9 +6102,9 @@ visova = derive { name="visova"; version="1.1"; sha256="1ag1vs5alh62yj5722qb74rm
 visreg = derive { name="visreg"; version="2.1-0"; sha256="1l8az4ykfr3rfgxx7wj9qvma77lcgr3pa60cxzqabm9cg6622fsf"; depends=[lattice]; };
 visualFields = derive { name="visualFields"; version="0.4"; sha256="07pkaccnk8c9zzizpcdw82vcbqdng2bi9aczpa68i7fz24bvcfan"; depends=[gridBase flip matrixStats Hmisc]; };
 visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
-vitality = derive { name="vitality"; version="1.0"; sha256="0di72khz1mwqlirx78a86lwqhjmbbgmxm6vmlwq546dwvs6q071g"; depends=[IMIS]; };
+vitality = derive { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; };
 vowels = derive { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; };
-vows = derive { name="vows"; version="0.3"; sha256="0b8jgf1zh7qqkiszbygm9hgld3gv6m5vsw7jz8sl3zkc0lixxysn"; depends=[fda gamm4 rpanel mgcv RLRsim Rniftilib shape stringr]; };
+vows = derive { name="vows"; version="0.3.1"; sha256="10r45gbsvmz4xqmync7lsh3db8wvpv2gfzg6sfq799ynrddbklvp"; depends=[fda gamm4 rpanel mgcv RLRsim shape stringr]; };
 vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
 vrtest = derive { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; };
 vscc = derive { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[teigen mclust]; };
@@ -6028,7 +6112,6 @@ vudc = derive { name="vudc"; version="1.0"; sha256="1xjbjfya4zn94arc76pcfflc2dcn
 vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[stringdist lattice latticeExtra]; };
 wSVM = derive { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
 waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp Rcpp]; };
-waldwolf = derive { name="waldwolf"; version="0.1"; sha256="0gig3dqs8f44kdzr3abmm4wcnby2ifgqs72ck5wvny6gkwyfdvys"; depends=[]; };
 walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
 wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[MASS qualV tiger fast]; };
 waterData = derive { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; };
@@ -6037,10 +6120,9 @@ waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnp
 waved = derive { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; };
 wavelets = derive { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; };
 wavemulcor = derive { name="wavemulcor"; version="1.2"; sha256="1039y5rakjkx2mvfmykg2z4jpkpbcj7rclyg7ab19wnxmdm8ls81"; depends=[waveslim]; };
-waveslim = derive { name="waveslim"; version="1.7.3"; sha256="0lkq8lcg8cd4iw95jb0r5iwl2habngzzzwcxfic05gbpj5gfmapk"; depends=[]; };
+waveslim = derive { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqhhk57m9vkbnfsznkvk8430cvbcsn7vridii"; depends=[]; };
 wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; };
 wbs = derive { name="wbs"; version="1.2"; sha256="1mnbx0ik4bakf818nbpgi4zgb8y4ljvz5yq602h3crsc4b32kq1k"; depends=[]; };
-wccsom = derive { name="wccsom"; version="1.2.8"; sha256="0dnqcmrrnzqys4mr1md7f0k0h434x25mdc576j00s3pmjjjh873a"; depends=[class MASS]; };
 weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; };
 webutils = derive { name="webutils"; version="0.2"; sha256="19b39jmhblvljkazzf6a55pxd74hx65cvh4s1vgx7m475rqrg6ih"; depends=[jsonlite]; };
 webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
@@ -6057,7 +6139,7 @@ widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7
 widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
 wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
 wikipediatrend = derive { name="wikipediatrend"; version="0.2.0"; sha256="11gxi94i6xfsj4dz7g2r7ag0gbah2km9ibbmjqihbk5ccxh5kfd6"; depends=[jsonlite stringr RCurl]; };
-wildlifeDI = derive { name="wildlifeDI"; version="0.1"; sha256="16262cb02d3w2lkaqns5zhzk9wm25lfcbwsgcav2hs93pmdx2dma"; depends=[sp rgeos adehabitatLT]; };
+wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[sp rgeos adehabitatLT]; };
 windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[geiger ape scatterplot3d]; };
 witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; };
 wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; };
@@ -6072,10 +6154,11 @@ wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvaw
 wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
 wppExplorer = derive { name="wppExplorer"; version="1.4-0"; sha256="1dyg9482h9854nx526151rclh3m45g78x36ll8xw78ywnj9xrjzj"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
 wq = derive { name="wq"; version="0.4-1"; sha256="0a46islpzpbkx6c7mbn6q787mh9mb6sy4k46lz8s63fh2h7p0szk"; depends=[zoo]; };
+wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; };
 write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
 wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; };
 wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
-wskm = derive { name="wskm"; version="1.4.11"; sha256="1pmsir4msy95x080k463f34ms4vm8nayr21g2cd50mmzffbm5mwl"; depends=[lattice latticeExtra clv]; };
+wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kprpwn0y3fb43ba79q94d6m5hm844y"; depends=[lattice latticeExtra clv]; };
 wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp Rcpp]; };
 wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; };
 wux = derive { name="wux"; version="1.2-2"; sha256="1x3d4ndaz6qpbd99vf1a9k68zj3jdk43gwix7022ds9ilq2wk4pj"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor]; };
@@ -6086,7 +6169,7 @@ xergm = derive { name="xergm"; version="1.3"; sha256="1bkvxi3f7hmzx9mlbp30sk1ixh
 xgboost = derive { name="xgboost"; version="0.3-2"; sha256="1sp0rl4ixdcqljcf12cc517vnwj851g88xla641nfl0qbcj8b7n7"; depends=[Matrix]; };
 xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
 xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
-xkcd = derive { name="xkcd"; version="0.0.3"; sha256="086kdy4dp7312pxv7zpx3qf8rk91lv0snrhipzcmcn1m4q77q9z2"; depends=[Hmisc ggplot2]; };
+xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; };
 xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
 xlsxjars = derive { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
 xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
@@ -6095,12 +6178,12 @@ xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5
 xtal = derive { name="xtal"; version="1.0"; sha256="1717pl64nbliwbdg5fs6cwj7zvgrm00zlyj2dhi06yyg16gq1w8k"; depends=[]; };
 xtermStyle = derive { name="xtermStyle"; version="2.2-4"; sha256="0m1lwr7smym7aczcqqgqj5bx46j38ymmljilxl54bby188qhfcyz"; depends=[]; };
 xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
-yaImpute = derive { name="yaImpute"; version="1.0-22"; sha256="1yg26f1q1i6vl1jvdff126025rimkvpj8dhr12d8ld8ryl1qghr3"; depends=[]; };
+yaImpute = derive { name="yaImpute"; version="1.0-23"; sha256="11k7ab5s9zldn0py7zhgi1zcbpsw3bp2xf6s6salv68fhzdgpzp8"; depends=[]; };
 yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
 yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
 ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
 yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[yacca miscTools plotrix boot]; };
-yhatr = derive { name="yhatr"; version="0.13.1"; sha256="0s75md4r6k6kqw1fi2ms8k09y8lml9gcyj0zmbyygjncf3zlgxq0"; depends=[httr RCurl rjson plyr jsonlite stringr]; };
+yhatr = derive { name="yhatr"; version="0.13.2"; sha256="0065252bgn96g1z7ddkyfbnnahvvdgfx3lxrb51fk7bkbvxs2781"; depends=[httr RCurl rjson plyr jsonlite stringr]; };
 ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; };
 yuima = derive { name="yuima"; version="1.0.36"; sha256="1rz96v0c9sikjvm3i8x887v1bkiixps691vclpd6i4cchyayx63h"; depends=[zoo expm cubature mvtnorm]; };
 zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };
@@ -6113,5 +6196,6 @@ zoib = derive { name="zoib"; version="1.0"; sha256="0mxd9j5sbwyv3bhhrly2ikbfqgk3
 zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; };
 zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; };
 zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
-zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
+ztable = derive { name="ztable"; version="0.1.3"; sha256="18ndpv45hgxhhp65hraz8a5c52ywpkh535zdcjzjy15im387fq4g"; depends=[]; };
+zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; 
 }
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index e6bbf906228..e60181100be 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1,9 +1,9 @@
 /* This file defines the composition for CRAN (R) packages. */
 
-{ pkgs, overrides }:
+{ R, pkgs, overrides }:
 
 let
-  inherit (pkgs) R fetchurl stdenv lib xvfb_run utillinux;
+  inherit (pkgs) fetchurl stdenv lib xvfb_run utillinux;
 
   buildRPackage = import ./generic-builder.nix { inherit R xvfb_run utillinux ; };
 
@@ -221,7 +221,6 @@ let
     libamtrack = [ pkgs.gsl ];
     mixcat = [ pkgs.gsl ];
     outbreaker = [ pkgs.gsl ];
-    pcaPA = [ pkgs.gsl ];
     ridge = [ pkgs.gsl ];
     simplexreg = [ pkgs.gsl ];
     stsm = [ pkgs.gsl ];
@@ -283,10 +282,6 @@ let
     PopGenome = [ pkgs.zlib ];
     RJaCGH = [ pkgs.zlib ];
     RcppCNPy = [ pkgs.zlib ];
-    Rniftilib = [ pkgs.zlib ];
-    WhopGenome = [ pkgs.zlib ];
-    devEMF = [ pkgs.zlib ];
-    gdsfmt = [ pkgs.zlib ];
     rbamtools = [ pkgs.zlib ];
     rmatio = [ pkgs.zlib ];
     RVowpalWabbit = [ pkgs.zlib pkgs.boost ];
@@ -311,7 +306,6 @@ let
     gmatrix = [ pkgs.cudatoolkit ];
     WideLM = [ pkgs.cudatoolkit ];
     RCurl = [ pkgs.curl ];
-    Rgnuplot = [ pkgs.gnuplot ];
     R2SWF = [ pkgs.pkgconfig ];
     RGtk2 = [ pkgs.pkgconfig ];
     RProtoBuf = [ pkgs.pkgconfig ];
@@ -393,7 +387,6 @@ let
     "LS2Wstat"
     "MAR1"
     "MTurkR"
-    "MVPARTwrap"
     "MareyMap"
     "MergeGUI"
     "Meth27QC"
@@ -405,8 +398,6 @@ let
     "PBSadmb"
     "PBSmodelling"
     "PCPS"
-    "PKmodelFinder"
-    "PoMoS"
     "PopGenReport"
     "PredictABEL"
     "PrevMap"
@@ -432,7 +423,6 @@ let
     "RcmdrPlugin_KMggplot2"
     "RcmdrPlugin_MA"
     "RcmdrPlugin_MPAStats"
-    "RcmdrPlugin_NMBU"
     "RcmdrPlugin_ROC"
     "RcmdrPlugin_SCDA"
     "RcmdrPlugin_SLC"
@@ -474,7 +464,6 @@ let
     "TestScorer"
     "VIMGUI"
     "VecStatGraphs3D"
-    "VisuClust"
     "WMCapacity"
     "accrual"
     "ade4TkGUI"
@@ -622,6 +611,8 @@ let
 
   # Packages which cannot be installed due to lack of dependencies or other reasons.
   brokenPackages = [            # sort -t '#' -k 2
+    "metabolomics" # depends on broken crmn
+    "retistruct" # depends on broken RImageJROI
     "CARrampsOcl" # depends on OpenCL
     "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED!
     "alm" # jsonlite.so: undefined symbol: XXX
@@ -644,7 +635,6 @@ let
     "rmongodb" # jsonlite.so: undefined symbol: XXX
     "rnoaa" # jsonlite.so: undefined symbol: XXX
     "RSiteCatalyst" # jsonlite.so: undefined symbol: XXX
-    "RSocrata" # jsonlite.so: undefined symbol: XXX
     "rsunlight" # jsonlite.so: undefined symbol: XXX
     "rWBclimate" # jsonlite.so: undefined symbol: XXX
     "SGP" # jsonlite.so: undefined symbol: XXX
@@ -722,7 +712,6 @@ let
     "gRapHD" # requires graph
     "msSurv" # requires graph
     "PairViz" # requires graph
-    "ddepn" # requires graph, and genefilter
     "iRefR" # requires graph, and RBGL
     "pcalg" # requires graph, and RBGL
     "protiq" # requires graph, and RBGL
@@ -765,7 +754,6 @@ let
     "metaMA" # requires limma
     "plmDE" # requires limma
     "SQDA" # requires limma
-    "RPPanalyzer" # requires limma, and Biobase
     "PerfMeas" # requires limma, graph, and RBGL
     "rLindo" # requires LINDO API
     "magma" # requires MAGMA
@@ -802,7 +790,6 @@ let
     "crmn" # requires pcaMethods, and Biobase
     "imputeLCMD" # requires pcaMethods, and impute
     "MEET" # requires pcaMethods, and seqLogo
-    "SigTree" # requires phyloseq
     "saps" # requires piano, and survcomp
     "smart" # requires PMA
     "surveillance" # requires polyCub
@@ -823,7 +810,6 @@ let
     "PKgraph" # requires rggobi
     "SeqGrapheR" # requires rggobi
     "branchLars" # requires Rgraphviz
-    "gcExplorer" # requires Rgraphviz
     "hasseDiagram" # requires Rgraphviz
     "hpoPlot" # requires Rgraphviz
     "strum" # requires Rgraphviz
@@ -891,7 +877,6 @@ let
     "rsig" # requires survcomp
     "leapp" # requires sva
     "ttScreening" # requires sva, and limma
-    "ENA" # requires WGCNA
     "GOGANPA" # requires WGCNA
     "nettools" # requires WGCNA
     "rneos" # requires XMLRPC
@@ -914,6 +899,10 @@ let
   ];
 
   otherOverrides = old: new: {
+    curl = old.curl.overrideDerivation (attrs: {
+      preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl";
+    });
+
     RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: {
       patchPhase = "patchShebangs configure";
     });
@@ -1067,13 +1056,6 @@ let
     qtpaint = old.qtpaint.override { hydraPlatforms = stdenv.lib.platforms.none; };
     bamboo = old.bamboo.override { hydraPlatforms = stdenv.lib.platforms.none; };
 
-    # Obsolete package that I keep around temporarily because some
-    # existing code depends on it.
-    Defaults = derive {
-      name="Defaults";
-      version="1.1-1";
-      sha256="0ikgd5mswlky327pzp09cz93bn3mq7qnybq1r64y19c2brbax00d";
-    };
   };
 in
   self
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index 69dbf46bcdd..c69814c16ca 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -2,14 +2,15 @@
 
 assert jdk != null;
 
-stdenv.mkDerivation {
-  name = "apache-maven-3.2.3";
+let version = "3.2.5"; in
+stdenv.mkDerivation rec {
+  name = "apache-maven-${version}";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = mirror://apache/maven/maven-3/3.2.3/binaries/apache-maven-3.2.3-bin.tar.gz;
-    sha256 = "1vd81bhj68mhnkb0zlarshlk61i2n160pyxxmrc739p3vsm08gxz";
+    url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
+    sha256 = "0md7fizam2lvl0b7fdlfjng6ywm283chmp382agzz4gmpmj046cc";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh
new file mode 100644
index 00000000000..a6073308920
--- /dev/null
+++ b/pkgs/development/tools/build-managers/boot/builder.sh
@@ -0,0 +1,13 @@
+source $stdenv/setup
+
+boot_bin=$out/bin/boot
+
+mkdir -pv $(dirname $boot_bin)
+cp -v $src $boot_bin
+chmod -v 755 $boot_bin
+
+patchShebangs $boot_bin
+
+wrapProgram $boot_bin \
+            --set JAVA_HOME "${jdk}" \
+            --prefix PATH ":" "${jdk}/bin"
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
new file mode 100644
index 00000000000..ccc7e326fd7
--- /dev/null
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, makeWrapper, jdk }:
+
+stdenv.mkDerivation rec {
+  version = "2.0.0-rc8";
+  name = "boot-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
+    sha256 = "1jqj04f33prb6nqsv7mffwdnz47ppi3szsbdzphjx8xzz394nl7j";
+  };
+
+  inherit jdk;
+  
+  builder = ./builder.sh;
+
+  buildInputs = [ makeWrapper ];
+
+  propagatedBuildInputs = [ jdk ];
+
+  meta = {
+    description = "Build tooling for Clojure";
+    homepage = http://boot-clj.com/;
+    license = stdenv.lib.licenses.epl10;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = [ stdenv.lib.maintainers.ragge ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index f7475a70e7f..f962eaef770 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -2,19 +2,19 @@
 
 /* Cargo binary snapshot */
 
-let snapshotDate = "2014-12-30";
+let snapshotDate = "2015-01-24";
 in
 
 with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
 
 let snapshotHash = if stdenv.system == "i686-linux"
-      then "ab8bba0918d3d2ddbd7fd21f147e223dbf04cece"
+      then "96213038f850569f1c4fa6a0d146c6155c0d566b"
       else if stdenv.system == "x86_64-linux"
-      then "0efe0f7bcbcbeb5494affcc8a2207db448a08c45"
+      then "4d87486493c2881edced7b1d2f8beaac32aaa5b5"
       else if stdenv.system == "i686-darwin"
-      then "e5097005b0a27c186b8edee24982fd4c3ebba81e"
+      then "17b9fc782e86bffe170abb83a01e0cb7c90a0daa"
       else if stdenv.system == "x86_64-darwin"
-      then "6c0bb776e5645fb93b67341b111c715f39b25511"
+      then "18887bdbd3e6d2a127aa34216fa06e9877b0fbc6"
       else throw "no snapshot for platform ${stdenv.system}";
     snapshotName = "cargo-nightly-${platform}.tar.gz";
 in
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
new file mode 100644
index 00000000000..dd0b07912c8
--- /dev/null
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, curl, dmd, gcc, unzip}:
+
+stdenv.mkDerivation {
+  name = "dub-0.9.22";
+
+  src = fetchurl {
+    url = "https://github.com/rejectedsoftware/dub/archive/v0.9.22.tar.gz";
+    sha256 = "0vhn96ybbsfflldlbyc17rmwb7bz21slbm189k5glyfr9nnp4cir";
+  };
+
+  buildInputs = [ unzip curl ];
+
+  propagatedBuildInputs = [ gcc dmd ];
+
+  buildPhase = ''
+      # Avoid that the version file is overwritten
+      substituteInPlace build.sh \
+          --replace source/dub/version_.d /dev/null
+      ./build.sh
+  '';
+
+  installPhase = ''
+      mkdir $out
+      mkdir $out/bin
+      cp bin/dub $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Build tool for D projects";
+    homepage = http://code.dlang.org/;
+    license = stdenv.lib.licenses.mit;
+    platforms = platforms.unix;
+  };
+}
+
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index a32ea9a3add..a4e81864985 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
-  version = "7.21.01";
+  version = "7.22.00";
 
   src = fetchurl {
     url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz";
-    sha256 = "0jx547bb0h1z5f3v9kvjiq5bgarbrcs1h47y1nnwdkg0q1mqma1h";
+    sha256 = "013vxnilygad981zb2608f95q2h3svvbgpjvzvk16qyxjy4y4q6z";
   };
 
   preConfigure = ''
@@ -25,4 +25,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/egg2nix/default.nix b/pkgs/development/tools/egg2nix/default.nix
index dd1c00116e4..d0f3b8a4e26 100644
--- a/pkgs/development/tools/egg2nix/default.nix
+++ b/pkgs/development/tools/egg2nix/default.nix
@@ -4,12 +4,12 @@
 # the tarball. Is there a nicer way than duplicating code?
 
 let
-  version = "0.4";
+  version = "0.5";
 in
 eggDerivation {
   src = fetchurl {
     url = "https://github.com/the-kenny/egg2nix/archive/${version}.tar.gz";
-    sha256 = "1xn79fgqxg0i47asjah31zi56v60is1n8d0cy8w4gbj0i41z7pvm";
+    sha256 = "0adal428v4i7h9lzs7sfq75q2mxhsbf1qqwzrsjv8j41paars20y";
   };
 
   name = "egg2nix-${version}";
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
new file mode 100644
index 00000000000..59b7bdb248e
--- /dev/null
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, buildPythonPackage, pythonPackages }:
+
+buildPythonPackage rec {
+
+  name = "grabserial-20141120";
+
+  src = fetchgit {
+    url = https://github.com/tbird20d/grabserial.git;
+    rev  = "8b9c98ea35d382bac2aafc7a8a9c02440369a792";
+    sha256 = "ff27f5e5ab38c8450a4a0291e943e6c5a265e56d29d6a1caa849ae3238d71679";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.pyserial ];
+
+  meta = {
+    description = "Python based serial dump and timing program";
+    homepage = https://github.com/tbird20d/grabserial;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ vmandela ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 281a3177bae..b20f8fa4f50 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -2,23 +2,35 @@
 
 stdenv.mkDerivation rec {
 
-  inherit (ihaskell) name pname version;
+  inherit (ihaskell) name pname src version meta;
 
   buildInputs = [ makeWrapper ];
 
   preferLocalBuild = true;
 
-  buildCommand = ''
+  buildCommand = let profile = "${pname}-${version}/profile/profile.tar"; in ''
+    tar xf $src ${profile}
+    mkdir -p $out/share/`dirname ${profile}`
+    mkdir profile
+    cd profile
+    tar xf ../${profile}
+    for cfg in ipython_*config.py;do
+      sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg
+    done
+    tar cf $out/share/${profile} .
     makeWrapper "${ihaskell}/bin/IHaskell" "$out/bin/ihaskell" \
       --prefix PATH : "${ghc}/bin:${ihaskell}/bin:${ipython}/bin" \
       --prefix LD_LIBRARY_PATH : "${ihaskell}/lib/ghc-${ghc.version}/${name}/" \
       --add-flags "--ipython=${ipython}/bin/ipython" \
       --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \
-      --set PROFILE_TAR "$(find ${ihaskell} -iname "profile.tar")" \
-      --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] && mkdir -p \$PROFILE_DIR && tar xvf \$PROFILE_TAR -C \$PROFILE_DIR)" \
+      --set PROFILE_TAR "$out/share/${profile}" \
+      --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \
+          && mkdir -p \$PROFILE_DIR \
+          && tar xf \$PROFILE_TAR -C \$PROFILE_DIR \
+          ; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \
+            sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done ) \
+        " \
       --prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${pname}-${version}.installedconf" \
       --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages
   '';
-
-  inherit (ihaskell) meta;
 }
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 3fdb75b3fdf..de7b2cfc689 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -2,19 +2,19 @@
 
 let
   libphutil = fetchgit {
-    url    = "git://github.com/facebook/libphutil.git";
-    rev    = "6c29d5c8d169084927df75b18761312195080550";
-    sha256 = "5891e5d7688a2f026e02a2684a2002c0715f0492fd8475bdcb8fab2066eff37a";
+    url    = "git://github.com/phacility/libphutil.git";
+    rev    = "00f1fcdc19e0d5712f4d8cdb4e6804adc6dfa2ec";
+    sha256 = "92031c50c61a8b46b7e978566b1add50dae5849f3c4c2870826d343c4bc458ce";
   };
   arcanist = fetchgit {
-    url    = "git://github.com/facebook/arcanist.git";
-    rev    = "a70a00a960ff4a7e30e20b4db1c68c081f16eaa0";
-    sha256 = "37d9b80fbfc694df86a4bf75a540f81aa2e65f463d301d1f8a5930ecae8ba9fc";
+    url    = "git://github.com/phacility/arcanist.git";
+    rev    = "8173ea3eea73abe12935ffc80fdd65f2d658336b";
+    sha256 = "efcbfb42cb879e7589c94c7bf293de996981cf2175935790501c389253aa7f43";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20140924";
+  version = "20150118";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper flex ];
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index c7cda38ef43..a4004f7cb8a 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -2,14 +2,14 @@
 
 let
   name = "astyle";
-  version = "2.04";
+  version = "2.05.1";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz";
-    sha256 = "0q3b2579ng01glfwan75zcyvkggixdz9c4i6cgid2664ad47zcvh";
+    sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv";
   };
 
   sourceRoot = "astyle/build/gcc";
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 1bfbfcd92d4..65a92a05e0e 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -3,10 +3,10 @@
 let
   ccache =
 stdenv.mkDerivation {
-  name = "ccache-3.1.10";
+  name = "ccache-3.2.1";
   src = fetchurl {
-    url = http://samba.org/ftp/ccache/ccache-3.1.10.tar.gz;
-    sha256 = "0fzxa45q7wfm63zrak65wh31w7pnsp0k65fxv00cgmf454as4dza";
+    url = http://samba.org/ftp/ccache/ccache-3.2.1.tar.xz;
+    sha256 = "17dxb0adha2bqzb2r8rcc3kl9mk7y6vrvlh181liivrc3m7g6al7";
   };
 
   buildInputs = [ zlib ];
@@ -36,10 +36,11 @@ stdenv.mkDerivation {
       '');
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = http://ccache.samba.org/;
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = with licenses; gpl3Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 };
 in
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index bc0ad398362..a7e42a07a63 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -11,7 +11,7 @@
 
 let
 
- version = "1.4.5.3";
+ version = "1.4.6";
 
 in stdenv.mkDerivation {
 
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "05jphslvfgp94vd86myjw5q4wgbayj8avw49h4a4npkwhn93d11j";
+    sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4";
   };
 
   buildInputs = [ autoconf automake114x gettext_0_19 libtool makeWrapper texinfo ];
@@ -37,11 +37,12 @@ in stdenv.mkDerivation {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A cross-platform file change monitor with multiple backends";
     homepage = https://github.com/emcrisostomo/fswatch;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pSub ];
   };
 
 }
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index bc08a32ab1f..b24b46aec3d 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.8";
+  basename = "gdb-7.8.2";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875";
+    sha256 = "11a4fj1vpsny71kz7xqqbqk3kgzbs5cfjj3z9gm0hpvxfkam8nb0";
   };
 
   patches = [ ./edit-signals.patch ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ texinfo python perl ]
     ++ stdenv.lib.optional isGNU mig;
 
-  buildInputs = [ ncurses readline gmp mpfr expat pkgconfig guile ]
+  buildInputs = [ ncurses readline gmp mpfr expat /* pkgconfig guile */ ]
     ++ stdenv.lib.optional isGNU hurd
     ++ stdenv.lib.optional doCheck dejagnu;
 
diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix
new file mode 100644
index 00000000000..978213f6760
--- /dev/null
+++ b/pkgs/development/tools/node-webkit/nw11.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, buildEnv, makeWrapper
+, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
+, libnotify}:
+let
+  bits = if stdenv.system == "x86_64-linux" then "x64"
+         else "ia32";
+
+  nwEnv = buildEnv {
+    name = "node-webkit-env";
+    paths = [
+      xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
+      freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage
+      xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc
+      xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap
+      libnotify
+    ];
+  };
+
+in stdenv.mkDerivation rec {
+  name = "node-webkit-${version}";
+  version = "0.11.2";
+
+  src = fetchurl {
+    url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
+    sha256 = if bits == "x64" then
+      "1iby0yrnbk9xfcsfz59f6g00l6rxiyxvq78shs0c145ky7lknq5q" else
+      "1hk3c9z3kwmqaj87vc5k1a7fv8jhkyqw1wjmsl3q5i50w880h398";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/node-webkit
+    cp -R * $out/share/node-webkit
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
+
+    ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
+
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
+
+    mkdir -p $out/bin
+    ln -s $out/share/node-webkit/nw $out/bin
+    ln -s $out/share/node-webkit/nwsnapshot $out/bin
+  '';
+
+  buildInputs = [ makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "An app runtime based on Chromium and node.js";
+    homepage = https://github.com/rogerwang/node-webkit;
+    platforms = ["i686-linux" "x86_64-linux"];
+    maintainers = [ maintainers.offline ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/nw9.nix
index 97399e5268c..97399e5268c 100644
--- a/pkgs/development/tools/node-webkit/default.nix
+++ b/pkgs/development/tools/node-webkit/nw9.nix
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index d049377ea94..dee605ced57 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
+{stdenv, fetchurl, makeWrapper, gcc, ocaml, ncurses}:
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
   pname = "camlidl";
@@ -20,9 +20,22 @@ stdenv.mkDerivation {
     mv config/Makefile.unix config/Makefile
     substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
     substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl
+    substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${gcc}/bin/cpp
     mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
   '';
 
+  postInstall = ''
+    cat >$out/lib/ocaml/${ocaml_version}/site-lib/camlidl/META <<EOF
+    # Courtesy of GODI
+    description = "Stub generator"
+    version = "${version}"
+    archive(byte) = "com.cma"
+    archive(native) = "com.cmxa"
+    EOF
+    mkdir -p $out/bin
+    ln -s $out/camlidl $out/bin
+  '';
+
   meta = {
     description = "CamlIDL is a stub code generator and COM binding for Objective Caml";
     homepage = "${webpage}";
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 106581b8fea..bd568eaf84d 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, ocaml, findlib, yojson, menhir
-, withEmacsMode ? false, emacs}:
+{ stdenv, fetchzip, ocaml, findlib, yojson, menhir
+, withEmacsMode ? false, emacs }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
+let version = "2.1.1"; in
+
 stdenv.mkDerivation {
 
-  name = "merlin-2.1";
+  name = "merlin-${version}";
 
-  src = fetchurl {
-    url = https://github.com/the-lambda-church/merlin/archive/v2.1.tar.gz;
-    sha256 = "0rk5ffhr69wbhr50ixgw1vnv0wkhxwh1z3cpbcwkm72cnac74nj6";
+  src = fetchzip {
+    url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz";
+    sha256 = "1j60jsgls6kkkh2cv4gq36q0mf27nw8pc6k94n0yvjafjmwl3kks";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ]
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
new file mode 100644
index 00000000000..767a5e17cb4
--- /dev/null
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
+
+let inherit (stdenv.lib) getVersion versionAtLeast optional; in
+
+assert versionAtLeast (getVersion ocaml) "3.12.1";
+assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
+assert versionAtLeast (getVersion ocpIndent) "1.4.2";
+
+let version = "1.1.1"; in
+
+stdenv.mkDerivation {
+
+  name = "ocp-index-${version}";
+
+  src = fetchzip {
+    url = "http://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
+    sha256 = "173lqbyivwv1zf9ifpxa9f8m2y3kybzs3idrwyzy824ixdqv2fww";
+  };
+
+  buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
+  ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
+  propagatedBuildInputs = [ ocpIndent ];
+
+  createFindlibDestdir = true;
+
+  preBuild = "export TERM=xterm";
+  postInstall = "mv $out/lib/{ocp-index,ocaml/${getVersion ocaml}/site-lib/}";
+
+  meta = {
+    homepage = http://typerex.ocamlpro.com/ocp-index.html;
+    description = "A simple and light-weight documentation extractor for OCaml";
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = ocaml.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+  };
+}
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 10025ff8a96..c5c0ac9a3ed 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -26,8 +26,11 @@ stdenv.mkDerivation rec {
   let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
   in
    ''
-    wrapProgram "$out"/bin/utop --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH'
-    '';
+   for prog in "$out"/bin/*
+   do
+    wrapProgram $prog --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH'
+   done
+   '';
 
   meta = {
     description = "Universal toplevel for OCaml";
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 0ae6cf92b4e..e55a2015a70 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "6.9";
 
   src = fetchurl {
-    url = "http://www.colm.net/wp-content/uploads/2014/10/${name}.tar.gz";
+    url = "http://www.colm.net/files/ragel/${name}.tar.gz";
     sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf";
   };
 
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 41e0ec53d6a..d07f7fd28e9 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -1,20 +1,26 @@
-{stdenv, fetchgit, rustc, makeWrapper }:
+{stdenv, fetchgit, rustc, cargo, makeWrapper }:
 
 stdenv.mkDerivation rec {
   #TODO add emacs support
-  name = "racer-git-2015-01-07";
+  name = "racer-git-2015-01-20";
   src = fetchgit {
     url = https://github.com/phildawes/racer;
-    rev = "bf73c05ac719cd3b0f8d8f9e0ecb066ede6aa9d9";
-    sha256 = "1159fsfca2kqvlajp8sawrskip7hc0rppk8vhwxa2vw8zznp56w0";
+    rev = "599aa524ea949ec5f9f0be0375dbb1df9cb852ae";
+    sha256 = "1kasm7vffn176wr072m1dmqg1rb3wqai9yisxf8mia62548pdx88";
   };
 
-  buildInputs = [ rustc makeWrapper ];
+  buildInputs = [ rustc cargo makeWrapper ];
+
+  buildPhase = ''
+    cargo build --release
+  '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -p bin/racer $out/bin/
+    cp -p target/release/racer $out/bin/
     wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src"
+    install -d $out/share/emacs/site-lisp
+    install "editors/"*.el $out/share/emacs/site-lisp
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 5e15ef64cb2..1d9247604ae 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,9 +1,16 @@
-{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconvOrLibc
+{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconvOrLibc
 , libxml2, libxslt }:
 
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
-let version = "1.6.5";
+let
+  version = "1.6.5";
+  rake = buildRubyGem {
+    inherit ruby;
+    name = "rake-10.3.2";
+    sha256 = "0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m";
+  };
+
 in
 stdenv.mkDerivation rec {
   name = "vagrant-${version}";
@@ -58,7 +65,7 @@ stdenv.mkDerivation rec {
     ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin
     ln -s ${ruby}/bin/gem opt/vagrant/embedded/bin
     ln -s ${ruby}/bin/irb opt/vagrant/embedded/bin
-    ln -s ${rubyLibs.rake}/bin/rake opt/vagrant/embedded/bin
+    ln -s ${rake}/bin/rake opt/vagrant/embedded/bin
     ln -s ${ruby}/bin/rdoc opt/vagrant/embedded/bin
     ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin
     ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 8aae538c804..af997f19e8d 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -1,6 +1,35 @@
 { stdenv, runCommand, nodejs, neededNatives}:
 
-args @ { name, src, deps ? {}, peerDependencies ? [], flags ? [], preShellHook ? "",  postShellHook ? "", resolvedDeps ? {}, bin ? null, ... }:
+{
+  name, src,
+
+  # Node package name
+  pkgName ? (builtins.parseDrvName name).name,
+
+  # List or attribute set of dependencies
+  deps ? {},
+
+  # List or attribute set of peer depencies
+  peerDependencies ? [],
+
+  # Whether package is binary or library
+  bin ? null,
+
+  # Flags passed to npm install
+  flags ? [],
+
+  # Command to be run before shell hook
+  preShellHook ? "",
+
+  # Command to be run after shell hook
+  postShellHook ? "",
+
+  # Attribute set of already resolved deps (internal),
+  # for avoiding infinite recursion
+  resolvedDeps ? {},
+
+  ...
+} @ args:
 
 with stdenv.lib;
 
@@ -22,10 +51,7 @@ let
   # Recursive dependencies that we want to avoid with shim creation
   recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps);
 
-  peerDeps = listToAttrs (concatMap (dep: map (name: {
-    inherit name;
-    value = dep;
-  }) (filter (nm: !(elem nm (args.passthru.names or []))) dep.names)) (peerDependencies));
+  peerDeps = filter (dep: dep.pkgName != pkgName) peerDependencies;
 
   self = let
     # Pass resolved dependencies to dependencies of this package
@@ -49,7 +75,9 @@ let
   in stdenv.mkDerivation ({
     inherit src;
 
-    postPatch = ''
+    configurePhase = ''
+      runHook preConfigure
+
       ${patchShebangs "./"}
 
       # Some version specifiers (latest, unstable, URLs, file paths) force NPM
@@ -107,10 +135,9 @@ let
         fs.writeFileSync("package.json", JSON.stringify(packageObj));
       EOF
       ) | node
-    '';
 
-    configurePhase = ''
-      runHook preConfigure
+      # We do not handle shrinkwraps yet
+      rm npm-shrinkwrap.json 2>/dev/null || true
 
       mkdir build-dir
       (
@@ -120,29 +147,29 @@ let
         # Symlink or copy dependencies for node modules
         # copy is needed if dependency has recursive dependencies,
         # because node can't follow symlinks while resolving recursive deps.
-        ${concatStrings (concatMap (dep: map (name:
+        ${concatMapStrings (dep:
           if dep.recursiveDeps == [] then ''
-            ln -sv ${dep}/lib/node_modules/${name} node_modules/
+            ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/
           '' else ''
-            cp -R ${dep}/lib/node_modules/${name} node_modules/
+            cp -R ${dep}/lib/node_modules/${dep.pkgName} node_modules/
           ''
-        ) dep.names) deps)}
+        ) deps}
 
         # Symlink peer dependencies
-        ${concatStrings (mapAttrsToList (name: dep: ''
-          ln -sv ${dep}/lib/node_modules/${name} node_modules/
-        '') peerDeps)}
+        ${concatMapStrings (dep: ''
+          ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/
+        '') peerDeps}
 
         # Create shims for recursive dependenceies
-        ${concatStrings (concatMap (dep: map (name: ''
-          mkdir -p node_modules/${name}
-          cat > node_modules/${name}/package.json <<EOF
+        ${concatMapStrings (dep: ''
+          mkdir -p node_modules/${dep.pkgName}
+          cat > node_modules/${dep.pkgName}/package.json <<EOF
           {
-              "name": "${name}",
-              "version": "${(builtins.parseDrvName dep.name).version}"
+              "name": "${dep.pkgName}",
+              "version": "${getVersion dep}"
           }
           EOF
-        '') dep.names) (attrValues recursiveDeps))}
+        '') (attrValues recursiveDeps)}
       )
 
       export HOME=$PWD/build-dir
@@ -173,34 +200,32 @@ let
         cd $HOME
 
         # Remove shims
-        ${concatStrings (concatMap (dep: map (name: ''
-          rm node_modules/${name}/package.json
-          rmdir node_modules/${name}
-        '') dep.names) (attrValues recursiveDeps))}
+        ${concatMapStrings (dep: ''
+          rm node_modules/${dep.pkgName}/package.json
+          rmdir node_modules/${dep.pkgName}
+        '') (attrValues recursiveDeps)}
 
         mkdir -p $out/lib/node_modules
 
         # Install manual
-        ${concatStrings (map (name: ''
-          mv node_modules/${name} $out/lib/node_modules
-          rm -fR $out/lib/node_modules/${name}/node_modules
-          cp -r node_modules $out/lib/node_modules/${name}/node_modules
-
-          if [ -e "$out/lib/node_modules/${name}/man" ]; then
-            mkdir -p $out/share
-            for dir in "$out/lib/node_modules/${name}/man/"*; do
-              mkdir -p $out/share/man/$(basename "$dir")
-              for page in "$dir"/*; do
-                ln -sv $page $out/share/man/$(basename "$dir")
-              done
+        mv node_modules/${pkgName} $out/lib/node_modules
+        rm -fR $out/lib/node_modules/${pkgName}/node_modules
+        cp -r node_modules $out/lib/node_modules/${pkgName}/node_modules
+
+        if [ -e "$out/lib/node_modules/${pkgName}/man" ]; then
+          mkdir -p $out/share
+          for dir in "$out/lib/node_modules/${pkgName}/man/"*; do
+            mkdir -p $out/share/man/$(basename "$dir")
+            for page in "$dir"/*; do
+              ln -sv $page $out/share/man/$(basename "$dir")
             done
-          fi
-        '') args.passthru.names)}
+          done
+        fi
 
         # Symlink dependencies
-        ${concatStrings (mapAttrsToList (name: dep: ''
-          mv node_modules/${name} $out/lib/node_modules
-        '') peerDeps)}
+        ${concatMapStrings (dep: ''
+          mv node_modules/${dep.pkgName} $out/lib/node_modules
+        '') peerDeps}
 
         # Install binaries and patch shebangs
         mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
@@ -213,19 +238,21 @@ let
       runHook postInstall
     '';
 
-    preFixup = concatStringsSep "\n" (map (src: ''
+    preFixup = ''
       find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g'
-    '') src);
+    '';
 
     shellHook = ''
       ${preShellHook}
       export PATH=${nodejs}/bin:$(pwd)/node_modules/.bin:$PATH
       mkdir -p node_modules
-      ${concatStrings (concatMap (dep: map (name: ''
-        ln -sfv ${dep}/lib/node_modules/${name} node_modules/
-      '') dep.names) deps)}
+      ${concatMapStrings (dep: ''
+        ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/
+      '') deps}
       ${postShellHook}
     '';
+
+    passthru.pkgName = pkgName;
   } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // {
     name = "${
       if bin == true then "bin-" else if bin == false then "node-" else ""
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 015ca2fca9d..4e34453a1e8 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -4,17 +4,17 @@
 
 let
   baseVersion = "40";
-  patchVersion = "23";
+  patchVersion = "24";
   srcs = {
     df_unfuck = fetchgit {
       url = "https://github.com/svenstaro/dwarf_fortress_unfuck";
-      rev = "c6ec52520c44ba09d0d14c1688d2e9d70354fd01";
-      sha256 = "0pp602ykyrq4rhyrf3pyy9vplxlkl256lw8bcfmgh0mqzzap9wq9";
+      rev = "39742d64d2886fb594d79e7cc4b98fb917f26811";
+      sha256 = "19vwx6kpv1sf93bx5v8x47f7x2cgxsqk82v6j1a72sa3q7m5cpc7";
     };
 
     df = fetchurl {
       url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2";
-      sha256 = "12gjb19scdgsz7zgk9s01qjxqrvh7z0xr68svwgxxqn4wf8kppcl";
+      sha256 = "0d4jrs45qj89vq9mjg7fxxhis7zivvb0vzjpmkk274b778kccdys";
     };
   };
 
diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix
index 9ecfe3c0acd..6d7eaf30736 100644
--- a/pkgs/games/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-therapist/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, coreutils, fetchurl, qt4, dwarf_fortress, bash, makeWrapper }:
+{ stdenv, coreutils, fetchgit, qt4, dwarf_fortress, bash, makeWrapper }:
 
 let
-  version = "30.1.0";
+  version = "30.2.0pre";
   df = dwarf_fortress;
 in
 stdenv.mkDerivation rec {
   name = "dwarf-therapist-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/splintermind/Dwarf-Therapist/archive/v${version}.tar.gz";
-    sha256 = "1x9dkis6b3f8iqcfrc2cj9mcgkwf0rzhxhq2lgy4xdr2n0yjkyv7";
+  src = fetchgit {
+    url = "https://github.com/splintermind/Dwarf-Therapist.git";
+    rev = "65bb15a29d616d788c20a3344058b7277e4fadba";
+    sha256 = "1q1n9sm0lgmn52m4aigb22cdfbh2s569y1mn5cmimgj600i6c2f2";
   };
 
   # Needed for hashing
@@ -19,12 +20,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   configurePhase = ''
-    substituteInPlace dwarftherapist.pro \
-      --replace /usr/bin $out/bin     \
-      --replace /usr/share $out/share \
-      --replace "INSTALLS += doc" ""
-
-    qmake INSTALL_PREFIX=$out
+    qmake PREFIX=$out
   '';
 
   postInstall = ''
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index bbf12065cc7..bbf12065cc7 100755..100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 1eb60fc3b56..b13db40d789 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.71";
+  name = "tibia-10.74";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1071.tgz;
-    sha256 = "183949xfvbbxbhj4i85ybcfv7h9j1f4va4c61wjzbhyjf55vj69a";
+    url = http://static.tibia.com/download/tibia1074.tgz;
+    sha256 = "1q8bg33xial0bkagaf4iwn2sny1hglc1fhdxwjbiwrw0jg9w644x";
   };
 
   shell = stdenv.shell;
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 4fa35c8b812..60e276defde 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,23 +1,35 @@
 { stdenv, fetchurl, automake, pkgconfig
 , cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
 , polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
-, withPlugin ? false
+, withPlugin ? false, substituteAll
 }:
 
-stdenv.mkDerivation rec {
-  name = "hplip-3.14.4";
+let
+
+  name = "hplip-3.14.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f";
+    sha256 = "164mm30yb61psk5j4ziybxdd310y09fixgl09hmb59ny261wvcqi";
   };
 
+  hplip_state =
+    substituteAll
+      {
+        src = ./hplip.state;
+        # evaluated this way, version is always up-to-date
+        version = (builtins.parseDrvName name).version;
+      };
+
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "0k1vpmy7babbm3c5v4dcbhq0jgyr8as722nylfs8zx0dy7kr8874";
+    sha256 = "10cvgy1h84fwh7xpw4x6cbkpisqbn3nbcqrgd9xz5fc6mn0b95dk";
   };
 
-  hplip_state = ./hplip.state;
+in
+
+stdenv.mkDerivation {
+  inherit name src;
 
   prePatch = ''
     # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/misc/drivers/hplip/hplip.state
index 52679963f06..9d19a93f364 100644
--- a/pkgs/misc/drivers/hplip/hplip.state
+++ b/pkgs/misc/drivers/hplip/hplip.state
@@ -1,4 +1,4 @@
 [plugin]
 installed=1
 eula=1
-version=3.14.4
+version=@version@
diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
new file mode 100644
index 00000000000..38b8e27db7d
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
@@ -0,0 +1,39 @@
+{ stdenv, pkgs, cores }:
+
+assert cores != [];
+
+with pkgs.lib;
+
+let
+
+  script = exec: ''
+    #!${stdenv.shell}
+    nohup sh -c "sleep 1 && pkill -SIGSTOP kodi" &
+    nohup sh -c "${exec} '$@' -f;pkill -SIGCONT kodi"
+  '';
+  scriptSh = exec: pkgs.writeScript ("kodi-"+exec.name) (script exec.path);
+  execs = map (core: rec { name = core.core; path = core+"/bin/retroarch-"+name;}) cores;
+
+in
+
+stdenv.mkDerivation rec {
+  name = "kodi-retroarch-advanced-launchers-${version}";
+  version = "0.2";
+
+  dontBuild = true;
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    ${stdenv.lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/kodi-${exec.name};") execs}
+  '';
+
+  meta = {
+    description = "Kodi retroarch advanced launchers";
+    longDescription = ''
+      These retroarch launchers are intended to be used with
+      anglescry advanced launcher for Kodi since device input is
+      caught by both Kodi and the retroarch process.
+    '';
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 36b6b770bda..0ccc0c7c6cf 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, lilypond, pyqt4 }:
+{ stdenv, fetchurl, pythonPackages, lilypond, pyqt4, pygame }:
 
 pythonPackages.buildPythonPackage rec {
   name = "frescobaldi-${version}";
@@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec {
   };
 
   propagatedBuildInputs = with pythonPackages; [ lilypond
-    pyqt4 poppler-qt4 ];
+    pyqt4 poppler-qt4 pygame ];
 
   patches = [ ./setup.cfg.patch ./python-path.patch ];
 
diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix
index 87be974ca96..6357c4e6f90 100644
--- a/pkgs/misc/misc.nix
+++ b/pkgs/misc/misc.nix
@@ -16,7 +16,7 @@ in
       packageOverrides = {
 	rubyCollection = collection {
 	  name = "ruby";
-	  list = let l = rubyLibs; in
+	  list = let l = rubyPackages; in
 	    [ pkgs.ruby l.chronic l.sup ];
 	};
       }
diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/misc/themes/orion/default.nix
new file mode 100644
index 00000000000..a6d037c3c4f
--- /dev/null
+++ b/pkgs/misc/themes/orion/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, gtk-engine-murrine }:
+
+stdenv.mkDerivation {
+  name = "orion-1.5";
+
+  src = fetchgit {
+    url = "https://github.com/shimmerproject/Orion.git";
+    rev = "refs/tags/v1.5";
+    sha256 = "995671990514a68192dc82ed51eaa6ab17c396950e1d8b7768c262027be6b05f";
+  };
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  phases = "$prePhases unpackPhase installPhase fixupPhase $postPhases";
+  installPhase = ''
+    mkdir -p $out/share/themes/orion
+    cp -r gtk-2.0 gtk-3.0 metacity-1 openbox-3 xfwm4 $out/share/themes/orion
+  '';
+
+  meta = {
+    homepage = https://github.com/shimmerproject/Orion;
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index c863be14461..fea41affe2c 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -4,28 +4,30 @@
 stdenv.mkDerivation rec {
   name = "dmtcp-${version}";
 
-  version = "1.2.0";
+  version = "2.3.1";
 
   buildInputs = [ perl python ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/dmtcp/dmtcp_${version}.tar.gz";
-    sha256 = "1pw3m4l1xf887xagd0yrrnb35s372j0kvjziyy3gmx9fxpga1jzb";
+    url = "mirror://sourceforge/dmtcp/dmtcp-${version}.tar.gz";
+    sha256 = "1f83ae112e102d4fbf69dded0dfaa6daeb60c4c0c569297553785a876e95ba15";
   };
 
   preConfigure = ''
-    substituteInPlace dmtcp/src/dmtcp_coordinator.cpp \
-      --replace /bin/bash /bin/sh
-    substituteInPlace utils/gdb-add-symbol-file \
-      --replace /bin/bash /bin/sh
+    substituteInPlace src/dmtcp_coordinator.cpp \
+      --replace /bin/bash ${stdenv.shell}
+    substituteInPlace util/gdb-add-symbol-file \
+      --replace /bin/bash ${stdenv.shell}
     substituteInPlace test/autotest.py \
       --replace /usr/bin/env $(type -p env) \
       --replace /bin/bash $(type -p bash) \
       --replace /usr/bin/perl $(type -p perl) \
-      --replace /usr/bin/python $(type -p python)
+      --replace /usr/bin/python $(type -p python) \
+      --replace "os.environ['USER']" "\"nixbld1\"" \
+      --replace "os.getenv('USER')" "\"nixbld1\""
   '';
 
-  doCheck = true;
+  doCheck = false;
 
   meta = {
     description = "Distributed MultiThreaded Checkpointing";
@@ -36,6 +38,6 @@ stdenv.mkDerivation rec {
       not modify the user's program or the operating system.
     '';
     homepage = http://dmtcp.sourceforge.net/;
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl3Plus; # most files seem this or LGPL-2.1+
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index cb4466dc20f..96e534e3b80 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zd1211-firmware";
-  version = "1.4";
+  version = "1.5";
 
   name = "${pname}-${version}";
   
   src = fetchurl {
     url = "mirror://sourceforge/zd1211/${name}.tar.bz2";
-    sha256 = "866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1";
+    sha256 = "04ibs0qw8bh6h6zmm5iz6lddgknwhsjq8ib3gyck6a7psw83h7gi";
   };
   
   buildPhase = "true";
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
new file mode 100644
index 00000000000..9903cb5b963
--- /dev/null
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "3.18.3";
+  name = "freefall-${version}";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "0ma2x68975xsi9kb15p0615nx9sm5ppb309kfdz7fgx9pg84q0hf";
+  };
+
+  buildPhase = ''
+    cd Documentation/laptops
+
+    # Default time-out is a little low, probably because the AC/lid status
+    # functions were never implemented. Because no-one still uses HDDs, right?
+    substituteInPlace freefall.c --replace "alarm(2)" "alarm(5)"
+
+    cc -o freefall freefall.c
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install freefall $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Free-fall protection for spinning HP/Dell laptop hard drives";
+    longDescription = ''
+      ATA/ATAPI-7 specifies the IDLE IMMEDIATE command with unload feature.
+      Issuing this command should cause the drive to switch to idle mode and
+      unload disk heads. This feature is being used in modern laptops in
+      conjunction with accelerometers and appropriate software to implement
+      a shock protection facility. The idea is to stop all I/O operations on
+      the internal hard drive and park its heads on the ramp when critical
+      situations are anticipated. This has no effect on SSD devices!
+    '';
+    license = with licenses; gpl2;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ef061459191..4f08e5a6fd8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -6,7 +6,9 @@ with stdenv.lib;
   # Power management and debugging.
   DEBUG_KERNEL y
   PM_ADVANCED_DEBUG y
-  PM_RUNTIME y
+  ${optionalString (versionOlder version "3.19") ''
+    PM_RUNTIME y
+  ''}
   ${optionalString (versionAtLeast version "3.10") ''
     X86_INTEL_PSTATE y
   ''}
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 69cefcda698..ce94288529e 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 = "3.18-rc7";
-  modDirVersion = "3.18.0-rc7";
-  extraMeta.branch = "3.18";
+  version = "3.19-rc5";
+  modDirVersion = "3.19.0-rc5";
+  extraMeta.branch = "3.19";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";
-    sha256 = "1zq7jd33jq4ibvjdsj8cm4zlgjag7j8r7w7ajmzivr7npdb9fvvk";
+    sha256 = "1n1bzdczqi9lqb6sahm1g9f59v1h6vp6r4skyi40dk3v2xacb0nw";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5d413a32102..2d0b4b7a108 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.29";
-      revision  = "201501182217";
+      revision  = "201501211943";
       branch    = "stable";
-      sha256    = "1g3ijwrclcli2hxv3f9yhvcxcxzs5mmzsw3632zq4pd9vcmsn8iz";
+      sha256    = "0kg33pzvs3dls0g6z9qxhmahiwy0asjpsp6hfcivhsri3kznwi6d";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "3.18.3";
-      revision  = "201501182219";
+      revision  = "201501211944";
       branch    = "test";
-      sha256    = "06s62kvxsc99rsslngkn3lrhyg58wmvnzq4p2zxyh8hm46bjm3ds";
+      sha256    = "12yz93l6442l6z41ama0nng6hzmnrc7jk3ha22cdypg06ybfjciv";
     };
 
   grsec_fix_path =
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 79e65fdb613..04ca4514a0f 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lxc-1.0.6";
+  name = "lxc-1.0.7";
 
   src = fetchurl {
     url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
-    sha256 = "075i5h136b3dnf8nk6mpailz6i18yv1zcsj0jdpr9kg2i6d1ksia";
+    sha256 = "1wm8n1b8j3x37757h2yyz53k3b6r2r301fmkviqf4xp0jaav1cd0";
   };
 
   buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index 30943d8cd41..3b0f7c694ac 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -1,16 +1,17 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "sdparm-1.08";
+  name = "sdparm-1.09";
 
   src = fetchurl {
-    url = http://sg.danny.cz/sg/p/sdparm-1.08.tgz;
-    sha256 = "0msy8anggdand1yr50vg2azcfgks7sbfpnqk7xzw9adi2jj7hsrp";
+    url = http://sg.danny.cz/sg/p/sdparm-1.09.tar.xz;
+    sha256 = "0jakqyjwi72zqjzss04bally0xl0lc4710mx8da08vpmir1hfphg";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://sg.danny.cz/sg/sdparm.html;
     description = "A utility to access SCSI device parameters";
-    license = stdenv.lib.licenses.free;
+    license = with licenses; bsd3;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 6b9526c15b2..1dec2dcb80b 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,10 +3,10 @@ let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version = "0.1.93";
+    version = "0.1.95";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "0rcbls1i82z2mwd3kcsidvhbb0xf0f4p7l2z3168wbpsh5nm9clz";
+    sha256 = "1h7yjfpgnhmzvc9862k7salc80sw7chmxx5chh4xw1lzsjz1nz5s";
   };
   buildInputs = [
     cmake zlib luajit
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 2d3dc4888a3..5242aabe507 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.27.0";
+  name = "xf86-input-wacom-0.28.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "0hpc0waa91d34h2fw1sjhxzn2xya51627jrps9rw4a2zb5hh6a6i";
+    sha256 = "0fr4ssdam8nxkahznqril8q2pbakb4r9ghhg61yl7997yy7006bw";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index a893154b936..511b167d358 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
+{ stdenv, fetchFromGitHub, kernel, spl, perl, python, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "zfs-${version}-${kernel.version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ./nix-build.patch # Remove in >=0.6.4
   ];
 
-  buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ];
+  buildInputs = [ spl perl python autoconf automake libtool zlib libuuid coreutils ];
 
   # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
   NIX_CFLAGS_LINK = "-lgcc_s";
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 21a580136d5..89f5cb9a2ad 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, kernel, spl_git, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
+{ stdenv, fetchgit, kernel, spl_git, perl, python, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
 
 stdenv.mkDerivation {
   name = "zfs-0.6.4-${kernel.version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     ./nix-build-git.patch
   ];
 
-  buildInputs = [ spl_git perl autoconf automake libtool zlib libuuid coreutils ];
+  buildInputs = [ spl_git perl python autoconf automake libtool zlib libuuid coreutils ];
 
   # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
   NIX_CFLAGS_LINK = "-lgcc_s";
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index b5f9195abbd..31eae0c2b6a 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
 
-  version = "3.3.5";
+  version = "3.4.3";
 
   src = fetchurl {
     url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
-    sha256 = "1hkhkpv2f0nzvw09zfrqg89mphdpn4nwvzrlqnhqf82bd2pzhsvs";
+    sha256 = "1mdma4bh6196ix9vhsigb3yav8l5gy2x78nsqxychm4hz5l2vjx6";
   };
 
   buildInputs =
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
new file mode 100755
index 00000000000..b1f732a451f
--- /dev/null
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, jre, makeWrapper, bash }:
+
+let
+  kafkaVersion = "0.8.1.1";
+  scalaVersion = "2.8.0";
+
+in
+
+stdenv.mkDerivation rec {
+  version = "${scalaVersion}-${kafkaVersion}";
+  name = "apache-kafka-${version}";
+
+  src = fetchurl {
+    url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz";
+    sha256 = "1bya4qs0ccrqibmdivgdxcsyiay4c3vywddrkci1dz9v3ymrqby9";
+  };
+
+  buildInputs = [ jre makeWrapper bash ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R config libs $out
+
+    mkdir -p $out/bin
+    cp bin/kafka* $out/bin
+
+    # allow us the specify logging directory using env
+    substituteInPlace $out/bin/kafka-run-class.sh \
+      --replace 'LOG_DIR=$base_dir/logs' 'LOG_DIR=$KAFKA_LOG_DIR'
+
+    for p in $out/bin\/*.sh; do
+      wrapProgram $p \
+        --set JAVA_HOME "${jre}" \
+        --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \
+        --prefix PATH : "${bash}/bin"
+    done
+    chmod +x $out/bin\/*
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://kafka.apache.org";
+    description = "A high-throughput distributed messaging system";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ragge ];
+    platforms = platforms.unix;
+  };
+
+}
diff --git a/pkgs/servers/consul/Gemfile b/pkgs/servers/consul/Gemfile
new file mode 100644
index 00000000000..77b884c352d
--- /dev/null
+++ b/pkgs/servers/consul/Gemfile
@@ -0,0 +1,6 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "uglifier"
+gem "sass"
+gem "therubyracer"
diff --git a/pkgs/servers/consul/Gemfile.lock b/pkgs/servers/consul/Gemfile.lock
new file mode 100644
index 00000000000..8ca7428084d
--- /dev/null
+++ b/pkgs/servers/consul/Gemfile.lock
@@ -0,0 +1,22 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    execjs (2.0.2)
+    json (1.8.1)
+    libv8 (3.16.14.3)
+    ref (1.0.5)
+    sass (3.3.6)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
+    uglifier (2.5.0)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sass
+  therubyracer
+  uglifier
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 49a3dac14ea..afe4a8e127d 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,8 +1,15 @@
-{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub
-, ruby, rubyLibs, nodejs }:
+{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub , ruby , nodejs
+, bundlerEnv }:
 
 let
   version = "0.4.1";
+  # `sass` et al
+  gems = bundlerEnv {
+    name = "consul-deps";
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
 in
 
 with lib;
@@ -13,13 +20,7 @@ stdenv.mkDerivation {
     inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
   };
 
-  buildInputs = [ go ruby rubyLibs.sass nodejs ];
-
-  configurePhase = flip concatMapStrings
-    (with rubyLibs; [ execjs json minitest rake rdoc sass uglifier ])
-    (gem: ''
-      export GEM_PATH="$GEM_PATH:${gem}/${ruby.gemPath}"
-    '');
+  buildInputs = [ go ruby gems nodejs ];
 
   buildPhase = ''
     # Build consul binary
diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix
new file mode 100644
index 00000000000..bf417f8c411
--- /dev/null
+++ b/pkgs/servers/consul/gemset.nix
@@ -0,0 +1,59 @@
+{
+  execjs = {
+    version = "2.0.2";
+    source = {
+      type = "gem";
+      sha256 = "167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs";
+    };
+  };
+  json = {
+    version = "1.8.1";
+    source = {
+      type = "gem";
+      sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn";
+    };
+  };
+  libv8 = {
+    version = "3.16.14.3";
+    source = {
+      type = "gem";
+      sha256 = "1arjjbmr9zxkyv6pdrihsz1p5cadzmx8308vgfvrhm380ccgridm";
+    };
+  };
+  ref = {
+    version = "1.0.5";
+    source = {
+      type = "gem";
+      sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la";
+    };
+  };
+  sass = {
+    version = "3.3.6";
+    source = {
+      type = "gem";
+      sha256 = "0ra0kxx52cgyrq6db7a1vysk984ilshbx40bcf527k8b3fha6k5r";
+    };
+  };
+  therubyracer = {
+    version = "0.12.1";
+    source = {
+      type = "gem";
+      sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6";
+    };
+    dependencies = [
+      "libv8"
+      "ref"
+    ];
+  };
+  uglifier = {
+    version = "2.5.0";
+    source = {
+      type = "gem";
+      sha256 = "0b9kxgyg8cv3g1bp6casndfzfy71jd9xyjxwng0lj90vzqrgjp20";
+    };
+    dependencies = [
+      "execjs"
+      "json"
+    ];
+  };
+}
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 5d6405f5fe7..ff21c4f508e 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -5,7 +5,9 @@
 , syslog ? false
 , moreheaders ? false
 , echo ? false
-, ngx_lua ? false }:
+, ngx_lua ? false
+, set_misc ? false
+}:
 
 with stdenv.lib;
 
@@ -65,6 +67,13 @@ let
     sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4";
   };
 
+  set-misc-ext = fetchFromGitHub {
+    owner = "openresty";
+    repo = "set-misc-nginx-module";
+    rev = "v0.27";
+    sha256 = "1bd1isacsiay73nc2jlp0wky32l42a3sjskvfa1082l12g0p1x39";
+  };
+
 in
 
 stdenv.mkDerivation rec {
@@ -109,6 +118,7 @@ stdenv.mkDerivation rec {
     ++ optional moreheaders "--add-module=${moreheaders-ext}"
     ++ optional echo "--add-module=${echo-ext}"
     ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
+    ++ optional set_misc "--add-module=${set-misc-ext}"
     ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
 
 
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index 6442c6f2621..e4fffecb959 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python, dnspython }:
 
 stdenv.mkDerivation rec {
-  name = "mailman-2.1.17";
+  name = "mailman-2.1.18";
 
   src = fetchurl {
     url = "mirror://gnu/mailman/${name}.tgz";
-    sha256 = "1rws4ghpq78ldp1si3z4pmiv1k4l8g6i6hjb2y4cwsjlxssahc64";
+    sha256 = "0jc360crakvpz71msl0h11zv3849fqzlj9jfh1g7x3j4459n07fw";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python dnspython ];
 
   patches = [ ./fix-var-prefix.patch ];
 
diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/servers/monitoring/riemann-dash/Gemfile
new file mode 100644
index 00000000000..496302e7643
--- /dev/null
+++ b/pkgs/servers/monitoring/riemann-dash/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem "riemann-dash", "0.2.9"
diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
new file mode 100644
index 00000000000..cd0ace470e2
--- /dev/null
+++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
@@ -0,0 +1,27 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    erubis (2.7.0)
+    multi_json (1.3.6)
+    rack (1.5.2)
+    rack-protection (1.5.3)
+      rack
+    riemann-dash (0.2.9)
+      erubis (>= 2.7.0)
+      multi_json (= 1.3.6)
+      sass (>= 3.1.14)
+      sinatra (~> 1.4.5)
+      webrick (~> 1.3.1)
+    sass (3.4.8)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    tilt (1.4.1)
+    webrick (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  riemann-dash (= 0.2.9)
diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/servers/monitoring/riemann-dash/default.nix
new file mode 100644
index 00000000000..1afcd81d9be
--- /dev/null
+++ b/pkgs/servers/monitoring/riemann-dash/default.nix
@@ -0,0 +1,8 @@
+{ bundlerEnv }:
+
+bundlerEnv {
+  name = "riemann-dash-0.2.9";
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+}
diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix
new file mode 100644
index 00000000000..f2e80e9aca4
--- /dev/null
+++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix
@@ -0,0 +1,80 @@
+{
+  erubis = {
+    version = "2.7.0";
+    source = {
+      type = "gem";
+      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+    };
+  };
+  multi_json = {
+    version = "1.3.6";
+    source = {
+      type = "gem";
+      sha256 = "0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr";
+    };
+  };
+  rack = {
+    version = "1.5.2";
+    source = {
+      type = "gem";
+      sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6";
+    };
+  };
+  rack-protection = {
+    version = "1.5.3";
+    source = {
+      type = "gem";
+      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  riemann-dash = {
+    version = "0.2.9";
+    source = {
+      type = "gem";
+      sha256 = "0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3";
+    };
+    dependencies = [
+      "erubis"
+      "multi_json"
+      "sass"
+      "sinatra"
+      "webrick"
+    ];
+  };
+  sass = {
+    version = "3.4.8";
+    source = {
+      type = "gem";
+      sha256 = "1ianyj2figwk314h10fkzpjql2xxi5l4njv1h0w8iyzjda85rqlp";
+    };
+  };
+  sinatra = {
+    version = "1.4.5";
+    source = {
+      type = "gem";
+      sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s";
+    };
+    dependencies = [
+      "rack"
+      "rack-protection"
+      "tilt"
+    ];
+  };
+  tilt = {
+    version = "1.4.1";
+    source = {
+      type = "gem";
+      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
+    };
+  };
+  webrick = {
+    version = "1.3.1";
+    source = {
+      type = "gem";
+      sha256 = "0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g";
+    };
+  };
+}
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 7a4a053d4ae..f8cd73605ca 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "riemann-${version}";
-  version = "0.2.7";
+  version = "0.2.8";
 
   src = fetchurl {
     url = "http://aphyr.com/riemann/${name}.tar.bz2";
-    sha256 = "1hnjikm24jlfi5qav7gam078k5gynca36xbxr3b3lbhw17kyknwg";
+    sha256 = "1p2pdkxy2xc5zlj6kadf4z8l0f0r4bvdgipqf52193l7rdm6dfzm";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index ac8547195d7..d3dca7e88ae 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -19,6 +19,7 @@
 , aacSupport ? true, faad2
 , pulseaudioSupport ? true, pulseaudio
 , jackSupport ? true, jack2
+, gmeSupport ? true, game-music-emu
 , icuSupport ? true, icu
 }:
 
@@ -26,13 +27,13 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.19";
-  minor = "6";
+  minor = "8";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${major}.${minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz";
-    sha256 = "023h2d9x4yg1z2glnwf8h2j0p1xhn1hb0wf02mg70j3p0bz63imj";
+    sha256 = "1qifgc20cawhjxj7skn5xg23526i15hmav56wmd7cfxv50kq4j91";
   };
 
   buildInputs = [ pkgconfig glib boost ]
@@ -59,6 +60,7 @@ in stdenv.mkDerivation rec {
     ++ opt zipSupport zziplib
     ++ opt pulseaudioSupport pulseaudio
     ++ opt jackSupport jack2
+    ++ opt gmeSupport game-music-emu
     ++ opt icuSupport icu;
 
   configureFlags =
@@ -85,6 +87,7 @@ in stdenv.mkDerivation rec {
       (mkFlag jackSupport "jack")
       (mkFlag stdenv.isDarwin "osx")
       (mkFlag icuSupport "icu")
+      (mkFlag gmeSupport "gme")
       "--enable-debug"
     ]
     ++ opt stdenv.isLinux
diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/default.nix
index fd263cad5d5..6d2f5ed91ca 100644
--- a/pkgs/servers/nosql/cassandra/default.nix
+++ b/pkgs/servers/nosql/cassandra/default.nix
@@ -8,13 +8,13 @@
 , getopt
 }:
 
-let version = "2.1.0";
+let version = "2.1.2";
 in stdenv.mkDerivation rec {
   name = "cassandra-${version}";
 
   src = fetchurl {
     url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
-    sha256 = "da99c4ebc8de925dc6b493443b70d2183cf3090b1aad6b6b918efa9565f264dd";
+    sha256 = "1glpv3d1c63ccqnfjzz76cxb508qyvbgva26h5j7k8dd5av84lcr";
   };
 
   buildInputs = [ makeWrapper ];
@@ -34,10 +34,11 @@ in stdenv.mkDerivation rec {
     wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://cassandra.apache.org/;
     description = "A massively scalable open source NoSQL database";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.asl20;
+    platforms = with platforms; all;
+    license = with licenses; asl20;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/servers/nosql/influxdb/backup.nix b/pkgs/servers/nosql/influxdb/backup.nix
new file mode 100644
index 00000000000..89cc1100414
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb/backup.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, go, fetchgit }:
+
+stdenv.mkDerivation rec {
+  version = "4556edb";
+  name = "influxdb-backup-${version}";
+
+  src = import ./deps.nix {
+    inherit stdenv lib fetchgit;
+  };
+
+  buildInputs = [ go ];
+
+  buildPhase = ''
+    export GOPATH=$src
+    go build -v -o influxdb-dump github.com/eckardt/influxdb-backup/influxdb-dump
+    go build -v -o influxdb-restore github.com/eckardt/influxdb-backup/influxdb-restore
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv influxdb-dump $out/bin
+    mv influxdb-restore $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Backup and Restore for InfluxDB";
+    homepage = https://github.com/eckardt/influxdb-backup;
+    maintainers = with maintainers; [ offline ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/nosql/influxdb/deps.nix b/pkgs/servers/nosql/influxdb/deps.nix
new file mode 100644
index 00000000000..faafafc2bba
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb/deps.nix
@@ -0,0 +1,35 @@
+# This file was generated by go2nix.
+{ stdenv, lib, fetchgit }:
+
+let
+  goDeps = [
+    {
+      root = "github.com/eckardt/influxdb-backup";
+      src = fetchgit {
+        url = https://github.com/eckardt/influxdb-backup.git;
+        rev = "4556edbffa914a8c17fa1fa1564962a33c6c7596";
+        sha256 = "2928063e6dfe4be7b69c8e72e4d6a5fc557f0c75e9625fadf607d59b8e80e34b";
+      };
+    }
+    {
+      root = "github.com/eckardt/influxdb-go";
+      src = fetchgit {
+        url = https://github.com/eckardt/influxdb-go.git;
+        rev = "8b71952efc257237e077c5d0672e936713bad38f";
+        sha256 = "5318c7e1131ba2330c90a1b67855209e41d3c77811b1d212a96525b42d391f6e";
+      };
+    }
+  ];
+
+in
+
+stdenv.mkDerivation rec {
+  name = "go-deps";
+
+  buildCommand =
+    lib.concatStrings
+      (map (dep: ''
+              mkdir -p $out/src/`dirname ${dep.root}`
+              ln -s ${dep.src} $out/src/${dep.root}
+            '') goDeps);
+}
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index b9c2e83d582..833a17246fc 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "redis-2.8.17";
+  name = "redis-2.8.19";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "19rnwapbsvfhd9pwdjdshrpqimf1ms0pzakvgnjrywkijmiwrisk";
+    sha256 = "29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145";
   };
 
   makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
new file mode 100644
index 00000000000..ef01a3976bc
--- /dev/null
+++ b/pkgs/servers/owncloud/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name= "owncloud-${version}";
+  version = "7.0.4";
+
+  src = fetchurl {
+    url = "https://download.owncloud.org/community/${name}.tar.bz2";
+    sha256 = "0djgqdyxkrh1wc4sn21fmdjr09dkmnjm3gs6lbkp6yn5fpbzhybi";
+  };
+
+  installPhase =
+    ''
+      mkdir -p $out
+      find . -maxdepth 1 -execdir cp -r '{}' $out \;
+
+      substituteInPlace $out/lib/base.php \
+        --replace 'OC_Config::$object = new \OC\Config(self::$configDir);' \
+                  'self::$configDir = getenv("OC_CONFIG_PATH"); OC_Config::$object = new \OC\Config(self::$configDir);'
+    '';
+
+  meta = {
+    description = "An enterprise file sharing solution for online collaboration and storage";
+    homepage = https://owncloud.org;
+    maintainers = with stdenv.lib.maintainers; [ matejc ];
+    license = stdenv.lib.licenses.agpl3Plus;
+  };
+
+}
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 307993a958a..307993a958a 100755..100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
new file mode 100644
index 00000000000..da797005be4
--- /dev/null
+++ b/pkgs/shells/mksh/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, groff }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "mksh-${version}";
+  version = "R50d";
+
+  src = fetchurl {
+    urls = [
+      "http://www.mirbsd.org/MirOS/dist/mir/mksh/${name}.tgz"
+      "http://pub.allbsd.org/MirOS/dist/mir/mksh/${name}.tgz"
+    ];
+    sha256 = "10prcdffwziksq9sw96c1r09h4kg2zwznybrggzmjfa6l4k8h9m2";
+  };
+
+  buildInputs = [ groff ];
+
+  buildPhase = ''
+    mkdir build-dir/
+    cp mksh.1 dot.mkshrc build-dir/
+    cd build-dir/
+    sh ../Build.sh -c lto
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1 $out/share/mksh $out/bin
+    install -D -m 755 mksh $out/bin/mksh
+    install -D -m 644 mksh.1 $out/share/man/man1/mksh.1
+    install -D -m 644 mksh.cat1 $out/share/mksh/mksh.cat1
+    install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc
+  '';
+
+  meta = {
+    description = "MirBSD Korn Shell";
+    longDescription = ''
+      The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI
+      approved) successor to pdksh, developed as part of the MirOS
+      Project as native Bourne/POSIX/Korn shell for MirOS BSD, but
+      also to be readily available under other UNIX(R)-like operating
+      systems.
+    '';
+    homepage = "https://www.mirbsd.org/mksh.htm";
+    licenses = "custom";
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 53940d21119..086c0b45706 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -16,6 +16,41 @@ let
 
   allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
 
+  whitelist = config.whitelistedLicenses or [];
+  blacklist = config.blacklistedLicenses or [];
+
+  onlyLicenses = list:
+    lib.lists.all (license:
+      let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
+      if license == l then true else
+        throw ''‘${builtins.toJSON license}’ is not an attribute of lib.licenses''
+    ) list;
+
+  mutuallyExclusive = a: b:
+    (builtins.length a) == 0 ||
+    (!(builtins.elem (builtins.head a) b) &&
+     mutuallyExclusive (builtins.tail a) b);
+
+  areLicenseListsValid =
+    if mutuallyExclusive whitelist blacklist then
+      assert onlyLicenses whitelist; assert onlyLicenses blacklist; true
+    else
+      throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive.";
+
+  hasLicense = attrs:
+    builtins.hasAttr "meta" attrs && builtins.hasAttr "license" attrs.meta;
+
+  hasWhitelistedLicense = assert areLicenseListsValid; attrs:
+    hasLicense attrs && builtins.elem attrs.meta.license whitelist;
+
+  hasBlacklistedLicense = assert areLicenseListsValid; attrs:
+    hasLicense attrs && builtins.elem attrs.meta.license blacklist;
+
+  allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
+
+  isUnfree = licenses: lib.lists.any (l:
+    !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
+
   # Alow granular checks to allow only some unfree packages
   # Example:
   # {pkgs, ...}:
@@ -25,13 +60,17 @@ let
   # }
   allowUnfreePredicate = config.allowUnfreePredicate or (x: false);
 
-  allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
+  # Check whether unfree packages are allowed and if not, whether the
+  # package has an unfree license and is not explicitely allowed by the
+  # `allowUNfreePredicate` function.
+  hasDeniedUnfreeLicense = attrs:
+    !allowUnfree &&
+    hasLicense attrs &&
+    isUnfree (lib.lists.toList attrs.meta.license) &&
+    !allowUnfreePredicate attrs;
 
   unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null);
 
-  isUnfree = licenses: lib.lists.any (l:
-    !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
-
   defaultNativeBuildInputs = extraBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
@@ -54,24 +93,33 @@ let
       pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
 
       throwEvalHelp = unfreeOrBroken: whatIsWrong:
-        assert (unfreeOrBroken == "Unfree" || unfreeOrBroken == "Broken");
-        throw ''
-          Package ‘${attrs.name}’ in ${pos'} ${whatIsWrong}, refusing to evaluate.
+        assert builtins.elem unfreeOrBroken ["Unfree" "Broken" "blacklisted"];
+
+        throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos'} ${whatIsWrong}, refusing to evaluate."
+        + (lib.strings.optionalString (unfreeOrBroken != "blacklisted") ''
+
           For `nixos-rebuild` you can set
             { nixpkgs.config.allow${unfreeOrBroken} = true; }
           in configuration.nix to override this.
           For `nix-env` you can add
             { allow${unfreeOrBroken} = true; }
           to ~/.nixpkgs/config.nix.
-        '';
+        ''));
+
+      licenseAllowed = attrs:
+        if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then
+          throwEvalHelp "Unfree" "has an unfree license ‘${builtins.toJSON attrs.meta.license}’ which is not whitelisted"
+        else if hasBlacklistedLicense attrs then
+          throwEvalHelp "blacklisted" "has the ‘${builtins.toJSON attrs.meta.license}’ license which is blacklisted"
+        else if !allowBroken && attrs.meta.broken or false then
+          throwEvalHelp "Broken" "is marked as broken"
+        else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
+          throwEvalHelp "Broken" "is not supported on ‘${result.system}’"
+        else true;
+
     in
-    if !allowUnfree && isUnfree (lib.lists.toList attrs.meta.license or []) && !allowUnfreePredicate attrs then
-      throwEvalHelp "Unfree" "has an unfree license"
-    else if !allowBroken && attrs.meta.broken or false then
-      throwEvalHelp "Broken" "is marked as broken"
-    else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
-      throwEvalHelp "Broken" "is not supported on ‘${result.system}’"
-    else
+      assert licenseAllowed attrs;
+
       lib.addPassthru (derivation (
         (removeAttrs attrs ["meta" "passthru" "crossAttrs"])
         // (let
diff --git a/pkgs/tools/X11/xdg-utils/0001-xdg-open-recognize-KDE_SESSION_VERSION.patch b/pkgs/tools/X11/xdg-utils/0001-xdg-open-recognize-KDE_SESSION_VERSION.patch
new file mode 100644
index 00000000000..e7dcf291867
--- /dev/null
+++ b/pkgs/tools/X11/xdg-utils/0001-xdg-open-recognize-KDE_SESSION_VERSION.patch
@@ -0,0 +1,25 @@
+From 2059662f6bd5de59144d6825d93cb5783110cd97 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 24 Jan 2015 17:07:50 -0600
+Subject: [PATCH] xdg-open: recognize KDE_SESSION_VERSION
+
+---
+ scripts/xdg-open | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-open b/scripts/xdg-open
+index b8db0aa..9fcf458 100755
+--- a/scripts/xdg-open
++++ b/scripts/xdg-open
+@@ -341,7 +341,7 @@ open_kde()
+     if kde-open -v 2>/dev/null 1>&2; then
+         kde-open "$1"
+     else
+-        if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
++        if [ $KDE_SESSION_VERSION -gt 3 ]; then
+             kfmclient openURL "$1"
+         else
+             kfmclient exec "$1"
+-- 
+2.1.4
+
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index a0b3283bb04..3e4615609e0 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv";
   };
 
+  patches = [ ./0001-xdg-open-recognize-KDE_SESSION_VERSION.patch ];
+
   postInstall = ''
     substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file
   '';
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 7148ca62027..cf58ab7890c 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -32,7 +32,6 @@ let
     chroma = enableAcoustid;
     discogs = enableDiscogs;
     echonest = enableEchonest;
-    echonest_tempo = enableEchonest;
     fetchart = enableFetchart;
     lastgenre = enableLastfm;
     lastimport = enableLastfm;
@@ -46,8 +45,8 @@ let
     "bench" "bpd" "bpm" "bucket" "convert" "duplicates" "embedart" "freedesktop"
     "fromfilename" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds"
     "info" "inline" "keyfinder" "lyrics" "mbcollection" "mbsync" "missing"
-    "play" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types"
-    "zero"
+    "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist"
+    "spotify" "the" "types" "zero"
   ];
 
   enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
@@ -55,22 +54,19 @@ let
   allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins;
   allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
 
-  # Discogs plugin wants to have an API token, so skip install checks.
-  allTestablePlugins = remove "discogs" allEnabledPlugins;
-
   testShell = "${bashInteractive}/bin/bash --norc";
   completion = "${bashCompletion}/share/bash-completion/bash_completion";
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.9";
+  version = "1.3.10";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "1srhkiyjqx6i3gn20ihf087l5pa77yh5b81ivc52lj491fda7xqk";
+    sha256 = "136rvzpygjym6hxq19qwiri5jxx718bbmi471mvc3vibrb7xj1sr";
   };
 
   propagatedBuildInputs = [
@@ -104,9 +100,7 @@ in buildPythonPackage rec {
   ];
 
   patches = [
-    ./mediafile-codec-fix.patch
     ./replaygain-default-audiotools.patch
-    ./test-bucket-fix-year.patch
   ];
 
   postPatch = ''
@@ -158,10 +152,7 @@ in buildPythonPackage rec {
     EDITOR="${writeScript "beetconfig.sh" ''
       #!${stdenv.shell}
       cat > "$1" <<CFG
-      plugins: ${concatStringsSep " " allTestablePlugins}
-      musicbrainz:
-        user: dummy
-        pass: dummy
+      plugins: ${concatStringsSep " " allEnabledPlugins}
       CFG
     ''}" HOME="$tmphome" "$out/bin/beet" config -e
     EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
diff --git a/pkgs/tools/audio/beets/mediafile-codec-fix.patch b/pkgs/tools/audio/beets/mediafile-codec-fix.patch
deleted file mode 100644
index 7eaa5e19590..00000000000
--- a/pkgs/tools/audio/beets/mediafile-codec-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 903e88a228d6bd93bd1884c59dd23dd9f04a1199 Mon Sep 17 00:00:00 2001
-From: Adrian Sampson <adrian@radbox.org>
-Date: Wed, 26 Nov 2014 19:04:40 -0800
-Subject: [PATCH] Fix codec reference in MediaFile (fix #1117)
-
----
- beets/mediafile.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/beets/mediafile.py b/beets/mediafile.py
-index ce42621..a459e09 100644
---- a/beets/mediafile.py
-+++ b/beets/mediafile.py
-@@ -1340,8 +1340,9 @@ def __init__(self, path, id3v23=False):
-             raise FileTypeError(path)
-         elif (type(self.mgfile).__name__ == 'M4A' or
-               type(self.mgfile).__name__ == 'MP4'):
--            if hasattr(self.mgfile.info, 'codec'):
--                if self.mgfile.codec and self.mgfile.codec.startswith('alac'):
-+            info = self.mgfile.info
-+            if hasattr(info, 'codec'):
-+                if info.codec and info.codec.startswith('alac'):
-                     self.type = 'alac'
-                 else:
-                     self.type = 'aac'
diff --git a/pkgs/tools/audio/beets/test-bucket-fix-year.patch b/pkgs/tools/audio/beets/test-bucket-fix-year.patch
deleted file mode 100644
index 967476006a8..00000000000
--- a/pkgs/tools/audio/beets/test-bucket-fix-year.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 80038e2a3fe6f5ac174a30f6fd01ebf8dd63e414 Mon Sep 17 00:00:00 2001
-From: Fabrice Laporte <kraymer@gmail.com>
-Date: Sat, 3 Jan 2015 23:03:29 +0100
-Subject: [PATCH] test_bucket: update test_year_single_year
-
-2015 was used as an example of date outside of [1970-current year] intervall which is not true anymore
----
- test/test_bucket.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_bucket.py b/test/test_bucket.py
-index 4610ec7..060c360 100644
---- a/test/test_bucket.py
-+++ b/test/test_bucket.py
-@@ -51,7 +51,7 @@ def test_year_single_year_last_folder(self):
-         year."""
-         self._setup_config(bucket_year=['1950', '1970'])
-         self.assertEqual(self.plugin._tmpl_bucket('2014'), '1970')
--        self.assertEqual(self.plugin._tmpl_bucket('2015'), '2015')
-+        self.assertEqual(self.plugin._tmpl_bucket('2025'), '2025')
- 
-     def test_year_two_years(self):
-         """Buckets can be named with the 'from-to' syntax."""
diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix
new file mode 100644
index 00000000000..bc3eaf9bf53
--- /dev/null
+++ b/pkgs/tools/audio/dir2opus/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, python, mutagen, wrapPython, opusTools }:
+
+let version = "0.12.1"; in
+stdenv.mkDerivation rec {
+  name = "dir2opus-${version}";
+
+  pythonPath = [ mutagen ];
+  buildInputs = [ wrapPython ];
+  propagatedBuildInputs = [ opusTools ];
+
+  src = fetchurl {
+    url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz";
+    name = "${name}.tar.gz";
+    sha256 = "1d6x3qfcj5lfmc8gzna1vrr7fl31i86ha8l4nz5987rx57fgwf0q";
+  };
+
+  postPatch = "sed -i -e 's|#!/usr/bin/python|#!${python}/bin/python|' dir2opus";
+
+  installPhase =
+    ''
+      mkdir -p $out/bin $out/share/man/man1
+      cp dir2opus $out/bin
+      cp dir2opus.1 $out/share/man/man1
+    '';
+
+  postFixup = "wrapPythonPrograms";
+
+  meta = with stdenv.lib;
+    { homepage = https://github.com/ehmry/dir2opus;
+      maintainers = [ maintainers.emery ];
+      license = licenses.gpl2;
+    };
+}
\ No newline at end of file
diff --git a/pkgs/tools/audio/mpdcron/Gemfile b/pkgs/tools/audio/mpdcron/Gemfile
new file mode 100644
index 00000000000..e0814bc4dda
--- /dev/null
+++ b/pkgs/tools/audio/mpdcron/Gemfile
@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "nokogiri"
diff --git a/pkgs/tools/audio/mpdcron/Gemfile.lock b/pkgs/tools/audio/mpdcron/Gemfile.lock
new file mode 100644
index 00000000000..e97aaf669f7
--- /dev/null
+++ b/pkgs/tools/audio/mpdcron/Gemfile.lock
@@ -0,0 +1,12 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    mini_portile (0.6.2)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  nokogiri
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index a772feca5c5..d368ee321af 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -1,7 +1,14 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon
-, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify, pandoc }:
+{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon, buildRubyGem
+, mpd_clientlib, curl, sqlite, ruby, bundlerEnv, libnotify, pandoc }:
 
-stdenv.mkDerivation rec {
+let
+  gemEnv = bundlerEnv {
+    name = "mpdcron-bundle";
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+in stdenv.mkDerivation rec {
   version = "20130809";
   name    = "mpdcron-${version}";
 
@@ -21,7 +28,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ autoconf automake libtool pkgconfig glib libdaemon pandoc
-      mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ];
+      mpd_clientlib curl sqlite ruby gemEnv libnotify ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/tools/audio/mpdcron/gemset.nix b/pkgs/tools/audio/mpdcron/gemset.nix
new file mode 100644
index 00000000000..6587603fb5b
--- /dev/null
+++ b/pkgs/tools/audio/mpdcron/gemset.nix
@@ -0,0 +1,19 @@
+{
+  "mini_portile" = {
+    version = "0.6.2";
+    source = {
+      type = "gem";
+      sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w";
+    };
+  };
+  "nokogiri" = {
+    version = "1.6.5";
+    source = {
+      type = "gem";
+      sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l";
+    };
+    dependencies = [
+      "mini_portile"
+    ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
new file mode 100644
index 00000000000..85a544ccd4c
--- /dev/null
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -0,0 +1,115 @@
+{ stdenv, fetchurl
+, unzip, gnu-efi, efibootmgr, dosfstools, imagemagick }:
+
+assert (stdenv.system == "x86_64-linux" ||stdenv.system == "i686-linux");
+
+stdenv.mkDerivation rec {
+
+  name = "refind-${version}";
+  srcName = "refind-src-${version}";
+  version = "0.8.4";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/refind/${version}/${srcName}.zip";
+    sha256 = "09g6x41fc7vvwv2y9kggjmazyhdvkn8qr02v769x33f20bfiz2zc";
+  };
+
+  buildInputs = [ unzip gnu-efi efibootmgr dosfstools imagemagick ];
+
+  HOSTARCH =
+    if stdenv.system == "x86_64-linux" then "x64"
+    else if stdenv.system == "i686-linux" then "ia32" else "null";
+
+  patchPhase = ''
+    sed -e 's|-DEFI_FUNCTION_WRAPPER|-DEFI_FUNCTION_WRAPPER -maccumulate-outgoing-args|g' -i Make.common
+    sed -e 's|-DEFIX64|-DEFIX64 -maccumulate-outgoing-args|g' -i Make.common
+    sed -e 's|-m64|-maccumulate-outgoing-args -m64|g' -i filesystems/Make.gnuefi
+  '';
+
+  buildPhase = ''
+    make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib  EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/elf_x86_64_efi.lds gnuefi fs_gnuefi
+  '';
+
+  installPhase = ''
+    install -d $out/bin/
+    install -d $out/share/refind/drivers_${HOSTARCH}/
+    install -d $out/share/refind/tools_${HOSTARCH}/
+    install -d $out/share/refind/docs/html/
+    install -d $out/share/refind/docs/Styles/
+    install -d $out/share/refind/fonts/
+    install -d $out/share/refind/icons/
+    install -d $out/share/refind/images/
+    install -d $out/share/refind/keys/
+
+    # refind uefi app
+    install -D -m0644 refind/refind_${HOSTARCH}.efi $out/share/refind/refind_${HOSTARCH}.efi
+
+    # uefi drivers
+    install -D -m0644 drivers_${HOSTARCH}/*.efi $out/share/refind/drivers_${HOSTARCH}/
+
+    # uefi apps
+    install -D -m0644 gptsync/gptsync_${HOSTARCH}.efi $out/share/refind/tools_${HOSTARCH}/gptsync_${HOSTARCH}.efi
+
+    # helper scripts
+    install -D -m0755 install.sh $out/bin/refind-install
+    install -D -m0755 mkrlconf.sh $out/bin/refind-mkrlconf
+    install -D -m0755 mvrefind.sh $out/bin/refind-mvrefind
+    install -D -m0755 fonts/mkfont.sh $out/bin/refind-mkfont
+
+    # sample config files
+    install -D -m0644 refind.conf-sample $out/share/refind/refind.conf-sample
+
+    # docs
+    install -D -m0644 docs/refind/* $out/share/refind/docs/html/
+    install -D -m0644 docs/Styles/* $out/share/refind/docs/Styles/
+    install -D -m0644 README.txt $out/share/refind/docs/README.txt
+    install -D -m0644 NEWS.txt $out/share/refind/docs/NEWS.txt
+    install -D -m0644 BUILDING.txt $out/share/refind/docs/BUILDING.txt
+    install -D -m0644 CREDITS.txt $out/share/refind/docs/CREDITS.txt
+
+    # fonts
+    install -D -m0644 fonts/* $out/share/refind/fonts/
+    rm -f $out/share/refind/fonts/mkfont.sh
+
+    # icons
+    install -D -m0644 icons/* $out/share/refind/icons/
+
+    # images
+    install -D -m0644 images/*.{png,bmp} $out/share/refind/images/
+
+    # keys
+    install -D -m0644 keys/* $out/share/refind/keys/
+
+    # fix sharp-bang paths
+    patchShebangs $out/bin/refind-*
+
+    # Post-install fixes
+    sed -e "s|^ThisDir=.*|ThisDir=$out/share/refind/|g" -i $out/bin/refind-install
+    sed -e "s|^RefindDir=.*|RefindDir=$out/share/refind/|g" -i $out/bin/refind-install
+    sed -e "s|^ThisScript=.*|ThisScript=$out/bin/refind-install|g" -i $out/bin/refind-install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A graphical {,U}EFI boot manager";
+    longDescription = ''
+      rEFInd is a graphical boot manager for EFI- and UEFI-based
+      computers, such as all Intel-based Macs and recent (most 2011
+      and later) PCs. rEFInd presents a boot menu showing all the EFI
+      boot loaders on the EFI-accessible partitions, and optionally
+      BIOS-bootable partitions on Macs. EFI-compatbile OSes, including
+      Linux, provide boot loaders that rEFInd can detect and
+      launch. rEFInd can launch Linux EFI boot loaders such as ELILO,
+      GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI stub
+      support. EFI filesystem drivers for ext2/3/4fs, ReiserFS, HFS+,
+      and ISO-9660 enable rEFInd to read boot loaders from these
+      filesystems, too. rEFInd's ability to detect boot loaders at
+      runtime makes it very easy to use, particularly when paired with
+      Linux kernels that provide EFI stub support.
+    '';
+    homepage = http://refind.sourceforge.net/;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+
+}
+# TODO: detect CPU host architecture (HOSTARCH can be ia32 or x64)
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 6f7cf5b987a..c89909503d5 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, valgrind }:
 
 stdenv.mkDerivation rec {
   # The r127 source still calls itself r126 everywhere, but I'm not going to
@@ -11,10 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "0hvbbr07j4hfix4dn4xw4fsmkr5s02bj596fn0i15d1i49xby2aj";
   };
 
+  # valgrind is required only by `make test`
+  buildInputs = [ valgrind ];
+
   enableParallelBuilding = true;
 
   makeFlags = "PREFIX=$(out)";
 
+  doCheck = true;
+  checkTarget = "test";
+
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";
     longDescription = ''
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index ff6279973d1..df6b21956d9 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, zlib, utillinux }:
 
 let name = "pigz";
-    version = "2.3.1";
+    version = "2.3.3";
 in
 stdenv.mkDerivation {
   name = name + "-" + version;
 
   src = fetchurl {
     url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";
-    sha256 = "0m5gw134wfqy1wwqzla0f6c88bxys1sq5gs22zrphf9a8bjhr6v2";
+    sha256 = "172hdf26k4zmm7z8md7nl0dph2a7mhf3x7slb9bhfyff6as6g2sf";
   };
 
   buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
new file mode 100644
index 00000000000..1a9a09aaa50
--- /dev/null
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, fuse, xz }:
+
+stdenv.mkDerivation rec {
+  name = "avfs-${version}";
+  version = "1.0.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
+    sha1 = "e4f8377ea2565c1ac59f7b66893905b778ddf849";
+  };
+
+  buildInputs = [ pkgconfig fuse xz ];
+
+  configureFlags = [
+    "--enable-library"
+    "--enable-fuse"
+    "--disable-static"
+  ];
+
+  meta = {
+    homepage = http://avf.sourceforge.net/;
+    description = "Virtual filesystem that allows browsing of compressed files";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix
new file mode 100644
index 00000000000..a767ba36b3f
--- /dev/null
+++ b/pkgs/tools/filesystems/exfat-utils/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, scons }:
+
+let version = "1.1.1"; in
+stdenv.mkDerivation rec {
+  name = "exfat-utils-${version}";
+
+  src = fetchurl {
+    sha256 = "0ck2snhlhp965bb9a4y1g2lpl979sw1yznm79wbavyv174458i66";
+    url = "https://docs.google.com/uc?export=download&id=0B7CLI-REKbE3UzNtSkRvdHBpdjQ";
+    name = "${name}.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Free exFAT file system utilities";
+    longDescription = ''
+      Full-featured exFAT file system implementation for GNU/Linux and other
+      Unix-like systems.
+    '';
+    homepage = https://code.google.com/p/exfat;
+    license = with licenses; gpl2Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ scons ];
+
+  buildPhase = ''
+    export CCFLAGS="-std=c99"
+    mkdir -pv $out/sbin
+    scons DESTDIR=$out/sbin install
+  '';
+
+  installPhase = ":";
+}
diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix
index 093b01bb141..983228e9de5 100644
--- a/pkgs/tools/filesystems/fuse-exfat/default.nix
+++ b/pkgs/tools/filesystems/fuse-exfat/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, fuse, scons }:
 
 stdenv.mkDerivation rec {
-  name = "fuse-exfat-1.0.1";
+  name = "fuse-exfat-1.1.0";
 
   src = fetchurl {
-    url = "http://exfat.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0n27hpi45lj9hpi7k8d7npiwyhasf1v832g7ckpknd6lnyhipb0j";
+    sha256 = "0glmgwrf0nv09am54i6s35ksbvrywrwc51w6q32mv5by8475530r";
+    url = "https://docs.google.com/uc?export=download&id=0B7CLI-REKbE3VTdaa0EzTkhYdU0";
+    name = "${name}.tar.gz";
   };
 
   buildInputs = [ pkgconfig fuse scons ];
@@ -19,11 +20,12 @@ stdenv.mkDerivation rec {
 
   installPhase = ":";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://code.google.com/p/exfat/;
     description = "A FUSE-based filesystem that allows read and write access to exFAT devices";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2;
+    platforms = with platforms; linux;
+    license = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }
 
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index 3e3bab80960..0984d917e52 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation {
-  name = "gifsicle-1.86";
+  name = "gifsicle-1.87";
 
   src = fetchurl {
-    url = http://www.lcdf.org/gifsicle/gifsicle-1.86.tar.gz;
-    sha256 = "153knkff04wh1szbmqklyq371m9whib007j0lq0dwh4jc5g6s15h";
+    url = http://www.lcdf.org/gifsicle/gifsicle-1.87.tar.gz;
+    sha256 = "078rih7gq86ixjqbnn5z1jsh11qlfisw6k8dxaccsh5amhybw2j7";
   };
 
   buildInputs = optional gifview [ xproto libXt libX11 ];
diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix
new file mode 100644
index 00000000000..81222cde2ed
--- /dev/null
+++ b/pkgs/tools/graphics/nip2/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome,
+fftw, gsl, goffice_0_8, libgsf }:
+
+stdenv.mkDerivation rec {
+  name = "nip2-7.42.1";
+
+  src = fetchurl {
+    url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
+    sha256 = "14lfyn0azswrz8r81ign9lbpxzk7ibmnnp03a3l8wgxvm2j9a7jl";
+  };
+
+  buildInputs =
+  [ pkgconfig glib libxml2 flex bison vips
+    gnome.gtk fftw gsl goffice_0_8 libgsf
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.vips.ecs.soton.ac.uk;
+    description = "Graphical user interface for VIPS image processing system";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ kovirobi ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix
new file mode 100644
index 00000000000..c4fc91edad4
--- /dev/null
+++ b/pkgs/tools/graphics/pgf/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }:
+
+with stdenv.lib;
+
+let
+  version = "6.14.12";
+in
+stdenv.mkDerivation {
+  name = "pgf-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz";
+    sha256 = "1vfm12cfq3an3xg0679bcwdmjq2x1bbij1iwsmm60hwmrm3zvab0";
+  };
+
+  buildInputs = [ autoconf automake libtool dos2unix libpgf freeimage doxygen ];
+
+  patchPhase = ''
+      sed 1i'#include <inttypes.h>' -i src/PGF.cpp
+      sed s/__int64/int64_t/g -i src/PGF.cpp
+  '';
+
+  preConfigure = "dos2unix configure.ac; sh autogen.sh";
+
+# configureFlags = optional static "--enable-static --disable-shared";
+
+  meta = {
+    homepage = http://www.libpgf.org/;
+    description = "Progressive Graphics Format command line program";
+    license = stdenv.lib.licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index 79902582ff4..668f86b8333 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.77";
+  name = "pngcrush-1.7.82";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "0404275rb6934aiwrysgapg0irbimcb2y8giqlc63gfspnvy67fa";
+    sha256 = "1cxg0a6x7sq0dh9ia8isgx3awwx1db96wq4n22rs31sm3niiw0fl";
   };
 
   configurePhase = ''
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
new file mode 100644
index 00000000000..28b65da24a5
--- /dev/null
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome,
+  fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif,
+  python27, libpng, matio ? null, cfitsio ? null, libwebp ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "vips-7.42.1";
+
+  src = fetchurl {
+    url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
+    sha256 = "1gvazsyfa8w9wdwz89rpa1xmfpyk3b0cp4kkila1r9jc3sqp5qjy";
+  };
+
+  buildInputs =
+    [ pkgconfig glib libxml2 fftw orc lcms
+      imagemagick openexr libtiff libjpeg
+      libgsf libexif python27 libpng
+    ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.vips.ecs.soton.ac.uk;
+    description = "Image processing system for large images";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ kovirobi ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix
new file mode 100644
index 00000000000..409297de9f7
--- /dev/null
+++ b/pkgs/tools/misc/ccze/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, autoconf, ncurses, pcre }:
+
+stdenv.mkDerivation rec {
+  name = "ccze-0.2.1-2";
+
+  src = fetchurl {
+    url = "https://github.com/madhouse/ccze/archive/${name}.tar.gz";
+    sha256 = "1amavfvyls4v0gnikk43n2rpciaspxifgrmvi99qj6imv3mfg66n";
+  };
+
+  buildInputs = [ autoconf ncurses pcre ];
+
+  preConfigure = '' autoheader && autoconf '';
+
+  meta = with stdenv.lib; {
+    description = "Fast, modular log colorizer";
+    longDescription = ''
+      Fast log colorizer written in C, intended to be a drop-in replacement
+      for the Perl colorize tool.  Includes plugins for a variety of log
+      formats (Apache, Postfix, Procmail, etc.).
+    '';
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ malyn ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
new file mode 100644
index 00000000000..9c32d3c5466
--- /dev/null
+++ b/pkgs/tools/misc/clex/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, ncurses }:
+
+let version = "4.6.patch6"; in
+stdenv.mkDerivation rec {
+  name = "clex-${version}";
+
+  src = fetchurl {
+    sha256 = "0bqa2hc9721d62cfsy5c7a5pzgh9b4px7g4q60xlybkwll19qbbp";
+    url = "${meta.homepage}/download/${name}.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    description = "File manager with full-screen terminal interface";
+    longDescription = ''
+      CLEX (pronounced KLEKS) displays directory contents including the file
+      status details and provides features like command history, filename
+      insertion, or name completion in order to help users to create commands
+      to be executed by the shell. There are no built-in commands, CLEX is an
+      add-on to your favorite shell.
+    '';
+    homepage = http://www.clex.sk;
+    license = with licenses; gpl2Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ ncurses ];
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 834dfcb7e3a..3b14e46d0d3 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -14,7 +14,7 @@ let
     };
     patches = [
       (fetchurl {
-       url = "http://ftp.de.debian.org/debian/pool/main/m/makedev/makedev_2.3.1-89.diff.gz";
+       url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-89.diff.gz";
        sha256 = "1zbifw2jkq6471fb67y893nq4lq009xbfbi57jbjwxnhqmrppcy9";
        })
     ];
@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation {
 
-  name = "debootstrap-1.0.64";
+  name = "debootstrap-1.0.66";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
-    url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.64.tar.xz;
-    sha256 = "0yrdgggqgb7g1h677zipaxs17iyw4fmnmhh0l5n17d8x39pqjkd8";
+    url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.66.tar.gz;
+    sha256 = "15gh6pvk7f0fib8ggz2zx53pg2jzqk4x0s8ihkpqxqdf4rlns91k";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
new file mode 100644
index 00000000000..d6ad7f1d26b
--- /dev/null
+++ b/pkgs/tools/misc/ent/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "ent-1.1";
+
+  src = fetchurl {
+    url = "http://www.fourmilab.ch/random/random.zip";
+    sha256 = "1v39jlj3lzr5f99avzs2j2z6anqqd64bzm1pdf6q84a5n8nxckn1";
+  };
+
+  # Work around the "unpacker appears to have produced no directories"
+  # case that happens when the archive doesn't have a subdirectory.
+  setSourceRoot = "sourceRoot=`pwd`";
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ent $out/bin/
+  '';
+
+  meta = {
+    description = "Pseudorandom Number Sequence Test Program";
+    homepage = http://www.fourmilab.ch/random/;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 2ced43d29cb..e29c5effbdb 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ethtool-3.16";
+  name = "ethtool-3.18";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "11m2ghjgnbjbvxamgjkr94cw9sz1znla8rkw923svhq4m4zxvq6n";
+    sha256 = "1xj20fr44dk01hghyy5sq962sbiywc88ni3qqliv8bfxzmczwgw1";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 68f826a9d93..941aa756420 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation {
   preConfigure = ''
     sed -i "s|/usr/|$out/|" Makefile 
   '';
+
+  preBuild = ''
+    makeFlagsArray=("CC=$CC" "REGEXDEFS=-DHAVE_REGEX_H -DPOSIX_REGEX" "LDFLAGS=")
+  '';
   
   postInstall = ''
     ln -s $out/games/fortune $out/bin/fortune
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index cc07ac95db8..e4557e6ae0b 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig, gtkmm, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.19.1";
+  name = "gparted-0.21.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gparted/${name}.tar.bz2";
-    sha256 = "1x0mbks94jpzphb8hm8w0iqjrn665jkdm4qnzrvxrnvy0x3m2fwd";
+    sha256 = "1ab56pplnlnqnhvvgfx1s47g9iz78sb048xlwv7v7hzzx16c73rr";
   };
 
   configureFlags = "--disable-doc";
@@ -17,10 +17,16 @@ stdenv.mkDerivation rec {
 
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Graphical disk partitioning tool";
+    longDescription = ''
+      GNOME Partition Editor for creating, reorganizing, and deleting disk
+      partitions. GParted enables you to change the partition organization
+      while preserving the partition contents.
+    '';
     homepage = http://gparted.sourceforge.net;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; gpl2Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 227fba3d377..17689a4848a 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchgit, pkgconfig, libusb1, udev
+{ stdenv, fetchFromGitHub, pkgconfig, libusb1, udev
 , enableGUI ? true, qt4 ? null
 }:
 
-stdenv.mkDerivation {
-  name = "heimdall-1.4.0";
+stdenv.mkDerivation rec {
+  version = "1.4.1";
+  name = "heimdall-${version}";
 
-  src = fetchgit {
-    url = git://github.com/Benjamin-Dobell/Heimdall.git;
-    rev = "refs/tags/v1.4.0";
-    sha256 = "285785d83fd4edbe98c0fa38c27772f72950a5887b255c00937a1f11c79ebf57";
+  src = fetchFromGitHub {
+    owner  = "Benjamin-Dobell";
+    repo   = "Heimdall";
+    rev    = "v${version}";
+    sha256 = "1b7xpamwvw5r2d9yf73f0axv35vg8zaz1345xs3lmsr105phnnp4";
   };
 
   buildInputs =
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 4c7bb9ad77e..5a42a5d8515 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "moreutils-${version}";
-  version = "0.54";
+  version = "0.55";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz";
-    sha256 = "17sj7d4l69gc7l17awwvq44rl137qc0lmi41z04apj5vdd6iqa2h";
+    sha256 = "1dcah2jx8dbznn8966xl7sf1jrld2qfh6l6xcmx9dsnf8p8mr7fs";
   };
 
   preBuild = ''
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index b91e6bcb313..f7d8d1d4e69 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  name = "ostree-2014.11";
+  name = "ostree-2015.3";
 
   meta = with stdenv.lib; {
     description = "Git for operating system binaries";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "GNOME";
     repo = "ostree";
-    rev = "v2014.11";
-    sha256 = "152s94r744lyz64syagha2c4y4afblc178lr9mkk8h2d4xvp6nf5";
+    rev = "v2015.3";
+    sha256 = "1n5q0yxwqx4pqiww3yjmqxl5835kknpw1bnwzbpanmyndnnl88dd";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 61745c8bf49..59f2f5d05ee 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20141122";
+  name = "parallel-20150122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1kpd4ayd4lb867nfnpkam4b3mh86jl6cdy386x1rich938gbrg38";
+    sha256 = "14g9pka59vln19rg6y8lyvrsc4nb3jk8y26hv3hdrf44rgwpds7d";
   };
 
   patchPhase =
diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index 7fa9eb0e34f..59eccbb1ab6 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "rcm-1.2.3";
 
   src = fetchurl {
@@ -8,9 +8,18 @@ stdenv.mkDerivation rec {
     sha256 = "0gwpclbc152jkclj3w83s2snx3dcgljwr75q1z8czl3yar7d8bsh";
   };
  
-  meta = {
+  patches = [ ./fix-rcmlib-path.patch ];
+
+  postPatch = ''
+    for f in bin/*.in; do
+      substituteInPlace $f --subst-var-by rcm $out
+    done
+  '';
+
+  meta = with stdenv.lib; {
     description = "Management Suite for Dotfiles";
     homepage = https://github.com/thoughtbot/rcm;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ malyn ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/rcm/fix-rcmlib-path.patch b/pkgs/tools/misc/rcm/fix-rcmlib-path.patch
new file mode 100644
index 00000000000..45bd32a2d2b
--- /dev/null
+++ b/pkgs/tools/misc/rcm/fix-rcmlib-path.patch
@@ -0,0 +1,68 @@
+*** rcm-1.2.3/bin/lsrc.in.orig	2014-05-09 04:57:39.000000000 -0700
+--- rcm-1.2.3/bin/lsrc.in	2015-01-24 14:27:48.786595479 -0800
+***************
+*** 1,6 ****
+  #!@SHELL@
+  
+! : ${RCM_LIB:=$(dirname "$0")/../share/rcm}
+  . "$RCM_LIB/rcm.sh"
+  
+  pushdir() {
+--- 1,6 ----
+  #!@SHELL@
+  
+! RCM_LIB=@rcm@/share/rcm
+  . "$RCM_LIB/rcm.sh"
+  
+  pushdir() {
+*** rcm-1.2.3/bin/mkrc.in.orig	2014-05-09 04:57:39.000000000 -0700
+--- rcm-1.2.3/bin/mkrc.in	2015-01-24 14:27:48.786595479 -0800
+***************
+*** 1,6 ****
+  #!@SHELL@
+  
+! : ${RCM_LIB:=$(dirname "$0")/../share/rcm}
+  . "$RCM_LIB/rcm.sh"
+  
+  destination() {
+--- 1,6 ----
+  #!@SHELL@
+  
+! RCM_LIB=@rcm@/share/rcm
+  . "$RCM_LIB/rcm.sh"
+  
+  destination() {
+*** rcm-1.2.3/bin/rcdn.in.orig	2014-05-09 04:57:39.000000000 -0700
+--- rcm-1.2.3/bin/rcdn.in	2015-01-24 14:27:48.786595479 -0800
+***************
+*** 1,6 ****
+  #!@SHELL@
+  
+! : ${RCM_LIB:=$(dirname "$0")/../share/rcm}
+  . "$RCM_LIB/rcm.sh"
+  
+  remove_link() {
+--- 1,6 ----
+  #!@SHELL@
+  
+! RCM_LIB=@rcm@/share/rcm
+  . "$RCM_LIB/rcm.sh"
+  
+  remove_link() {
+*** rcm-1.2.3/bin/rcup.in.orig	2014-05-09 04:57:39.000000000 -0700
+--- rcm-1.2.3/bin/rcup.in	2015-01-24 14:27:48.786595479 -0800
+***************
+*** 1,6 ****
+  #!@SHELL@
+  
+! : ${RCM_LIB:=$(dirname "$0")/../share/rcm}
+  . "$RCM_LIB/rcm.sh"
+  
+  link_or_copy() {
+--- 1,6 ----
+  #!@SHELL@
+  
+! RCM_LIB=@rcm@/share/rcm
+  . "$RCM_LIB/rcm.sh"
+  
+  link_or_copy() {
diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix
index 6b74f9ac5d3..5c56f9accfc 100644
--- a/pkgs/tools/misc/rkflashtool/default.nix
+++ b/pkgs/tools/misc/rkflashtool/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp rkunpack rkcrc rkflashtool $out/bin
+    cp rkunpack rkcrc rkflashtool rkparameters rkparametersblock rkunsign rkmisc $out/bin
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 805bcf6b01c..21643a9d11a 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -1,24 +1,31 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchurl
+, gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "rmlint-1.0.8";
+  name = "rmlint-${version}";
+  version = "2.0.0";
 
   src = fetchurl {
-    url = "https://github.com/downloads/sahib/rmlint/rmlint_1.0.8.tar.gz";
-    sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01";
+    url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
+    sha256 = "14jiswagipsmzxclcskn672ws4126p65l6hlzkkvanyv8gmpv90f";
   };
 
-  preConfigure = ''
-    substituteInPlace Makefile.in \
-      --replace "/usr/" "/"
-  '';
+  patches = [ ./fix-scons.patch ];
 
-  makeFlags="DESTDIR=$(out)";
+  configurePhase = "scons config";
+
+  buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ];
+
+  buildPhase = "scons";
+
+  installPhase = "scons --prefix=$out install";
 
   meta = {
-    description = "A tool to remove duplicates and other lint";
-    homepage = "https://github.com/sahib/rmlint";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl3;
+    description = "Extremely fast tool to remove duplicates and other lint from your filesystem.";
+    homepage = http://rmlint.readthedocs.org;
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.koral ];
   };
 }
diff --git a/pkgs/tools/misc/rmlint/fix-scons.patch b/pkgs/tools/misc/rmlint/fix-scons.patch
new file mode 100644
index 00000000000..4d7d832f13d
--- /dev/null
+++ b/pkgs/tools/misc/rmlint/fix-scons.patch
@@ -0,0 +1,22 @@
+diff --git b/SConstruct a/SConstruct
+old mode 100644
+new mode 100755
+index a7fca2e..561007e
+--- b/SConstruct
++++ a/SConstruct
+@@ -404,11 +404,10 @@ options = dict(
+     SHLINKCOMSTR=link_shared_library_message,
+     LINKCOMSTR=link_program_message,
+     PREFIX=GetOption('prefix'),
+-    ENV={
+-        'PATH': os.environ['PATH'],
+-        'TERM': os.environ['TERM'],
+-        'HOME': os.environ['HOME']
+-    }
++    ENV = dict([ (key, os.environ[key])
++                 for key in os.environ
++                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
++              ])
+ )
+ 
+ if ARGUMENTS.get('VERBOSE') == "1":
diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 29d98284ccf..53c1b0de24e 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -1,22 +1,23 @@
-{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo }:
+{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff }:
 
-stdenv.mkDerivation {
-  name = "rrdtool-1.4.5";
+stdenv.mkDerivation rec {
+  name = "rrdtool-1.4.9";
   src = fetchurl {
-    url = http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.5.tar.gz;
-    sha256 = "07fgn0y4yj7p2vh6a37q273hf98gkfw2sdam5r1ldn1k0m1ayrqj";
+    url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
+    sha256 = "1k1506v86nijd9vdljib93z4hrwj786kqnx37lqqbbqasvh2ca1y";
   };
-  buildInputs = [ gettext perl pkgconfig libxml2 pango cairo ];
+  buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ];
   
   postInstall = ''
     # for munin support
     mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://oss.oetiker.ch/rrdtool/;
     description = "High performance logging in Round Robin Databases";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
new file mode 100644
index 00000000000..d251c7cdd94
--- /dev/null
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils, kmod
+, enableRDW ? true, networkmanager }:
+
+let version = "0.6";
+in stdenv.mkDerivation {
+  inherit enableRDW;
+
+  name = "tlp-${version}";
+
+  src = fetchFromGitHub {
+        owner = "linrunner";
+        repo = "TLP";
+        rev = "${version}";
+        sha256 = "1kfm6x5w9vica2i13vfckza4fad4wv8ivr40fws3qa6d5jbyx0fy";
+      };
+
+  makeFlags = [ "DESTDIR=$(out)"
+                "TLP_LIBDIR=/lib"
+                "TLP_SBIN=/bin"
+                "TLP_BIN=/bin"
+                "TLP_NO_INIT=1"
+                "TLP_NO_PMUTILS=1"
+              ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ perl ];
+
+  paths = with stdenv.lib;
+          concatMapStringsSep ":" (x: "${x}/bin")
+          ([ iw rfkill hdparm ethtool inetutils systemd kmod ]
+           ++ optional enableRDW networkmanager
+          );
+
+  installTargets = [ "install-tlp" ] ++ stdenv.lib.optional enableRDW "install-rdw";
+
+  postInstall = ''
+    for i in $out/bin/* $out/lib/udev/tlp-*; do
+      sed -i "s,/usr/lib/,$out/lib/,g" "$i"
+      wrapProgram "$i" \
+        --prefix PATH : "$paths"
+    done
+    if [ "$enableRDW" = "1" ]; then
+      for i in $out/etc/NetworkManager/dispatcher.d/*; do
+        sed -i "s,/usr/lib/,$out/lib/,g" "$i"
+        wrapProgram "$i" \
+          --prefix PATH : "$paths"
+      done
+    fi
+
+    for i in $out/lib/udev/rules.d/*; do
+      sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i"
+    done
+  '';
+
+  passthru = { inherit enableRDW; };
+
+  meta = with stdenv.lib; {
+    description = "Advanced Power Management for Linux";
+    homepage = "http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix
index 0c3fb212293..ea61e063328 100644
--- a/pkgs/tools/misc/vorbisgain/default.nix
+++ b/pkgs/tools/misc/vorbisgain/default.nix
@@ -1,17 +1,24 @@
 { stdenv, fetchurl, unzip, libogg, libvorbis }:
 
 stdenv.mkDerivation rec {
-  name = "vorbisgain-0.34";
+  name = "vorbisgain-0.37";
 
   src = fetchurl {
-    url = "http://sjeng.org/ftp/vorbis/${name}.zip";
-    sha256 = "1sjxl20ahhjv63b8a99sq9p14vz3lf1gacivkk0x2c11cc9zw4nr";
+    url = "http://sjeng.org/ftp/vorbis/${name}.tar.gz";
+    sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx";
   };
 
   buildInputs = [ unzip libogg libvorbis ];
   patchPhase = ''
     chmod -v +x configure
-    sed -e 's/^        /\t/' -i Makefile.*
     configureFlags="--mandir=$out/share/man"
     '';
+
+  meta = with stdenv.lib; {
+    homepage = http://sjeng.org/vorbisgain.html;
+    description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
 }
diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix
new file mode 100644
index 00000000000..c08947fc107
--- /dev/null
+++ b/pkgs/tools/misc/xflux/default.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr}:
+stdenv.mkDerivation {
+  name = "xflux";
+  src = fetchurl {
+    url = https://justgetflux.com/linux/xflux64.tgz;
+    sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021";
+  };
+
+  libPath = stdenv.lib.makeLibraryPath [
+    stdenv.cc.gcc
+    libXxf86vm
+    libXext
+    libX11
+    libXrandr
+  ];
+
+  unpackPhase = ''
+    unpackFile $src;
+  '';
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp  xflux "$out/bin"
+  '';
+  postFixup = ''
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "$libPath" "$out/bin/xflux"
+  '';
+  meta = {
+    description = "Adjusts your screen to emit warmer light at night";
+    longDescription = ''
+      xflux changes the color temperature of your screen to be much warmer
+      when the sun sets, and then changes it back its colder temperature
+      when the sun rises.
+    '';
+    homepage = https://justgetflux.com/;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.paholg ];
+  };
+}
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 14ab4fb3b72..b423aa301f9 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip, pandoc }:
 
 let
-  version = "2014.12.17.2";
+  version = "2015.01.30.2";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1yk8dw0p4nh68p4rcncwl95gcjwn147wyp2anfhn0gr8b95wcb1h";
+    sha256 = "00ymx254qgic9ka7wb41cinv1w0ijq6l0f5k2cfspi958jqql9lm";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix
new file mode 100644
index 00000000000..cb3e1445aa3
--- /dev/null
+++ b/pkgs/tools/networking/asynk/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, python2, python2Packages, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "2.0.0-rc2";
+  name = "ASynK-${version}";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz";
+    sha256 = "14s53ijn9fpxr490ypnn92zk6h5rdadf7j3z98rah1h7l659qi1b";
+  };
+
+  propagatedBuildInputs = with python2Packages; [ python2 makeWrapper tornado requests dateutil ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp asynk.py $out/bin/
+    cp state.init.json $out/
+    cp -R config $out/
+    cp -R lib $out/
+    cp -R asynk $out/
+
+    substituteInPlace $out/bin/asynk.py \
+      --replace "ASYNK_BASE_DIR    = os.path.dirname(os.path.abspath(__file__))" "ASYNK_BASE_DIR    = \"$out\""
+
+    wrapProgram "$out/bin/asynk.py" \
+      --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://asynk.io/;
+    description = "Flexible contacts synchronization program";
+    license = licenses.agpl3;
+    maintainers = [ maintainers.DamienCassou ];
+  };
+}
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 54220ea5cb6..60534683813 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
 
 let
-  version = "13"; # see ${src}/util/version/Version.h
-  date = "20150102";
+  version = "15"; # see ${src}/util/version/Version.h
+  date = "20150130";
 in
 stdenv.mkDerivation {
   name = "cjdns-${version}-${date}";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "cjdelisle";
     repo = "cjdns";
-    rev = "da108a24c958b6b8f592bcc6f89990923af0099e";
-    sha256 = "0x4161bl4wii4530ja8i1b8qsab9var8yggj7ipvcijd7v3hfvx7";
+    rev = "b7681f601dc0ba84c6c710061089f9898247ba4e";
+    sha256 = "0r59j9x5i1nkd6k8172l9iq95f6c22ymmkrm9nxwxr5dp2bj0qn5";
   };
 
   buildInputs = [ which python27 nodejs ] ++
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     sed -i 's,/usr/bin/env python,'$(type -P python), \
       $(find contrib -type f)
     mkdir -p $out/share/cjdns
-    cp -R contrib node_build node_modules $out/share/cjdns/
+    cp -R contrib tools node_build node_modules $out/share/cjdns/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 021f470af24..b493bd74dae 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, openssl, pkgconfig, db }:
 
 stdenv.mkDerivation rec {
-  name = "isync-1.1.1";
+  name = "isync-1.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/isync/${name}.tar.gz";
-    sha256 = "14blgxhpl78bpr1291zb7n3y9g8jpgmnpdnbl0vp2qplw76zv9f3";
+    sha256 = "1960ah3fmp75cakd06lcx50n5q0yvfsadjh3lffhyvjvj7ava9d2";
   };
 
   buildInputs = [ openssl pkgconfig db ];
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 5326c9059de..5326c9059de 100755..100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index 2fa8ca33e86..10a951f84fc 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -3,20 +3,21 @@
 
 stdenv.mkDerivation rec {
   name = "megatools-${version}";
-  version = "1.9.93";
+  version = "1.9.94";
 
   src = fetchurl {
     url = "http://megatools.megous.com/builds/${name}.tar.gz";
-    sha256 = "0xm57pgjvfifq1j5lyvrcs6x0vxhqzr399s7paj4g7nspj0dbll9";
+    sha256 = "1kms0k652sszcbzmx5nmz07gc8zbqqiskh8hvmvf6xaga7y3lgrx";
   };
 
-  buildInputs = [ pkgconfig glib fuse curl makeWrapper ];
+  buildInputs = [ pkgconfig glib fuse curl makeWrapper
+      gsettings_desktop_schemas ];
 
   postInstall = ''
     for i in $(find $out/bin/ -type f); do
       wrapProgram "$i" \
             --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-            --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
+            --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 19957de5d1c..10990829b0a 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   name = "openssh-6.7p1";
 
   src = fetchurl {
-    url = "http://ftp.nluug.nl/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
+    url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
     sha256 = "01smf9pvn2sk5qs80gkmc9acj07ckawi1b3xxyysp3c5mr73ky5j";
   };
 
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index e33edaa32da..65d3b01e89c 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "socat-1.7.2.4";
+  name = "socat-1.7.3.0";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "028yjka2zr6j1i8pmfmvzqki8ajczdl1hnry1x31xbbg3j83jxsb";
+    sha256 = "011ydc0x8camplf8l6mshs3v5fswarld8v0wf7grz6rjq18fhrq7";
   };
 
   buildInputs = [ openssl ];
 
+  patches = [ ./enable-ecdhe.patch ];
+
   meta = {
     description = "A utility for bidirectional data transfer between two independent data channels";
     homepage = http://www.dest-unreach.org/socat/;
diff --git a/pkgs/tools/networking/socat/enable-ecdhe.patch b/pkgs/tools/networking/socat/enable-ecdhe.patch
new file mode 100644
index 00000000000..ad63ec287bc
--- /dev/null
+++ b/pkgs/tools/networking/socat/enable-ecdhe.patch
@@ -0,0 +1,19 @@
+--- socat-1.7.3.0/xio-openssl.c	2015-01-24 15:33:42.000000000 +0100
++++ socat-1.7.3.0-ecdhe/xio-openssl.c	2015-01-25 13:38:54.353641097 +0100
+@@ -960,7 +960,6 @@
+       }
+    }
+
+-#if defined(EC_KEY)	/* not on Openindiana 5.11 */
+    {
+       /* see http://openssl.6102.n7.nabble.com/Problem-with-cipher-suite-ECDHE-ECDSA-AES256-SHA384-td42229.html */
+       int	 nid;
+@@ -982,7 +981,6 @@
+
+       SSL_CTX_set_tmp_ecdh(*ctx, ecdh);
+    }
+-#endif /* !defined(EC_KEY) */
+
+ #if OPENSSL_VERSION_NUMBER >= 0x00908000L
+    if (opt_compress) {
+
diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
new file mode 100644
index 00000000000..52ca9ad494f
--- /dev/null
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ppp, libevent, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "sstp-client-${version}";
+  version = "1.0.9";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz";
+    sha256 = "0kpwywbavmlgid07rk8ff0bxp75bnfa1nc28w4j0pkxjhmja5n6k";
+  };
+
+  patchPhase =
+    ''
+      sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c
+      sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c
+    '';
+
+  configureFlags = [
+    "--with-openssl=${openssl}"
+    "--with-runtime-dir=/run/sstpc"
+    "--with-pppd-plugin-dir=$(out)/lib/pppd"
+  ];
+
+  buildInputs = [ libevent openssl ppp ];
+
+  meta = {
+    description = "SSTP client for Linux";
+    homepage = http://sstp-client.sourceforge.net/;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.ktosiek ];
+  };
+}
diff --git a/pkgs/tools/networking/tlsdate/default.nix b/pkgs/tools/networking/tlsdate/default.nix
new file mode 100644
index 00000000000..eea7dfcccac
--- /dev/null
+++ b/pkgs/tools/networking/tlsdate/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchgit
+, autoconf
+, automake
+, libevent
+, libtool
+, pkgconfig
+, openssl
+}:
+
+stdenv.mkDerivation {
+  name = "tlsdate-0.0.12";
+
+  src = fetchgit {
+    url = https://github.com/ioerror/tlsdate;
+    rev = "fd04f48ed60eb773c8e34d27ef2ee12ee7559a41";
+    sha256 = "d97b7cc6fe64799c12c31a9ebd3a69c9bc954de2eaa7f70d113d39544472854d";
+  };
+
+  buildInputs = [
+    autoconf
+    automake
+    libevent
+    libtool
+    pkgconfig
+    openssl
+  ];
+
+  preConfigure = ''
+    export COMPILE_DATE=0
+    ./autogen.sh
+  '';
+
+  doCheck = true;
+
+  meta = {
+    description = "Secure parasitic rdate replacement";
+    homepage = https://github.com/ioerror/tlsdate;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.tv ];
+  };
+}
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
index 0762254b706..2ce8d1cde3e 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "traceroute-${version}";
-  version = "2.0.20";
+  version = "2.0.21";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/traceroute/${name}.tar.gz";
-    sha256 = "0wf2xnh5hm81fdn6dbkqqqlwbn6gdvy178zkpzbjhm694navmb1g";
+    sha256 = "1q4n9s42nfcc4fmnwmrsiabvqrcaagiagmmqj9r5hfmi63pr7b7p";
   };
 
   makeFlags = "prefix=$(out)";
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index e1a7a685b14..e1594733268 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [openssl expat libevent];
 
+  patches = [
+    # This patch fixes unbound 1.5.1 on linux versions previous to 3.15 which
+    # do not implement IP_PMTUDISC_OMIT.
+    #
+    # It should be discarded when this support makes it into a released
+    # version.
+    ./linux-pre-3.15-unbound-1.5.1.patch
+  ];
+
   configureFlags = [
     "--with-ssl=${openssl}"
     "--with-libexpat=${expat}"
diff --git a/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch b/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch
new file mode 100644
index 00000000000..61956807899
--- /dev/null
+++ b/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch
@@ -0,0 +1,66 @@
+--- ./services/listen_dnsport.c	2014-12-10 10:59:31.726514857 +0100
++++ ./services/listen_dnsport.c	2014-12-10 11:08:45.009071300 +0100
+@@ -368,29 +368,47 @@
+  * (and also uses the interface mtu to determine the size of the packets).
+  * So there won't be any EMSGSIZE error.  Against DNS fragmentation attacks.
+  * FreeBSD already has same semantics without setting the option. */
+-#    if defined(IP_PMTUDISC_OMIT)
+-		int action = IP_PMTUDISC_OMIT;
+-#    else
+-		int action = IP_PMTUDISC_DONT;
+-#    endif
++		int omit_set = 0;
++		int action;
++#   if defined(IP_PMTUDISC_OMIT)
++		action = IP_PMTUDISC_OMIT;
+ 		if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, 
+ 			&action, (socklen_t)sizeof(action)) < 0) {
+-			log_err("setsockopt(..., IP_MTU_DISCOVER, "
+-#    if defined(IP_PMTUDISC_OMIT)
+-				"IP_PMTUDISC_OMIT"
++
++			if (errno != EINVAL) {
++				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_OMIT...) failed: %s",
++					strerror(errno));
++
++#    ifndef USE_WINSOCK
++				close(s);
+ #    else
+-				"IP_PMTUDISC_DONT"
++				closesocket(s);
+ #    endif
+-				"...) failed: %s",
+-				strerror(errno));
++				*noproto = 0;
++				*inuse = 0;
++				return -1;
++			}
++		}
++		else
++		{
++		    omit_set = 1;
++		}
++#   endif
++		if (omit_set == 0) {
++   			action = IP_PMTUDISC_DONT;
++			if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER,
++				&action, (socklen_t)sizeof(action)) < 0) {
++				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_DONT...) failed: %s",
++					strerror(errno));
+ #    ifndef USE_WINSOCK
+-			close(s);
++				close(s);
+ #    else
+-			closesocket(s);
++				closesocket(s);
+ #    endif
+-			*noproto = 0;
+-			*inuse = 0;
+-			return -1;
++				*noproto = 0;
++				*inuse = 0;
++				return -1;
++			}
+ 		}
+ #  elif defined(IP_DONTFRAG)
+ 		int off = 0;
diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix
index e32ee43113e..e14326fe9e6 100644
--- a/pkgs/tools/networking/vtun/default.nix
+++ b/pkgs/tools/networking/vtun/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, openssl, lzo, zlib, yacc, flex }:
-stdenv.mkDerivation {
-  name = "vtun-3.0.1";
+{ stdenv, fetchurl, openssl, lzo, zlib, yacc, flex }:
+
+stdenv.mkDerivation rec {
+  name = "vtun-3.0.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/vtun/vtun-3.0.1.tar.gz;
-    sha256 = "1sxf9qq2wlfh1wnrlqkh801v1m9jlqpycxvr2nbyyl7nm2cp8l12";
+    url = "mirror://sourceforge/vtun/${name}.tar.gz";
+    sha256 = "1jxrxp3klhc8az54d5qn84cbc0vdafg319jh84dxkrswii7vxp39";
   };
 
   patchPhase = ''
-    sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in 
+    sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in
+    sed -i '/strip/d' Makefile.in
   '';
   buildInputs = [ lzo openssl zlib yacc flex ];
 
@@ -17,9 +19,11 @@ stdenv.mkDerivation {
     --with-ssl-headers=${openssl}/include/openssl
     --with-blowfish-headers=${openssl}/include/openssl'';
 
-  meta = { 
-      description="Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption";
-      homepage="http://vtun.sourceforge.net/";
-      license = stdenv.lib.licenses.gpl2;
+  meta = with stdenv.lib; {
+      description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption";
+      homepage = http://vtun.sourceforge.net/;
+      license = licenses.gpl2;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/tools/package-management/gem-nix/default.nix b/pkgs/tools/package-management/gem-nix/default.nix
deleted file mode 100644
index e048122b287..00000000000
--- a/pkgs/tools/package-management/gem-nix/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, rubygems, rubyLibs, ruby, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "gem-nix";
-
-  buildInputs = [ ruby rubygems rubyLibs.nix makeWrapper ];
-
-  phases = ["installPhase"];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    echo 'exec ${rubygems}/bin/gem nix "$@"' >> $out/bin/gem-nix
-    chmod +x $out/bin/gem-nix
-    wrapProgram $out/bin/gem-nix \
-      --set GEM_PATH $GEM_PATH
-  '';
-
-  meta = with stdenv.lib; {
-    description = "gem nix command in a nice wrapper";
-    platforms = platforms.unix;
-    maintainers = [ maintainers.iElectric ];
-  };
-}
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 251ff5b220c..04179abbce3 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.9pre4020_f6716e9";
+  name = "nix-1.9pre4021_f46e329";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/18780017/download/4/${name}.tar.xz";
-    sha256 = "0jki14yxwv1f33fqkd1bi8bpxafkzjv8yixiwnw8nkhx074sipsn";
+    url = "http://hydra.nixos.org/build/18964230/download/4/${name}.tar.xz";
+    sha256 = "1a8njx3m8lv7w8ciag5wbl6q16k3gpf9kvv1yr9m4alc6kzm44b2";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
new file mode 100644
index 00000000000..73004091a42
--- /dev/null
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem, writeScript
+, profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"])
+, dataDir ? (config.nixui.dataDir or "/tmp")
+, configurations ? (config.nixui.configurations or ["/etc/nixos/configuration.nix"])
+, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos-config=/etc/nixos/configuration.nix") }:
+let
+  version = "0.1.2";
+  src = fetchgit {
+    url = "git://github.com/matejc/nixui.git";
+    rev = "refs/tags/${version}";
+    sha256 = "0rq8q867j4fx5j8mkidbwgbzqj4w4xi45xr8ya79m6v3iqqblhhj";
+  };
+  nixui = (import ./node-default.nix { nixui = src; inherit pkgs; }).build;
+  script = writeScript "nixui" ''
+    #! ${stdenv.shell}
+    export PATH="${nix}/bin:\$PATH"
+    export NIXUI_CONFIG="${config}"
+    ${node_webkit}/bin/nw ${nixui}/lib/node_modules/nixui/
+  '';
+  config = builtins.toFile "config.json" ''
+  {
+      "profilePaths": ${builtins.toJSON profilePaths},
+      "dataDir": "${dataDir}",
+      "configurations": ${builtins.toJSON configurations},
+      "NIX_PATH": "${NIX_PATH}"
+  }
+  '';
+  desktop = makeDesktopItem {
+    name = "nixui";
+    exec = script;
+    icon = "${nixui}/lib/node_modules/nixui/img/128.png";
+    desktopName = "NixUI";
+    genericName = "NixUI";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "nixui-${version}";
+  inherit version src;
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${script} $out/bin/nixui
+
+    mkdir -p $out/share/applications
+    ln -s ${desktop}/share/applications/* $out/share/applications/
+  '';
+  meta = {
+    description = "NodeWebkit user interface for Nix";
+    homepage = https://github.com/matejc/nixui;
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [ stdenv.lib.maintainers.matejc ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/tools/package-management/nixui/node-default.nix b/pkgs/tools/package-management/nixui/node-default.nix
new file mode 100644
index 00000000000..38a4cd4cfcc
--- /dev/null
+++ b/pkgs/tools/package-management/nixui/node-default.nix
@@ -0,0 +1,24 @@
+{ nixui ? { outPath = ./.; name = "nixui"; }
+, pkgs ? import <nixpkgs> {}
+}:
+let
+  nodePackages = import ../../../top-level/node-packages.nix {
+    inherit pkgs;
+    inherit (pkgs) stdenv nodejs fetchurl fetchgit;
+    neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux;
+    self = nodePackages;
+    generated = ./node.nix;
+  };
+in rec {
+  tarball = pkgs.runCommand "nixui.tgz" { buildInputs = [ pkgs.nodejs ]; } ''
+    mv `HOME=$PWD npm pack ${nixui}` $out
+  '';
+  build = nodePackages.buildNodePackage {
+    name = "nixui";
+    src = [ tarball ];
+    buildInputs = nodePackages.nativeDeps."nixui" or [];
+    deps = [ nodePackages.underscore nodePackages.nedb ];
+    peerDependencies = [];
+    passthru.names = [ "nixui" ];
+  };
+}
diff --git a/pkgs/tools/package-management/nixui/node.nix b/pkgs/tools/package-management/nixui/node.nix
new file mode 100644
index 00000000000..fd2e34653c2
--- /dev/null
+++ b/pkgs/tools/package-management/nixui/node.nix
@@ -0,0 +1,617 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."async"."0.2.10" =
+    self.by-version."async"."0.2.10";
+  by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "async-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  by-spec."binary-search-tree"."0.2.4" =
+    self.by-version."binary-search-tree"."0.2.4";
+  by-version."binary-search-tree"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "binary-search-tree-0.2.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz";
+        name = "binary-search-tree-0.2.4.tgz";
+        sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."binary-search-tree" or []);
+    deps = {
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "binary-search-tree" ];
+  };
+  by-spec."commander"."0.6.1" =
+    self.by-version."commander"."0.6.1";
+  by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  by-spec."commander"."2.3.0" =
+    self.by-version."commander"."2.3.0";
+  by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
+  by-spec."debug"."2.0.0" =
+    self.by-version."debug"."2.0.0";
+  by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "debug-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug" or []);
+    deps = {
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  by-spec."diff"."1.0.8" =
+    self.by-version."diff"."1.0.8";
+  by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "diff-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."diff" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "diff" ];
+  };
+  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" = lib.makeOverridable self.buildNodePackage {
+    name = "escape-string-regexp-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."escape-string-regexp" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "escape-string-regexp" ];
+  };
+  by-spec."expect.js"."~0.3.1" =
+    self.by-version."expect.js"."0.3.1";
+  by-version."expect.js"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "expect.js-0.3.1";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz";
+        name = "expect.js-0.3.1.tgz";
+        sha1 = "b0a59a0d2eff5437544ebf0ceaa6015841d09b5b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."expect.js" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "expect.js" ];
+  };
+  "expect.js" = self.by-version."expect.js"."0.3.1";
+  by-spec."formatio"."~1.0" =
+    self.by-version."formatio"."1.0.2";
+  by-version."formatio"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "formatio-1.0.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz";
+        name = "formatio-1.0.2.tgz";
+        sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."formatio" or []);
+    deps = {
+      "samsam-1.1.2" = self.by-version."samsam"."1.1.2";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "formatio" ];
+  };
+  by-spec."glob"."3.2.3" =
+    self.by-version."glob"."3.2.3";
+  by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob" or []);
+    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";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  by-spec."graceful-fs"."~2.0.0" =
+    self.by-version."graceful-fs"."2.0.3";
+  by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  by-spec."growl"."1.8.1" =
+    self.by-version."growl"."1.8.1";
+  by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "growl-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."growl" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "growl" ];
+  };
+  by-spec."inherits"."2" =
+    self.by-version."inherits"."2.0.1";
+  by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "inherits-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inherits" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "inherits" ];
+  };
+  by-spec."inherits"."2.0.1" =
+    self.by-version."inherits"."2.0.1";
+  by-spec."jade"."0.26.3" =
+    self.by-version."jade"."0.26.3";
+  by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jade" or []);
+    deps = {
+      "commander-0.6.1" = self.by-version."commander"."0.6.1";
+      "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "jade" ];
+  };
+  by-spec."lru-cache"."2" =
+    self.by-version."lru-cache"."2.5.0";
+  by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lru-cache-2.5.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
+        name = "lru-cache-2.5.0.tgz";
+        sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-cache" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-cache" ];
+  };
+  by-spec."minimatch"."~0.2.11" =
+    self.by-version."minimatch"."0.2.14";
+  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch" or []);
+    deps = {
+      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  by-spec."minimist"."0.0.8" =
+    self.by-version."minimist"."0.0.8";
+  by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "minimist-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  by-spec."mkdirp"."0.3.0" =
+    self.by-version."mkdirp"."0.3.0";
+  by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  by-spec."mkdirp"."0.5.0" =
+    self.by-version."mkdirp"."0.5.0";
+  by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp" or []);
+    deps = {
+      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  by-spec."mkdirp"."~0.3.5" =
+    self.by-version."mkdirp"."0.3.5";
+  by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        name = "mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  by-spec."mocha"."~1.21.0" =
+    self.by-version."mocha"."1.21.5";
+  by-version."mocha"."1.21.5" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.21.5";
+    bin = true;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.21.5.tgz";
+        name = "mocha-1.21.5.tgz";
+        sha1 = "7c58b09174df976e434a23b1e8d639873fc529e9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mocha" or []);
+    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";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "mocha" ];
+  };
+  "mocha" = self.by-version."mocha"."1.21.5";
+  by-spec."ms"."0.6.2" =
+    self.by-version."ms"."0.6.2";
+  by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ms-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ms" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "ms" ];
+  };
+  by-spec."nedb"."~1.0.0" =
+    self.by-version."nedb"."1.0.2";
+  by-version."nedb"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "nedb-1.0.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz";
+        name = "nedb-1.0.2.tgz";
+        sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nedb" or []);
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "binary-search-tree-0.2.4" = self.by-version."binary-search-tree"."0.2.4";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "nedb" ];
+  };
+  "nedb" = self.by-version."nedb"."1.0.2";
+  by-spec."samsam"."~1.1" =
+    self.by-version."samsam"."1.1.2";
+  by-version."samsam"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "samsam-1.1.2";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
+        name = "samsam-1.1.2.tgz";
+        sha1 = "bec11fdc83a9fda063401210e40176c3024d1567";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."samsam" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "samsam" ];
+  };
+  by-spec."sigmund"."~1.0.0" =
+    self.by-version."sigmund"."1.0.0";
+  by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "sigmund-1.0.0";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
+        name = "sigmund-1.0.0.tgz";
+        sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sigmund" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "sigmund" ];
+  };
+  by-spec."sinon"."~1.10.3" =
+    self.by-version."sinon"."1.10.3";
+  by-version."sinon"."1.10.3" = lib.makeOverridable self.buildNodePackage {
+    name = "sinon-1.10.3";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz";
+        name = "sinon-1.10.3.tgz";
+        sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sinon" or []);
+    deps = {
+      "formatio-1.0.2" = self.by-version."formatio"."1.0.2";
+      "util-0.10.3" = self.by-version."util"."0.10.3";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "sinon" ];
+  };
+  "sinon" = self.by-version."sinon"."1.10.3";
+  by-spec."underscore"."^1.6.0" =
+    self.by-version."underscore"."1.7.0";
+  by-version."underscore"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  "underscore" = self.by-version."underscore"."1.7.0";
+  by-spec."underscore"."~1.4.4" =
+    self.by-version."underscore"."1.4.4";
+  by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.4.4";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        name = "underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore" or []);
+    deps = {
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
+  by-spec."util".">=0.10.3 <1" =
+    self.by-version."util"."0.10.3";
+  by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage {
+    name = "util-0.10.3";
+    bin = false;
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
+        name = "util-0.10.3.tgz";
+        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."util" or []);
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    peerDependencies = [
+    ];
+    passthru.names = [ "util" ];
+  };
+}
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index a115894c621..f59e3285343 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.06b";
+  version = "1.21b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1kisqjfws90zjv2byj1jplfjdyssspa16s0bnym351j81frhmfsw";
+    sha256 = "1j3857947lyr0j6jjdrx1mrdqpgi7fnfysxlycxb61xyg4av0k30";
   };
 
   buildPhase   = "make PREFIX=$out";
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 1c6573b236b..4bd0587135c 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
       --replace "modutil" "${nssTools}/bin/modutil"
   '';
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) middleware";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index cb8b9db908b..45a314e13a6 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -21,8 +21,14 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib
+    cat >> $out/share/applications/eid-viewer.desktop << EOF
+    # eid-viewer creates XML without a header, making it "plain text":
+    MimeType=application/xml;text/xml;text/plain
+    EOF
   '';
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) viewer";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index fb606273c26..4513cf35920 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/kpcli --set PERL5LIB \
       "${with perlPackages; stdenv.lib.makePerlPath [
-         Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu
+         Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
       ]}"
   '';
 
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index ab543b541ab..150cb49a9c4 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.0.2";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "02ibpkfq6cmr5dxgps9hr0dk1vgmda3m4g24yq6cg15sp94147mh" else
-      "1cxhkbdrwixfg81wwd6hdf5zbil12mff4yfqxzlwp55iqh49skry";
+      "0x2jch8v57z59inncvmq2nr12j0f5by10mgj7sv9cabysj07xb45" else
+      "07g78gh909gcg4bqdmj1ag1kkl3707qi6l4wa9cm81r364192hha";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index eedca8bd7fd..987648e69af 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -2,14 +2,14 @@
 
 let
   pkgname = "ipmitool";
-  version = "1.8.14";
+  version = "1.8.15";
 in
 stdenv.mkDerivation {
   name = "${pkgname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz";
-    sha256 = "1avlb0lwqncd28hp6p5w3rkcnhgy84rgv1jdgkyy0gzqhx2wx6zy";
+    sha256 = "0y6g8xg9p854n7xm3kds8m3d53jrsllnknp8lcr3jscf99j4x5ph";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 73dda1b5516..9b8db03b73e 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.03.09";
+  version = "0.03.11";
   name = "stress-ng-${version}";
 
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
-    sha256 = "0lpm04yn7jkfbmdhv73vnnskj492cwvcddh962pgz1mb5rzdkskj";
+    sha256 = "01pshnqb75c0g4pwcz5i1gh2a6ijy3dlz8drb0i0p6n6l3fpgmar";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index ba110640b31..7a14df63ff7 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q";
   };
 
+  # Fix cross compile (stolen from Gentoo).
+  # Not needed for 4.1.1.
+  crossAttrs = {
+    preConfigure = ''
+      sed -i \
+        -e '/check-recursive all-recursive: check-for-shared-lib-support/d' \
+        extension/Makefile.in
+    '';
+  };
+
   doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
 
   buildInputs = [ libsigsegv ]
diff --git a/pkgs/tools/text/gist/Gemfile b/pkgs/tools/text/gist/Gemfile
new file mode 100644
index 00000000000..18500f898f1
--- /dev/null
+++ b/pkgs/tools/text/gist/Gemfile
@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "gist"
diff --git a/pkgs/tools/text/gist/Gemfile.lock b/pkgs/tools/text/gist/Gemfile.lock
new file mode 100644
index 00000000000..a2d2659b69a
--- /dev/null
+++ b/pkgs/tools/text/gist/Gemfile.lock
@@ -0,0 +1,10 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    gist (4.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gist
diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index 1ac9901a8e1..0833fd6ce18 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -1,32 +1,15 @@
-{ stdenv
-, fetchurl
-, makeWrapper
-, ruby
-, rake
-}:
+{ stdenv, lib, bundlerEnv }:
 
-let version = "v4.3.0";
-in stdenv.mkDerivation rec {
+let version = "4.3.0";
+in bundlerEnv {
   name = "gist-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/defunkt/gist/archive/${version}.tar.gz";
-    sha256 = "92b91ffe07cc51ca8576b091e7123b851ee0d7d2d3f0e21d18b19d8bd8f9aa47";
-  };
-
-  buildInputs = [ rake makeWrapper ];
-
-  installPhase = ''
-    rake install prefix=$out
-
-    wrapProgram $out/bin/gist \
-      --prefix PATH : ${ruby}/bin \
-  '';
-
-  meta = {
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+  meta = with lib; {
     homepage = "http://defunkt.io/gist/";
     description = "upload code to https://gist.github.com (or github enterprise)";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.mit;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/tools/text/gist/gemset.nix b/pkgs/tools/text/gist/gemset.nix
new file mode 100644
index 00000000000..7d207374fe3
--- /dev/null
+++ b/pkgs/tools/text/gist/gemset.nix
@@ -0,0 +1,9 @@
+{
+  "gist" = {
+    version = "4.3.0";
+    source = {
+      type = "gem";
+      sha256 = "0az6l8nq433sszailr7kglh21l3gkcb11k7ag6668nyxxplm9rp0";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index 0a658a23e1c..b185d859093 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, freetype, libjpeg, libungif, zlib }:
 
-stdenv.mkDerivation {
-  name = "swftools-0.8.1";
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "swftools-${version}";
+  version = "0.9.2";
 
   src = fetchurl {
-    url = http://www.swftools.org/swftools-0.8.1.tar.gz;
-    sha256 = "0l75c3ibwd24g9nqghp1rv1dfrlicw87s0rbdnyffjv4izz6gc2l";
+    url = "http://www.swftools.org/${name}.tar.gz";
+    sha256 = "1w81dyi81019a6jmnm5z7fzarswng27lg1d4k4d5llxzqszr2s5z";
   };
 
-  buildInputs = [ zlib ];
+  patches = [ ./swftools.patch ];
 
-  meta = { 
+  buildInputs = [ freetype libjpeg libungif zlib ];
+
+  meta = {
     description = "Collection of SWF manipulation and creation utilities";
     homepage = http://www.swftools.org/about.html;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.koral ];
   };
 }
diff --git a/pkgs/tools/video/swftools/swftools.patch b/pkgs/tools/video/swftools/swftools.patch
new file mode 100644
index 00000000000..c7eb89f9b3e
--- /dev/null
+++ b/pkgs/tools/video/swftools/swftools.patch
@@ -0,0 +1,17 @@
+--- a/swfs/Makefile.in.orig
++++ b/swfs/Makefile.in
+@@ -41,10 +41,10 @@ install:
+ 	$(INSTALL_DATA) ./PreLoaderTemplate.swf $(pkgdatadir)/swfs/PreLoaderTemplate.swf
+ 	$(INSTALL_DATA) ./tessel_loader.swf $(pkgdatadir)/swfs/tessel_loader.swf
+ 	$(INSTALL_DATA) ./swft_loader.swf $(pkgdatadir)/swfs/swft_loader.swf
+-	rm -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf
+-	$(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
+-	rm -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf
+-	$(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
++	rm -f $(pkgdatadir)/swfs/default_viewer.swf # -o -L $(pkgdatadir)/swfs/default_viewer.swf
++	$(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
++	rm -f $(pkgdatadir)/swfs/default_loader.swf # -o -L $(pkgdatadir)/swfs/default_loader.swf
++	$(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
+ 		
+ uninstall:
+ 	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/simple_viewer.swf
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e15e116ddf7..5c90ca8559a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -251,6 +251,8 @@ let
     theAttrSet = arg;
   };
 
+  autonix = callPackage ../build-support/autonix {};
+
   autoreconfHook = makeSetupHook
     { substitutions = { inherit autoconf automake libtool gettext; }; }
     ../build-support/setup-hooks/autoreconf.sh;
@@ -522,6 +524,8 @@ let
 
   attic = callPackage ../tools/backup/attic { };
 
+  avfs = callPackage ../tools/filesystems/avfs { };
+
   awscli = callPackage ../tools/admin/awscli { };
 
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
@@ -655,6 +659,8 @@ let
 
   boost-build = callPackage ../development/tools/boost-build { };
 
+  boot = callPackage ../development/tools/build-managers/boot { };
+
   bootchart = callPackage ../tools/system/bootchart { };
 
   boxfs = callPackage ../tools/filesystems/boxfs { };
@@ -678,13 +684,15 @@ let
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
   consul = callPackage ../servers/consul {
-    inherit ruby rubyLibs;
+   # inherit ruby;
   };
 
   consul_ui = consul.ui;
 
   corosync = callPackage ../servers/corosync { };
 
+  cherrytree = callPackage ../applications/misc/cherrytree { };
+
   chntpw = callPackage ../tools/security/chntpw { };
 
   coprthr = callPackage ../development/libraries/coprthr {
@@ -721,10 +729,14 @@ let
 
   enca = callPackage ../tools/text/enca { };
 
+  ent = callPackage ../tools/misc/ent { };
+
   fasd = callPackage ../tools/misc/fasd { };
 
   fop = callPackage ../tools/typesetting/fop { };
 
+  filter_audio = callPackage ../development/libraries/filter_audio { };
+
   gist = callPackage ../tools/text/gist { };
 
   mcrl = callPackage ../tools/misc/mcrl { };
@@ -763,6 +775,8 @@ let
 
   autossh = callPackage ../tools/networking/autossh { };
 
+  asynk = callPackage ../tools/networking/asynk { };
+
   bacula = callPackage ../tools/backup/bacula { };
 
   bareos = callPackage ../tools/backup/bareos { };
@@ -833,6 +847,8 @@ let
 
   ccrypt = callPackage ../tools/security/ccrypt { };
 
+  ccze = callPackage ../tools/misc/ccze { };
+
   cdecl = callPackage ../development/tools/cdecl { };
 
   cdrdao = callPackage ../tools/cd-dvd/cdrdao { };
@@ -917,6 +933,8 @@ let
 
   clamav = callPackage ../tools/security/clamav { };
 
+  clex = callPackage ../tools/misc/clex { };
+
   cloc = callPackage ../tools/misc/cloc {
     inherit (perlPackages) perl AlgorithmDiff RegexpCommon;
   };
@@ -927,7 +945,7 @@ let
 
   convmv = callPackage ../tools/misc/convmv { };
 
-  cool-old-term = callPackage ../applications/misc/cool-old-term { };
+  cool-retro-term = callPackage ../applications/misc/cool-retro-term { };
 
   coreutils = callPackage ../tools/misc/coreutils
     {
@@ -1027,6 +1045,11 @@ let
 
   diffutils = callPackage ../tools/text/diffutils { };
 
+  dir2opus = callPackage ../tools/audio/dir2opus {
+    inherit (pythonPackages) mutagen python wrapPython;
+    inherit opusTools;
+  };
+
   wgetpaste = callPackage ../tools/text/wgetpaste { };
 
   dirmngr = callPackage ../tools/security/dirmngr { };
@@ -1062,6 +1085,8 @@ let
 
   dtach = callPackage ../tools/misc/dtach { };
 
+  dub = callPackage ../development/tools/build-managers/dub { };
+
   duff = callPackage ../tools/filesystems/duff { };
 
   duo-unix = callPackage ../tools/security/duo-unix { };
@@ -1140,6 +1165,8 @@ let
 
   exercism = callPackage ../development/tools/exercism { };
 
+  exfat-utils = callPackage ../tools/filesystems/exfat-utils { };
+
   exif = callPackage ../tools/graphics/exif { };
 
   exiftags = callPackage ../tools/graphics/exiftags { };
@@ -1210,6 +1237,8 @@ let
 
   libbsd = callPackage ../development/libraries/libbsd { };
 
+  libbladeRF = callPackage ../development/libraries/libbladeRF { };
+
   lprof = callPackage ../tools/graphics/lprof { };
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };
@@ -1302,9 +1331,12 @@ let
 
   gitlab = callPackage ../applications/version-management/gitlab {
     libiconv = libiconvOrLibc;
+    ruby = ruby_2_1_3;
   };
 
-  gitlab-shell = callPackage ../applications/version-management/gitlab-shell { };
+  gitlab-shell = callPackage ../applications/version-management/gitlab-shell {
+    ruby = ruby_2_1_3;
+  };
 
   glusterfs = callPackage ../tools/filesystems/glusterfs { };
 
@@ -1463,6 +1495,8 @@ let
 
   partimage = callPackage ../tools/backup/partimage { };
 
+  pgf_graphics = callPackage ../tools/graphics/pgf { };
+
   pigz = callPackage ../tools/compression/pigz { };
 
   pxz = callPackage ../tools/compression/pxz { };
@@ -1609,6 +1643,8 @@ let
 
   kst = callPackage ../tools/graphics/kst { };
 
+  leocad = callPackage ../applications/graphics/leocad { };
+
   less = callPackage ../tools/misc/less { };
 
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { };
@@ -1648,11 +1684,9 @@ let
   nodejs = callPackage ../development/web/nodejs { };
   nodejs-unstable = callPackage ../development/web/nodejs { unstableVersion = true; };
 
-  nodePackages = recurseIntoAttrs (callPackage ./node-packages.nix {
-    inherit pkgs stdenv nodejs fetchurl fetchgit;
-    neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux;
-    self = pkgs.nodePackages;
-  });
+  nodePackages = recurseIntoAttrs (
+    callPackage ./node-packages.nix { self = nodePackages; }
+  );
 
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
@@ -1934,6 +1968,11 @@ let
 
   pnmixer = callPackage ../tools/audio/pnmixer { };
 
+  pwsafe = callPackage ../applications/misc/pwsafe {
+    inherit (xlibs) libXt libXtst libXi xextproto;
+    wxGTK = wxGTK30;
+  };
+
   nifskope = callPackage ../tools/graphics/nifskope { };
 
   nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
@@ -2083,25 +2122,23 @@ let
 
   otpw = callPackage ../os-specific/linux/otpw { };
 
+  owncloud = callPackage ../servers/owncloud { };
+
   owncloudclient = callPackage ../applications/networking/owncloud-client { };
 
   p7zip = callPackage ../tools/archivers/p7zip { };
 
   pal = callPackage ../tools/misc/pal { };
 
-  pandoc = with haskellPackages; pandoc.override {
-    cabal = cabal.override {
-      extension = self: super: {
-        configureFlags = super.configureFlags or "" + " -fembed_data_files";
-        buildTools = super.buildTools or [] ++ [hsb2hs];
-        enableSharedExecutables = false;
-        enableSharedLibraries = false;
-        isLibrary = false;
-        noHaddock = true;
-        postFixup = "rm -rf $out/lib $out/nix-support $out/share";
-      };
-    };
-  };
+  pandoc = haskell-ng.lib.overrideCabal haskellngPackages.pandoc (drv: {
+    configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
+    buildTools = drv.buildTools or [] ++ [haskellngPackages.hsb2hs];
+    enableSharedExecutables = false;
+    enableSharedLibraries = false;
+    isLibrary = false;
+    doHaddock = false;
+    postFixup = "rm -rf $out/lib $out/nix-support $out/share";
+  });
 
   panomatic = callPackage ../tools/graphics/panomatic { };
 
@@ -2352,7 +2389,9 @@ let
 
   rkflashtool = callPackage ../tools/misc/rkflashtool { };
 
-  rmlint = callPackage ../tools/misc/rmlint {};
+  rmlint = callPackage ../tools/misc/rmlint {
+    inherit (pythonPackages) sphinx;
+  };
 
   rng_tools = callPackage ../tools/security/rng-tools { };
 
@@ -2518,6 +2557,8 @@ let
 
   sshuttle = callPackage ../tools/security/sshuttle { };
 
+  sstp = callPackage ../tools/networking/sstp {};
+
   sudo = callPackage ../tools/security/sudo { };
 
   suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
@@ -2613,7 +2654,7 @@ let
 
   thc-hydra = callPackage ../tools/security/thc-hydra { };
 
-  tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
+  tiled = callPackage ../applications/editors/tiled { qt = qt4; };
 
   tinc = callPackage ../tools/networking/tinc { };
 
@@ -2621,6 +2662,8 @@ let
 
   tiny8086 = callPackage ../applications/virtualization/8086tiny { };
 
+  tlsdate = callPackage ../tools/networking/tlsdate { };
+
   tmpwatch = callPackage ../tools/misc/tmpwatch  { };
 
   tmux = callPackage ../tools/misc/tmux { };
@@ -2937,6 +2980,8 @@ let
 
   xdummy = callPackage ../tools/misc/xdummy { };
 
+  xflux = callPackage ../tools/misc/xflux { };
+
   xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
 
   xml2 = callPackage ../tools/text/xml/xml2 { };
@@ -3015,6 +3060,8 @@ let
     python = python27Full;
   };
 
+  mksh = callPackage ../shells/mksh { };
+
   tcsh = callPackage ../shells/tcsh { };
 
   rush = callPackage ../shells/rush { };
@@ -3101,15 +3148,7 @@ let
 
   compcert = callPackage ../development/compilers/compcert {};
 
-  cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
-  cryptol2 = with haskellPackages_ghc763; callPackage ../development/compilers/cryptol/2.0.x.nix {
-    Cabal = Cabal_1_18_1_3;
-    cabalInstall = cabalInstall_1_18_0_3.override {
-      network = network_2_5_0_0;
-      HTTP = HTTP.override { network = network_2_5_0_0; };
-    };
-    process = process_1_2_0_0;
-  };
+  cryptol = haskell-ng.packages.ghc763.cryptol;
 
   cython = pythonPackages.cython;
   cython3 = python3Packages.cython;
@@ -3449,8 +3488,6 @@ let
 
   fsharp = callPackage ../development/compilers/fsharp {};
 
-  gem-nix = callPackage ../tools/package-management/gem-nix { };
-
   go_1_0 = callPackage ../development/compilers/go { };
 
   go_1_1 =
@@ -3511,6 +3548,8 @@ let
         jdk = openjdkBootstrap;
       }) // { outputs = [ "out" ]; };
 
+  openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { } // { outputs = [ "out" ]; };
+
   # FIXME: Need a way to set per-output meta attributes.
   openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs
     { description = "The open-source Java Runtime Environment"; }
@@ -3572,23 +3611,23 @@ let
 
   jikes = callPackage ../development/compilers/jikes { };
 
-  julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
+  julia02 = callPackage ../development/compilers/julia/0.2.nix {
     liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
     openblas = openblas_0_2_2;
     suitesparse = suitesparse_4_2;
   };
 
-  julia035 = let
+  julia03 = let
     liblapack = liblapack_3_5_0.override {shared = true;};
-  in callPackage ../development/compilers/julia/0.3.5.nix {
+  in callPackage ../development/compilers/julia/0.3.nix {
     inherit liblapack;
     suitesparse = suitesparse_4_2.override {
       inherit liblapack;
     };
     llvm = llvm_33;
   };
-  julia = julia035;
+  julia = julia03;
 
   lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
     fpc = fpc;
@@ -3732,6 +3771,8 @@ let
 
     config-file = callPackage ../development/ocaml-modules/config-file { };
 
+    cpdf = callPackage ../development/ocaml-modules/cpdf { };
+
     cppo = callPackage ../development/tools/ocaml/cppo { };
 
     cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
@@ -3746,6 +3787,11 @@ let
 
     eliom = callPackage ../development/ocaml-modules/eliom { };
 
+    ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
+      lwt = ocaml_lwt;
+      sexplib = ocaml_sexplib;
+    };
+
     fieldslib = callPackage ../development/ocaml-modules/fieldslib { };
 
     findlib = callPackage ../development/tools/ocaml/findlib { };
@@ -3762,14 +3808,20 @@ let
 
     patoline = callPackage ../tools/typesetting/patoline { };
 
+    gapi_ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { };
+
     gg = callPackage ../development/ocaml-modules/gg { };
 
     gmetadom = callPackage ../development/ocaml-modules/gmetadom { };
 
     gtktop = callPackage ../development/ocaml-modules/gtktop { };
 
+    hex = callPackage ../development/ocaml-modules/hex { };
+
     js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { };
 
+    jsonm = callPackage ../development/ocaml-modules/jsonm { };
+
     lablgl = callPackage ../development/ocaml-modules/lablgl { };
 
     lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
@@ -3788,7 +3840,11 @@ let
       gtkmathview = callPackage ../development/libraries/gtkmathview { };
     };
 
-    lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { };
+    lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { };
+    lambdaTerm =
+      if lib.versionOlder "4.01" ocaml_version
+      then callPackage ../development/ocaml-modules/lambda-term { }
+      else lambdaTerm-1_6;
 
     macaque = callPackage ../development/ocaml-modules/macaque { };
 
@@ -3812,6 +3868,8 @@ let
 
     ocaml_expat = callPackage ../development/ocaml-modules/expat { };
 
+    ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { };
+
     ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
 
     ocaml_http = callPackage ../development/ocaml-modules/http { };
@@ -3855,6 +3913,8 @@ let
 
     ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };
 
+    ocp-index = callPackage ../development/tools/ocaml/ocp-index { };
+
     ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
 
     ojquery = callPackage ../development/ocaml-modules/ojquery { };
@@ -3894,6 +3954,8 @@ let
       minimal = false;
     };
 
+    ocurl = callPackage ../development/ocaml-modules/ocurl { };
+
     pprint = callPackage ../development/ocaml-modules/pprint { };
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };
@@ -3969,7 +4031,7 @@ let
     ocaml = ocaml_3_08_0;
   };
 
-  rustc       = callPackage ../development/compilers/rustc/0.12.nix {};
+  rustc       = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {};
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
 
 
@@ -4064,6 +4126,27 @@ let
       inherit stdenv gcc binutils libc shell name cross;
     });
 
+  /* Alternative GCC wrapper that uses the standard -I include flag instead of
+   * -isystem. The -isystem flag can change the search order specified by prior
+   * -I flags. For KDE 5 packages, we don't want to interfere with the include
+   * search path order specified by the build system. Some packages depend on
+   * Qt 4 and Qt 5 simultaneously; because the two Qt versions provide headers
+   * with the same filenames, we must respect the search order specified by the
+   * build system so that the Qt 4 components find the Qt 4 headers and the Qt 5
+   * components find the Qt 5 headers.
+   */
+  wrapGCCStdInc = glibc: baseGCC: (import ../build-support/gcc-wrapper) {
+    nativeTools = stdenv.cc.nativeTools or false;
+    nativeLibc = stdenv.cc.nativeLibc or false;
+    nativePrefix = stdenv.cc.nativePrefix or "";
+    gcc = baseGCC;
+    libc = glibc;
+    inherit stdenv binutils coreutils zlib;
+    setupHook = ../build-support/gcc-wrapper/setup-hook-stdinc.sh;
+  };
+
+  gccStdInc = wrapGCCStdInc glibc gcc.gcc;
+
   # prolog
   yap = callPackage ../development/compilers/yap { };
 
@@ -4298,6 +4381,17 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
+  bundix = callPackage ../development/interpreters/ruby/bundix {
+    ruby = ruby_2_1_3;
+  };
+  bundler = callPackage ../development/interpreters/ruby/bundler.nix { };
+  bundler_HEAD = import ../development/interpreters/ruby/bundler-head.nix {
+    inherit buildRubyGem coreutils fetchgit;
+  };
+  defaultGemConfig = callPackage ../development/interpreters/ruby/bundler-env/default-gem-config.nix { };
+  buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { };
+  bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
+
   ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
   ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { };
   ruby_2_0_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { });
@@ -4315,12 +4409,6 @@ let
   ruby_2_1 = ruby_2_1_3;
   ruby_2_2 = ruby_2_2_0;
 
-  rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
-
-  rake = rubyLibs.rake;
-
-  rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { };
-
   rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
     inherit ruby makeWrapper;
   };
@@ -4442,6 +4530,8 @@ let
 
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
 
+  apacheKafka = callPackage ../servers/apache-kafka { };
+
   astyle = callPackage ../development/tools/misc/astyle { };
 
   atom-shell = callPackage ../development/tools/atom-shell {
@@ -4776,7 +4866,13 @@ let
       pythonPackages = python3Packages;
   };
 
-  node_webkit = callPackage ../development/tools/node-webkit {
+  node_webkit = node_webkit_0_9;
+
+  node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix {
+    gconf = pkgs.gnome.GConf;
+  };
+
+  node_webkit_0_9 = callPackage ../development/tools/node-webkit/nw9.nix {
     gconf = pkgs.gnome.GConf;
   };
 
@@ -4820,7 +4916,10 @@ let
 
   premake = premake4;
 
-  racerRust = callPackage ../development/tools/rust/racer { rustc = rustcMaster; };
+  racerRust = callPackage ../development/tools/rust/racer {
+    rustc = rustcMaster;
+    cargo = cargoSnapshot;
+  };
 
   radare = callPackage ../development/tools/analysis/radare {
     inherit (gnome) vte;
@@ -4974,6 +5073,8 @@ let
 
   winpdb = callPackage ../development/tools/winpdb { };
 
+  grabserial = callPackage ../development/tools/grabserial { };
+
 
   ### DEVELOPMENT / LIBRARIES
 
@@ -5006,6 +5107,8 @@ let
 
   amrwb = callPackage ../development/libraries/amrwb { };
 
+  appstream = callPackage ../development/libraries/appstream { };
+
   apr = callPackage ../development/libraries/apr { };
 
   aprutil = callPackage ../development/libraries/apr-util {
@@ -5432,8 +5535,8 @@ let
     installLocales = config.glibc.locales or false;
   };
 
-  # Not supported on Darwin
-  glibcLocales = if (! stdenv.isDarwin) then (callPackage ../development/libraries/glibc/locales.nix { }) else null;
+  # Only supported on Linux
+  glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null;
 
   glibcInfo = callPackage ../development/libraries/glibc/info.nix { };
 
@@ -5589,6 +5692,8 @@ let
       else stdenv;
   };
 
+  gnome-sharp = callPackage ../development/libraries/gnome-sharp {};
+
   granite = callPackage ../development/libraries/granite { };
 
   gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
@@ -5603,26 +5708,15 @@ let
   gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
 
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
-    gtksharp = gtksharp2;
-  };
-
-  gtksharp1 = callPackage ../development/libraries/gtk-sharp-1 {
-    inherit (gnome) libglade libgtkhtml gtkhtml
-              libgnomecanvas libgnomeui libgnomeprint
-              libgnomeprintui GConf;
+    gtksharp = gtk-sharp;
   };
 
-  gtksharp2 = callPackage ../development/libraries/gtk-sharp-2 {
+  gtk-sharp = callPackage ../development/libraries/gtk-sharp-2 {
     inherit (gnome) libglade libgtkhtml gtkhtml
               libgnomecanvas libgnomeui libgnomeprint
               libgnomeprintui GConf gnomepanel;
   };
 
-  gtksourceviewsharp = callPackage ../development/libraries/gtksourceview-sharp {
-    inherit (gnome) gtksourceview;
-    gtksharp = gtksharp2;
-  };
-
   gtkspell = callPackage ../development/libraries/gtkspell { };
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
@@ -5754,6 +5848,13 @@ let
     automake = automake111x;
   };
 
+  kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 {
+    stdenv = overrideGCC stdenv gccStdInc;
+  });
+  kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {});
+  kf5_latest = kf56;
+  kf5_stable = kf55;
+
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
     openldap = openldap.override {
       cyrus_sasl = cyrus_sasl.override { kerberos = null; };
@@ -5883,6 +5984,7 @@ let
   };
 
   libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
+  libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix {};
 
   libdc1394 = callPackage ../development/libraries/libdc1394 { };
 
@@ -6152,6 +6254,8 @@ let
 
   libkate = callPackage ../development/libraries/libkate { };
 
+  libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
+
   libksba = callPackage ../development/libraries/libksba { };
 
   libmad = callPackage ../development/libraries/libmad { };
@@ -6269,6 +6373,8 @@ let
 
   libpipeline = callPackage ../development/libraries/libpipeline { };
 
+  libpgf = callPackage ../development/libraries/libpgf { };
+
   libpng = callPackage ../development/libraries/libpng { };
   libpng_apng = libpng.override { apngSupport = true; };
   libpng12 = callPackage ../development/libraries/libpng/12.nix { };
@@ -6767,23 +6873,16 @@ let
 
   pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
 
-  phonon = callPackage ../development/libraries/phonon { inherit qt4; };
+  phonon = callPackage ../development/libraries/phonon/qt4 {};
 
-  phonon_qt5 = phonon.override {
-    withQt5 = true;
-    inherit qt5;
-    qt4 = null;
-  };
+  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {};
 
-  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { };
+  phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {};
 
-  phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { inherit qt4; };
+  phonon_qt5 = callPackage ../development/libraries/phonon/qt5 {};
 
-  phonon_qt5_backend_vlc = phonon_backend_vlc.override {
-    withQt5 = true;
-    inherit qt5;
-    qt4 = null;
-  };
+  phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 {};
+  phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 {};
 
   physfs = callPackage ../development/libraries/physfs { };
 
@@ -6816,6 +6915,7 @@ let
 
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
   popplerQt4 = poppler.poppler_qt4;
+  popplerQt5 = poppler.poppler_qt5;
 
   popt = callPackage ../development/libraries/popt { };
 
@@ -6854,6 +6954,8 @@ let
 
   qjson = callPackage ../development/libraries/qjson { };
 
+  qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
+
   qoauth = callPackage ../development/libraries/qoauth { };
 
   quazip = callPackage ../development/libraries/quazip {
@@ -7217,6 +7319,10 @@ let
 
   ucommon = callPackage ../development/libraries/ucommon { };
 
+  v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
+    inherit (pythonPackages) gyp;
+  };
+
   v8 = callPackage ../development/libraries/v8 {
     inherit (pythonPackages) gyp;
   };
@@ -7603,6 +7709,8 @@ let
 
   pygtk = pythonPackages.pygtk;
 
+  pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
+
   pyGtkGlade = pythonPackages.pyGtkGlade;
 
   pylint = callPackage ../development/python-modules/pylint { };
@@ -7661,8 +7769,7 @@ let
     packages = [];
   };
 
-  rPackages = import ../development/r-modules {
-    inherit pkgs;
+  rPackages = callPackage ../development/r-modules {
     overrides = (config.rPackageOverrides or (p: {})) pkgs;
   };
 
@@ -7813,7 +7920,9 @@ let
 
   lighttpd = callPackage ../servers/http/lighttpd { };
 
-  mailman = callPackage ../servers/mail/mailman { };
+  mailman = callPackage ../servers/mail/mailman {
+    dnspython = pythonPackages.dns;
+  };
 
   mediatomb = callPackage ../servers/mediatomb {
     spidermonkey = spidermonkey_185;
@@ -7913,6 +8022,8 @@ let
 
   influxdb = callPackage ../servers/nosql/influxdb { };
 
+  influxdb-backup = callPackage ../servers/nosql/influxdb/backup.nix { };
+
   hyperdex = callPackage ../servers/nosql/hyperdex { };
 
   mysql51 = import ../servers/sql/mysql/5.1.x.nix {
@@ -7939,6 +8050,7 @@ let
   newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
 
   riemann = callPackage ../servers/monitoring/riemann { };
+  riemann-dash = callPackage ../servers/monitoring/riemann-dash { };
 
   oidentd = callPackage ../servers/identd/oidentd { };
 
@@ -8335,6 +8447,8 @@ let
 
   firejail = callPackage ../os-specific/linux/firejail {};
 
+  freefall = callPackage ../os-specific/linux/freefall { };
+
   fuse = callPackage ../os-specific/linux/fuse { };
 
   fxload = callPackage ../os-specific/linux/fxload { };
@@ -8561,7 +8675,7 @@ let
      for a specific kernel.  This function can then be called for
      whatever kernel you're using. */
 
-  linuxPackagesFor = kernel: self: let callPackage = newScope self; in {
+  linuxPackagesFor = kernel: self: let callPackage = newScope self; in rec {
     inherit kernel;
 
     acpi_call = callPackage ../os-specific/linux/acpi-call {};
@@ -8641,6 +8755,10 @@ let
       pulseSupport = config.pulseaudio or false;
     };
 
+    virtualboxHardened = lowPrio (virtualbox.override {
+      enableHardening = true;
+    });
+
     virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };
 
     zfs = callPackage ../os-specific/linux/zfs { };
@@ -9267,6 +9385,8 @@ let
 
   xkeyboard_config = xorg.xkeyboardconfig;
 
+  zeal = callPackage ../data/documentation/zeal { };
+
 
   ### APPLICATIONS
 
@@ -9592,7 +9712,9 @@ let
   dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) {
   };
 
-  docker = callPackage ../applications/virtualization/docker { };
+  docker = callPackage ../applications/virtualization/docker {
+    go = go_1_3;
+  };
 
   doodle = callPackage ../applications/search/doodle { };
 
@@ -9698,6 +9820,8 @@ let
 
     ess = callPackage ../applications/editors/emacs-modes/ess { };
 
+    flycheck = callPackage ../applications/editors/emacs-modes/flycheck { };
+
     flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
 
     gh = callPackage ../applications/editors/emacs-modes/gh { };
@@ -9729,6 +9853,8 @@ let
 
     js2 = callPackage ../applications/editors/emacs-modes/js2 { };
 
+    let-alist = callPackage ../applications/editors/emacs-modes/let-alist { };
+
     logito = callPackage ../applications/editors/emacs-modes/logito { };
 
     loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
@@ -9883,8 +10009,12 @@ let
 
   goldendict = callPackage ../applications/misc/goldendict { };
 
+  google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
+
   google-musicmanager = callPackage ../applications/audio/google-musicmanager { };
 
+  gpa = callPackage ../applications/misc/gpa { };
+
   gpicview = callPackage ../applications/graphics/gpicview { };
 
   gqrx = callPackage ../applications/misc/gqrx { };
@@ -9991,13 +10121,10 @@ let
 
   freicoin = callPackage ../applications/misc/freicoin { };
 
-  fspot = callPackage ../applications/graphics/f-spot {
-    inherit (gnome) libgnome libgnomeui;
-    gtksharp = gtksharp1;
-  };
-
   fuze = callPackage ../applications/networking/instant-messengers/fuze {};
 
+  game-music-emu = callPackage ../applications/audio/game-music-emu { };
+
   gcolor2 = callPackage ../applications/graphics/gcolor2 { };
 
   get_iplayer = callPackage ../applications/misc/get_iplayer {};
@@ -10306,12 +10433,22 @@ let
     boost = boost155;
   };
 
+  kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
+    stdenv = overrideGCC stdenv gccStdInc;
+  });
+  kdeApps_latest = kdeApps_14_12;
+  kdeApps_stable = kdeApps_14_12;
+
   keepnote = callPackage ../applications/office/keepnote {
     pygtk = pyGtkGlade;
   };
 
   kermit = callPackage ../tools/misc/kermit { };
 
+  keyfinder = callPackage ../applications/audio/keyfinder { };
+
+  keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { };
+
   keymon = callPackage ../applications/video/key-mon { };
 
   kid3 = callPackage ../applications/audio/kid3 {
@@ -10444,13 +10581,12 @@ let
 
   mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
 
-  meld = callPackage ../applications/version-management/meld {
-    inherit (gnome) scrollkeeper;
-    pygtk = pyGtkGlade;
-  };
+  meld = callPackage ../applications/version-management/meld { };
 
   mcomix = callPackage ../applications/graphics/mcomix { };
 
+  mendeley = callPackage ../applications/office/mendeley { };
+
   mercurial = callPackage ../applications/version-management/mercurial {
     inherit (pythonPackages) curses docutils;
     guiSupport = false; # use mercurialFull to get hgk GUI
@@ -10493,6 +10629,8 @@ let
     inherit (vamp) vampSDK;
   };
 
+  mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
+
   mmex = callPackage ../applications/office/mmex { };
 
   moc = callPackage ../applications/audio/moc { };
@@ -10501,15 +10639,7 @@ let
 
   monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
 
-  monodevelop = callPackage ../applications/editors/monodevelop {
-    inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf;
-    mozilla = firefox;
-    gtksharp = gtksharp2;
-  };
-
-  monodoc = callPackage ../applications/editors/monodoc {
-    gtksharp = gtksharp1;
-  };
+  monodevelop = callPackage ../applications/editors/monodevelop {};
 
   monotone = callPackage ../applications/version-management/monotone {
     lua = lua5;
@@ -10626,42 +10756,14 @@ let
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
-  ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
-    ruby = ruby_1_9_3;
-    hoe = rubyLibs.hoe;
-  };
-
-  ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { };
-
   shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; };
 
   smplayer = callPackage ../applications/video/smplayer { };
 
   smtube = callPackage ../applications/video/smtube {};
 
-  sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup {
-    ruby = ruby_1_9_3.override {
-      cursesSupport = true;
-    };
-
-    inherit gettext highline iconv locale lockfile
-      text trollop xapian_ruby which;
-
-    rmail_sup = ""; # missing
-    unicode = "";
-
-    # See https://github.com/NixOS/nixpkgs/issues/1804 and
-    # https://github.com/NixOS/nixpkgs/issues/2146
-    bundler = pkgs.lib.overrideDerivation pkgs.rubyLibs.bundler (
-      oldAttrs: {
-        dontPatchShebangs = 1;
-      }
-    );
-    chronic      = chronic;
-    gpgme        = ruby_gpgme;
-    mime_types   = mime_types;
-    ncursesw_sup = ruby_ncursesw_sup;
-    rake         = rake;
+  sup = callPackage ../applications/networking/mailreaders/sup {
+    ruby = ruby_1_9_3.override { cursesSupport = true; };
   };
 
   synfigstudio = callPackage ../applications/graphics/synfigstudio {
@@ -10826,7 +10928,7 @@ let
   pinpoint = callPackage ../applications/office/pinpoint {};
 
   pinta = callPackage ../applications/graphics/pinta {
-    gtksharp = gtksharp2;
+    gtksharp = gtk-sharp;
   };
 
   pommed = callPackage ../os-specific/linux/pommed {
@@ -10885,6 +10987,17 @@ let
 
   qtractor = callPackage ../applications/audio/qtractor { };
 
+  quassel_qt5 = callPackage ../applications/networking/irc/quassel {
+    monolithic = true;
+    daemon = false;
+    client = false;
+    withKDE = false;
+    useQt5 = true;
+    qt = qt5;
+    dconf = gnome3.dconf;
+    tag = "-qt5";
+  };
+
   quirc = callPackage ../tools/graphics/quirc {};
 
   quodlibet = callPackage ../applications/audio/quodlibet {
@@ -10996,6 +11109,8 @@ let
 
   slrn = callPackage ../applications/networking/newsreaders/slrn { };
 
+  sooperlooper = callPackage ../applications/audio/sooperlooper { };
+
   spideroak = callPackage ../applications/networking/spideroak { };
 
   ssvnc = callPackage ../applications/networking/remote/ssvnc { };
@@ -11176,6 +11291,8 @@ let
 
   telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};
 
+  terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
+
   terminator = callPackage ../applications/misc/terminator {
     vte = gnome.vte.override { pythonSupport = true; };
     inherit (pythonPackages) notify;
@@ -11218,6 +11335,10 @@ let
 
   tla = callPackage ../applications/version-management/arch { };
 
+  tlp = callPackage ../tools/misc/tlp {
+    enableRDW = config.networking.networkmanager.enable or false;
+  };
+
   todo-txt-cli = callPackage ../applications/office/todo.txt-cli { };
 
   tomahawk = callPackage ../applications/audio/tomahawk {
@@ -11536,6 +11657,16 @@ let
       );
   };
 
+  wrapKodi = { kodi }: import ../applications/video/kodi/wrapper.nix {
+    inherit stdenv lib makeWrapper kodi;
+    plugins = let inherit (lib) optional; in with kodiPlugins;
+      ([]
+      ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher
+      ++ optional (config.kodi.enableGenesis or false) genesis
+      ++ optional (config.kodi.enableSVTPlay or false) svtplay
+      );
+  };
+
   wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
 
   wxcam = callPackage ../applications/video/wxcam {
@@ -11573,12 +11704,25 @@ let
     xbmc = xbmcPlain;
   };
 
-  kodi = callPackage ../applications/video/kodi { };
+  kodiPlain = callPackage ../applications/video/kodi { };
+
+  kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {
+    kodi = kodiPlain;
+  });
+
+  kodi = wrapKodi {
+    kodi = kodiPlain;
+  };
 
   xbmc-retroarch-advanced-launchers =
     callPackage ../misc/emulators/retroarch/xbmc-advanced-launchers.nix {
       cores = retroArchCores;
-    };
+  };
+
+  kodi-retroarch-advanced-launchers =
+    callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix {
+      cores = retroArchCores;
+  };
 
   xca = callPackage ../applications/misc/xca { };
 
@@ -12358,6 +12502,8 @@ let
     geoclue = geoclue2;
   };
 
+  orion = callPackage ../misc/themes/orion {};
+
   oxygen-gtk2 = callPackage ../misc/themes/gtk2/oxygen-gtk { };
 
   oxygen-gtk3 = callPackage ../misc/themes/gtk3/oxygen-gtk3 { };
@@ -12374,6 +12520,15 @@ let
 
   mate-themes = callPackage ../misc/themes/mate-themes { };
 
+  plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 {
+    stdenv = overrideGCC stdenv gccStdInc;
+  });
+  plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {});
+  plasma5_latest = plasma52;
+  plasma5_stable = plasma51;
+
+  kde5 = kf55 // plasma51 // kdeApps_14_12;
+
   xfce = xfce4_10;
   xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });
 
@@ -12516,7 +12671,13 @@ let
 
     bedrock = callPackage ../development/coq-modules/bedrock {};
 
-    containers = callPackage ../development/coq-modules/containers {};
+    contribs =
+      let contribs =
+        import ../development/coq-modules/contribs
+        contribs
+        callPackage { };
+      in
+        recurseIntoAttrs contribs;
 
     coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {};
 
@@ -12903,8 +13064,12 @@ let
 
   nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { };
 
+  nixui = callPackage ../tools/package-management/nixui { node_webkit = node_webkit_0_11; };
+
   nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { };
 
+  nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
+
   nix-repl = callPackage ../tools/package-management/nix-repl { };
 
   nix-serve = callPackage ../tools/package-management/nix-serve { };
@@ -12988,6 +13153,8 @@ let
 
   runit = callPackage ../tools/system/runit { };
 
+  refind = callPackage ../tools/bootloaders/refind { };
+
   xlockmore = callPackage ../misc/screensavers/xlockmore { };
 
   sails = callPackage ../misc/sails { };
@@ -13150,6 +13317,9 @@ let
     desktopName = "Vimb";
   };
 
+  vips = callPackage ../tools/graphics/vips { };
+  nip2 = callPackage ../tools/graphics/nip2 { };
+
   VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
@@ -13261,6 +13431,7 @@ let
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   nfsUtils = nfs-utils;  # added 2014-12-06
   buildbotSlave = buildbot-slave;  # added 2014-12-09
+  cool-old-term = cool-retro-term; # added 2015-01-31
 
   opentsdb = callPackage ../tools/misc/opentsdb {};
 
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 509c3d5acdf..204603ddee6 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -34,6 +34,7 @@
     jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_3; };
     MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x
     mtl = self.mtl_2_1_3_1;
+    xhtml = null;
     transformersCompat = super.transformersCompat.override { cabal = self.cabal.override {
       extension = self: super: { configureFlags = "-fthree " + super.configureFlags or ""; };
     }; };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 71a2ab092e4..c17972dbd38 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -781,7 +781,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
     optparseApplicative = self.optparseApplicative_0_10_0;
   };
 
-  elmPackage = callPackage ../development/compilers/elm/elm-package.nix {};
+  elmPackage = callPackage ../development/compilers/elm/elm-package.nix {
+    optparseApplicative = self.optparseApplicative_0_10_0;
+  };
 
   elmServer = callPackage ../development/compilers/elm/elm-server.nix {};
 
@@ -1656,6 +1658,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   logict = callPackage ../development/libraries/haskell/logict {};
 
+  logsink = callPackage ../development/libraries/haskell/logsink {};
+
   loop = callPackage ../development/libraries/haskell/loop {};
 
   lushtags = callPackage ../development/libraries/haskell/lushtags {};
@@ -2885,6 +2889,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};
 
+  webRoutesHappstack = callPackage ../development/libraries/haskell/web-routes-happstack {};
+
   websockets = callPackage ../development/libraries/haskell/websockets {};
 
   websocketsSnap = callPackage ../development/libraries/haskell/websockets-snap {};
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 24095915657..8709dd62b6e 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -3,133 +3,142 @@
 {
   by-spec."7f"."*" =
     self.by-version."7f"."1.1.3";
-  by-version."7f"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."7f"."1.1.3" = self.buildNodePackage {
     name = "7f-1.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/7f/-/7f-1.1.3.tgz";
-        name = "7f-1.1.3.tgz";
-        sha1 = "88d2cb194fceeb96db7b24bc710b283451e7a851";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."7f" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/7f/-/7f-1.1.3.tgz";
+      name = "7f-1.1.3.tgz";
+      sha1 = "88d2cb194fceeb96db7b24bc710b283451e7a851";
+    };
     deps = {
       "bits-0.1.1" = self.by-version."bits"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "7f" ];
+    peerDependencies = [];
   };
   "7f" = self.by-version."7f"."1.1.3";
   by-spec."Base64"."~0.2.0" =
     self.by-version."Base64"."0.2.1";
-  by-version."Base64"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."Base64"."0.2.1" = self.buildNodePackage {
     name = "Base64-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
-        name = "Base64-0.2.1.tgz";
-        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."Base64" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
+      name = "Base64-0.2.1.tgz";
+      sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "Base64" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
+      name = "CSSwhat-0.4.7.tgz";
+      sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."JSONPath"."^0.10.0" =
+    self.by-version."JSONPath"."0.10.0";
+  by-version."JSONPath"."0.10.0" = self.buildNodePackage {
+    name = "JSONPath-0.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/JSONPath/-/JSONPath-0.10.0.tgz";
+      name = "JSONPath-0.10.0.tgz";
+      sha1 = "44959bdd94e3641858e7f2147d93c732f3505b1c";
+    };
+    deps = {
+      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+    };
+    peerDependencies = [];
   };
   by-spec."JSONStream"."~0.6.4" =
     self.by-version."JSONStream"."0.6.4";
-  by-version."JSONStream"."0.6.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."JSONStream"."0.6.4" = self.buildNodePackage {
     name = "JSONStream-0.6.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz";
-        name = "JSONStream-0.6.4.tgz";
-        sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."JSONStream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz";
+      name = "JSONStream-0.6.4.tgz";
+      sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb";
+    };
     deps = {
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
       "through-2.2.7" = self.by-version."through"."2.2.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "JSONStream" ];
+    peerDependencies = [];
   };
   by-spec."JSONStream"."~0.7.1" =
     self.by-version."JSONStream"."0.7.4";
-  by-version."JSONStream"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."JSONStream"."0.7.4" = self.buildNodePackage {
     name = "JSONStream-0.7.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz";
-        name = "JSONStream-0.7.4.tgz";
-        sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."JSONStream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz";
+      name = "JSONStream-0.7.4.tgz";
+      sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786";
+    };
     deps = {
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "JSONStream" ];
+    peerDependencies = [];
   };
   by-spec."JSONStream"."~0.8.3" =
     self.by-version."JSONStream"."0.8.4";
-  by-version."JSONStream"."0.8.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."JSONStream"."0.8.4" = self.buildNodePackage {
     name = "JSONStream-0.8.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
-        name = "JSONStream-0.8.4.tgz";
-        sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."JSONStream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
+      name = "JSONStream-0.8.4.tgz";
+      sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
+    };
     deps = {
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "JSONStream" ];
+    peerDependencies = [];
   };
   by-spec."JSONStream"."~0.8.4" =
     self.by-version."JSONStream"."0.8.4";
   by-spec."abbrev"."1" =
     self.by-version."abbrev"."1.0.5";
-  by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."abbrev"."1.0.5" = self.buildNodePackage {
     name = "abbrev-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
-        name = "abbrev-1.0.5.tgz";
-        sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."abbrev" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
+      name = "abbrev-1.0.5.tgz";
+      sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "abbrev" ];
+    peerDependencies = [];
   };
   by-spec."abbrev"."1.0.x" =
     self.by-version."abbrev"."1.0.5";
@@ -137,27 +146,39 @@
     self.by-version."abbrev"."1.0.5";
   by-spec."abbrev"."~1.0.5" =
     self.by-version."abbrev"."1.0.5";
+  by-spec."accepts"."~1.0.4" =
+    self.by-version."accepts"."1.0.7";
+  by-version."accepts"."1.0.7" = self.buildNodePackage {
+    name = "accepts-1.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
+      name = "accepts-1.0.7.tgz";
+      sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
+    };
+    deps = {
+      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+      "negotiator-0.4.7" = self.by-version."negotiator"."0.4.7";
+    };
+    peerDependencies = [];
+  };
+  by-spec."accepts"."~1.0.7" =
+    self.by-version."accepts"."1.0.7";
   by-spec."accepts"."~1.1.0" =
     self.by-version."accepts"."1.1.4";
-  by-version."accepts"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."accepts"."1.1.4" = self.buildNodePackage {
     name = "accepts-1.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
-        name = "accepts-1.1.4.tgz";
-        sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."accepts" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
+      name = "accepts-1.1.4.tgz";
+      sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
+    };
     deps = {
       "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7";
       "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "accepts" ];
+    peerDependencies = [];
   };
   by-spec."accepts"."~1.1.2" =
     self.by-version."accepts"."1.1.4";
@@ -167,462 +188,450 @@
     self.by-version."accepts"."1.1.4";
   by-spec."accepts"."~1.2.2" =
     self.by-version."accepts"."1.2.2";
-  by-version."accepts"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."accepts"."1.2.2" = self.buildNodePackage {
     name = "accepts-1.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/accepts/-/accepts-1.2.2.tgz";
-        name = "accepts-1.2.2.tgz";
-        sha1 = "9bc29b9b39f33a351e76a76058184ebc8ed7783f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."accepts" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.2.tgz";
+      name = "accepts-1.2.2.tgz";
+      sha1 = "9bc29b9b39f33a351e76a76058184ebc8ed7783f";
+    };
     deps = {
       "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7";
       "negotiator-0.5.0" = self.by-version."negotiator"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "accepts" ];
+    peerDependencies = [];
+  };
+  by-spec."acorn"."^0.11.0" =
+    self.by-version."acorn"."0.11.0";
+  by-version."acorn"."0.11.0" = self.buildNodePackage {
+    name = "acorn-0.11.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/acorn/-/acorn-0.11.0.tgz";
+      name = "acorn-0.11.0.tgz";
+      sha1 = "6e95f0253ad161ff0127db32983e5e2e5352d59a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."acorn"."^0.8.0" =
     self.by-version."acorn"."0.8.0";
-  by-version."acorn"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."acorn"."0.8.0" = self.buildNodePackage {
     name = "acorn-0.8.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz";
-        name = "acorn-0.8.0.tgz";
-        sha1 = "e07ae6721110b22878242950ae2e96658b0aac7e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."acorn" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz";
+      name = "acorn-0.8.0.tgz";
+      sha1 = "e07ae6721110b22878242950ae2e96658b0aac7e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "acorn" ];
+    peerDependencies = [];
   };
   by-spec."acorn"."~0.9.0" =
     self.by-version."acorn"."0.9.0";
-  by-version."acorn"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."acorn"."0.9.0" = self.buildNodePackage {
     name = "acorn-0.9.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz";
-        name = "acorn-0.9.0.tgz";
-        sha1 = "67728e0acad6cc61dfb901c121837694db5b926b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."acorn" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz";
+      name = "acorn-0.9.0.tgz";
+      sha1 = "67728e0acad6cc61dfb901c121837694db5b926b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "acorn" ];
+    peerDependencies = [];
   };
   by-spec."acorn-globals"."^1.0.0" =
-    self.by-version."acorn-globals"."1.0.1";
-  by-version."acorn-globals"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "acorn-globals-1.0.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.1.tgz";
-        name = "acorn-globals-1.0.1.tgz";
-        sha1 = "00013368c24311f9fc2c2d420df6c311b9df64d9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."acorn-globals" or []);
+    self.by-version."acorn-globals"."1.0.2";
+  by-version."acorn-globals"."1.0.2" = self.buildNodePackage {
+    name = "acorn-globals-1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.2.tgz";
+      name = "acorn-globals-1.0.2.tgz";
+      sha1 = "f90bf21844405e649d00add61a688fc6a3462158";
+    };
     deps = {
-      "acorn-0.8.0" = self.by-version."acorn"."0.8.0";
+      "acorn-0.11.0" = self.by-version."acorn"."0.11.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "acorn-globals" ];
+    peerDependencies = [];
   };
   by-spec."acorn-globals"."^1.0.1" =
-    self.by-version."acorn-globals"."1.0.1";
+    self.by-version."acorn-globals"."1.0.2";
   by-spec."active-x-obfuscator"."0.0.1" =
     self.by-version."active-x-obfuscator"."0.0.1";
-  by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."active-x-obfuscator"."0.0.1" = self.buildNodePackage {
     name = "active-x-obfuscator-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
-        name = "active-x-obfuscator-0.0.1.tgz";
-        sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."active-x-obfuscator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
+      name = "active-x-obfuscator-0.0.1.tgz";
+      sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a";
+    };
     deps = {
       "zeparser-0.0.5" = self.by-version."zeparser"."0.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "active-x-obfuscator" ];
+    peerDependencies = [];
   };
   by-spec."addr-to-ip-port"."^1.0.0" =
     self.by-version."addr-to-ip-port"."1.4.0";
-  by-version."addr-to-ip-port"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."addr-to-ip-port"."1.4.0" = self.buildNodePackage {
     name = "addr-to-ip-port-1.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.0.tgz";
-        name = "addr-to-ip-port-1.4.0.tgz";
-        sha1 = "9b784874d8a6a284c64d453f2c0f6430f201a8db";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."addr-to-ip-port" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.0.tgz";
+      name = "addr-to-ip-port-1.4.0.tgz";
+      sha1 = "9b784874d8a6a284c64d453f2c0f6430f201a8db";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "addr-to-ip-port" ];
+    peerDependencies = [];
   };
   by-spec."addr-to-ip-port"."^1.0.1" =
     self.by-version."addr-to-ip-port"."1.4.0";
+  by-spec."addressparser"."~0.1.3" =
+    self.by-version."addressparser"."0.1.3";
+  by-version."addressparser"."0.1.3" = self.buildNodePackage {
+    name = "addressparser-0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
+      name = "addressparser-0.1.3.tgz";
+      sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."addressparser"."~0.2.1" =
     self.by-version."addressparser"."0.2.1";
-  by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."addressparser"."0.2.1" = self.buildNodePackage {
     name = "addressparser-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz";
-        name = "addressparser-0.2.1.tgz";
-        sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."addressparser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz";
+      name = "addressparser-0.2.1.tgz";
+      sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "addressparser" ];
+    peerDependencies = [];
   };
   by-spec."adm-zip"."0.4.4" =
     self.by-version."adm-zip"."0.4.4";
-  by-version."adm-zip"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."adm-zip"."0.4.4" = self.buildNodePackage {
     name = "adm-zip-0.4.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz";
-        name = "adm-zip-0.4.4.tgz";
-        sha1 = "a61ed5ae6905c3aea58b3a657d25033091052736";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."adm-zip" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz";
+      name = "adm-zip-0.4.4.tgz";
+      sha1 = "a61ed5ae6905c3aea58b3a657d25033091052736";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "adm-zip" ];
+    peerDependencies = [];
   };
   by-spec."adm-zip"."~0.4.3" =
     self.by-version."adm-zip"."0.4.4";
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz";
+      name = "after-0.8.1.tgz";
+      sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."agent-base"."~1.0.1" =
+    self.by-version."agent-base"."1.0.1";
+  by-version."agent-base"."1.0.1" = self.buildNodePackage {
+    name = "agent-base-1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/agent-base/-/agent-base-1.0.1.tgz";
+      name = "agent-base-1.0.1.tgz";
+      sha1 = "806dbee16f2f27506730e2eb78f537192706ccc3";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."airplay-js"."^0.2.0" =
-    self.by-version."airplay-js"."0.2.6";
-  by-version."airplay-js"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "airplay-js-0.2.6";
-    bin = false;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.6.tgz";
-        name = "airplay-js-0.2.6.tgz";
-        sha1 = "a7038ed3559d9dd6d8c96d553b56158bf9434f7c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."airplay-js" or []);
-    deps = {
-      "mdns-js-0.2.4" = self.by-version."mdns-js"."0.2.4";
+    self.by-version."airplay-js"."0.2.11";
+  by-version."airplay-js"."0.2.11" = self.buildNodePackage {
+    name = "airplay-js-0.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.11.tgz";
+      name = "airplay-js-0.2.11.tgz";
+      sha1 = "276dc149bb5ce19d13632d7cab7afd4e759e37cc";
+    };
+    deps = {
+      "asyncblock-2.1.23" = self.by-version."asyncblock"."2.1.23";
+      "mdns-js-0.2.5" = self.by-version."mdns-js"."0.2.5";
       "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "airplay-js" ];
+    peerDependencies = [];
   };
   by-spec."airplay-js"."^0.2.5" =
-    self.by-version."airplay-js"."0.2.6";
+    self.by-version."airplay-js"."0.2.11";
+  by-spec."alea"."~0.0.9" =
+    self.by-version."alea"."0.0.9";
+  by-version."alea"."0.0.9" = self.buildNodePackage {
+    name = "alea-0.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/alea/-/alea-0.0.9.tgz";
+      name = "alea-0.0.9.tgz";
+      sha1 = "f738cb45f83430069f45cf69ccbf312dd57a9e1a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."almond"."*" =
     self.by-version."almond"."0.3.0";
-  by-version."almond"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."almond"."0.3.0" = self.buildNodePackage {
     name = "almond-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/almond/-/almond-0.3.0.tgz";
-        name = "almond-0.3.0.tgz";
-        sha1 = "701510c31038354f85ea31410b89ff3392058014";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."almond" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/almond/-/almond-0.3.0.tgz";
+      name = "almond-0.3.0.tgz";
+      sha1 = "701510c31038354f85ea31410b89ff3392058014";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "almond" ];
+    peerDependencies = [];
   };
   "almond" = self.by-version."almond"."0.3.0";
+  by-spec."alter"."~0.2.0" =
+    self.by-version."alter"."0.2.0";
+  by-version."alter"."0.2.0" = self.buildNodePackage {
+    name = "alter-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/alter/-/alter-0.2.0.tgz";
+      name = "alter-0.2.0.tgz";
+      sha1 = "c7588808617572034aae62480af26b1d4d1cb3cd";
+    };
+    deps = {
+      "stable-0.1.5" = self.by-version."stable"."0.1.5";
+    };
+    peerDependencies = [];
+  };
   by-spec."amdefine"."*" =
     self.by-version."amdefine"."0.1.0";
-  by-version."amdefine"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."amdefine"."0.1.0" = self.buildNodePackage {
     name = "amdefine-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz";
-        name = "amdefine-0.1.0.tgz";
-        sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."amdefine" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz";
+      name = "amdefine-0.1.0.tgz";
+      sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "amdefine" ];
+    peerDependencies = [];
   };
   "amdefine" = self.by-version."amdefine"."0.1.0";
   by-spec."amdefine".">=0.0.4" =
     self.by-version."amdefine"."0.1.0";
+  by-spec."amqp".">=0.1.3" =
+    self.by-version."amqp"."0.2.0";
+  by-version."amqp"."0.2.0" = self.buildNodePackage {
+    name = "amqp-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/amqp/-/amqp-0.2.0.tgz";
+      name = "amqp-0.2.0.tgz";
+      sha1 = "caed3d5a1ef5f419663f80dcf6e95312e5fca2ca";
+    };
+    deps = {
+      "lodash-1.3.1" = self.by-version."lodash"."1.3.1";
+    };
+    peerDependencies = [];
+  };
   by-spec."ansi"."^0.3.0" =
     self.by-version."ansi"."0.3.0";
-  by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansi"."0.3.0" = self.buildNodePackage {
     name = "ansi-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
-        name = "ansi-0.3.0.tgz";
-        sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
+      name = "ansi-0.3.0.tgz";
+      sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi" ];
+    peerDependencies = [];
   };
   by-spec."ansi"."~0.3.0" =
     self.by-version."ansi"."0.3.0";
   by-spec."ansi-regex"."^0.1.0" =
     self.by-version."ansi-regex"."0.1.0";
-  by-version."ansi-regex"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansi-regex"."0.1.0" = self.buildNodePackage {
     name = "ansi-regex-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz";
-        name = "ansi-regex-0.1.0.tgz";
-        sha1 = "55ca60db6900857c423ae9297980026f941ed903";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi-regex" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz";
+      name = "ansi-regex-0.1.0.tgz";
+      sha1 = "55ca60db6900857c423ae9297980026f941ed903";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi-regex" ];
+    peerDependencies = [];
   };
   by-spec."ansi-regex"."^0.2.0" =
     self.by-version."ansi-regex"."0.2.1";
-  by-version."ansi-regex"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansi-regex"."0.2.1" = self.buildNodePackage {
     name = "ansi-regex-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi-regex" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi-regex" ];
+    peerDependencies = [];
   };
   by-spec."ansi-regex"."^0.2.1" =
     self.by-version."ansi-regex"."0.2.1";
   by-spec."ansi-regex"."^1.0.0" =
     self.by-version."ansi-regex"."1.1.0";
-  by-version."ansi-regex"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansi-regex"."1.1.0" = self.buildNodePackage {
     name = "ansi-regex-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.0.tgz";
-        name = "ansi-regex-1.1.0.tgz";
-        sha1 = "67792c5d6ad05c792d6cd6057ac8f5e69ebf4357";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi-regex" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.0.tgz";
+      name = "ansi-regex-1.1.0.tgz";
+      sha1 = "67792c5d6ad05c792d6cd6057ac8f5e69ebf4357";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi-regex" ];
+    peerDependencies = [];
   };
+  by-spec."ansi-regex"."^1.1.0" =
+    self.by-version."ansi-regex"."1.1.0";
   by-spec."ansi-remover"."*" =
     self.by-version."ansi-remover"."0.0.2";
-  by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansi-remover"."0.0.2" = self.buildNodePackage {
     name = "ansi-remover-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
-        name = "ansi-remover-0.0.2.tgz";
-        sha1 = "7020086289f10e195d85d828de065ccdd50e6e66";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi-remover" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
+      name = "ansi-remover-0.0.2.tgz";
+      sha1 = "7020086289f10e195d85d828de065ccdd50e6e66";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi-remover" ];
+    peerDependencies = [];
   };
   "ansi-remover" = self.by-version."ansi-remover"."0.0.2";
   by-spec."ansi-styles"."^1.1.0" =
     self.by-version."ansi-styles"."1.1.0";
-  by-version."ansi-styles"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansi-styles"."1.1.0" = self.buildNodePackage {
     name = "ansi-styles-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi-styles" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi-styles" ];
+    peerDependencies = [];
   };
   by-spec."ansi-styles"."~1.0.0" =
     self.by-version."ansi-styles"."1.0.0";
-  by-version."ansi-styles"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansi-styles"."1.0.0" = self.buildNodePackage {
     name = "ansi-styles-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
-        name = "ansi-styles-1.0.0.tgz";
-        sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi-styles" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
+      name = "ansi-styles-1.0.0.tgz";
+      sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi-styles" ];
+    peerDependencies = [];
   };
   by-spec."ansicolors"."~0.3.2" =
     self.by-version."ansicolors"."0.3.2";
-  by-version."ansicolors"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansicolors"."0.3.2" = self.buildNodePackage {
     name = "ansicolors-0.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
-        name = "ansicolors-0.3.2.tgz";
-        sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansicolors" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
+      name = "ansicolors-0.3.2.tgz";
+      sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansicolors" ];
+    peerDependencies = [];
   };
   by-spec."ansistyles"."~0.1.3" =
     self.by-version."ansistyles"."0.1.3";
-  by-version."ansistyles"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."ansistyles"."0.1.3" = self.buildNodePackage {
     name = "ansistyles-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
-        name = "ansistyles-0.1.3.tgz";
-        sha1 = "5de60415bda071bb37127854c864f41b23254539";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansistyles" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
+      name = "ansistyles-0.1.3.tgz";
+      sha1 = "5de60415bda071bb37127854c864f41b23254539";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansistyles" ];
+    peerDependencies = [];
+  };
+  by-spec."anymatch"."~1.1.0" =
+    self.by-version."anymatch"."1.1.0";
+  by-version."anymatch"."1.1.0" = self.buildNodePackage {
+    name = "anymatch-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/anymatch/-/anymatch-1.1.0.tgz";
+      name = "anymatch-1.1.0.tgz";
+      sha1 = "ebc63275cee368a96b300f31623bf9f228d428e3";
+    };
+    deps = {
+      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+    };
+    peerDependencies = [];
   };
   by-spec."apparatus".">= 0.0.6" =
     self.by-version."apparatus"."0.0.8";
-  by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."apparatus"."0.0.8" = self.buildNodePackage {
     name = "apparatus-0.0.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz";
-        name = "apparatus-0.0.8.tgz";
-        sha1 = "14e8aeb84189208b7f8d77f09d9f0307778b079a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."apparatus" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz";
+      name = "apparatus-0.0.8.tgz";
+      sha1 = "14e8aeb84189208b7f8d77f09d9f0307778b079a";
+    };
     deps = {
       "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "apparatus" ];
+    peerDependencies = [];
   };
   by-spec."archiver"."~0.12.0" =
     self.by-version."archiver"."0.12.0";
-  by-version."archiver"."0.12.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."archiver"."0.12.0" = self.buildNodePackage {
     name = "archiver-0.12.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/archiver/-/archiver-0.12.0.tgz";
-        name = "archiver-0.12.0.tgz";
-        sha1 = "b8ccde2508cab9092bb7106630139c0f39a280cc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."archiver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/archiver/-/archiver-0.12.0.tgz";
+      name = "archiver-0.12.0.tgz";
+      sha1 = "b8ccde2508cab9092bb7106630139c0f39a280cc";
+    };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
@@ -633,646 +642,588 @@
       "tar-stream-1.0.2" = self.by-version."tar-stream"."1.0.2";
       "zip-stream-0.4.1" = self.by-version."zip-stream"."0.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "archiver" ];
+    peerDependencies = [];
   };
   by-spec."archy"."0" =
     self.by-version."archy"."0.0.2";
-  by-version."archy"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."archy"."0.0.2" = self.buildNodePackage {
     name = "archy-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
-        name = "archy-0.0.2.tgz";
-        sha1 = "910f43bf66141fc335564597abc189df44b3d35e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."archy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
+      name = "archy-0.0.2.tgz";
+      sha1 = "910f43bf66141fc335564597abc189df44b3d35e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "archy" ];
+    peerDependencies = [];
   };
   by-spec."archy"."0.0.2" =
     self.by-version."archy"."0.0.2";
   by-spec."archy"."^1.0.0" =
     self.by-version."archy"."1.0.0";
-  by-version."archy"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."archy"."1.0.0" = self.buildNodePackage {
     name = "archy-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz";
-        name = "archy-1.0.0.tgz";
-        sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."archy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz";
+      name = "archy-1.0.0.tgz";
+      sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "archy" ];
+    peerDependencies = [];
   };
   by-spec."archy"."~1.0.0" =
     self.by-version."archy"."1.0.0";
   by-spec."are-we-there-yet"."~1.0.0" =
     self.by-version."are-we-there-yet"."1.0.2";
-  by-version."are-we-there-yet"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."are-we-there-yet"."1.0.2" = self.buildNodePackage {
     name = "are-we-there-yet-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.2.tgz";
-        name = "are-we-there-yet-1.0.2.tgz";
-        sha1 = "b518f4a6ec85862b57ce82df495bbabc76cb5246";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."are-we-there-yet" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.2.tgz";
+      name = "are-we-there-yet-1.0.2.tgz";
+      sha1 = "b518f4a6ec85862b57ce82df495bbabc76cb5246";
+    };
     deps = {
       "delegates-0.1.0" = self.by-version."delegates"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "are-we-there-yet" ];
+    peerDependencies = [];
   };
   by-spec."argparse"."0.1.15" =
     self.by-version."argparse"."0.1.15";
-  by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage {
+  by-version."argparse"."0.1.15" = self.buildNodePackage {
     name = "argparse-0.1.15";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
-        name = "argparse-0.1.15.tgz";
-        sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."argparse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
+      name = "argparse-0.1.15.tgz";
+      sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
+    };
     deps = {
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
       "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "argparse" ];
+    peerDependencies = [];
   };
   by-spec."argparse"."~ 0.1.11" =
     self.by-version."argparse"."0.1.16";
-  by-version."argparse"."0.1.16" = lib.makeOverridable self.buildNodePackage {
+  by-version."argparse"."0.1.16" = self.buildNodePackage {
     name = "argparse-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."argparse" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "argparse" ];
+    peerDependencies = [];
   };
   by-spec."array-differ"."^1.0.0" =
     self.by-version."array-differ"."1.0.0";
-  by-version."array-differ"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."array-differ"."1.0.0" = self.buildNodePackage {
     name = "array-differ-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz";
-        name = "array-differ-1.0.0.tgz";
-        sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-differ" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz";
+      name = "array-differ-1.0.0.tgz";
+      sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-differ" ];
+    peerDependencies = [];
   };
   by-spec."array-filter"."~0.0.0" =
     self.by-version."array-filter"."0.0.1";
-  by-version."array-filter"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."array-filter"."0.0.1" = self.buildNodePackage {
     name = "array-filter-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
-        name = "array-filter-0.0.1.tgz";
-        sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-filter" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
+      name = "array-filter-0.0.1.tgz";
+      sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-filter" ];
+    peerDependencies = [];
+  };
+  by-spec."array-indexofobject"."~0.0.1" =
+    self.by-version."array-indexofobject"."0.0.1";
+  by-version."array-indexofobject"."0.0.1" = self.buildNodePackage {
+    name = "array-indexofobject-0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
+      name = "array-indexofobject-0.0.1.tgz";
+      sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."array-loop"."^1.0.0" =
     self.by-version."array-loop"."1.0.0";
-  by-version."array-loop"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."array-loop"."1.0.0" = self.buildNodePackage {
     name = "array-loop-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz";
-        name = "array-loop-1.0.0.tgz";
-        sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-loop" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz";
+      name = "array-loop-1.0.0.tgz";
+      sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-loop" ];
+    peerDependencies = [];
   };
   by-spec."array-map"."~0.0.0" =
     self.by-version."array-map"."0.0.0";
-  by-version."array-map"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."array-map"."0.0.0" = self.buildNodePackage {
     name = "array-map-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
-        name = "array-map-0.0.0.tgz";
-        sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-map" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
+      name = "array-map-0.0.0.tgz";
+      sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-map" ];
+    peerDependencies = [];
   };
   by-spec."array-reduce"."~0.0.0" =
     self.by-version."array-reduce"."0.0.0";
-  by-version."array-reduce"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."array-reduce"."0.0.0" = self.buildNodePackage {
     name = "array-reduce-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
-        name = "array-reduce-0.0.0.tgz";
-        sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-reduce" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
+      name = "array-reduce-0.0.0.tgz";
+      sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-reduce" ];
+    peerDependencies = [];
   };
   by-spec."array-uniq"."^1.0.2" =
     self.by-version."array-uniq"."1.0.2";
-  by-version."array-uniq"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."array-uniq"."1.0.2" = self.buildNodePackage {
     name = "array-uniq-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz";
-        name = "array-uniq-1.0.2.tgz";
-        sha1 = "5fcc373920775723cfd64d65c64bef53bf9eba6d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."array-uniq" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz";
+      name = "array-uniq-1.0.2.tgz";
+      sha1 = "5fcc373920775723cfd64d65c64bef53bf9eba6d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "array-uniq" ];
+    peerDependencies = [];
+  };
+  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";
+    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 = {
+    };
+    peerDependencies = [];
   };
   by-spec."asap"."^1.0.0" =
     self.by-version."asap"."1.0.0";
-  by-version."asap"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."asap"."1.0.0" = self.buildNodePackage {
     name = "asap-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
-        name = "asap-1.0.0.tgz";
-        sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."asap" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
+      name = "asap-1.0.0.tgz";
+      sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "asap" ];
+    peerDependencies = [];
   };
   by-spec."asap"."~1.0.0" =
     self.by-version."asap"."1.0.0";
   by-spec."ascii-json"."~0.2" =
     self.by-version."ascii-json"."0.2.0";
-  by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ascii-json"."0.2.0" = self.buildNodePackage {
     name = "ascii-json-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz";
-        name = "ascii-json-0.2.0.tgz";
-        sha1 = "10ddb361fd48f72595309fd10a6ea2e7bf2c9218";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ascii-json" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz";
+      name = "ascii-json-0.2.0.tgz";
+      sha1 = "10ddb361fd48f72595309fd10a6ea2e7bf2c9218";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ascii-json" ];
+    peerDependencies = [];
   };
   by-spec."ascli"."~0.3" =
     self.by-version."ascli"."0.3.0";
-  by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ascli"."0.3.0" = self.buildNodePackage {
     name = "ascli-0.3.0";
     bin = false;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
-        name = "ascli-0.3.0.tgz";
-        sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ascli" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
+      name = "ascli-0.3.0.tgz";
+      sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a";
+    };
     deps = {
       "colour-0.7.1" = self.by-version."colour"."0.7.1";
       "optjs-3.2.1-boom" = self.by-version."optjs"."3.2.1-boom";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ascli" ];
+    peerDependencies = [];
   };
   by-spec."asn1"."0.1.11" =
     self.by-version."asn1"."0.1.11";
-  by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."asn1"."0.1.11" = self.buildNodePackage {
     name = "asn1-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."asn1" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+      name = "asn1-0.1.11.tgz";
+      sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."asn1"."0.2.1" =
+    self.by-version."asn1"."0.2.1";
+  by-version."asn1"."0.2.1" = self.buildNodePackage {
+    name = "asn1-0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.2.1.tgz";
+      name = "asn1-0.2.1.tgz";
+      sha1 = "ecc73f75d31ea3c6ed9d47428db35fecc7b2c6dc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "asn1" ];
+    peerDependencies = [];
   };
   by-spec."asn1.js".">=1.0.0-0 >=1.0.0-0 <2.0.0-0" =
-    self.by-version."asn1.js"."1.0.0";
-  by-version."asn1.js"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "asn1.js-1.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.0.tgz";
-        name = "asn1.js-1.0.0.tgz";
-        sha1 = "62aa7c36d18c32ec17883e40b5e2d719562ed01d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."asn1.js" or []);
+    self.by-version."asn1.js"."1.0.2";
+  by-version."asn1.js"."1.0.2" = self.buildNodePackage {
+    name = "asn1.js-1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.2.tgz";
+      name = "asn1.js-1.0.2.tgz";
+      sha1 = "967f8108b236b2bb056aaf8022316e88d3efe895";
+    };
     deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
       "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "asn1.js" ];
+    peerDependencies = [];
   };
   by-spec."asn1.js"."^1.0.0" =
-    self.by-version."asn1.js"."1.0.0";
+    self.by-version."asn1.js"."1.0.2";
   by-spec."asn1.js-rfc3280"."^1.0.0" =
     self.by-version."asn1.js-rfc3280"."1.0.0";
-  by-version."asn1.js-rfc3280"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."asn1.js-rfc3280"."1.0.0" = self.buildNodePackage {
     name = "asn1.js-rfc3280-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/asn1.js-rfc3280/-/asn1.js-rfc3280-1.0.0.tgz";
-        name = "asn1.js-rfc3280-1.0.0.tgz";
-        sha1 = "4bb2013a7c9bdb4930c077b1b60d936186f4f4a7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."asn1.js-rfc3280" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1.js-rfc3280/-/asn1.js-rfc3280-1.0.0.tgz";
+      name = "asn1.js-rfc3280-1.0.0.tgz";
+      sha1 = "4bb2013a7c9bdb4930c077b1b60d936186f4f4a7";
+    };
     deps = {
     };
     peerDependencies = [
-      self.by-version."asn1.js"."1.0.0"
-    ];
-    passthru.names = [ "asn1.js-rfc3280" ];
+      self.by-version."asn1.js"."1.0.2"];
   };
   by-spec."assert"."*" =
     self.by-version."assert"."1.3.0";
-  by-version."assert"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."assert"."1.3.0" = self.buildNodePackage {
     name = "assert-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        name = "assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."assert" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
+      name = "assert-1.3.0.tgz";
+      sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+    };
     deps = {
       "util-0.10.3" = self.by-version."util"."0.10.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "assert" ];
+    peerDependencies = [];
   };
   "assert" = self.by-version."assert"."1.3.0";
   by-spec."assert"."~1.1.0" =
     self.by-version."assert"."1.1.2";
-  by-version."assert"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."assert"."1.1.2" = self.buildNodePackage {
     name = "assert-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/assert/-/assert-1.1.2.tgz";
-        name = "assert-1.1.2.tgz";
-        sha1 = "adaa04c46bb58c6dd1f294da3eb26e6228eb6e44";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."assert" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert/-/assert-1.1.2.tgz";
+      name = "assert-1.1.2.tgz";
+      sha1 = "adaa04c46bb58c6dd1f294da3eb26e6228eb6e44";
+    };
     deps = {
       "util-0.10.3" = self.by-version."util"."0.10.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "assert" ];
+    peerDependencies = [];
   };
   by-spec."assert"."~1.3.0" =
     self.by-version."assert"."1.3.0";
   by-spec."assert-plus"."0.1.2" =
     self.by-version."assert-plus"."0.1.2";
-  by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."assert-plus"."0.1.2" = self.buildNodePackage {
     name = "assert-plus-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
-        name = "assert-plus-0.1.2.tgz";
-        sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."assert-plus" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
+      name = "assert-plus-0.1.2.tgz";
+      sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "assert-plus" ];
+    peerDependencies = [];
   };
   by-spec."assert-plus"."0.1.3" =
     self.by-version."assert-plus"."0.1.3";
-  by-version."assert-plus"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."assert-plus"."0.1.3" = self.buildNodePackage {
     name = "assert-plus-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.3.tgz";
-        name = "assert-plus-0.1.3.tgz";
-        sha1 = "32eba8ac83e50ae4f4b5babab1ae9aa0edec9fef";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."assert-plus" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.3.tgz";
+      name = "assert-plus-0.1.3.tgz";
+      sha1 = "32eba8ac83e50ae4f4b5babab1ae9aa0edec9fef";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "assert-plus" ];
+    peerDependencies = [];
   };
-  by-spec."assert-plus"."^0.1.5" =
+  by-spec."assert-plus"."0.1.5" =
     self.by-version."assert-plus"."0.1.5";
-  by-version."assert-plus"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
     name = "assert-plus-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."assert-plus" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "assert-plus" ];
+    peerDependencies = [];
   };
+  by-spec."assert-plus"."^0.1.5" =
+    self.by-version."assert-plus"."0.1.5";
   by-spec."assertion-error"."1.0.0" =
     self.by-version."assertion-error"."1.0.0";
-  by-version."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."assertion-error"."1.0.0" = self.buildNodePackage {
     name = "assertion-error-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
-        name = "assertion-error-1.0.0.tgz";
-        sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."assertion-error" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
+      name = "assertion-error-1.0.0.tgz";
+      sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "assertion-error" ];
+    peerDependencies = [];
+  };
+  by-spec."ast-traverse"."~0.1.1" =
+    self.by-version."ast-traverse"."0.1.1";
+  by-version."ast-traverse"."0.1.1" = self.buildNodePackage {
+    name = "ast-traverse-0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz";
+      name = "ast-traverse-0.1.1.tgz";
+      sha1 = "69cf2b8386f19dcda1bb1e05d68fe359d8897de6";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."ast-types"."~0.3.22" =
+    self.by-version."ast-types"."0.3.38";
+  by-version."ast-types"."0.3.38" = self.buildNodePackage {
+    name = "ast-types-0.3.38";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.3.38.tgz";
+      name = "ast-types-0.3.38.tgz";
+      sha1 = "afe430e60b4db3ce2ed22ceea0f16f1c31763ef7";
+    };
+    deps = {
+      "private-0.1.6" = self.by-version."private"."0.1.6";
+    };
+    peerDependencies = [];
+  };
+  by-spec."ast-types"."~0.4.7" =
+    self.by-version."ast-types"."0.4.13";
+  by-version."ast-types"."0.4.13" = self.buildNodePackage {
+    name = "ast-types-0.4.13";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.4.13.tgz";
+      name = "ast-types-0.4.13.tgz";
+      sha1 = "445bd0b0f235028f5dc5b532fca27dc7b19ed754";
+    };
+    deps = {
+      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."ast-types"."~0.6.1" =
+    self.by-version."ast-types"."0.6.10";
+  by-version."ast-types"."0.6.10" = self.buildNodePackage {
+    name = "ast-types-0.6.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.10.tgz";
+      name = "ast-types-0.6.10.tgz";
+      sha1 = "381c6b083112bdf6561f14ce1aee5dce4a0089a7";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."astw"."~0.0.0" =
     self.by-version."astw"."0.0.0";
-  by-version."astw"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."astw"."0.0.0" = self.buildNodePackage {
     name = "astw-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/astw/-/astw-0.0.0.tgz";
-        name = "astw-0.0.0.tgz";
-        sha1 = "4490866a3ef116aaf91adba63ca7ddf70b6d59bd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."astw" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/astw/-/astw-0.0.0.tgz";
+      name = "astw-0.0.0.tgz";
+      sha1 = "4490866a3ef116aaf91adba63ca7ddf70b6d59bd";
+    };
     deps = {
       "esprima-1.0.2" = self.by-version."esprima"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "astw" ];
+    peerDependencies = [];
   };
   by-spec."astw"."~0.1.0" =
     self.by-version."astw"."0.1.0";
-  by-version."astw"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."astw"."0.1.0" = self.buildNodePackage {
     name = "astw-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz";
-        name = "astw-0.1.0.tgz";
-        sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."astw" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz";
+      name = "astw-0.1.0.tgz";
+      sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085";
+    };
     deps = {
       "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "astw" ];
+    peerDependencies = [];
   };
   by-spec."astw"."~1.1.0" =
     self.by-version."astw"."1.1.0";
-  by-version."astw"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."astw"."1.1.0" = self.buildNodePackage {
     name = "astw-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/astw/-/astw-1.1.0.tgz";
-        name = "astw-1.1.0.tgz";
-        sha1 = "f394778ab01c4ea467e64a614ed896ace0321a34";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."astw" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/astw/-/astw-1.1.0.tgz";
+      name = "astw-1.1.0.tgz";
+      sha1 = "f394778ab01c4ea467e64a614ed896ace0321a34";
+    };
     deps = {
       "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "astw" ];
+    peerDependencies = [];
   };
   by-spec."async"."*" =
     self.by-version."async"."0.9.0";
-  by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."async"."0.9.0" = self.buildNodePackage {
     name = "async-0.9.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
-        name = "async-0.9.0.tgz";
-        sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
+      name = "async-0.9.0.tgz";
+      sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
+    peerDependencies = [];
   };
   "async" = self.by-version."async"."0.9.0";
+  by-spec."async"."0.1.18" =
+    self.by-version."async"."0.1.18";
+  by-version."async"."0.1.18" = self.buildNodePackage {
+    name = "async-0.1.18";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.1.18.tgz";
+      name = "async-0.1.18.tgz";
+      sha1 = "c59c923920b76d5bf23248c04433920c4d45086a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."async"."0.1.22" =
     self.by-version."async"."0.1.22";
-  by-version."async"."0.1.22" = lib.makeOverridable self.buildNodePackage {
+  by-version."async"."0.1.22" = self.buildNodePackage {
     name = "async-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+      name = "async-0.1.22.tgz";
+      sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
+    peerDependencies = [];
   };
   by-spec."async"."0.1.x" =
     self.by-version."async"."0.1.22";
   by-spec."async"."0.2.9" =
     self.by-version."async"."0.2.9";
-  by-version."async"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."async"."0.2.9" = self.buildNodePackage {
     name = "async-0.2.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
-        name = "async-0.2.9.tgz";
-        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+      name = "async-0.2.9.tgz";
+      sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
+    peerDependencies = [];
   };
   by-spec."async"."0.2.x" =
     self.by-version."async"."0.2.10";
-  by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."async"."0.2.10" = self.buildNodePackage {
     name = "async-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+      name = "async-0.2.10.tgz";
+      sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
+    peerDependencies = [];
   };
+  by-spec."async"."0.9.0" =
+    self.by-version."async"."0.9.0";
   by-spec."async"."0.9.x" =
     self.by-version."async"."0.9.0";
+  by-spec."async".">=0.2.9" =
+    self.by-version."async"."0.9.0";
   by-spec."async"."^0.9.0" =
     self.by-version."async"."0.9.0";
   by-spec."async"."~0.1.22" =
     self.by-version."async"."0.1.22";
   by-spec."async"."~0.2.0" =
     self.by-version."async"."0.2.10";
+  by-spec."async"."~0.2.10" =
+    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.6" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.7" =
@@ -1287,661 +1238,1560 @@
     self.by-version."async"."0.9.0";
   by-spec."async-each"."~0.1.5" =
     self.by-version."async-each"."0.1.6";
-  by-version."async-each"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."async-each"."0.1.6" = self.buildNodePackage {
     name = "async-each-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz";
-        name = "async-each-0.1.6.tgz";
-        sha1 = "b67e99edcddf96541e44af56290cd7d5c6e70439";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async-each" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz";
+      name = "async-each-0.1.6.tgz";
+      sha1 = "b67e99edcddf96541e44af56290cd7d5c6e70439";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async-each" ];
+    peerDependencies = [];
   };
   by-spec."async-some"."~1.0.1" =
     self.by-version."async-some"."1.0.1";
-  by-version."async-some"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."async-some"."1.0.1" = self.buildNodePackage {
     name = "async-some-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz";
-        name = "async-some-1.0.1.tgz";
-        sha1 = "8b54f08d46f0f9babc72ea9d646c245d23a4d9e5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async-some" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz";
+      name = "async-some-1.0.1.tgz";
+      sha1 = "8b54f08d46f0f9babc72ea9d646c245d23a4d9e5";
+    };
     deps = {
       "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async-some" ];
+    peerDependencies = [];
+  };
+  by-spec."asyncblock"."^2.1.23" =
+    self.by-version."asyncblock"."2.1.23";
+  by-version."asyncblock"."2.1.23" = self.buildNodePackage {
+    name = "asyncblock-2.1.23";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asyncblock/-/asyncblock-2.1.23.tgz";
+      name = "asyncblock-2.1.23.tgz";
+      sha1 = "b51489b4e95cd152a148cff85015ff09691d1df9";
+    };
+    deps = {
+      "fibers-1.0.2" = self.by-version."fibers"."1.0.2";
+      "esprima-1.2.2" = self.by-version."esprima"."1.2.2";
+    };
+    peerDependencies = [];
   };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.1.5";
-  by-version."aws-sdk"."2.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-2.1.5";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.5.tgz";
-        name = "aws-sdk-2.1.5.tgz";
-        sha1 = "22ddd9dfff6b4caff5021d6d1812ba6d1c6d9a6b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."aws-sdk" or []);
+    self.by-version."aws-sdk"."2.1.7";
+  by-version."aws-sdk"."2.1.7" = self.buildNodePackage {
+    name = "aws-sdk-2.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.7.tgz";
+      name = "aws-sdk-2.1.7.tgz";
+      sha1 = "624d1ab9dbdf4782b9c3e07f906bf86a00f0bcb5";
+    };
     deps = {
       "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6";
       "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "aws-sdk" ];
+    peerDependencies = [];
+  };
+  "aws-sdk" = self.by-version."aws-sdk"."2.1.7";
+  by-spec."aws-sdk"."2.0.5" =
+    self.by-version."aws-sdk"."2.0.5";
+  by-version."aws-sdk"."2.0.5" = self.buildNodePackage {
+    name = "aws-sdk-2.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.5.tgz";
+      name = "aws-sdk-2.0.5.tgz";
+      sha1 = "f3ebb1898d0632b7b6672e8d77728cbbb69f98c6";
+    };
+    deps = {
+      "aws-sdk-apis-3.1.10" = self.by-version."aws-sdk-apis"."3.1.10";
+      "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6";
+      "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
+    };
+    peerDependencies = [];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.1.5";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
-  by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."aws-sdk"."1.18.0" = self.buildNodePackage {
     name = "aws-sdk-1.18.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
-        name = "aws-sdk-1.18.0.tgz";
-        sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."aws-sdk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
+      name = "aws-sdk-1.18.0.tgz";
+      sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
+    };
     deps = {
       "xml2js-0.2.4" = self.by-version."xml2js"."0.2.4";
       "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "aws-sdk" ];
+    peerDependencies = [];
+  };
+  by-spec."aws-sdk-apis"."3.x" =
+    self.by-version."aws-sdk-apis"."3.1.10";
+  by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage {
+    name = "aws-sdk-apis-3.1.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.10.tgz";
+      name = "aws-sdk-apis-3.1.10.tgz";
+      sha1 = "4eed97f590a16cf080fd1b8d8cfdf2472de8ab0e";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."aws-sign"."~0.2.0" =
     self.by-version."aws-sign"."0.2.0";
-  by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."aws-sign"."0.2.0" = self.buildNodePackage {
     name = "aws-sign-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
-        name = "aws-sign-0.2.0.tgz";
-        sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."aws-sign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
+      name = "aws-sign-0.2.0.tgz";
+      sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "aws-sign" ];
+    peerDependencies = [];
   };
   by-spec."aws-sign"."~0.3.0" =
     self.by-version."aws-sign"."0.3.0";
-  by-version."aws-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."aws-sign"."0.3.0" = self.buildNodePackage {
     name = "aws-sign-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
-        name = "aws-sign-0.3.0.tgz";
-        sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."aws-sign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
+      name = "aws-sign-0.3.0.tgz";
+      sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "aws-sign" ];
+    peerDependencies = [];
   };
   by-spec."aws-sign2"."~0.5.0" =
     self.by-version."aws-sign2"."0.5.0";
-  by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
     name = "aws-sign2-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."aws-sign2" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "aws-sign2" ];
+    peerDependencies = [];
   };
   by-spec."backbone"."*" =
     self.by-version."backbone"."1.1.2";
-  by-version."backbone"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."backbone"."1.1.2" = self.buildNodePackage {
     name = "backbone-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz";
-        name = "backbone-1.1.2.tgz";
-        sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."backbone" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz";
+      name = "backbone-1.1.2.tgz";
+      sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d";
+    };
     deps = {
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "backbone" ];
+    peerDependencies = [];
   };
   "backbone" = self.by-version."backbone"."1.1.2";
   by-spec."backoff"."2.1.0" =
     self.by-version."backoff"."2.1.0";
-  by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."backoff"."2.1.0" = self.buildNodePackage {
     name = "backoff-2.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
-        name = "backoff-2.1.0.tgz";
-        sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."backoff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
+      name = "backoff-2.1.0.tgz";
+      sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "backoff" ];
+    peerDependencies = [];
   };
   by-spec."backoff"."~2.3.0" =
     self.by-version."backoff"."2.3.0";
-  by-version."backoff"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."backoff"."2.3.0" = self.buildNodePackage {
     name = "backoff-2.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz";
-        name = "backoff-2.3.0.tgz";
-        sha1 = "ee7c7e38093f92e472859db635e7652454fc21ea";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."backoff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz";
+      name = "backoff-2.3.0.tgz";
+      sha1 = "ee7c7e38093f92e472859db635e7652454fc21ea";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "backoff" ];
+    peerDependencies = [];
   };
   by-spec."balanced-match"."^0.2.0" =
     self.by-version."balanced-match"."0.2.0";
-  by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."balanced-match"."0.2.0" = self.buildNodePackage {
     name = "balanced-match-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
-        name = "balanced-match-0.2.0.tgz";
-        sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."balanced-match" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
+      name = "balanced-match-0.2.0.tgz";
+      sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "balanced-match" ];
+    peerDependencies = [];
+  };
+  by-spec."base-converter"."1.1.2" =
+    self.by-version."base-converter"."1.1.2";
+  by-version."base-converter"."1.1.2" = self.buildNodePackage {
+    name = "base-converter-1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base-converter/-/base-converter-1.1.2.tgz";
+      name = "base-converter-1.1.2.tgz";
+      sha1 = "3abd417c6277c28bc3dedb6ac1af16d4b720615a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."base62"."0.1.1" =
     self.by-version."base62"."0.1.1";
-  by-version."base62"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."base62"."0.1.1" = self.buildNodePackage {
     name = "base62-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
-        name = "base62-0.1.1.tgz";
-        sha1 = "7b4174c2f94449753b11c2651c083da841a7b084";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."base62" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
+      name = "base62-0.1.1.tgz";
+      sha1 = "7b4174c2f94449753b11c2651c083da841a7b084";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "base62" ];
+    peerDependencies = [];
+  };
+  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";
+    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 = {
+    };
+    peerDependencies = [];
   };
   by-spec."base64-js"."0.0.6" =
     self.by-version."base64-js"."0.0.6";
-  by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."base64-js"."0.0.6" = self.buildNodePackage {
     name = "base64-js-0.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
-        name = "base64-js-0.0.6.tgz";
-        sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."base64-js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
+      name = "base64-js-0.0.6.tgz";
+      sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "base64-js" ];
+    peerDependencies = [];
   };
   by-spec."base64-js"."0.0.8" =
     self.by-version."base64-js"."0.0.8";
-  by-version."base64-js"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."base64-js"."0.0.8" = self.buildNodePackage {
     name = "base64-js-0.0.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
-        name = "base64-js-0.0.8.tgz";
-        sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."base64-js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
+      name = "base64-js-0.0.8.tgz";
+      sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "base64-js" ];
+    peerDependencies = [];
   };
   by-spec."base64-js"."~0.0.4" =
     self.by-version."base64-js"."0.0.8";
   by-spec."base64-url"."1" =
-    self.by-version."base64-url"."1.1.0";
-  by-version."base64-url"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "base64-url-1.1.0";
+    self.by-version."base64-url"."1.2.0";
+  by-version."base64-url"."1.2.0" = self.buildNodePackage {
+    name = "base64-url-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/base64-url/-/base64-url-1.1.0.tgz";
-        name = "base64-url-1.1.0.tgz";
-        sha1 = "fff58640464480a208a532f2e1919d296e3fbf10";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."base64-url" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.0.tgz";
+      name = "base64-url-1.2.0.tgz";
+      sha1 = "5b10db3a40720a0d46d33d1954bc95c2c8b97917";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "base64-url" ];
+    peerDependencies = [];
   };
   by-spec."base64-url"."1.1.0" =
     self.by-version."base64-url"."1.1.0";
+  by-version."base64-url"."1.1.0" = self.buildNodePackage {
+    name = "base64-url-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-url/-/base64-url-1.1.0.tgz";
+      name = "base64-url-1.1.0.tgz";
+      sha1 = "fff58640464480a208a532f2e1919d296e3fbf10";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."base64id"."0.1.0" =
     self.by-version."base64id"."0.1.0";
-  by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."base64id"."0.1.0" = self.buildNodePackage {
     name = "base64id-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."base64id" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+      name = "base64id-0.1.0.tgz";
+      sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "base64id" ];
+    peerDependencies = [];
+  };
+  by-spec."base64url"."0.0.3" =
+    self.by-version."base64url"."0.0.3";
+  by-version."base64url"."0.0.3" = self.buildNodePackage {
+    name = "base64url-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz";
+      name = "base64url-0.0.3.tgz";
+      sha1 = "50c20edac277dde1a0b15059954ced7a2d102d57";
+    };
+    deps = {
+      "tap-0.3.3" = self.by-version."tap"."0.3.3";
+    };
+    peerDependencies = [];
   };
+  by-spec."base64url"."0.0.6" =
+    self.by-version."base64url"."0.0.6";
+  by-version."base64url"."0.0.6" = self.buildNodePackage {
+    name = "base64url-0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
+      name = "base64url-0.0.6.tgz";
+      sha1 = "9597b36b330db1c42477322ea87ea8027499b82b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."base64url"."~0.0.3" =
+    self.by-version."base64url"."0.0.6";
   by-spec."basic-auth"."1.0.0" =
     self.by-version."basic-auth"."1.0.0";
-  by-version."basic-auth"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."basic-auth"."1.0.0" = self.buildNodePackage {
     name = "basic-auth-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz";
-        name = "basic-auth-1.0.0.tgz";
-        sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."basic-auth" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz";
+      name = "basic-auth-1.0.0.tgz";
+      sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "basic-auth" ];
+    peerDependencies = [];
   };
   by-spec."basic-auth-connect"."1.0.0" =
     self.by-version."basic-auth-connect"."1.0.0";
-  by-version."basic-auth-connect"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage {
     name = "basic-auth-connect-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
-        name = "basic-auth-connect-1.0.0.tgz";
-        sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."basic-auth-connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
+      name = "basic-auth-connect-1.0.0.tgz";
+      sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "basic-auth-connect" ];
+    peerDependencies = [];
+  };
+  by-spec."batbelt"."0.0.2" =
+    self.by-version."batbelt"."0.0.2";
+  by-version."batbelt"."0.0.2" = self.buildNodePackage {
+    name = "batbelt-0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/batbelt/-/batbelt-0.0.2.tgz";
+      name = "batbelt-0.0.2.tgz";
+      sha1 = "2285bf5438b03502e5c5a3cdaf3ad68bf0ad4a65";
+    };
+    deps = {
+      "hashish-0.0.4" = self.by-version."hashish"."0.0.4";
+    };
+    peerDependencies = [];
   };
   by-spec."batch"."0.5.0" =
     self.by-version."batch"."0.5.0";
-  by-version."batch"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."batch"."0.5.0" = self.buildNodePackage {
     name = "batch-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz";
-        name = "batch-0.5.0.tgz";
-        sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."batch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz";
+      name = "batch-0.5.0.tgz";
+      sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "batch" ];
+    peerDependencies = [];
   };
   by-spec."batch"."0.5.1" =
     self.by-version."batch"."0.5.1";
-  by-version."batch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."batch"."0.5.1" = self.buildNodePackage {
     name = "batch-0.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/batch/-/batch-0.5.1.tgz";
-        name = "batch-0.5.1.tgz";
-        sha1 = "36a4bab594c050fd7b507bca0db30c2d92af4ff2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."batch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/batch/-/batch-0.5.1.tgz";
+      name = "batch-0.5.1.tgz";
+      sha1 = "36a4bab594c050fd7b507bca0db30c2d92af4ff2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "batch" ];
+    peerDependencies = [];
   };
   by-spec."batch"."0.5.2" =
     self.by-version."batch"."0.5.2";
-  by-version."batch"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."batch"."0.5.2" = self.buildNodePackage {
     name = "batch-0.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz";
-        name = "batch-0.5.2.tgz";
-        sha1 = "546543dbe32118c83c7c7ca33a1f5c5d5ea963e9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."batch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz";
+      name = "batch-0.5.2.tgz";
+      sha1 = "546543dbe32118c83c7c7ca33a1f5c5d5ea963e9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "batch" ];
+    peerDependencies = [];
   };
   by-spec."bcrypt"."*" =
-    self.by-version."bcrypt"."0.8.0";
-  by-version."bcrypt"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bcrypt-0.8.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.0.tgz";
-        name = "bcrypt-0.8.0.tgz";
-        sha1 = "b8f226406e5b78c838833a8468a4a0402cbc93c9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bcrypt" or []);
+    self.by-version."bcrypt"."0.8.1";
+  by-version."bcrypt"."0.8.1" = self.buildNodePackage {
+    name = "bcrypt-0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.1.tgz";
+      name = "bcrypt-0.8.1.tgz";
+      sha1 = "384fa4fbc106ec87ccf8ee3d1e7e12d0ef8eeaaf";
+    };
     deps = {
       "bindings-1.0.0" = self.by-version."bindings"."1.0.0";
-      "nan-1.3.0" = self.by-version."nan"."1.3.0";
+      "nan-1.5.0" = self.by-version."nan"."1.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bcrypt" ];
+    peerDependencies = [];
   };
-  "bcrypt" = self.by-version."bcrypt"."0.8.0";
+  "bcrypt" = self.by-version."bcrypt"."0.8.1";
+  by-spec."bcrypt".">= 0.5" =
+    self.by-version."bcrypt"."0.8.1";
   by-spec."beeper"."^1.0.0" =
     self.by-version."beeper"."1.0.0";
-  by-version."beeper"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."beeper"."1.0.0" = self.buildNodePackage {
     name = "beeper-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz";
-        name = "beeper-1.0.0.tgz";
-        sha1 = "1ad2a27a9c7e545234119180afed61f80daaf02c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."beeper" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz";
+      name = "beeper-1.0.0.tgz";
+      sha1 = "1ad2a27a9c7e545234119180afed61f80daaf02c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "beeper" ];
+    peerDependencies = [];
   };
   by-spec."bencode"."^0.6.0" =
     self.by-version."bencode"."0.6.0";
-  by-version."bencode"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bencode"."0.6.0" = self.buildNodePackage {
     name = "bencode-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz";
-        name = "bencode-0.6.0.tgz";
-        sha1 = "04d6190e1d7467c56a969e1a94d1668076eac050";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bencode" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz";
+      name = "bencode-0.6.0.tgz";
+      sha1 = "04d6190e1d7467c56a969e1a94d1668076eac050";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bencode" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bigi"."^1.1.0" =
+    self.by-version."bigi"."1.4.0";
+  by-version."bigi"."1.4.0" = self.buildNodePackage {
+    name = "bigi-1.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bigi/-/bigi-1.4.0.tgz";
+      name = "bigi-1.4.0.tgz";
+      sha1 = "90ac1aeac0a531216463bdb58f42c1e05c8407ac";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."bignumber.js"."^1.3.0" =
+    self.by-version."bignumber.js"."1.5.0";
+  by-version."bignumber.js"."1.5.0" = self.buildNodePackage {
+    name = "bignumber.js-1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz";
+      name = "bignumber.js-1.5.0.tgz";
+      sha1 = "ff41453ac7b19ee15cda7977e179ff1b0d11956d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."binary"."~0.3.0" =
     self.by-version."binary"."0.3.0";
-  by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."binary"."0.3.0" = self.buildNodePackage {
     name = "binary-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz";
-        name = "binary-0.3.0.tgz";
-        sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."binary" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz";
+      name = "binary-0.3.0.tgz";
+      sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79";
+    };
     deps = {
       "chainsaw-0.1.0" = self.by-version."chainsaw"."0.1.0";
       "buffers-0.1.1" = self.by-version."buffers"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "binary" ];
+    peerDependencies = [];
+  };
+  by-spec."binaryheap".">= 0.0.3" =
+    self.by-version."binaryheap"."0.0.3";
+  by-version."binaryheap"."0.0.3" = self.buildNodePackage {
+    name = "binaryheap-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz";
+      name = "binaryheap-0.0.3.tgz";
+      sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."bindings"."*" =
     self.by-version."bindings"."1.2.1";
-  by-version."bindings"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."bindings"."1.2.1" = self.buildNodePackage {
     name = "bindings-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-        name = "bindings-1.2.1.tgz";
-        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bindings" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+      name = "bindings-1.2.1.tgz";
+      sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bindings" ];
+    peerDependencies = [];
   };
   by-spec."bindings"."1.0.0" =
     self.by-version."bindings"."1.0.0";
-  by-version."bindings"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bindings"."1.0.0" = self.buildNodePackage {
     name = "bindings-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz";
-        name = "bindings-1.0.0.tgz";
-        sha1 = "c3ccde60e9de6807c6f1aa4ef4843af29191c828";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bindings" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz";
+      name = "bindings-1.0.0.tgz";
+      sha1 = "c3ccde60e9de6807c6f1aa4ef4843af29191c828";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bindings" ];
+    peerDependencies = [];
   };
   by-spec."bindings"."1.1.0" =
     self.by-version."bindings"."1.1.0";
-  by-version."bindings"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bindings"."1.1.0" = self.buildNodePackage {
     name = "bindings-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.1.0.tgz";
-        name = "bindings-1.1.0.tgz";
-        sha1 = "f3cc4deec19fe31f255864eb1e6ffad857266ef0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bindings" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bindings/-/bindings-1.1.0.tgz";
+      name = "bindings-1.1.0.tgz";
+      sha1 = "f3cc4deec19fe31f255864eb1e6ffad857266ef0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bindings" ];
+    peerDependencies = [];
   };
   by-spec."bindings"."1.1.1" =
     self.by-version."bindings"."1.1.1";
-  by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."bindings"."1.1.1" = self.buildNodePackage {
     name = "bindings-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
-        name = "bindings-1.1.1.tgz";
-        sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bindings" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
+      name = "bindings-1.1.1.tgz";
+      sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bindings" ];
+    peerDependencies = [];
+  };
+  by-spec."bindings"."1.2.0" =
+    self.by-version."bindings"."1.2.0";
+  by-version."bindings"."1.2.0" = self.buildNodePackage {
+    name = "bindings-1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz";
+      name = "bindings-1.2.0.tgz";
+      sha1 = "c224fc5b349a84043779f97a6271d9d70da7636f";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."bindings".">=1.2.1" =
     self.by-version."bindings"."1.2.1";
+  by-spec."bindings"."^1.2.1" =
+    self.by-version."bindings"."1.2.1";
   by-spec."bindings"."~1.1.1" =
     self.by-version."bindings"."1.1.1";
   by-spec."bindings"."~1.2.1" =
     self.by-version."bindings"."1.2.1";
+  by-spec."bip-pod".">=0.0.1" =
+    self.by-version."bip-pod"."0.3.2";
+  by-version."bip-pod"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod/-/bip-pod-0.3.2.tgz";
+      name = "bip-pod-0.3.2.tgz";
+      sha1 = "f8d86caebc88c62c731e708b9d275314ec87fc40";
+    };
+    deps = {
+      "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0";
+      "cron-1.0.6" = self.by-version."cron"."1.0.6";
+      "dns-0.2.2" = self.by-version."dns"."0.2.2";
+      "extend-2.0.0" = self.by-version."extend"."2.0.0";
+      "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19";
+      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "validator-1.5.1" = self.by-version."validator"."1.5.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-alchemy"."*" =
+    self.by-version."bip-pod-alchemy"."0.3.0";
+  by-version."bip-pod-alchemy"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-alchemy-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-alchemy/-/bip-pod-alchemy-0.3.0.tgz";
+      name = "bip-pod-alchemy-0.3.0.tgz";
+      sha1 = "b0f75ec915bd890d56b47864de3e883787f55a9d";
+    };
+    deps = {
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-alchemy" = self.by-version."bip-pod-alchemy"."0.3.0";
+  by-spec."bip-pod-bitly"."*" =
+    self.by-version."bip-pod-bitly"."0.3.0";
+  by-version."bip-pod-bitly"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-bitly-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-bitly/-/bip-pod-bitly-0.3.0.tgz";
+      name = "bip-pod-bitly-0.3.0.tgz";
+      sha1 = "3d08cc7aec108e3df6d32c5d9aa5760b8ecd9165";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-bitly-0.1.0" = self.by-version."passport-bitly"."0.1.0";
+      "request-2.29.0" = self.by-version."request"."2.29.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-bitly" = self.by-version."bip-pod-bitly"."0.3.0";
+  by-spec."bip-pod-chain"."*" =
+    self.by-version."bip-pod-chain"."0.3.0";
+  by-version."bip-pod-chain"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-chain-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-chain/-/bip-pod-chain-0.3.0.tgz";
+      name = "bip-pod-chain-0.3.0.tgz";
+      sha1 = "4acd59449ae8c4e5449f6eef66cc442fc5f4821e";
+    };
+    deps = {
+      "chain-node-3.0.1" = self.by-version."chain-node"."3.0.1";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-chain" = self.by-version."bip-pod-chain"."0.3.0";
+  by-spec."bip-pod-circonus"."*" =
+    self.by-version."bip-pod-circonus"."0.3.0";
+  by-version."bip-pod-circonus"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-circonus-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-circonus/-/bip-pod-circonus-0.3.0.tgz";
+      name = "bip-pod-circonus-0.3.0.tgz";
+      sha1 = "7a8a26f9e04f1e84c76083da65b657e2aee6319d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-circonus" = self.by-version."bip-pod-circonus"."0.3.0";
+  by-spec."bip-pod-coindesk"."*" =
+    self.by-version."bip-pod-coindesk"."0.3.0";
+  by-version."bip-pod-coindesk"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-coindesk-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-coindesk/-/bip-pod-coindesk-0.3.0.tgz";
+      name = "bip-pod-coindesk-0.3.0.tgz";
+      sha1 = "51e0a6973da016968f5da988f5505d57009caa1f";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-coindesk" = self.by-version."bip-pod-coindesk"."0.3.0";
+  by-spec."bip-pod-craigslist"."*" =
+    self.by-version."bip-pod-craigslist"."0.3.0";
+  by-version."bip-pod-craigslist"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-craigslist-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-craigslist/-/bip-pod-craigslist-0.3.0.tgz";
+      name = "bip-pod-craigslist-0.3.0.tgz";
+      sha1 = "755021eeb9bf04ddeed804eaa6dd8e9c7d6c8927";
+    };
+    deps = {
+      "node-craigslist-0.1.7" = self.by-version."node-craigslist"."0.1.7";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-craigslist" = self.by-version."bip-pod-craigslist"."0.3.0";
+  by-spec."bip-pod-crypto"."*" =
+    self.by-version."bip-pod-crypto"."0.3.0";
+  by-version."bip-pod-crypto"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-crypto-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-crypto/-/bip-pod-crypto-0.3.0.tgz";
+      name = "bip-pod-crypto-0.3.0.tgz";
+      sha1 = "94b9e7e0f48b104921d61594897e219184c9297e";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-crypto" = self.by-version."bip-pod-crypto"."0.3.0";
+  by-spec."bip-pod-crypto".">=0.0.1" =
+    self.by-version."bip-pod-crypto"."0.3.0";
+  by-spec."bip-pod-dropbox"."*" =
+    self.by-version."bip-pod-dropbox"."0.3.0";
+  by-version."bip-pod-dropbox"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-dropbox-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-dropbox/-/bip-pod-dropbox-0.3.0.tgz";
+      name = "bip-pod-dropbox-0.3.0.tgz";
+      sha1 = "2913f96f1aaa797fa3ba6edf7adc8314e5807c3b";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "passport-dropbox-0.1.2" = self.by-version."passport-dropbox"."0.1.2";
+      "dropbox-0.9.2" = self.by-version."dropbox"."0.9.2";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-dropbox" = self.by-version."bip-pod-dropbox"."0.3.0";
+  by-spec."bip-pod-email".">=0.0.1" =
+    self.by-version."bip-pod-email"."0.3.3";
+  by-version."bip-pod-email"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-email-0.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-email/-/bip-pod-email-0.3.3.tgz";
+      name = "bip-pod-email-0.3.3.tgz";
+      sha1 = "192ee1789e540761bb8d9b27b35ce3a80bd2fa69";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "nodemailer-0.7.1" = self.by-version."nodemailer"."0.7.1";
+      "ejs-0.7.1" = self.by-version."ejs"."0.7.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-embedly"."*" =
+    self.by-version."bip-pod-embedly"."0.3.0";
+  by-version."bip-pod-embedly"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-embedly-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-embedly/-/bip-pod-embedly-0.3.0.tgz";
+      name = "bip-pod-embedly-0.3.0.tgz";
+      sha1 = "02c7f1c60157f5f5aa880d77acbcdaabf1661ea8";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "embedly-1.0.2" = self.by-version."embedly"."1.0.2";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-embedly" = self.by-version."bip-pod-embedly"."0.3.0";
+  by-spec."bip-pod-evernote"."*" =
+    self.by-version."bip-pod-evernote"."0.3.1";
+  by-version."bip-pod-evernote"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-evernote-0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-evernote/-/bip-pod-evernote-0.3.1.tgz";
+      name = "bip-pod-evernote-0.3.1.tgz";
+      sha1 = "8b68235df6cad374b45bd456b2358a21a6bafd73";
+    };
+    deps = {
+      "evernote-1.25.4" = self.by-version."evernote"."1.25.4";
+      "passport-evernote-0.1.1" = self.by-version."passport-evernote"."0.1.1";
+      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-evernote" = self.by-version."bip-pod-evernote"."0.3.1";
+  by-spec."bip-pod-facebook"."*" =
+    self.by-version."bip-pod-facebook"."0.3.0";
+  by-version."bip-pod-facebook"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-facebook-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-facebook/-/bip-pod-facebook-0.3.0.tgz";
+      name = "bip-pod-facebook-0.3.0.tgz";
+      sha1 = "ee81bf9e12ed54831d0c4aa69bab4d19308c6f45";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "async-0.1.18" = self.by-version."async"."0.1.18";
+      "fb-0.7.0" = self.by-version."fb"."0.7.0";
+      "passport-facebook-1.0.3" = self.by-version."passport-facebook"."1.0.3";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-facebook" = self.by-version."bip-pod-facebook"."0.3.0";
+  by-spec."bip-pod-flickr"."*" =
+    self.by-version."bip-pod-flickr"."0.3.1";
+  by-version."bip-pod-flickr"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-flickr-0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-flickr/-/bip-pod-flickr-0.3.1.tgz";
+      name = "bip-pod-flickr-0.3.1.tgz";
+      sha1 = "10f17538e2d7431957b8b0dc69b2945c4e2fce8c";
+    };
+    deps = {
+      "passport-flickr-0.2.0" = self.by-version."passport-flickr"."0.2.0";
+      "flickrapi-0.3.28" = self.by-version."flickrapi"."0.3.28";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-flickr" = self.by-version."bip-pod-flickr"."0.3.1";
+  by-spec."bip-pod-flow".">=0.0.1" =
+    self.by-version."bip-pod-flow"."0.3.0";
+  by-version."bip-pod-flow"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-flow-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.0.tgz";
+      name = "bip-pod-flow-0.3.0.tgz";
+      sha1 = "7660d5a584b752545306483964ce402a434e86b3";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1";
+      "q-1.0.1" = self.by-version."q"."1.0.1";
+      "safe-regex-0.0.1" = self.by-version."safe-regex"."0.0.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-github"."*" =
+    self.by-version."bip-pod-github"."0.3.1";
+  by-version."bip-pod-github"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-github-0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-github/-/bip-pod-github-0.3.1.tgz";
+      name = "bip-pod-github-0.3.1.tgz";
+      sha1 = "8605c36790e3a26f4b881a9dcd8a1b179b875369";
+    };
+    deps = {
+      "passport-github-0.1.5" = self.by-version."passport-github"."0.1.5";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-github" = self.by-version."bip-pod-github"."0.3.1";
+  by-spec."bip-pod-gmail"."*" =
+    self.by-version."bip-pod-gmail"."0.3.0";
+  by-version."bip-pod-gmail"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-gmail-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.0.tgz";
+      name = "bip-pod-gmail-0.3.0.tgz";
+      sha1 = "08f3113886a7d20a568950561323da239e7e521c";
+    };
+    deps = {
+      "googleapis-1.1.1" = self.by-version."googleapis"."1.1.1";
+      "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.0";
+  by-spec."bip-pod-google"."*" =
+    self.by-version."bip-pod-google"."0.3.0";
+  by-version."bip-pod-google"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-google-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-google/-/bip-pod-google-0.3.0.tgz";
+      name = "bip-pod-google-0.3.0.tgz";
+      sha1 = "75712cc9a5ed0e78d01fafef879ff9ccd717b07b";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
+      "googleapis-0.8.0" = self.by-version."googleapis"."0.8.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-google" = self.by-version."bip-pod-google"."0.3.0";
+  by-spec."bip-pod-google-drive"."*" =
+    self.by-version."bip-pod-google-drive"."0.3.0";
+  by-version."bip-pod-google-drive"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-google-drive-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-google-drive/-/bip-pod-google-drive-0.3.0.tgz";
+      name = "bip-pod-google-drive-0.3.0.tgz";
+      sha1 = "d34617def8d9216f0a08e2c0a36bfc0e9d491021";
+    };
+    deps = {
+      "googleapis-1.1.1" = self.by-version."googleapis"."1.1.1";
+      "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-google-drive" = self.by-version."bip-pod-google-drive"."0.3.0";
+  by-spec."bip-pod-html".">=0.0.1" =
+    self.by-version."bip-pod-html"."0.3.0";
+  by-version."bip-pod-html"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-html-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.0.tgz";
+      name = "bip-pod-html-0.3.0.tgz";
+      sha1 = "a1c6b2698270cd36f9441c7e52cb8916a505fbbb";
+    };
+    deps = {
+      "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
+      "jsdom-0.10.6" = self.by-version."jsdom"."0.10.6";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-http".">=0.0.1" =
+    self.by-version."bip-pod-http"."0.3.0";
+  by-version."bip-pod-http"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-http-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-http/-/bip-pod-http-0.3.0.tgz";
+      name = "bip-pod-http-0.3.0.tgz";
+      sha1 = "311f42fdfca0e013390650ac2149740cb7a34afe";
+    };
+    deps = {
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-imgur"."*" =
+    self.by-version."bip-pod-imgur"."0.3.0";
+  by-version."bip-pod-imgur"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-imgur-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-imgur/-/bip-pod-imgur-0.3.0.tgz";
+      name = "bip-pod-imgur-0.3.0.tgz";
+      sha1 = "a3f7e3ded575bc9d77358e32f888634abe2fd50e";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "passport-imgur-0.0.2" = self.by-version."passport-imgur"."0.0.2";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-imgur" = self.by-version."bip-pod-imgur"."0.3.0";
+  by-spec."bip-pod-instagram"."*" =
+    self.by-version."bip-pod-instagram"."0.3.0";
+  by-version."bip-pod-instagram"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-instagram-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-instagram/-/bip-pod-instagram-0.3.0.tgz";
+      name = "bip-pod-instagram-0.3.0.tgz";
+      sha1 = "fd4c8dfe2968d89020957ac29334abb256b8b4ba";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-instagram-0.1.2" = self.by-version."passport-instagram"."0.1.2";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-instagram" = self.by-version."bip-pod-instagram"."0.3.0";
+  by-spec."bip-pod-kato"."*" =
+    self.by-version."bip-pod-kato"."0.3.0";
+  by-version."bip-pod-kato"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-kato-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-kato/-/bip-pod-kato-0.3.0.tgz";
+      name = "bip-pod-kato-0.3.0.tgz";
+      sha1 = "4b6b384c84535923a351a2f18c691a105d403dd1";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-kato" = self.by-version."bip-pod-kato"."0.3.0";
+  by-spec."bip-pod-keenio"."*" =
+    self.by-version."bip-pod-keenio"."0.3.0";
+  by-version."bip-pod-keenio"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-keenio-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-keenio/-/bip-pod-keenio-0.3.0.tgz";
+      name = "bip-pod-keenio-0.3.0.tgz";
+      sha1 = "4888228bd2535e0423680ea9d3028152c531ee38";
+    };
+    deps = {
+      "keen.io-0.1.3" = self.by-version."keen.io"."0.1.3";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-keenio" = self.by-version."bip-pod-keenio"."0.3.0";
+  by-spec."bip-pod-mailchimp"."*" =
+    self.by-version."bip-pod-mailchimp"."0.3.0";
+  by-version."bip-pod-mailchimp"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-mailchimp-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.0.tgz";
+      name = "bip-pod-mailchimp-0.3.0.tgz";
+      sha1 = "dbcc920e9297e68a97085675e430e396c2b2df34";
+    };
+    deps = {
+      "passport-mailchimp-0.0.1" = self.by-version."passport-mailchimp"."0.0.1";
+      "mailchimp-1.1.0" = self.by-version."mailchimp"."1.1.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.0";
+  by-spec."bip-pod-mailgun"."*" =
+    self.by-version."bip-pod-mailgun"."0.3.0";
+  by-version."bip-pod-mailgun"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-mailgun-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-mailgun/-/bip-pod-mailgun-0.3.0.tgz";
+      name = "bip-pod-mailgun-0.3.0.tgz";
+      sha1 = "34a4a921ad790a00c8b6a5b9fba30bbc935e9a35";
+    };
+    deps = {
+      "mailgun-js-0.6.8" = self.by-version."mailgun-js"."0.6.8";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-mailgun" = self.by-version."bip-pod-mailgun"."0.3.0";
+  by-spec."bip-pod-math".">=0.0.1" =
+    self.by-version."bip-pod-math"."0.3.2";
+  by-version."bip-pod-math"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-math-0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-math/-/bip-pod-math-0.3.2.tgz";
+      name = "bip-pod-math-0.3.2.tgz";
+      sha1 = "b8de2c25dbf25449c86c2eca2a5738c80c6b96d8";
+    };
+    deps = {
+      "mathjs-0.19.0" = self.by-version."mathjs"."0.19.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-mixcloud"."*" =
+    self.by-version."bip-pod-mixcloud"."0.3.0";
+  by-version."bip-pod-mixcloud"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-mixcloud-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-mixcloud/-/bip-pod-mixcloud-0.3.0.tgz";
+      name = "bip-pod-mixcloud-0.3.0.tgz";
+      sha1 = "a218a84e84329b4972509de2449ef99744b809ea";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-mixcloud" = self.by-version."bip-pod-mixcloud"."0.3.0";
+  by-spec."bip-pod-mongodb"."*" =
+    self.by-version."bip-pod-mongodb"."0.3.0";
+  by-version."bip-pod-mongodb"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-mongodb-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.0.tgz";
+      name = "bip-pod-mongodb-0.3.0.tgz";
+      sha1 = "333cdd30bb30c369b151a27fc4b1bc2aaf6f802d";
+    };
+    deps = {
+      "mongodb-2.0.14" = self.by-version."mongodb"."2.0.14";
+      "assert-1.3.0" = self.by-version."assert"."1.3.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-mongodb" = self.by-version."bip-pod-mongodb"."0.3.0";
+  by-spec."bip-pod-numerous"."*" =
+    self.by-version."bip-pod-numerous"."0.3.0";
+  by-version."bip-pod-numerous"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-numerous-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-numerous/-/bip-pod-numerous-0.3.0.tgz";
+      name = "bip-pod-numerous-0.3.0.tgz";
+      sha1 = "f2abbe029b380c637e55c62382caff9e3c7bc154";
+    };
+    deps = {
+      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-numerous" = self.by-version."bip-pod-numerous"."0.3.0";
+  by-spec."bip-pod-pushbullet"."*" =
+    self.by-version."bip-pod-pushbullet"."0.3.0";
+  by-version."bip-pod-pushbullet"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-pushbullet-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-pushbullet/-/bip-pod-pushbullet-0.3.0.tgz";
+      name = "bip-pod-pushbullet-0.3.0.tgz";
+      sha1 = "da4f43cdc68ecaf267df8fe74c65f5206f65d657";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-pushbullet" = self.by-version."bip-pod-pushbullet"."0.3.0";
+  by-spec."bip-pod-pusher"."*" =
+    self.by-version."bip-pod-pusher"."0.3.0";
+  by-version."bip-pod-pusher"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-pusher-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-pusher/-/bip-pod-pusher-0.3.0.tgz";
+      name = "bip-pod-pusher-0.3.0.tgz";
+      sha1 = "c23247a9532d9913938d547e6278c7466634a0d8";
+    };
+    deps = {
+      "pusher-1.0.2" = self.by-version."pusher"."1.0.2";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-pusher" = self.by-version."bip-pod-pusher"."0.3.0";
+  by-spec."bip-pod-soundcloud"."*" =
+    self.by-version."bip-pod-soundcloud"."0.3.0";
+  by-version."bip-pod-soundcloud"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-soundcloud-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-soundcloud/-/bip-pod-soundcloud-0.3.0.tgz";
+      name = "bip-pod-soundcloud-0.3.0.tgz";
+      sha1 = "3f35efdf27e684ae3f05019bfe83798c36fe0f19";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-soundcloud-0.1.2" = self.by-version."passport-soundcloud"."0.1.2";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-soundcloud" = self.by-version."bip-pod-soundcloud"."0.3.0";
+  by-spec."bip-pod-statuscake"."*" =
+    self.by-version."bip-pod-statuscake"."0.3.0";
+  by-version."bip-pod-statuscake"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-statuscake-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-statuscake/-/bip-pod-statuscake-0.3.0.tgz";
+      name = "bip-pod-statuscake-0.3.0.tgz";
+      sha1 = "3cc042c336739248d98609aaf6ea0dd881796dc8";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-statuscake" = self.by-version."bip-pod-statuscake"."0.3.0";
+  by-spec."bip-pod-syndication".">=0.0.1" =
+    self.by-version."bip-pod-syndication"."0.3.4";
+  by-version."bip-pod-syndication"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-syndication-0.3.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.3.4.tgz";
+      name = "bip-pod-syndication-0.3.4.tgz";
+      sha1 = "d38f2acafda836fa87b8cd3e253049d67cab10a6";
+    };
+    deps = {
+      "ejs-2.2.3" = self.by-version."ejs"."2.2.3";
+      "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
+      "feedparser-0.19.2" = self.by-version."feedparser"."0.19.2";
+      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3";
+      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "rss-1.1.1" = self.by-version."rss"."1.1.1";
+      "send-0.9.3" = self.by-version."send"."0.9.3";
+      "validator-1.5.1" = self.by-version."validator"."1.5.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-templater".">=0.0.1" =
+    self.by-version."bip-pod-templater"."0.3.0";
+  by-version."bip-pod-templater"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-templater-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-templater/-/bip-pod-templater-0.3.0.tgz";
+      name = "bip-pod-templater-0.3.0.tgz";
+      sha1 = "37e06e747d3fe6efc324ff5a32bd7c797353f719";
+    };
+    deps = {
+      "html-md-3.0.2" = self.by-version."html-md"."3.0.2";
+      "marked-0.3.2" = self.by-version."marked"."0.3.2";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-time".">=0.0.1" =
+    self.by-version."bip-pod-time"."0.3.0";
+  by-version."bip-pod-time"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-time-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.0.tgz";
+      name = "bip-pod-time-0.3.0.tgz";
+      sha1 = "c7e3628b35c2d8a054e7a73db78e162c9247275f";
+    };
+    deps = {
+      "moment-2.5.1" = self.by-version."moment"."2.5.1";
+      "moment-timezone-0.0.3" = self.by-version."moment-timezone"."0.0.3";
+      "sugar-1.4.1" = self.by-version."sugar"."1.4.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bip-pod-todoist"."*" =
+    self.by-version."bip-pod-todoist"."0.3.0";
+  by-version."bip-pod-todoist"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-todoist-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-todoist/-/bip-pod-todoist-0.3.0.tgz";
+      name = "bip-pod-todoist-0.3.0.tgz";
+      sha1 = "d5d7e92ffa609c44c3bcb12db24f57686c3b5a2c";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-todoist" = self.by-version."bip-pod-todoist"."0.3.0";
+  by-spec."bip-pod-trello"."*" =
+    self.by-version."bip-pod-trello"."0.3.0";
+  by-version."bip-pod-trello"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-trello-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-trello/-/bip-pod-trello-0.3.0.tgz";
+      name = "bip-pod-trello-0.3.0.tgz";
+      sha1 = "52fc0731a0c3a357a21b79b3a7d5902cb2f80408";
+    };
+    deps = {
+      "passport-trello-0.1.4" = self.by-version."passport-trello"."0.1.4";
+      "q-1.1.2" = self.by-version."q"."1.1.2";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-trello" = self.by-version."bip-pod-trello"."0.3.0";
+  by-spec."bip-pod-twilio"."*" =
+    self.by-version."bip-pod-twilio"."0.3.1";
+  by-version."bip-pod-twilio"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-twilio-0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-twilio/-/bip-pod-twilio-0.3.1.tgz";
+      name = "bip-pod-twilio-0.3.1.tgz";
+      sha1 = "44160bf0df0fd0f4b6ce879383434044081c01b7";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "twilio-1.10.0" = self.by-version."twilio"."1.10.0";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-twilio" = self.by-version."bip-pod-twilio"."0.3.1";
+  by-spec."bip-pod-twitter"."*" =
+    self.by-version."bip-pod-twitter"."0.3.0";
+  by-version."bip-pod-twitter"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-twitter-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.0.tgz";
+      name = "bip-pod-twitter-0.3.0.tgz";
+      sha1 = "9304bbb8493a604fd0fe28bcd5f61f725fb0ec70";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "ntwitter-0.5.0" = self.by-version."ntwitter"."0.5.0";
+      "passport-twitter-1.0.2" = self.by-version."passport-twitter"."1.0.2";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.0";
+  by-spec."bip-pod-witai"."*" =
+    self.by-version."bip-pod-witai"."0.3.0";
+  by-version."bip-pod-witai"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-witai-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-witai/-/bip-pod-witai-0.3.0.tgz";
+      name = "bip-pod-witai-0.3.0.tgz";
+      sha1 = "5fa089155895fe375fc32262fe734ff980ef455d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-witai" = self.by-version."bip-pod-witai"."0.3.0";
+  by-spec."bip-pod-wordpress"."*" =
+    self.by-version."bip-pod-wordpress"."0.3.0";
+  by-version."bip-pod-wordpress"."0.3.0" = self.buildNodePackage {
+    name = "bip-pod-wordpress-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-wordpress/-/bip-pod-wordpress-0.3.0.tgz";
+      name = "bip-pod-wordpress-0.3.0.tgz";
+      sha1 = "5a4f863de9a5fae3aea7f9fd76ef5c0f9b46172a";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "passport-wordpress-0.0.3" = self.by-version."passport-wordpress"."0.0.3";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-wordpress" = self.by-version."bip-pod-wordpress"."0.3.0";
+  by-spec."bip-pod-zoho"."*" =
+    self.by-version."bip-pod-zoho"."0.3.1";
+  by-version."bip-pod-zoho"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-zoho-0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bip-pod-zoho/-/bip-pod-zoho-0.3.1.tgz";
+      name = "bip-pod-zoho-0.3.1.tgz";
+      sha1 = "a7c4edd30388ef66798fb871bb67f793ea18a774";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1";
+    };
+    peerDependencies = [];
+  };
+  "bip-pod-zoho" = self.by-version."bip-pod-zoho"."0.3.1";
+  by-spec."bipio"."*" =
+    self.by-version."bipio"."0.3.3";
+  by-version."bipio"."0.3.3" = self.buildNodePackage {
+    name = "bipio-0.3.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bipio/-/bipio-0.3.3.tgz";
+      name = "bipio-0.3.3.tgz";
+      sha1 = "5dd85ded95c8662bad90d4029c040bf57d89ec17";
+    };
+    deps = {
+      "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0";
+      "amqp-0.2.0" = self.by-version."amqp"."0.2.0";
+      "async-0.1.18" = self.by-version."async"."0.1.18";
+      "base-converter-1.1.2" = self.by-version."base-converter"."1.1.2";
+      "bcrypt-0.8.1" = self.by-version."bcrypt"."0.8.1";
+      "bip-pod-0.3.2" = self.by-version."bip-pod"."0.3.2";
+      "bip-pod-crypto-0.3.0" = self.by-version."bip-pod-crypto"."0.3.0";
+      "bip-pod-email-0.3.3" = self.by-version."bip-pod-email"."0.3.3";
+      "bip-pod-flow-0.3.0" = self.by-version."bip-pod-flow"."0.3.0";
+      "bip-pod-html-0.3.0" = self.by-version."bip-pod-html"."0.3.0";
+      "bip-pod-http-0.3.0" = self.by-version."bip-pod-http"."0.3.0";
+      "bip-pod-math-0.3.2" = self.by-version."bip-pod-math"."0.3.2";
+      "bip-pod-syndication-0.3.4" = self.by-version."bip-pod-syndication"."0.3.4";
+      "bip-pod-templater-0.3.0" = self.by-version."bip-pod-templater"."0.3.0";
+      "bip-pod-time-0.3.0" = self.by-version."bip-pod-time"."0.3.0";
+      "body-parser-1.10.2" = self.by-version."body-parser"."1.10.2";
+      "clone-0.2.0" = self.by-version."clone"."0.2.0";
+      "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "config-0.4.36" = self.by-version."config"."0.4.36";
+      "connect-2.28.2" = self.by-version."connect"."2.28.2";
+      "connect-mongo-0.7.0" = self.by-version."connect-mongo"."0.7.0";
+      "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3";
+      "cron-1.0.6" = self.by-version."cron"."1.0.6";
+      "dateformat-1.0.7-1.2.3" = self.by-version."dateformat"."1.0.7-1.2.3";
+      "datejs-1.0.0-rc3" = self.by-version."datejs"."1.0.0-rc3";
+      "errorhandler-1.3.2" = self.by-version."errorhandler"."1.3.2";
+      "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1";
+      "express-session-1.10.1" = self.by-version."express-session"."1.10.1";
+      "extend-2.0.0" = self.by-version."extend"."2.0.0";
+      "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
+      "heapdump-0.2.10" = self.by-version."heapdump"."0.2.10";
+      "html-md-3.0.2" = self.by-version."html-md"."3.0.2";
+      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3";
+      "inquirer-0.8.0" = self.by-version."inquirer"."0.8.0";
+      "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6";
+      "json-middleware-1.0.2" = self.by-version."json-middleware"."1.0.2";
+      "jsonwebtoken-1.3.0" = self.by-version."jsonwebtoken"."1.3.0";
+      "ldapjs-0.7.1" = self.by-version."ldapjs"."0.7.1";
+      "marked-0.3.2" = self.by-version."marked"."0.3.2";
+      "memwatch-0.2.2" = self.by-version."memwatch"."0.2.2";
+      "method-override-1.0.2" = self.by-version."method-override"."1.0.2";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+      "mongoose-3.9.7" = self.by-version."mongoose"."3.9.7";
+      "multer-0.1.7" = self.by-version."multer"."0.1.7";
+      "node-fs-0.1.7" = self.by-version."node-fs"."0.1.7";
+      "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
+      "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0";
+      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
+      "ssl-root-cas-1.1.9-beta" = self.by-version."ssl-root-cas"."1.1.9-beta";
+      "sugar-1.4.1" = self.by-version."sugar"."1.4.1";
+      "temp-0.8.1" = self.by-version."temp"."0.8.1";
+      "time-0.11.0" = self.by-version."time"."0.11.0";
+      "tldtools-0.0.21" = self.by-version."tldtools"."0.0.21";
+      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "validator-1.5.1" = self.by-version."validator"."1.5.1";
+      "webkit-devtools-agent-0.2.5" = self.by-version."webkit-devtools-agent"."0.2.5";
+      "winston-0.5.1" = self.by-version."winston"."0.5.1";
+    };
+    peerDependencies = [];
+  };
+  "bipio" = self.by-version."bipio"."0.3.3";
+  by-spec."bitcoinjs-lib"."1.2.0" =
+    self.by-version."bitcoinjs-lib"."1.2.0";
+  by-version."bitcoinjs-lib"."1.2.0" = self.buildNodePackage {
+    name = "bitcoinjs-lib-1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-1.2.0.tgz";
+      name = "bitcoinjs-lib-1.2.0.tgz";
+      sha1 = "731ce2f24b6065f8d9af18757516eed882ad1619";
+    };
+    deps = {
+      "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
+      "bs58check-1.0.3" = self.by-version."bs58check"."1.0.3";
+      "crypto-browserify-3.9.9" = self.by-version."crypto-browserify"."3.9.9";
+      "ecurve-1.0.0" = self.by-version."ecurve"."1.0.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."bitfield"."^0.1.0" =
     self.by-version."bitfield"."0.1.0";
-  by-version."bitfield"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bitfield"."0.1.0" = self.buildNodePackage {
     name = "bitfield-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz";
-        name = "bitfield-0.1.0.tgz";
-        sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bitfield" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz";
+      name = "bitfield-0.1.0.tgz";
+      sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bitfield" ];
+    peerDependencies = [];
   };
   by-spec."bits"."~0.1.1" =
     self.by-version."bits"."0.1.1";
-  by-version."bits"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."bits"."0.1.1" = self.buildNodePackage {
     name = "bits-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bits/-/bits-0.1.1.tgz";
-        name = "bits-0.1.1.tgz";
-        sha1 = "7082eb8b7bdf12e47b0a8cf8f7ad3af4e7053a96";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bits" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bits/-/bits-0.1.1.tgz";
+      name = "bits-0.1.1.tgz";
+      sha1 = "7082eb8b7bdf12e47b0a8cf8f7ad3af4e7053a96";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bits" ];
+    peerDependencies = [];
   };
   by-spec."bittorrent-dht"."^1.0.0" =
     self.by-version."bittorrent-dht"."1.5.0";
-  by-version."bittorrent-dht"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bittorrent-dht"."1.5.0" = self.buildNodePackage {
     name = "bittorrent-dht-1.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-1.5.0.tgz";
-        name = "bittorrent-dht-1.5.0.tgz";
-        sha1 = "b14b34eace8f44e795a8bad69a44b08ca485c355";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bittorrent-dht" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-1.5.0.tgz";
+      name = "bittorrent-dht-1.5.0.tgz";
+      sha1 = "b14b34eace8f44e795a8bad69a44b08ca485c355";
+    };
     deps = {
       "bencode-0.6.0" = self.by-version."bencode"."0.6.0";
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
@@ -1955,24 +2805,18 @@
       "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bittorrent-dht" ];
+    peerDependencies = [];
   };
   by-spec."bittorrent-dht"."^2.1.1" =
     self.by-version."bittorrent-dht"."2.6.4";
-  by-version."bittorrent-dht"."2.6.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."bittorrent-dht"."2.6.4" = self.buildNodePackage {
     name = "bittorrent-dht-2.6.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-2.6.4.tgz";
-        name = "bittorrent-dht-2.6.4.tgz";
-        sha1 = "af090c6576f6228596fdd5c538d3439aaf50577b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bittorrent-dht" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-2.6.4.tgz";
+      name = "bittorrent-dht-2.6.4.tgz";
+      sha1 = "af090c6576f6228596fdd5c538d3439aaf50577b";
+    };
     deps = {
       "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0";
       "bencode-0.6.0" = self.by-version."bencode"."0.6.0";
@@ -1987,32 +2831,25 @@
       "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bittorrent-dht" ];
+    peerDependencies = [];
   };
   by-spec."bittorrent-dht"."^2.6.4" =
     self.by-version."bittorrent-dht"."2.6.4";
   by-spec."bittorrent-tracker"."^2.0.0" =
-    self.by-version."bittorrent-tracker"."2.10.3";
-  by-version."bittorrent-tracker"."2.10.3" = lib.makeOverridable self.buildNodePackage {
-    name = "bittorrent-tracker-2.10.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.10.3.tgz";
-        name = "bittorrent-tracker-2.10.3.tgz";
-        sha1 = "f58be79a52269f4b258a8c77b805977246206cba";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bittorrent-tracker" or []);
+    self.by-version."bittorrent-tracker"."2.12.1";
+  by-version."bittorrent-tracker"."2.12.1" = self.buildNodePackage {
+    name = "bittorrent-tracker-2.12.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.12.1.tgz";
+      name = "bittorrent-tracker-2.12.1.tgz";
+      sha1 = "562f0e43c6340d003b08c5dad3d4bff0eb3fd64d";
+    };
     deps = {
       "bencode-0.6.0" = self.by-version."bencode"."0.6.0";
-      "bn.js-0.16.1" = self.by-version."bn.js"."0.16.1";
+      "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "extend.js-0.0.2" = self.by-version."extend.js"."0.0.2";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
@@ -2021,222 +2858,186 @@
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "portfinder-0.3.0" = self.by-version."portfinder"."0.3.0";
       "run-series-1.0.2" = self.by-version."run-series"."1.0.2";
+      "simple-get-1.3.0" = self.by-version."simple-get"."1.3.0";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bittorrent-tracker" ];
+    peerDependencies = [];
   };
   by-spec."bittorrent-tracker"."^2.6.0" =
-    self.by-version."bittorrent-tracker"."2.10.3";
+    self.by-version."bittorrent-tracker"."2.12.1";
   by-spec."bl"."^0.9.0" =
-    self.by-version."bl"."0.9.3";
-  by-version."bl"."0.9.3" = lib.makeOverridable self.buildNodePackage {
-    name = "bl-0.9.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bl/-/bl-0.9.3.tgz";
-        name = "bl-0.9.3.tgz";
-        sha1 = "c41eff3e7cb31bde107c8f10076d274eff7f7d44";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bl" or []);
+    self.by-version."bl"."0.9.4";
+  by-version."bl"."0.9.4" = self.buildNodePackage {
+    name = "bl-0.9.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
+      name = "bl-0.9.4.tgz";
+      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
+    };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bl" ];
+    peerDependencies = [];
   };
   by-spec."bl"."~0.9.0" =
-    self.by-version."bl"."0.9.3";
+    self.by-version."bl"."0.9.4";
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/blob/-/blob-0.0.2.tgz";
+      name = "blob-0.0.2.tgz";
+      sha1 = "b89562bd6994af95ba1e812155536333aa23cf24";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."block-stream"."*" =
     self.by-version."block-stream"."0.0.7";
-  by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."block-stream"."0.0.7" = self.buildNodePackage {
     name = "block-stream-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
-        name = "block-stream-0.0.7.tgz";
-        sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."block-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
+      name = "block-stream-0.0.7.tgz";
+      sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "block-stream" ];
+    peerDependencies = [];
   };
   by-spec."block-stream"."0.0.7" =
     self.by-version."block-stream"."0.0.7";
   by-spec."bluebird".">= 1.2.1" =
-    self.by-version."bluebird"."2.6.2";
-  by-version."bluebird"."2.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "bluebird-2.6.2";
+    self.by-version."bluebird"."2.9.1";
+  by-version."bluebird"."2.9.1" = self.buildNodePackage {
+    name = "bluebird-2.9.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bluebird/-/bluebird-2.6.2.tgz";
-        name = "bluebird-2.6.2.tgz";
-        sha1 = "8f51818cbbffa5f32d7927ce8fe0d57d88ad53a2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bluebird" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.1.tgz";
+      name = "bluebird-2.9.1.tgz";
+      sha1 = "5a10857dd34a025ebd2013b303027b027f20557f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bluebird" ];
+    peerDependencies = [];
   };
   by-spec."blueimp-md5"."~1.1.0" =
     self.by-version."blueimp-md5"."1.1.0";
-  by-version."blueimp-md5"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."blueimp-md5"."1.1.0" = self.buildNodePackage {
     name = "blueimp-md5-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz";
-        name = "blueimp-md5-1.1.0.tgz";
-        sha1 = "041ed794862f3c5f2847282a7481329f1d2352cd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."blueimp-md5" or []);
-    deps = {
+    src = fetchurl {
+      url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz";
+      name = "blueimp-md5-1.1.0.tgz";
+      sha1 = "041ed794862f3c5f2847282a7481329f1d2352cd";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "blueimp-md5" ];
-  };
-  by-spec."bn.js"."^0.16.0" =
-    self.by-version."bn.js"."0.16.1";
-  by-version."bn.js"."0.16.1" = lib.makeOverridable self.buildNodePackage {
-    name = "bn.js-0.16.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bn.js/-/bn.js-0.16.1.tgz";
-        name = "bn.js-0.16.1.tgz";
-        sha1 = "5f9e74fc53abfd3bb74020b824b83a599f8a9c6f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bn.js" or []);
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bn.js" ];
+    peerDependencies = [];
   };
   by-spec."bn.js"."^1.0.0" =
     self.by-version."bn.js"."1.0.0";
-  by-version."bn.js"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bn.js"."1.0.0" = self.buildNodePackage {
     name = "bn.js-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bn.js/-/bn.js-1.0.0.tgz";
-        name = "bn.js-1.0.0.tgz";
-        sha1 = "01e39f8c13f981c468b673caf0632f726d54713f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bn.js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bn.js/-/bn.js-1.0.0.tgz";
+      name = "bn.js-1.0.0.tgz";
+      sha1 = "01e39f8c13f981c468b673caf0632f726d54713f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bn.js" ];
+    peerDependencies = [];
   };
   by-spec."bncode"."^0.2.3" =
     self.by-version."bncode"."0.2.3";
-  by-version."bncode"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."bncode"."0.2.3" = self.buildNodePackage {
     name = "bncode-0.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz";
-        name = "bncode-0.2.3.tgz";
-        sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bncode" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz";
+      name = "bncode-0.2.3.tgz";
+      sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bncode" ];
+    peerDependencies = [];
   };
   by-spec."bncode"."^0.5.2" =
     self.by-version."bncode"."0.5.3";
-  by-version."bncode"."0.5.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."bncode"."0.5.3" = self.buildNodePackage {
     name = "bncode-0.5.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz";
-        name = "bncode-0.5.3.tgz";
-        sha1 = "e16661697452d436bf9886238cc791b08d66a61a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bncode" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz";
+      name = "bncode-0.5.3.tgz";
+      sha1 = "e16661697452d436bf9886238cc791b08d66a61a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bncode" ];
-  };
-  by-spec."body-parser"."~1.10.1" =
-    self.by-version."body-parser"."1.10.1";
-  by-version."body-parser"."1.10.1" = lib.makeOverridable self.buildNodePackage {
-    name = "body-parser-1.10.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.10.1.tgz";
-        name = "body-parser-1.10.1.tgz";
-        sha1 = "af0c7156b128d946f3c43f5fe0364da00cfa7391";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."body-parser" or []);
+    peerDependencies = [];
+  };
+  by-spec."body-parser"."1.5.0" =
+    self.by-version."body-parser"."1.5.0";
+  by-version."body-parser"."1.5.0" = self.buildNodePackage {
+    name = "body-parser-1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.5.0.tgz";
+      name = "body-parser-1.5.0.tgz";
+      sha1 = "c6fce2483c9eeb49ab349ff25a92d336d91055b9";
+    };
+    deps = {
+      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+      "depd-0.4.2" = self.by-version."depd"."0.4.2";
+      "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4";
+      "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0";
+      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0";
+      "type-is-1.3.2" = self.by-version."type-is"."1.3.2";
+    };
+    peerDependencies = [];
+  };
+  by-spec."body-parser"."^1.0.2" =
+    self.by-version."body-parser"."1.10.2";
+  by-version."body-parser"."1.10.2" = self.buildNodePackage {
+    name = "body-parser-1.10.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.10.2.tgz";
+      name = "body-parser-1.10.2.tgz";
+      sha1 = "405d465fcd3ccf0ea8a35adbf1055f6e98316bd1";
+    };
     deps = {
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5";
+      "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6";
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1";
+      "raw-body-1.3.2" = self.by-version."raw-body"."1.3.2";
       "type-is-1.5.5" = self.by-version."type-is"."1.5.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "body-parser" ];
+    peerDependencies = [];
   };
+  by-spec."body-parser"."~1.10.2" =
+    self.by-version."body-parser"."1.10.2";
   by-spec."body-parser"."~1.8.4" =
     self.by-version."body-parser"."1.8.4";
-  by-version."body-parser"."1.8.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."body-parser"."1.8.4" = self.buildNodePackage {
     name = "body-parser-1.8.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz";
-        name = "body-parser-1.8.4.tgz";
-        sha1 = "d497e04bc13b3f9a8bd8c70bb0cdc16f2e028898";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."body-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz";
+      name = "body-parser-1.8.4.tgz";
+      sha1 = "d497e04bc13b3f9a8bd8c70bb0cdc16f2e028898";
+    };
     deps = {
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "depd-0.4.5" = self.by-version."depd"."0.4.5";
@@ -2247,24 +3048,18 @@
       "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0";
       "type-is-1.5.5" = self.by-version."type-is"."1.5.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "body-parser" ];
+    peerDependencies = [];
   };
   by-spec."body-parser"."~1.9.3" =
     self.by-version."body-parser"."1.9.3";
-  by-version."body-parser"."1.9.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."body-parser"."1.9.3" = self.buildNodePackage {
     name = "body-parser-1.9.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.3.tgz";
-        name = "body-parser-1.9.3.tgz";
-        sha1 = "edfacd4fcfad87dfe74f861a5cc712900aef2623";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."body-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.3.tgz";
+      name = "body-parser-1.9.3.tgz";
+      sha1 = "edfacd4fcfad87dfe74f861a5cc712900aef2623";
+    };
     deps = {
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
@@ -2275,66 +3070,48 @@
       "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1";
       "type-is-1.5.5" = self.by-version."type-is"."1.5.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "body-parser" ];
+    peerDependencies = [];
   };
   by-spec."boom"."0.3.x" =
     self.by-version."boom"."0.3.8";
-  by-version."boom"."0.3.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."boom"."0.3.8" = self.buildNodePackage {
     name = "boom-0.3.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
-        name = "boom-0.3.8.tgz";
-        sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."boom" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
+      name = "boom-0.3.8.tgz";
+      sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea";
+    };
     deps = {
       "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "boom" ];
+    peerDependencies = [];
   };
   by-spec."boom"."0.4.x" =
     self.by-version."boom"."0.4.2";
-  by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."boom"."0.4.2" = self.buildNodePackage {
     name = "boom-0.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
-        name = "boom-0.4.2.tgz";
-        sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."boom" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+      name = "boom-0.4.2.tgz";
+      sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+    };
     deps = {
       "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "boom" ];
+    peerDependencies = [];
   };
   by-spec."bower"."*" =
     self.by-version."bower"."1.3.12";
-  by-version."bower"."1.3.12" = lib.makeOverridable self.buildNodePackage {
+  by-version."bower"."1.3.12" = self.buildNodePackage {
     name = "bower-1.3.12";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.3.12.tgz";
-        name = "bower-1.3.12.tgz";
-        sha1 = "37de0edb3904baf90aee13384a1a379a05ee214c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower/-/bower-1.3.12.tgz";
+      name = "bower-1.3.12.tgz";
+      sha1 = "37de0edb3904baf90aee13384a1a379a05ee214c";
+    };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
       "archy-0.0.2" = self.by-version."archy"."0.0.2";
@@ -2342,12 +3119,12 @@
       "bower-endpoint-parser-0.2.2" = self.by-version."bower-endpoint-parser"."0.2.2";
       "bower-json-0.4.0" = self.by-version."bower-json"."0.4.0";
       "bower-logger-0.2.2" = self.by-version."bower-logger"."0.2.2";
-      "bower-registry-client-0.2.2" = self.by-version."bower-registry-client"."0.2.2";
+      "bower-registry-client-0.2.3" = self.by-version."bower-registry-client"."0.2.3";
       "cardinal-0.4.0" = self.by-version."cardinal"."0.4.0";
       "chalk-0.5.0" = self.by-version."chalk"."0.5.0";
       "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
       "decompress-zip-0.0.8" = self.by-version."decompress-zip"."0.0.8";
-      "fstream-1.0.3" = self.by-version."fstream"."1.0.3";
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
       "glob-4.0.6" = self.by-version."glob"."4.0.6";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
@@ -2378,189 +3155,141 @@
       "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower" ];
+    peerDependencies = [];
   };
   "bower" = self.by-version."bower"."1.3.12";
   by-spec."bower".">=1.2.8 <2" =
     self.by-version."bower"."1.3.12";
   by-spec."bower-config"."~0.5.0" =
     self.by-version."bower-config"."0.5.2";
-  by-version."bower-config"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."bower-config"."0.5.2" = self.buildNodePackage {
     name = "bower-config-0.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz";
-        name = "bower-config-0.5.2.tgz";
-        sha1 = "1f7d2e899e99b70c29a613e70d4c64590414b22e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-config" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz";
+      name = "bower-config-0.5.2.tgz";
+      sha1 = "1f7d2e899e99b70c29a613e70d4c64590414b22e";
+    };
     deps = {
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "mout-0.9.1" = self.by-version."mout"."0.9.1";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-config" ];
+    peerDependencies = [];
   };
   by-spec."bower-config"."~0.5.2" =
     self.by-version."bower-config"."0.5.2";
   by-spec."bower-endpoint-parser"."0.2.1" =
     self.by-version."bower-endpoint-parser"."0.2.1";
-  by-version."bower-endpoint-parser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."bower-endpoint-parser"."0.2.1" = self.buildNodePackage {
     name = "bower-endpoint-parser-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz";
-        name = "bower-endpoint-parser-0.2.1.tgz";
-        sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-endpoint-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz";
+      name = "bower-endpoint-parser-0.2.1.tgz";
+      sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-endpoint-parser" ];
+    peerDependencies = [];
   };
   by-spec."bower-endpoint-parser"."~0.2.2" =
     self.by-version."bower-endpoint-parser"."0.2.2";
-  by-version."bower-endpoint-parser"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."bower-endpoint-parser"."0.2.2" = self.buildNodePackage {
     name = "bower-endpoint-parser-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz";
-        name = "bower-endpoint-parser-0.2.2.tgz";
-        sha1 = "00b565adbfab6f2d35addde977e97962acbcb3f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-endpoint-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz";
+      name = "bower-endpoint-parser-0.2.2.tgz";
+      sha1 = "00b565adbfab6f2d35addde977e97962acbcb3f6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-endpoint-parser" ];
+    peerDependencies = [];
   };
   by-spec."bower-json"."0.4.0" =
     self.by-version."bower-json"."0.4.0";
-  by-version."bower-json"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bower-json"."0.4.0" = self.buildNodePackage {
     name = "bower-json-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz";
-        name = "bower-json-0.4.0.tgz";
-        sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-json" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz";
+      name = "bower-json-0.4.0.tgz";
+      sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766";
+    };
     deps = {
       "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "intersect-0.0.3" = self.by-version."intersect"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-json" ];
+    peerDependencies = [];
   };
   by-spec."bower-json"."~0.4.0" =
     self.by-version."bower-json"."0.4.0";
   by-spec."bower-logger"."0.2.1" =
     self.by-version."bower-logger"."0.2.1";
-  by-version."bower-logger"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."bower-logger"."0.2.1" = self.buildNodePackage {
     name = "bower-logger-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz";
-        name = "bower-logger-0.2.1.tgz";
-        sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-logger" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz";
+      name = "bower-logger-0.2.1.tgz";
+      sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-logger" ];
+    peerDependencies = [];
   };
   by-spec."bower-logger"."~0.2.2" =
     self.by-version."bower-logger"."0.2.2";
-  by-version."bower-logger"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."bower-logger"."0.2.2" = self.buildNodePackage {
     name = "bower-logger-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz";
-        name = "bower-logger-0.2.2.tgz";
-        sha1 = "39be07e979b2fc8e03a94634205ed9422373d381";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-logger" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz";
+      name = "bower-logger-0.2.2.tgz";
+      sha1 = "39be07e979b2fc8e03a94634205ed9422373d381";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-logger" ];
+    peerDependencies = [];
   };
   by-spec."bower-registry-client"."~0.2.0" =
-    self.by-version."bower-registry-client"."0.2.2";
-  by-version."bower-registry-client"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-registry-client-0.2.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.2.tgz";
-        name = "bower-registry-client-0.2.2.tgz";
-        sha1 = "461bf4c6e88bdc216408752b913b85ea097cd12c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-registry-client" or []);
+    self.by-version."bower-registry-client"."0.2.3";
+  by-version."bower-registry-client"."0.2.3" = self.buildNodePackage {
+    name = "bower-registry-client-0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.3.tgz";
+      name = "bower-registry-client-0.2.3.tgz";
+      sha1 = "876e669d4b3eae5fc7e00f7b3da58a4b630b6603";
+    };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "bower-config-0.5.2" = self.by-version."bower-config"."0.5.2";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1";
-      "request-2.27.0" = self.by-version."request"."2.27.0";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
       "request-replay-0.2.0" = self.by-version."request-replay"."0.2.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-registry-client" ];
+    peerDependencies = [];
   };
   by-spec."bower2nix"."*" =
     self.by-version."bower2nix"."2.1.0";
-  by-version."bower2nix"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bower2nix"."2.1.0" = self.buildNodePackage {
     name = "bower2nix-2.1.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz";
-        name = "bower2nix-2.1.0.tgz";
-        sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower2nix" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz";
+      name = "bower2nix-2.1.0.tgz";
+      sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6";
+    };
     deps = {
       "temp-0.6.0" = self.by-version."temp"."0.6.0";
-      "fs.extra-1.3.0" = self.by-version."fs.extra"."1.3.0";
+      "fs.extra-1.3.2" = self.by-version."fs.extra"."1.3.2";
       "bower-json-0.4.0" = self.by-version."bower-json"."0.4.0";
       "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1";
       "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1";
@@ -2570,90 +3299,80 @@
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "fetch-bower-2.0.0" = self.by-version."fetch-bower"."2.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower2nix" ];
+    peerDependencies = [];
   };
   "bower2nix" = self.by-version."bower2nix"."2.1.0";
   by-spec."bplist-parser"."0.0.6" =
     self.by-version."bplist-parser"."0.0.6";
-  by-version."bplist-parser"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."bplist-parser"."0.0.6" = self.buildNodePackage {
     name = "bplist-parser-0.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz";
-        name = "bplist-parser-0.0.6.tgz";
-        sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bplist-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz";
+      name = "bplist-parser-0.0.6.tgz";
+      sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bplist-parser" ];
+    peerDependencies = [];
   };
   by-spec."brace-expansion"."^1.0.0" =
     self.by-version."brace-expansion"."1.1.0";
-  by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."brace-expansion"."1.1.0" = self.buildNodePackage {
     name = "brace-expansion-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
-        name = "brace-expansion-1.1.0.tgz";
-        sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."brace-expansion" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
+      name = "brace-expansion-1.1.0.tgz";
+      sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9";
+    };
     deps = {
       "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
       "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "brace-expansion" ];
+    peerDependencies = [];
+  };
+  by-spec."breakable"."~0.1.0" =
+    self.by-version."breakable"."0.1.0";
+  by-version."breakable"."0.1.0" = self.buildNodePackage {
+    name = "breakable-0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/breakable/-/breakable-0.1.0.tgz";
+      name = "breakable-0.1.0.tgz";
+      sha1 = "fe6325427b2662bd6e024009bf232f3e35fab7f5";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."brfs"."0.0.8" =
     self.by-version."brfs"."0.0.8";
-  by-version."brfs"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."brfs"."0.0.8" = self.buildNodePackage {
     name = "brfs-0.0.8";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/brfs/-/brfs-0.0.8.tgz";
-        name = "brfs-0.0.8.tgz";
-        sha1 = "e4377a177638a4b0520901bb134491dd7e38a386";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."brfs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/brfs/-/brfs-0.0.8.tgz";
+      name = "brfs-0.0.8.tgz";
+      sha1 = "e4377a177638a4b0520901bb134491dd7e38a386";
+    };
     deps = {
       "through-2.2.7" = self.by-version."through"."2.2.7";
       "falafel-0.1.6" = self.by-version."falafel"."0.1.6";
       "escodegen-0.0.17" = self.by-version."escodegen"."0.0.17";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "brfs" ];
+    peerDependencies = [];
   };
   by-spec."broadway"."0.2.x" =
     self.by-version."broadway"."0.2.10";
-  by-version."broadway"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."broadway"."0.2.10" = self.buildNodePackage {
     name = "broadway-0.2.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
-        name = "broadway-0.2.10.tgz";
-        sha1 = "0f58532be140426e9000e49a93e242a0d1263238";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."broadway" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
+      name = "broadway-0.2.10.tgz";
+      sha1 = "0f58532be140426e9000e49a93e242a0d1263238";
+    };
     deps = {
       "cliff-0.1.8" = self.by-version."cliff"."0.1.8";
       "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
@@ -2661,24 +3380,18 @@
       "winston-0.7.2" = self.by-version."winston"."0.7.2";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "broadway" ];
+    peerDependencies = [];
   };
   by-spec."broadway"."~0.3.2" =
     self.by-version."broadway"."0.3.6";
-  by-version."broadway"."0.3.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."broadway"."0.3.6" = self.buildNodePackage {
     name = "broadway-0.3.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz";
-        name = "broadway-0.3.6.tgz";
-        sha1 = "7dbef068b954b7907925fd544963b578a902ba7a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."broadway" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz";
+      name = "broadway-0.3.6.tgz";
+      sha1 = "7dbef068b954b7907925fd544963b578a902ba7a";
+    };
     deps = {
       "cliff-0.1.9" = self.by-version."cliff"."0.1.9";
       "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
@@ -2686,46 +3399,34 @@
       "winston-0.8.0" = self.by-version."winston"."0.8.0";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "broadway" ];
+    peerDependencies = [];
   };
   by-spec."broadway"."~0.3.6" =
     self.by-version."broadway"."0.3.6";
   by-spec."brorand"."^1.0.1" =
     self.by-version."brorand"."1.0.5";
-  by-version."brorand"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."brorand"."1.0.5" = self.buildNodePackage {
     name = "brorand-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz";
-        name = "brorand-1.0.5.tgz";
-        sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."brorand" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz";
+      name = "brorand-1.0.5.tgz";
+      sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "brorand" ];
+    peerDependencies = [];
   };
   by-spec."browser-pack"."^3.2.0" =
     self.by-version."browser-pack"."3.2.0";
-  by-version."browser-pack"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."browser-pack"."3.2.0" = self.buildNodePackage {
     name = "browser-pack-3.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz";
-        name = "browser-pack-3.2.0.tgz";
-        sha1 = "faa1cbc41487b1acc4747e373e1148adffd0e2d9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browser-pack" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz";
+      name = "browser-pack-3.2.0.tgz";
+      sha1 = "faa1cbc41487b1acc4747e373e1148adffd0e2d9";
+    };
     deps = {
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
@@ -2734,145 +3435,109 @@
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
       "umd-2.1.0" = self.by-version."umd"."2.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browser-pack" ];
+    peerDependencies = [];
   };
   by-spec."browser-pack"."~2.0.0" =
     self.by-version."browser-pack"."2.0.1";
-  by-version."browser-pack"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."browser-pack"."2.0.1" = self.buildNodePackage {
     name = "browser-pack-2.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz";
-        name = "browser-pack-2.0.1.tgz";
-        sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browser-pack" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz";
+      name = "browser-pack-2.0.1.tgz";
+      sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150";
+    };
     deps = {
       "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4";
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browser-pack" ];
+    peerDependencies = [];
   };
   by-spec."browser-request".">= 0.2.0" =
     self.by-version."browser-request"."0.3.3";
-  by-version."browser-request"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."browser-request"."0.3.3" = self.buildNodePackage {
     name = "browser-request-0.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
-        name = "browser-request-0.3.3.tgz";
-        sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browser-request" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
+      name = "browser-request-0.3.3.tgz";
+      sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browser-request" ];
+    peerDependencies = [];
   };
   by-spec."browser-request"."~0.3.1" =
     self.by-version."browser-request"."0.3.3";
   by-spec."browser-resolve"."^1.3.0" =
-    self.by-version."browser-resolve"."1.5.0";
-  by-version."browser-resolve"."1.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "browser-resolve-1.5.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.5.0.tgz";
-        name = "browser-resolve-1.5.0.tgz";
-        sha1 = "716cc9008aa2161a38e4c823bb5aa097cff40447";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browser-resolve" or []);
+    self.by-version."browser-resolve"."1.6.0";
+  by-version."browser-resolve"."1.6.0" = self.buildNodePackage {
+    name = "browser-resolve-1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.6.0.tgz";
+      name = "browser-resolve-1.6.0.tgz";
+      sha1 = "3b364916bf1ea32960449e0725a4a5732b2adbd0";
+    };
     deps = {
       "resolve-1.0.0" = self.by-version."resolve"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browser-resolve" ];
+    peerDependencies = [];
   };
   by-spec."browser-resolve"."^1.3.1" =
-    self.by-version."browser-resolve"."1.5.0";
+    self.by-version."browser-resolve"."1.6.0";
   by-spec."browser-resolve"."~1.2.1" =
     self.by-version."browser-resolve"."1.2.4";
-  by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."browser-resolve"."1.2.4" = self.buildNodePackage {
     name = "browser-resolve-1.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz";
-        name = "browser-resolve-1.2.4.tgz";
-        sha1 = "59ae7820a82955ecd32f5fb7c468ac21c4723806";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browser-resolve" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz";
+      name = "browser-resolve-1.2.4.tgz";
+      sha1 = "59ae7820a82955ecd32f5fb7c468ac21c4723806";
+    };
     deps = {
       "resolve-0.6.3" = self.by-version."resolve"."0.6.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browser-resolve" ];
+    peerDependencies = [];
   };
   by-spec."browser-resolve"."~1.2.2" =
     self.by-version."browser-resolve"."1.2.4";
   by-spec."browserchannel"."*" =
     self.by-version."browserchannel"."2.0.0";
-  by-version."browserchannel"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."browserchannel"."2.0.0" = self.buildNodePackage {
     name = "browserchannel-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
-        name = "browserchannel-2.0.0.tgz";
-        sha1 = "0f211b3cad9995e8729b2bacd46b53c027c0ea63";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserchannel" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
+      name = "browserchannel-2.0.0.tgz";
+      sha1 = "0f211b3cad9995e8729b2bacd46b53c027c0ea63";
+    };
     deps = {
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "connect-2.28.1" = self.by-version."connect"."2.28.1";
+      "connect-2.28.2" = self.by-version."connect"."2.28.2";
       "request-2.51.0" = self.by-version."request"."2.51.0";
       "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserchannel" ];
+    peerDependencies = [];
   };
   "browserchannel" = self.by-version."browserchannel"."2.0.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."8.1.0";
-  by-version."browserify"."8.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-8.1.0";
+    self.by-version."browserify"."8.1.1";
+  by-version."browserify"."8.1.1" = self.buildNodePackage {
+    name = "browserify-8.1.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-8.1.0.tgz";
-        name = "browserify-8.1.0.tgz";
-        sha1 = "e8d966c0eb47a3e3e8a98deeff08812715033112";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify/-/browserify-8.1.1.tgz";
+      name = "browserify-8.1.1.tgz";
+      sha1 = "3b1f8e1d47a0037908d4feaac7e7d76c55ba4678";
+    };
     deps = {
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
       "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0";
-      "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0";
+      "browser-resolve-1.6.0" = self.by-version."browser-resolve"."1.6.0";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
       "buffer-3.0.1" = self.by-version."buffer"."3.0.1";
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
@@ -2880,14 +3545,14 @@
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "crypto-browserify-3.9.1" = self.by-version."crypto-browserify"."3.9.1";
+      "crypto-browserify-3.9.9" = self.by-version."crypto-browserify"."3.9.9";
       "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5";
       "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "events-1.0.2" = self.by-version."events"."1.0.2";
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
       "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -2896,7 +3561,7 @@
       "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2";
       "module-deps-3.6.4" = self.by-version."module-deps"."3.6.4";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
-      "parents-0.0.3" = self.by-version."parents"."0.0.3";
+      "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
       "process-0.10.0" = self.by-version."process"."0.10.0";
       "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
@@ -2904,7 +3569,7 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
-      "shasum-1.0.0" = self.by-version."shasum"."1.0.0";
+      "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
       "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
       "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
@@ -2919,30 +3584,24 @@
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify" ];
+    peerDependencies = [];
   };
-  "browserify" = self.by-version."browserify"."8.1.0";
+  "browserify" = self.by-version."browserify"."8.1.1";
   by-spec."browserify"."7.1.0" =
     self.by-version."browserify"."7.1.0";
-  by-version."browserify"."7.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."browserify"."7.1.0" = self.buildNodePackage {
     name = "browserify-7.1.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-7.1.0.tgz";
-        name = "browserify-7.1.0.tgz";
-        sha1 = "1660775c93c3efeaeb42f3c6638a6c4c2b414f14";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify/-/browserify-7.1.0.tgz";
+      name = "browserify-7.1.0.tgz";
+      sha1 = "1660775c93c3efeaeb42f3c6638a6c4c2b414f14";
+    };
     deps = {
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
       "assert-1.1.2" = self.by-version."assert"."1.1.2";
       "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0";
-      "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0";
+      "browser-resolve-1.6.0" = self.by-version."browser-resolve"."1.6.0";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
       "buffer-3.0.1" = self.by-version."buffer"."3.0.1";
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
@@ -2950,14 +3609,14 @@
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "crypto-browserify-3.9.1" = self.by-version."crypto-browserify"."3.9.1";
+      "crypto-browserify-3.9.9" = self.by-version."crypto-browserify"."3.9.9";
       "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5";
       "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "events-1.0.2" = self.by-version."events"."1.0.2";
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
       "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -2974,7 +3633,7 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
-      "shasum-1.0.0" = self.by-version."shasum"."1.0.0";
+      "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
       "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
       "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
@@ -2989,24 +3648,18 @@
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify" ];
+    peerDependencies = [];
   };
   by-spec."browserify"."~3.19.1" =
     self.by-version."browserify"."3.19.1";
-  by-version."browserify"."3.19.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."browserify"."3.19.1" = self.buildNodePackage {
     name = "browserify-3.19.1";
     bin = true;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.19.1.tgz";
-        name = "browserify-3.19.1.tgz";
-        sha1 = "e4e994f7c8313432df46b1a2b029d8bab13a456b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify/-/browserify-3.19.1.tgz";
+      name = "browserify-3.19.1.tgz";
+      sha1 = "e4e994f7c8313432df46b1a2b029d8bab13a456b";
+    };
     deps = {
       "module-deps-1.2.2" = self.by-version."module-deps"."1.2.2";
       "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1";
@@ -3048,24 +3701,18 @@
       "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify" ];
+    peerDependencies = [];
   };
   by-spec."browserify"."~3.24.1" =
     self.by-version."browserify"."3.24.13";
-  by-version."browserify"."3.24.13" = lib.makeOverridable self.buildNodePackage {
+  by-version."browserify"."3.24.13" = self.buildNodePackage {
     name = "browserify-3.24.13";
     bin = true;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.24.13.tgz";
-        name = "browserify-3.24.13.tgz";
-        sha1 = "d82012886791c4b1edd36612ad508a614e9ad86e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify/-/browserify-3.24.13.tgz";
+      name = "browserify-3.24.13.tgz";
+      sha1 = "d82012886791c4b1edd36612ad508a614e9ad86e";
+    };
     deps = {
       "module-deps-1.4.2" = self.by-version."module-deps"."1.4.2";
       "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1";
@@ -3110,512 +3757,505 @@
       "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify" ];
-  };
-  by-spec."browserify-aes"."0.8.1" =
-    self.by-version."browserify-aes"."0.8.1";
-  by-version."browserify-aes"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-aes-0.8.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.8.1.tgz";
-        name = "browserify-aes-0.8.1.tgz";
-        sha1 = "05902c0db3817b7f67f1668f74efb14ee900801d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify-aes" or []);
+    peerDependencies = [];
+  };
+  by-spec."browserify-aes"."^1.0.0" =
+    self.by-version."browserify-aes"."1.0.0";
+  by-version."browserify-aes"."1.0.0" = self.buildNodePackage {
+    name = "browserify-aes-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz";
+      name = "browserify-aes-1.0.0.tgz";
+      sha1 = "582efc30561166f89855fcdc945b686919848b62";
+    };
     deps = {
+      "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify-aes" ];
+    peerDependencies = [];
   };
   by-spec."browserify-rsa"."^1.1.0" =
     self.by-version."browserify-rsa"."1.1.1";
-  by-version."browserify-rsa"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."browserify-rsa"."1.1.1" = self.buildNodePackage {
     name = "browserify-rsa-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-1.1.1.tgz";
-        name = "browserify-rsa-1.1.1.tgz";
-        sha1 = "d7c952e12e44192680613ea7f3baa83af585c8ad";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify-rsa" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-1.1.1.tgz";
+      name = "browserify-rsa-1.1.1.tgz";
+      sha1 = "d7c952e12e44192680613ea7f3baa83af585c8ad";
+    };
     deps = {
       "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify-rsa" ];
-  };
-  by-spec."browserify-sign"."2.7.5" =
-    self.by-version."browserify-sign"."2.7.5";
-  by-version."browserify-sign"."2.7.5" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-sign-2.7.5";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.7.5.tgz";
-        name = "browserify-sign-2.7.5.tgz";
-        sha1 = "92fce12b47775547f2887d7c5282856c163715b2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify-sign" or []);
+    peerDependencies = [];
+  };
+  by-spec."browserify-sign"."2.8.0" =
+    self.by-version."browserify-sign"."2.8.0";
+  by-version."browserify-sign"."2.8.0" = self.buildNodePackage {
+    name = "browserify-sign-2.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.8.0.tgz";
+      name = "browserify-sign-2.8.0.tgz";
+      sha1 = "655975c12006d02b59181da9ab73f856c63c9aa4";
+    };
     deps = {
       "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
       "browserify-rsa-1.1.1" = self.by-version."browserify-rsa"."1.1.1";
-      "elliptic-1.0.0" = self.by-version."elliptic"."1.0.0";
+      "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify-sign" ];
+    peerDependencies = [];
   };
   by-spec."browserify-zlib"."^0.1.4" =
     self.by-version."browserify-zlib"."0.1.4";
-  by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."browserify-zlib"."0.1.4" = self.buildNodePackage {
     name = "browserify-zlib-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify-zlib" or []);
+    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.5" = self.by-version."pako"."0.2.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify-zlib" ];
+    peerDependencies = [];
   };
   by-spec."browserify-zlib"."~0.1.2" =
     self.by-version."browserify-zlib"."0.1.4";
+  by-spec."bs58"."^2.0.0" =
+    self.by-version."bs58"."2.0.1";
+  by-version."bs58"."2.0.1" = self.buildNodePackage {
+    name = "bs58-2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bs58/-/bs58-2.0.1.tgz";
+      name = "bs58-2.0.1.tgz";
+      sha1 = "55908d58f1982aba2008fa1bed8f91998a29bf8d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."bs58check"."1.0.3" =
+    self.by-version."bs58check"."1.0.3";
+  by-version."bs58check"."1.0.3" = self.buildNodePackage {
+    name = "bs58check-1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bs58check/-/bs58check-1.0.3.tgz";
+      name = "bs58check-1.0.3.tgz";
+      sha1 = "3e4dc6dde96e60b9db321ea7372fd4fd0523559e";
+    };
+    deps = {
+      "bs58-2.0.1" = self.by-version."bs58"."2.0.1";
+    };
+    peerDependencies = [];
+  };
   by-spec."bson"."0.1.8" =
     self.by-version."bson"."0.1.8";
-  by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."bson"."0.1.8" = self.buildNodePackage {
     name = "bson-0.1.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
-        name = "bson-0.1.8.tgz";
-        sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bson" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
+      name = "bson-0.1.8.tgz";
+      sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bson" ];
-  };
-  by-spec."bson"."0.2.16" =
-    self.by-version."bson"."0.2.16";
-  by-version."bson"."0.2.16" = lib.makeOverridable self.buildNodePackage {
-    name = "bson-0.2.16";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bson/-/bson-0.2.16.tgz";
-        name = "bson-0.2.16.tgz";
-        sha1 = "c4d056d16631ec481e8ef33659c01e581d2b97ed";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bson" or []);
+    peerDependencies = [];
+  };
+  by-spec."bson"."0.2.18" =
+    self.by-version."bson"."0.2.18";
+  by-version."bson"."0.2.18" = self.buildNodePackage {
+    name = "bson-0.2.18";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bson/-/bson-0.2.18.tgz";
+      name = "bson-0.2.18.tgz";
+      sha1 = "363adc4366bc582988213f3f58cb9a049add6f1c";
+    };
     deps = {
-      "nan-1.3.0" = self.by-version."nan"."1.3.0";
+      "nan-1.5.1" = self.by-version."nan"."1.5.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bson" ];
+    peerDependencies = [];
   };
   by-spec."bson"."0.2.2" =
     self.by-version."bson"."0.2.2";
-  by-version."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."bson"."0.2.2" = self.buildNodePackage {
     name = "bson-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
-        name = "bson-0.2.2.tgz";
-        sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bson" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
+      name = "bson-0.2.2.tgz";
+      sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bson" ];
+    peerDependencies = [];
   };
   by-spec."bson"."~0.2" =
-    self.by-version."bson"."0.2.16";
+    self.by-version."bson"."0.2.18";
   by-spec."buffer"."^3.0.0" =
     self.by-version."buffer"."3.0.1";
-  by-version."buffer"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."buffer"."3.0.1" = self.buildNodePackage {
     name = "buffer-3.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer/-/buffer-3.0.1.tgz";
-        name = "buffer-3.0.1.tgz";
-        sha1 = "d2743fff2b1d92ad532dd5716ecd9217838dfb3e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer/-/buffer-3.0.1.tgz";
+      name = "buffer-3.0.1.tgz";
+      sha1 = "d2743fff2b1d92ad532dd5716ecd9217838dfb3e";
+    };
     deps = {
       "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
       "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
       "is-array-1.0.1" = self.by-version."is-array"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffer" ];
+    peerDependencies = [];
   };
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
-  by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."buffer-crc32"."0.1.1" = self.buildNodePackage {
     name = "buffer-crc32-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
-        name = "buffer-crc32-0.1.1.tgz";
-        sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffer-crc32" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
+      name = "buffer-crc32-0.1.1.tgz";
+      sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffer-crc32" ];
+    peerDependencies = [];
   };
   by-spec."buffer-crc32"."0.2.1" =
     self.by-version."buffer-crc32"."0.2.1";
-  by-version."buffer-crc32"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."buffer-crc32"."0.2.1" = self.buildNodePackage {
     name = "buffer-crc32-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
-        name = "buffer-crc32-0.2.1.tgz";
-        sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffer-crc32" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
+      name = "buffer-crc32-0.2.1.tgz";
+      sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffer-crc32" ];
+    peerDependencies = [];
+  };
+  by-spec."buffer-crc32"."0.2.3" =
+    self.by-version."buffer-crc32"."0.2.3";
+  by-version."buffer-crc32"."0.2.3" = self.buildNodePackage {
+    name = "buffer-crc32-0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
+      name = "buffer-crc32-0.2.3.tgz";
+      sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."buffer-crc32"."~0.2.1" =
     self.by-version."buffer-crc32"."0.2.5";
-  by-version."buffer-crc32"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."buffer-crc32"."0.2.5" = self.buildNodePackage {
     name = "buffer-crc32-0.2.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
-        name = "buffer-crc32-0.2.5.tgz";
-        sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffer-crc32" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
+      name = "buffer-crc32-0.2.5.tgz";
+      sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffer-crc32" ];
+    peerDependencies = [];
   };
   by-spec."buffer-equal"."0.0.1" =
     self.by-version."buffer-equal"."0.0.1";
-  by-version."buffer-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."buffer-equal"."0.0.1" = self.buildNodePackage {
     name = "buffer-equal-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
-        name = "buffer-equal-0.0.1.tgz";
-        sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffer-equal" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
+      name = "buffer-equal-0.0.1.tgz";
+      sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffer-equal" ];
+    peerDependencies = [];
   };
   by-spec."buffer-equal"."^0.0.1" =
     self.by-version."buffer-equal"."0.0.1";
+  by-spec."buffer-equal"."~0.0.0" =
+    self.by-version."buffer-equal"."0.0.1";
+  by-spec."buffercursor".">= 0.0.12" =
+    self.by-version."buffercursor"."0.0.12";
+  by-version."buffercursor"."0.0.12" = self.buildNodePackage {
+    name = "buffercursor-0.0.12";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz";
+      name = "buffercursor-0.0.12.tgz";
+      sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
+    };
+    deps = {
+      "verror-1.6.0" = self.by-version."verror"."1.6.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."buffers"."~0.1.1" =
     self.by-version."buffers"."0.1.1";
-  by-version."buffers"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."buffers"."0.1.1" = self.buildNodePackage {
     name = "buffers-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz";
-        name = "buffers-0.1.1.tgz";
-        sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffers" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz";
+      name = "buffers-0.1.1.tgz";
+      sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffers" ];
+    peerDependencies = [];
   };
   by-spec."buffertools"."*" =
     self.by-version."buffertools"."2.1.2";
-  by-version."buffertools"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."buffertools"."2.1.2" = self.buildNodePackage {
     name = "buffertools-2.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.2.tgz";
-        name = "buffertools-2.1.2.tgz";
-        sha1 = "d667afc1ef8b9932e90a25f2e3a66a929d42daab";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffertools" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.2.tgz";
+      name = "buffertools-2.1.2.tgz";
+      sha1 = "d667afc1ef8b9932e90a25f2e3a66a929d42daab";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffertools" ];
+    peerDependencies = [];
   };
   "buffertools" = self.by-version."buffertools"."2.1.2";
   by-spec."buffertools".">=1.1.1 <2.0.0" =
     self.by-version."buffertools"."1.1.1";
-  by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."buffertools"."1.1.1" = self.buildNodePackage {
     name = "buffertools-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
-        name = "buffertools-1.1.1.tgz";
-        sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffertools" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz";
+      name = "buffertools-1.1.1.tgz";
+      sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffertools" ];
+    peerDependencies = [];
   };
   by-spec."bufferview"."~1" =
     self.by-version."bufferview"."1.0.1";
-  by-version."bufferview"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."bufferview"."1.0.1" = self.buildNodePackage {
     name = "bufferview-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz";
-        name = "bufferview-1.0.1.tgz";
-        sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bufferview" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz";
+      name = "bufferview-1.0.1.tgz";
+      sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bufferview" ];
+    peerDependencies = [];
   };
   by-spec."builtins"."~0.0.3" =
     self.by-version."builtins"."0.0.7";
-  by-version."builtins"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."builtins"."0.0.7" = self.buildNodePackage {
     name = "builtins-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
-        name = "builtins-0.0.7.tgz";
-        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."builtins" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
+      name = "builtins-0.0.7.tgz";
+      sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "builtins" ];
+    peerDependencies = [];
+  };
+  by-spec."bunker"."0.1.X" =
+    self.by-version."bunker"."0.1.2";
+  by-version."bunker"."0.1.2" = self.buildNodePackage {
+    name = "bunker-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
+      name = "bunker-0.1.2.tgz";
+      sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
+    };
+    deps = {
+      "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
+    };
+    peerDependencies = [];
   };
   by-spec."bunyan"."0.21.1" =
     self.by-version."bunyan"."0.21.1";
-  by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."bunyan"."0.21.1" = self.buildNodePackage {
     name = "bunyan-0.21.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz";
-        name = "bunyan-0.21.1.tgz";
-        sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bunyan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz";
+      name = "bunyan-0.21.1.tgz";
+      sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a";
+    };
     deps = {
       "mv-0.0.5" = self.by-version."mv"."0.0.5";
       "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bunyan" ];
+    peerDependencies = [];
+  };
+  by-spec."bunyan"."0.22.1" =
+    self.by-version."bunyan"."0.22.1";
+  by-version."bunyan"."0.22.1" = self.buildNodePackage {
+    name = "bunyan-0.22.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz";
+      name = "bunyan-0.22.1.tgz";
+      sha1 = "020c383bed625af5c6c8834dd8c4aca0dd0f765c";
+    };
+    deps = {
+      "mv-0.0.5" = self.by-version."mv"."0.0.5";
+      "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
+    };
+    peerDependencies = [];
+  };
+  by-spec."bunyan"."~1.0.0" =
+    self.by-version."bunyan"."1.0.1";
+  by-version."bunyan"."1.0.1" = self.buildNodePackage {
+    name = "bunyan-1.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bunyan/-/bunyan-1.0.1.tgz";
+      name = "bunyan-1.0.1.tgz";
+      sha1 = "9916a8c1832020c2d095656d923da5963db05466";
+    };
+    deps = {
+      "mv-2.0.3" = self.by-version."mv"."2.0.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."burrito".">=0.2.5 <0.3" =
+    self.by-version."burrito"."0.2.12";
+  by-version."burrito"."0.2.12" = self.buildNodePackage {
+    name = "burrito-0.2.12";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
+      name = "burrito-0.2.12.tgz";
+      sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
+    };
+    deps = {
+      "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
+      "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."busboy"."~0.2.9" =
+    self.by-version."busboy"."0.2.9";
+  by-version."busboy"."0.2.9" = self.buildNodePackage {
+    name = "busboy-0.2.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/busboy/-/busboy-0.2.9.tgz";
+      name = "busboy-0.2.9.tgz";
+      sha1 = "a0a181e78b19dee76974560f55843b09eaea7376";
+    };
+    deps = {
+      "dicer-0.2.3" = self.by-version."dicer"."0.2.3";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    peerDependencies = [];
   };
   by-spec."bytebuffer"."~3 >=3.5" =
     self.by-version."bytebuffer"."3.5.4";
-  by-version."bytebuffer"."3.5.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."bytebuffer"."3.5.4" = self.buildNodePackage {
     name = "bytebuffer-3.5.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.4.tgz";
-        name = "bytebuffer-3.5.4.tgz";
-        sha1 = "436e2733174f96aaa978b0926749e83fa162e786";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bytebuffer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.4.tgz";
+      name = "bytebuffer-3.5.4.tgz";
+      sha1 = "436e2733174f96aaa978b0926749e83fa162e786";
+    };
     deps = {
       "long-2.2.3" = self.by-version."long"."2.2.3";
       "bufferview-1.0.1" = self.by-version."bufferview"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bytebuffer" ];
+    peerDependencies = [];
   };
   by-spec."bytes"."0.1.0" =
     self.by-version."bytes"."0.1.0";
-  by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bytes"."0.1.0" = self.buildNodePackage {
     name = "bytes-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
-        name = "bytes-0.1.0.tgz";
-        sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bytes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
+      name = "bytes-0.1.0.tgz";
+      sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bytes" ];
+    peerDependencies = [];
   };
   by-spec."bytes"."0.2.0" =
     self.by-version."bytes"."0.2.0";
-  by-version."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bytes"."0.2.0" = self.buildNodePackage {
     name = "bytes-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
-        name = "bytes-0.2.0.tgz";
-        sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bytes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
+      name = "bytes-0.2.0.tgz";
+      sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bytes" ];
+    peerDependencies = [];
   };
   by-spec."bytes"."0.2.1" =
     self.by-version."bytes"."0.2.1";
-  by-version."bytes"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."bytes"."0.2.1" = self.buildNodePackage {
     name = "bytes-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
-        name = "bytes-0.2.1.tgz";
-        sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bytes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
+      name = "bytes-0.2.1.tgz";
+      sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bytes" ];
+    peerDependencies = [];
   };
   by-spec."bytes"."0.3.0" =
     self.by-version."bytes"."0.3.0";
-  by-version."bytes"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bytes"."0.3.0" = self.buildNodePackage {
     name = "bytes-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
-        name = "bytes-0.3.0.tgz";
-        sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bytes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
+      name = "bytes-0.3.0.tgz";
+      sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bytes" ];
+    peerDependencies = [];
   };
   by-spec."bytes"."1" =
     self.by-version."bytes"."1.0.0";
-  by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."bytes"."1.0.0" = self.buildNodePackage {
     name = "bytes-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
-        name = "bytes-1.0.0.tgz";
-        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bytes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+      name = "bytes-1.0.0.tgz";
+      sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bytes" ];
+    peerDependencies = [];
   };
   by-spec."bytes"."1.0.0" =
     self.by-version."bytes"."1.0.0";
@@ -3623,163 +4263,119 @@
     self.by-version."bytes"."0.2.1";
   by-spec."bytes"."~0.3.0" =
     self.by-version."bytes"."0.3.0";
-  by-spec."callsite"."~1.0.0" =
+  by-spec."callsite"."1.0.0" =
     self.by-version."callsite"."1.0.0";
-  by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."callsite"."1.0.0" = self.buildNodePackage {
     name = "callsite-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."callsite" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
+      name = "callsite-1.0.0.tgz";
+      sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "callsite" ];
+    peerDependencies = [];
   };
+  by-spec."callsite"."~1.0.0" =
+    self.by-version."callsite"."1.0.0";
   by-spec."camelcase"."^1.0.1" =
     self.by-version."camelcase"."1.0.2";
-  by-version."camelcase"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."camelcase"."1.0.2" = self.buildNodePackage {
     name = "camelcase-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz";
-        name = "camelcase-1.0.2.tgz";
-        sha1 = "7912eac1d496836782c976c2d73e874dc54f2eaf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."camelcase" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz";
+      name = "camelcase-1.0.2.tgz";
+      sha1 = "7912eac1d496836782c976c2d73e874dc54f2eaf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "camelcase" ];
+    peerDependencies = [];
   };
   by-spec."camelcase-keys"."^1.0.0" =
     self.by-version."camelcase-keys"."1.0.0";
-  by-version."camelcase-keys"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
     name = "camelcase-keys-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
-        name = "camelcase-keys-1.0.0.tgz";
-        sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."camelcase-keys" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
+      name = "camelcase-keys-1.0.0.tgz";
+      sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
+    };
     deps = {
       "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2";
       "map-obj-1.0.0" = self.by-version."map-obj"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "camelcase-keys" ];
+    peerDependencies = [];
   };
   by-spec."cardinal"."0.4.0" =
     self.by-version."cardinal"."0.4.0";
-  by-version."cardinal"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cardinal"."0.4.0" = self.buildNodePackage {
     name = "cardinal-0.4.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz";
-        name = "cardinal-0.4.0.tgz";
-        sha1 = "7d10aafb20837bde043c45e43a0c8c28cdaae45e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cardinal" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz";
+      name = "cardinal-0.4.0.tgz";
+      sha1 = "7d10aafb20837bde043c45e43a0c8c28cdaae45e";
+    };
     deps = {
       "redeyed-0.4.4" = self.by-version."redeyed"."0.4.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cardinal" ];
+    peerDependencies = [];
   };
   by-spec."caseless"."~0.6.0" =
     self.by-version."caseless"."0.6.0";
-  by-version."caseless"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."caseless"."0.6.0" = self.buildNodePackage {
     name = "caseless-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
-        name = "caseless-0.6.0.tgz";
-        sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."caseless" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
+      name = "caseless-0.6.0.tgz";
+      sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "caseless" ];
+    peerDependencies = [];
   };
   by-spec."caseless"."~0.7.0" =
     self.by-version."caseless"."0.7.0";
-  by-version."caseless"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."caseless"."0.7.0" = self.buildNodePackage {
     name = "caseless-0.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz";
-        name = "caseless-0.7.0.tgz";
-        sha1 = "cbd705ae6229158bb0bc971bf7d7a04bdbd51ff8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."caseless" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz";
+      name = "caseless-0.7.0.tgz";
+      sha1 = "cbd705ae6229158bb0bc971bf7d7a04bdbd51ff8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "caseless" ];
+    peerDependencies = [];
   };
   by-spec."caseless"."~0.8.0" =
     self.by-version."caseless"."0.8.0";
-  by-version."caseless"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."caseless"."0.8.0" = self.buildNodePackage {
     name = "caseless-0.8.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
-        name = "caseless-0.8.0.tgz";
-        sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."caseless" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
+      name = "caseless-0.8.0.tgz";
+      sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "caseless" ];
+    peerDependencies = [];
   };
   by-spec."castnow"."*" =
     self.by-version."castnow"."0.4.7";
-  by-version."castnow"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."castnow"."0.4.7" = self.buildNodePackage {
     name = "castnow-0.4.7";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/castnow/-/castnow-0.4.7.tgz";
-        name = "castnow-0.4.7.tgz";
-        sha1 = "155c1314c3f70d2b5ef601164b0c39beb1e33461";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."castnow" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/castnow/-/castnow-0.4.7.tgz";
+      name = "castnow-0.4.7.tgz";
+      sha1 = "155c1314c3f70d2b5ef601164b0c39beb1e33461";
+    };
     deps = {
       "array-loop-1.0.0" = self.by-version."array-loop"."1.0.0";
       "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8";
@@ -3804,113 +4400,100 @@
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "castnow" ];
+    peerDependencies = [];
   };
   "castnow" = self.by-version."castnow"."0.4.7";
   by-spec."castv2"."~0.1.4" =
     self.by-version."castv2"."0.1.4";
-  by-version."castv2"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."castv2"."0.1.4" = self.buildNodePackage {
     name = "castv2-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/castv2/-/castv2-0.1.4.tgz";
-        name = "castv2-0.1.4.tgz";
-        sha1 = "f67a8bc4883dc0e1ba0e66ae937c3c9f9914974b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."castv2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/castv2/-/castv2-0.1.4.tgz";
+      name = "castv2-0.1.4.tgz";
+      sha1 = "f67a8bc4883dc0e1ba0e66ae937c3c9f9914974b";
+    };
     deps = {
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
       "protobufjs-3.8.2" = self.by-version."protobufjs"."3.8.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "castv2" ];
+    peerDependencies = [];
   };
   by-spec."castv2-client"."0.0.8" =
     self.by-version."castv2-client"."0.0.8";
-  by-version."castv2-client"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."castv2-client"."0.0.8" = self.buildNodePackage {
     name = "castv2-client-0.0.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/castv2-client/-/castv2-client-0.0.8.tgz";
-        name = "castv2-client-0.0.8.tgz";
-        sha1 = "a47adf5cc10575e2a71f3b05eb2b72c8d26bbbdc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."castv2-client" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/castv2-client/-/castv2-client-0.0.8.tgz";
+      name = "castv2-client-0.0.8.tgz";
+      sha1 = "a47adf5cc10575e2a71f3b05eb2b72c8d26bbbdc";
+    };
     deps = {
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "castv2-0.1.4" = self.by-version."castv2"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "castv2-client" ];
+    peerDependencies = [];
   };
   by-spec."chai"."*" =
     self.by-version."chai"."1.10.0";
-  by-version."chai"."1.10.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."chai"."1.10.0" = self.buildNodePackage {
     name = "chai-1.10.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chai/-/chai-1.10.0.tgz";
-        name = "chai-1.10.0.tgz";
-        sha1 = "e4031cc87654461a75943e5a35ab46eaf39c1eb9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chai" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chai/-/chai-1.10.0.tgz";
+      name = "chai-1.10.0.tgz";
+      sha1 = "e4031cc87654461a75943e5a35ab46eaf39c1eb9";
+    };
     deps = {
       "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0";
       "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chai" ];
+    peerDependencies = [];
   };
   "chai" = self.by-version."chai"."1.10.0";
+  by-spec."chain-node".">=0.0.17" =
+    self.by-version."chain-node"."3.0.1";
+  by-version."chain-node"."3.0.1" = self.buildNodePackage {
+    name = "chain-node-3.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chain-node/-/chain-node-3.0.1.tgz";
+      name = "chain-node-3.0.1.tgz";
+      sha1 = "994ae2fb09491c47c2a727c3d3ee847eb4595cca";
+    };
+    deps = {
+      "request-2.36.0" = self.by-version."request"."2.36.0";
+      "bitcoinjs-lib-1.2.0" = self.by-version."bitcoinjs-lib"."1.2.0";
+      "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."chainsaw"."~0.1.0" =
     self.by-version."chainsaw"."0.1.0";
-  by-version."chainsaw"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."chainsaw"."0.1.0" = self.buildNodePackage {
     name = "chainsaw-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz";
-        name = "chainsaw-0.1.0.tgz";
-        sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chainsaw" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz";
+      name = "chainsaw-0.1.0.tgz";
+      sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98";
+    };
     deps = {
       "traverse-0.3.9" = self.by-version."traverse"."0.3.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chainsaw" ];
+    peerDependencies = [];
   };
   by-spec."chalk"."0.5.0" =
     self.by-version."chalk"."0.5.0";
-  by-version."chalk"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."chalk"."0.5.0" = self.buildNodePackage {
     name = "chalk-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz";
-        name = "chalk-0.5.0.tgz";
-        sha1 = "375dfccbc21c0a60a8b61bc5b78f3dc2a55c212f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chalk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz";
+      name = "chalk-0.5.0.tgz";
+      sha1 = "375dfccbc21c0a60a8b61bc5b78f3dc2a55c212f";
+    };
     deps = {
       "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0";
       "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2";
@@ -3918,47 +4501,35 @@
       "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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chalk" ];
+    peerDependencies = [];
   };
   by-spec."chalk"."^0.4.0" =
     self.by-version."chalk"."0.4.0";
-  by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."chalk"."0.4.0" = self.buildNodePackage {
     name = "chalk-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
-        name = "chalk-0.4.0.tgz";
-        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chalk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
+      name = "chalk-0.4.0.tgz";
+      sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
+    };
     deps = {
       "has-color-0.1.7" = self.by-version."has-color"."0.1.7";
       "ansi-styles-1.0.0" = self.by-version."ansi-styles"."1.0.0";
       "strip-ansi-0.1.1" = self.by-version."strip-ansi"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chalk" ];
+    peerDependencies = [];
   };
   by-spec."chalk"."^0.5.0" =
     self.by-version."chalk"."0.5.1";
-  by-version."chalk"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."chalk"."0.5.1" = self.buildNodePackage {
     name = "chalk-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chalk" or []);
+    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.2" = self.by-version."escape-string-regexp"."1.0.2";
@@ -3966,173 +4537,158 @@
       "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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chalk" ];
+    peerDependencies = [];
   };
   by-spec."chalk"."^0.5.1" =
     self.by-version."chalk"."0.5.1";
-  by-spec."chalk"."~0.4.0" =
-    self.by-version."chalk"."0.4.0";
   by-spec."char-spinner"."~1.0.1" =
     self.by-version."char-spinner"."1.0.1";
-  by-version."char-spinner"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."char-spinner"."1.0.1" = self.buildNodePackage {
     name = "char-spinner-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
-        name = "char-spinner-1.0.1.tgz";
-        sha1 = "e6ea67bd247e107112983b7ab0479ed362800081";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."char-spinner" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
+      name = "char-spinner-1.0.1.tgz";
+      sha1 = "e6ea67bd247e107112983b7ab0479ed362800081";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "char-spinner" ];
+    peerDependencies = [];
   };
   by-spec."character-parser"."1.2.0" =
     self.by-version."character-parser"."1.2.0";
-  by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."character-parser"."1.2.0" = self.buildNodePackage {
     name = "character-parser-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
-        name = "character-parser-1.2.0.tgz";
-        sha1 = "94134d6e5d870a39be359f7d22460935184ddef6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."character-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
+      name = "character-parser-1.2.0.tgz";
+      sha1 = "94134d6e5d870a39be359f7d22460935184ddef6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "character-parser" ];
+    peerDependencies = [];
   };
   by-spec."character-parser"."1.2.1" =
     self.by-version."character-parser"."1.2.1";
-  by-version."character-parser"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."character-parser"."1.2.1" = self.buildNodePackage {
     name = "character-parser-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz";
-        name = "character-parser-1.2.1.tgz";
-        sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."character-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz";
+      name = "character-parser-1.2.1.tgz";
+      sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "character-parser" ];
+    peerDependencies = [];
+  };
+  by-spec."charm"."0.1.x" =
+    self.by-version."charm"."0.1.2";
+  by-version."charm"."0.1.2" = self.buildNodePackage {
+    name = "charm-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
+      name = "charm-0.1.2.tgz";
+      sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  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";
+    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.1" = self.by-version."lodash"."2.4.1";
+    };
+    peerDependencies = [];
   };
   by-spec."child-process-close"."~0.1.1" =
     self.by-version."child-process-close"."0.1.1";
-  by-version."child-process-close"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."child-process-close"."0.1.1" = self.buildNodePackage {
     name = "child-process-close-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz";
-        name = "child-process-close-0.1.1.tgz";
-        sha1 = "c153ede7a5eb65ac69e78a38973b1a286377f75f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."child-process-close" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz";
+      name = "child-process-close-0.1.1.tgz";
+      sha1 = "c153ede7a5eb65ac69e78a38973b1a286377f75f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "child-process-close" ];
+    peerDependencies = [];
   };
   by-spec."chmodr"."0.1.0" =
     self.by-version."chmodr"."0.1.0";
-  by-version."chmodr"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."chmodr"."0.1.0" = self.buildNodePackage {
     name = "chmodr-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz";
-        name = "chmodr-0.1.0.tgz";
-        sha1 = "e09215a1d51542db2a2576969765bcf6125583eb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chmodr" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz";
+      name = "chmodr-0.1.0.tgz";
+      sha1 = "e09215a1d51542db2a2576969765bcf6125583eb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chmodr" ];
+    peerDependencies = [];
   };
   by-spec."chmodr"."~0.1.0" =
     self.by-version."chmodr"."0.1.0";
   by-spec."chokidar".">=0.8.2" =
-    self.by-version."chokidar"."0.12.6";
-  by-version."chokidar"."0.12.6" = lib.makeOverridable self.buildNodePackage {
-    name = "chokidar-0.12.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz";
-        name = "chokidar-0.12.6.tgz";
-        sha1 = "be204f5b9634e009311256e5d6e8e0e508284d2f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chokidar" or []);
+    self.by-version."chokidar"."1.0.0-rc2";
+  by-version."chokidar"."1.0.0-rc2" = self.buildNodePackage {
+    name = "chokidar-1.0.0-rc2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chokidar/-/chokidar-1.0.0-rc2.tgz";
+      name = "chokidar-1.0.0-rc2.tgz";
+      sha1 = "7adc3966f8b97492a95b7d8b98ba2c21cbdaa7a1";
+    };
     deps = {
-      "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
+      "anymatch-1.1.0" = self.by-version."anymatch"."1.1.0";
       "async-each-0.1.6" = self.by-version."async-each"."0.1.6";
-      "fsevents-0.3.1" = self.by-version."fsevents"."0.3.1";
+      "glob-parent-1.0.0" = self.by-version."glob-parent"."1.0.0";
+      "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
+      "fsevents-0.3.4" = self.by-version."fsevents"."0.3.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chokidar" ];
+    peerDependencies = [];
   };
   by-spec."chownr"."0" =
     self.by-version."chownr"."0.0.1";
-  by-version."chownr"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."chownr"."0.0.1" = self.buildNodePackage {
     name = "chownr-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz";
-        name = "chownr-0.0.1.tgz";
-        sha1 = "51d18189d9092d5f8afd623f3288bfd1c6bf1a62";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chownr" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz";
+      name = "chownr-0.0.1.tgz";
+      sha1 = "51d18189d9092d5f8afd623f3288bfd1c6bf1a62";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chownr" ];
+    peerDependencies = [];
   };
   by-spec."chromecast-player"."0.1.6" =
     self.by-version."chromecast-player"."0.1.6";
-  by-version."chromecast-player"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."chromecast-player"."0.1.6" = self.buildNodePackage {
     name = "chromecast-player-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.6.tgz";
-        name = "chromecast-player-0.1.6.tgz";
-        sha1 = "a59fcd264f381ebdf885ada79280814e8cd9d425";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chromecast-player" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.6.tgz";
+      name = "chromecast-player-0.1.6.tgz";
+      sha1 = "a59fcd264f381ebdf885ada79280814e8cd9d425";
+    };
     deps = {
       "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8";
       "chromecast-scanner-0.0.1" = self.by-version."chromecast-scanner"."0.0.1";
@@ -4142,695 +4698,533 @@
       "ware-1.2.0" = self.by-version."ware"."1.2.0";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chromecast-player" ];
+    peerDependencies = [];
   };
   by-spec."chromecast-scanner"."0.0.1" =
     self.by-version."chromecast-scanner"."0.0.1";
-  by-version."chromecast-scanner"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."chromecast-scanner"."0.0.1" = self.buildNodePackage {
     name = "chromecast-scanner-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.0.1.tgz";
-        name = "chromecast-scanner-0.0.1.tgz";
-        sha1 = "96d685ba1864e142b3599171dd679cbdcfb63859";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."chromecast-scanner" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.0.1.tgz";
+      name = "chromecast-scanner-0.0.1.tgz";
+      sha1 = "96d685ba1864e142b3599171dd679cbdcfb63859";
+    };
     deps = {
       "mdns-js2-0.0.5" = self.by-version."mdns-js2"."0.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "chromecast-scanner" ];
+    peerDependencies = [];
   };
   by-spec."cint"."^8.0.1" =
     self.by-version."cint"."8.1.0";
-  by-version."cint"."8.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cint"."8.1.0" = self.buildNodePackage {
     name = "cint-8.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cint/-/cint-8.1.0.tgz";
-        name = "cint-8.1.0.tgz";
-        sha1 = "1541f04a820340fb6d816368857310f55ddd3e7e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cint" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cint/-/cint-8.1.0.tgz";
+      name = "cint-8.1.0.tgz";
+      sha1 = "1541f04a820340fb6d816368857310f55ddd3e7e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cint" ];
+    peerDependencies = [];
   };
   by-spec."clean-css"."^3.0.1" =
-    self.by-version."clean-css"."3.0.3";
-  by-version."clean-css"."3.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-3.0.3";
+    self.by-version."clean-css"."3.0.7";
+  by-version."clean-css"."3.0.7" = self.buildNodePackage {
+    name = "clean-css-3.0.7";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-3.0.3.tgz";
-        name = "clean-css-3.0.3.tgz";
-        sha1 = "1d044d211b36d5b909be59979117e45ebd86f1fd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clean-css" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clean-css/-/clean-css-3.0.7.tgz";
+      name = "clean-css-3.0.7.tgz";
+      sha1 = "bce35bf2e28531807608c8419f8315ea4833a7f5";
+    };
     deps = {
       "commander-2.5.1" = self.by-version."commander"."2.5.1";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "clean-css" ];
+    peerDependencies = [];
   };
   by-spec."cli"."0.6.x" =
     self.by-version."cli"."0.6.5";
-  by-version."cli"."0.6.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."cli"."0.6.5" = self.buildNodePackage {
     name = "cli-0.6.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cli/-/cli-0.6.5.tgz";
-        name = "cli-0.6.5.tgz";
-        sha1 = "f4edda12dfa8d56d726b43b0b558e089b0d2a85c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cli" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cli/-/cli-0.6.5.tgz";
+      name = "cli-0.6.5.tgz";
+      sha1 = "f4edda12dfa8d56d726b43b0b558e089b0d2a85c";
+    };
     deps = {
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "exit-0.1.2" = self.by-version."exit"."0.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cli" ];
+    peerDependencies = [];
   };
   by-spec."cli-color"."~0.3.2" =
     self.by-version."cli-color"."0.3.2";
-  by-version."cli-color"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."cli-color"."0.3.2" = self.buildNodePackage {
     name = "cli-color-0.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz";
-        name = "cli-color-0.3.2.tgz";
-        sha1 = "75fa5f728c308cc4ac594b05e06cc5d80daccd86";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cli-color" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz";
+      name = "cli-color-0.3.2.tgz";
+      sha1 = "75fa5f728c308cc4ac594b05e06cc5d80daccd86";
+    };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
       "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8";
       "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cli-color" ];
+    peerDependencies = [];
   };
   by-spec."cli-table"."^0.3.1" =
     self.by-version."cli-table"."0.3.1";
-  by-version."cli-table"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."cli-table"."0.3.1" = self.buildNodePackage {
     name = "cli-table-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
-        name = "cli-table-0.3.1.tgz";
-        sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cli-table" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
+      name = "cli-table-0.3.1.tgz";
+      sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
+    };
     deps = {
       "colors-1.0.3" = self.by-version."colors"."1.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cli-table" ];
+    peerDependencies = [];
   };
   by-spec."cliff"."0.1.8" =
     self.by-version."cliff"."0.1.8";
-  by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."cliff"."0.1.8" = self.buildNodePackage {
     name = "cliff-0.1.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
-        name = "cliff-0.1.8.tgz";
-        sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cliff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
+      name = "cliff-0.1.8.tgz";
+      sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
+    };
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "winston-0.6.2" = self.by-version."winston"."0.6.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cliff" ];
+    peerDependencies = [];
   };
   by-spec."cliff"."0.1.9" =
     self.by-version."cliff"."0.1.9";
-  by-version."cliff"."0.1.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."cliff"."0.1.9" = self.buildNodePackage {
     name = "cliff-0.1.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz";
-        name = "cliff-0.1.9.tgz";
-        sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cliff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz";
+      name = "cliff-0.1.9.tgz";
+      sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc";
+    };
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cliff" ];
+    peerDependencies = [];
   };
   by-spec."cliff"."~0.1.9" =
     self.by-version."cliff"."0.1.10";
-  by-version."cliff"."0.1.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."cliff"."0.1.10" = self.buildNodePackage {
     name = "cliff-0.1.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz";
-        name = "cliff-0.1.10.tgz";
-        sha1 = "53be33ea9f59bec85609ee300ac4207603e52013";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cliff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz";
+      name = "cliff-0.1.10.tgz";
+      sha1 = "53be33ea9f59bec85609ee300ac4207603e52013";
+    };
     deps = {
       "colors-1.0.3" = self.by-version."colors"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cliff" ];
+    peerDependencies = [];
   };
   by-spec."clivas"."^0.1.4" =
     self.by-version."clivas"."0.1.4";
-  by-version."clivas"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."clivas"."0.1.4" = self.buildNodePackage {
     name = "clivas-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz";
-        name = "clivas-0.1.4.tgz";
-        sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clivas" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz";
+      name = "clivas-0.1.4.tgz";
+      sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "clivas" ];
+    peerDependencies = [];
   };
   by-spec."clone"."0.1.11" =
     self.by-version."clone"."0.1.11";
-  by-version."clone"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."clone"."0.1.11" = self.buildNodePackage {
     name = "clone-0.1.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz";
-        name = "clone-0.1.11.tgz";
-        sha1 = "408b7d1773eb0dfbf2ddb156c1c47170c17e3a96";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clone" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz";
+      name = "clone-0.1.11.tgz";
+      sha1 = "408b7d1773eb0dfbf2ddb156c1c47170c17e3a96";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "clone" ];
+    peerDependencies = [];
   };
   by-spec."clone"."0.1.5" =
     self.by-version."clone"."0.1.5";
-  by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."clone"."0.1.5" = self.buildNodePackage {
     name = "clone-0.1.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
-        name = "clone-0.1.5.tgz";
-        sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clone" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
+      name = "clone-0.1.5.tgz";
+      sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "clone" ];
+    peerDependencies = [];
   };
   by-spec."clone"."0.1.6" =
     self.by-version."clone"."0.1.6";
-  by-version."clone"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."clone"."0.1.6" = self.buildNodePackage {
     name = "clone-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
-        name = "clone-0.1.6.tgz";
-        sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clone" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
+      name = "clone-0.1.6.tgz";
+      sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "clone" ];
+    peerDependencies = [];
   };
-  by-spec."clone"."^0.2.0" =
+  by-spec."clone".">=0.1.0" =
     self.by-version."clone"."0.2.0";
-  by-version."clone"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."clone"."0.2.0" = self.buildNodePackage {
     name = "clone-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz";
-        name = "clone-0.2.0.tgz";
-        sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clone" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz";
+      name = "clone-0.2.0.tgz";
+      sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "clone" ];
+    peerDependencies = [];
   };
+  by-spec."clone"."^0.2.0" =
+    self.by-version."clone"."0.2.0";
   by-spec."clone"."~0.1.5" =
     self.by-version."clone"."0.1.19";
-  by-version."clone"."0.1.19" = lib.makeOverridable self.buildNodePackage {
+  by-version."clone"."0.1.19" = self.buildNodePackage {
     name = "clone-0.1.19";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz";
-        name = "clone-0.1.19.tgz";
-        sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clone" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz";
+      name = "clone-0.1.19.tgz";
+      sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "clone" ];
+    peerDependencies = [];
   };
   by-spec."clone"."~0.2.0" =
     self.by-version."clone"."0.2.0";
   by-spec."clone-stats"."^0.0.1" =
     self.by-version."clone-stats"."0.0.1";
-  by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."clone-stats"."0.0.1" = self.buildNodePackage {
     name = "clone-stats-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
-        name = "clone-stats-0.0.1.tgz";
-        sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clone-stats" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
+      name = "clone-stats-0.0.1.tgz";
+      sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "clone-stats" ];
+    peerDependencies = [];
+  };
+  by-spec."cls"."~0.1.3" =
+    self.by-version."cls"."0.1.5";
+  by-version."cls"."0.1.5" = self.buildNodePackage {
+    name = "cls-0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cls/-/cls-0.1.5.tgz";
+      name = "cls-0.1.5.tgz";
+      sha1 = "df3218cf9d1480747f584d88b19b74c6b281317b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."cmd-shim"."2.0.0" =
     self.by-version."cmd-shim"."2.0.0";
-  by-version."cmd-shim"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cmd-shim"."2.0.0" = self.buildNodePackage {
     name = "cmd-shim-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.0.tgz";
-        name = "cmd-shim-2.0.0.tgz";
-        sha1 = "34e0cd2ede0505cd8b154667eee9054ee24006b4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cmd-shim" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.0.tgz";
+      name = "cmd-shim-2.0.0.tgz";
+      sha1 = "34e0cd2ede0505cd8b154667eee9054ee24006b4";
+    };
     deps = {
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cmd-shim" ];
+    peerDependencies = [];
   };
   by-spec."cmd-shim"."~2.0.1" =
     self.by-version."cmd-shim"."2.0.1";
-  by-version."cmd-shim"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."cmd-shim"."2.0.1" = self.buildNodePackage {
     name = "cmd-shim-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz";
-        name = "cmd-shim-2.0.1.tgz";
-        sha1 = "4512a373d2391679aec51ad1d4733559e9b85d4a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cmd-shim" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz";
+      name = "cmd-shim-2.0.1.tgz";
+      sha1 = "4512a373d2391679aec51ad1d4733559e9b85d4a";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cmd-shim" ];
+    peerDependencies = [];
   };
   by-spec."cmdln"."1.3.2" =
     self.by-version."cmdln"."1.3.2";
-  by-version."cmdln"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."cmdln"."1.3.2" = self.buildNodePackage {
     name = "cmdln-1.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cmdln/-/cmdln-1.3.2.tgz";
-        name = "cmdln-1.3.2.tgz";
-        sha1 = "46a7b362166875cdafe7bc3fe6c73e4644dc6884";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cmdln" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cmdln/-/cmdln-1.3.2.tgz";
+      name = "cmdln-1.3.2.tgz";
+      sha1 = "46a7b362166875cdafe7bc3fe6c73e4644dc6884";
+    };
     deps = {
       "assert-plus-0.1.3" = self.by-version."assert-plus"."0.1.3";
       "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
       "verror-1.3.6" = self.by-version."verror"."1.3.6";
       "dashdash-1.3.2" = self.by-version."dashdash"."1.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cmdln" ];
+    peerDependencies = [];
   };
   by-spec."co"."3.1.0" =
     self.by-version."co"."3.1.0";
-  by-version."co"."3.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."co"."3.1.0" = self.buildNodePackage {
     name = "co-3.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/co/-/co-3.1.0.tgz";
-        name = "co-3.1.0.tgz";
-        sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."co" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/co/-/co-3.1.0.tgz";
+      name = "co-3.1.0.tgz";
+      sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "co" ];
+    peerDependencies = [];
+  };
+  by-spec."co"."~3.0.6" =
+    self.by-version."co"."3.0.6";
+  by-version."co"."3.0.6" = self.buildNodePackage {
+    name = "co-3.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/co/-/co-3.0.6.tgz";
+      name = "co-3.0.6.tgz";
+      sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."codepage"."~1.3.4" =
     self.by-version."codepage"."1.3.8";
-  by-version."codepage"."1.3.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."codepage"."1.3.8" = self.buildNodePackage {
     name = "codepage-1.3.8";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/codepage/-/codepage-1.3.8.tgz";
-        name = "codepage-1.3.8.tgz";
-        sha1 = "4f2e5d7c0975de28f88498058dcb5afcab6a5f71";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."codepage" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/codepage/-/codepage-1.3.8.tgz";
+      name = "codepage-1.3.8.tgz";
+      sha1 = "4f2e5d7c0975de28f88498058dcb5afcab6a5f71";
+    };
     deps = {
       "voc-0.5.0" = self.by-version."voc"."0.5.0";
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "codepage" ];
+    peerDependencies = [];
   };
   by-spec."coffee-script"."*" =
     self.by-version."coffee-script"."1.8.0";
-  by-version."coffee-script"."1.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."coffee-script"."1.8.0" = self.buildNodePackage {
     name = "coffee-script-1.8.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz";
-        name = "coffee-script-1.8.0.tgz";
-        sha1 = "9c9f1d2b4a52a000ded15b659791703648263c1d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."coffee-script" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz";
+      name = "coffee-script-1.8.0.tgz";
+      sha1 = "9c9f1d2b4a52a000ded15b659791703648263c1d";
+    };
     deps = {
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "coffee-script" ];
+    peerDependencies = [];
   };
   "coffee-script" = self.by-version."coffee-script"."1.8.0";
   by-spec."coffee-script"."1.6.3" =
     self.by-version."coffee-script"."1.6.3";
-  by-version."coffee-script"."1.6.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."coffee-script"."1.6.3" = self.buildNodePackage {
     name = "coffee-script-1.6.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
-        name = "coffee-script-1.6.3.tgz";
-        sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."coffee-script" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+      name = "coffee-script-1.6.3.tgz";
+      sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "coffee-script" ];
+    peerDependencies = [];
   };
   by-spec."coffee-script".">= 0.0.1" =
     self.by-version."coffee-script"."1.8.0";
   by-spec."coffee-script".">=1.2.0" =
     self.by-version."coffee-script"."1.8.0";
+  by-spec."coffee-script".">=1.6.2 <2.0.0" =
+    self.by-version."coffee-script"."1.8.0";
   by-spec."coffee-script"."~1.3.3" =
     self.by-version."coffee-script"."1.3.3";
-  by-version."coffee-script"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."coffee-script"."1.3.3" = self.buildNodePackage {
     name = "coffee-script-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."coffee-script" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "coffee-script" ];
+    peerDependencies = [];
   };
   by-spec."coffee-script"."~1.8.0" =
     self.by-version."coffee-script"."1.8.0";
   by-spec."collections".">=2.0.1 <3.0.0" =
     self.by-version."collections"."2.0.1";
-  by-version."collections"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."collections"."2.0.1" = self.buildNodePackage {
     name = "collections-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/collections/-/collections-2.0.1.tgz";
-        name = "collections-2.0.1.tgz";
-        sha1 = "ee201b142bd1ee5b37a95d62fe13062d87d83db0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."collections" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/collections/-/collections-2.0.1.tgz";
+      name = "collections-2.0.1.tgz";
+      sha1 = "ee201b142bd1ee5b37a95d62fe13062d87d83db0";
+    };
     deps = {
       "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "collections" ];
+    peerDependencies = [];
   };
   by-spec."color"."~0.7.3" =
     self.by-version."color"."0.7.3";
-  by-version."color"."0.7.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."color"."0.7.3" = self.buildNodePackage {
     name = "color-0.7.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/color/-/color-0.7.3.tgz";
-        name = "color-0.7.3.tgz";
-        sha1 = "ab3ae4bc6cb8cfadb5d749c40f34aea088104f89";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."color" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/color/-/color-0.7.3.tgz";
+      name = "color-0.7.3.tgz";
+      sha1 = "ab3ae4bc6cb8cfadb5d749c40f34aea088104f89";
+    };
     deps = {
       "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2";
       "color-string-0.2.4" = self.by-version."color-string"."0.2.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "color" ];
+    peerDependencies = [];
   };
   by-spec."color-convert"."0.5.x" =
     self.by-version."color-convert"."0.5.2";
-  by-version."color-convert"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."color-convert"."0.5.2" = self.buildNodePackage {
     name = "color-convert-0.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.2.tgz";
-        name = "color-convert-0.5.2.tgz";
-        sha1 = "febd9efc33674df3374ff8eeaec3bc56c79a9b35";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."color-convert" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.2.tgz";
+      name = "color-convert-0.5.2.tgz";
+      sha1 = "febd9efc33674df3374ff8eeaec3bc56c79a9b35";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "color-convert" ];
+    peerDependencies = [];
   };
   by-spec."color-name"."1.0.x" =
     self.by-version."color-name"."1.0.0";
-  by-version."color-name"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."color-name"."1.0.0" = self.buildNodePackage {
     name = "color-name-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/color-name/-/color-name-1.0.0.tgz";
-        name = "color-name-1.0.0.tgz";
-        sha1 = "ce3579a4ef43b672bee4f37e8876332b5a36e6b5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."color-name" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/color-name/-/color-name-1.0.0.tgz";
+      name = "color-name-1.0.0.tgz";
+      sha1 = "ce3579a4ef43b672bee4f37e8876332b5a36e6b5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "color-name" ];
+    peerDependencies = [];
   };
   by-spec."color-string"."0.2.x" =
     self.by-version."color-string"."0.2.4";
-  by-version."color-string"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."color-string"."0.2.4" = self.buildNodePackage {
     name = "color-string-0.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/color-string/-/color-string-0.2.4.tgz";
-        name = "color-string-0.2.4.tgz";
-        sha1 = "221ff64234f71aaa3e13bc8c7e8c95f3cdd8f81a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."color-string" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/color-string/-/color-string-0.2.4.tgz";
+      name = "color-string-0.2.4.tgz";
+      sha1 = "221ff64234f71aaa3e13bc8c7e8c95f3cdd8f81a";
+    };
     deps = {
       "color-name-1.0.0" = self.by-version."color-name"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "color-string" ];
+    peerDependencies = [];
   };
   by-spec."colors"."0.5.x" =
     self.by-version."colors"."0.5.1";
-  by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."colors"."0.5.1" = self.buildNodePackage {
     name = "colors-0.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
-        name = "colors-0.5.1.tgz";
-        sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colors" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
+      name = "colors-0.5.1.tgz";
+      sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colors" ];
+    peerDependencies = [];
   };
   by-spec."colors"."0.6.x" =
     self.by-version."colors"."0.6.2";
-  by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."colors"."0.6.2" = self.buildNodePackage {
     name = "colors-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colors" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+      name = "colors-0.6.2.tgz";
+      sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colors" ];
+    peerDependencies = [];
   };
   by-spec."colors"."0.x.x" =
     self.by-version."colors"."0.6.2";
   by-spec."colors"."1.0.3" =
     self.by-version."colors"."1.0.3";
-  by-version."colors"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."colors"."1.0.3" = self.buildNodePackage {
     name = "colors-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
-        name = "colors-1.0.3.tgz";
-        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colors" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+      name = "colors-1.0.3.tgz";
+      sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colors" ];
+    peerDependencies = [];
   };
   by-spec."colors"."~0.6.2" =
     self.by-version."colors"."0.6.2";
@@ -4838,450 +5232,383 @@
     self.by-version."colors"."1.0.3";
   by-spec."colour"."*" =
     self.by-version."colour"."0.7.1";
-  by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."colour"."0.7.1" = self.buildNodePackage {
     name = "colour-0.7.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
-        name = "colour-0.7.1.tgz";
-        sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colour" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
+      name = "colour-0.7.1.tgz";
+      sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colour" ];
+    peerDependencies = [];
   };
   by-spec."columnify"."~1.2.1" =
     self.by-version."columnify"."1.2.1";
-  by-version."columnify"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."columnify"."1.2.1" = self.buildNodePackage {
     name = "columnify-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz";
-        name = "columnify-1.2.1.tgz";
-        sha1 = "921ec51c178f4126d3c07e9acecd67a55c7953e4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."columnify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz";
+      name = "columnify-1.2.1.tgz";
+      sha1 = "921ec51c178f4126d3c07e9acecd67a55c7953e4";
+    };
     deps = {
       "strip-ansi-1.0.0" = self.by-version."strip-ansi"."1.0.0";
       "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "columnify" ];
+    peerDependencies = [];
   };
   by-spec."columnify"."~1.3.2" =
     self.by-version."columnify"."1.3.2";
-  by-version."columnify"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."columnify"."1.3.2" = self.buildNodePackage {
     name = "columnify-1.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/columnify/-/columnify-1.3.2.tgz";
-        name = "columnify-1.3.2.tgz";
-        sha1 = "61bd578a9269ae6fd949ce36fff589f3702c7867";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."columnify" or []);
-    deps = {
-      "strip-ansi-2.0.0" = self.by-version."strip-ansi"."2.0.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/columnify/-/columnify-1.3.2.tgz";
+      name = "columnify-1.3.2.tgz";
+      sha1 = "61bd578a9269ae6fd949ce36fff589f3702c7867";
+    };
+    deps = {
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
       "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "columnify" ];
+    peerDependencies = [];
   };
   by-spec."combine-source-map"."~0.3.0" =
     self.by-version."combine-source-map"."0.3.0";
-  by-version."combine-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."combine-source-map"."0.3.0" = self.buildNodePackage {
     name = "combine-source-map-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
-        name = "combine-source-map-0.3.0.tgz";
-        sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."combine-source-map" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
+      name = "combine-source-map-0.3.0.tgz";
+      sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7";
+    };
     deps = {
       "inline-source-map-0.3.0" = self.by-version."inline-source-map"."0.3.0";
       "convert-source-map-0.3.5" = self.by-version."convert-source-map"."0.3.5";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "combine-source-map" ];
+    peerDependencies = [];
   };
   by-spec."combined-stream"."~0.0.4" =
     self.by-version."combined-stream"."0.0.7";
-  by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."combined-stream"."0.0.7" = self.buildNodePackage {
     name = "combined-stream-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
-        name = "combined-stream-0.0.7.tgz";
-        sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."combined-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+      name = "combined-stream-0.0.7.tgz";
+      sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+    };
     deps = {
       "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "combined-stream" ];
+    peerDependencies = [];
   };
   by-spec."combined-stream"."~0.0.5" =
     self.by-version."combined-stream"."0.0.7";
   by-spec."commander"."*" =
     self.by-version."commander"."2.6.0";
-  by-version."commander"."2.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."2.6.0" = self.buildNodePackage {
     name = "commander-2.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
-        name = "commander-2.6.0.tgz";
-        sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
+      name = "commander-2.6.0.tgz";
+      sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    peerDependencies = [];
   };
   by-spec."commander"."0.6.1" =
     self.by-version."commander"."0.6.1";
-  by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."0.6.1" = self.buildNodePackage {
     name = "commander-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+      name = "commander-0.6.1.tgz";
+      sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    peerDependencies = [];
   };
   by-spec."commander"."1.3.1" =
     self.by-version."commander"."1.3.1";
-  by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."1.3.1" = self.buildNodePackage {
     name = "commander-1.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
-        name = "commander-1.3.1.tgz";
-        sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
+      name = "commander-1.3.1.tgz";
+      sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
+    };
     deps = {
       "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    peerDependencies = [];
   };
   by-spec."commander"."1.3.2" =
     self.by-version."commander"."1.3.2";
-  by-version."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."1.3.2" = self.buildNodePackage {
     name = "commander-1.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
-        name = "commander-1.3.2.tgz";
-        sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
+      name = "commander-1.3.2.tgz";
+      sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
+    };
     deps = {
       "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    peerDependencies = [];
   };
   by-spec."commander"."2.0.0" =
     self.by-version."commander"."2.0.0";
-  by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."2.0.0" = self.buildNodePackage {
     name = "commander-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
-        name = "commander-2.0.0.tgz";
-        sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
+      name = "commander-2.0.0.tgz";
+      sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    peerDependencies = [];
   };
   by-spec."commander"."2.1.0" =
     self.by-version."commander"."2.1.0";
-  by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."2.1.0" = self.buildNodePackage {
     name = "commander-2.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
-        name = "commander-2.1.0.tgz";
-        sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+      name = "commander-2.1.0.tgz";
+      sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    peerDependencies = [];
   };
   by-spec."commander"."2.3.0" =
     self.by-version."commander"."2.3.0";
-  by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."2.3.0" = self.buildNodePackage {
     name = "commander-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+      name = "commander-2.3.0.tgz";
+      sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    peerDependencies = [];
   };
   by-spec."commander"."2.5.x" =
     self.by-version."commander"."2.5.1";
-  by-version."commander"."2.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."2.5.1" = self.buildNodePackage {
     name = "commander-2.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz";
-        name = "commander-2.5.1.tgz";
-        sha1 = "23c61f6e47be143cc02e7ad4bb1c47f5cd5a2883";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz";
+      name = "commander-2.5.1.tgz";
+      sha1 = "23c61f6e47be143cc02e7ad4bb1c47f5cd5a2883";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    peerDependencies = [];
   };
   by-spec."commander"."2.6.0" =
     self.by-version."commander"."2.6.0";
   by-spec."commander"."2.x" =
     self.by-version."commander"."2.6.0";
+  by-spec."commander".">=2.0.0" =
+    self.by-version."commander"."2.6.0";
+  by-spec."commander"."~0.6.1" =
+    self.by-version."commander"."0.6.1";
   by-spec."commander"."~2.0.0" =
     self.by-version."commander"."2.0.0";
   by-spec."commander"."~2.1.0" =
     self.by-version."commander"."2.1.0";
   by-spec."commander"."~2.5.0" =
     self.by-version."commander"."2.5.1";
+  by-spec."commander"."~2.6.0" =
+    self.by-version."commander"."2.6.0";
   by-spec."commondir"."0.0.1" =
     self.by-version."commondir"."0.0.1";
-  by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."commondir"."0.0.1" = self.buildNodePackage {
     name = "commondir-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
-        name = "commondir-0.0.1.tgz";
-        sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commondir" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
+      name = "commondir-0.0.1.tgz";
+      sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commondir" ];
+    peerDependencies = [];
   };
   by-spec."commondir"."~0.0.1" =
     self.by-version."commondir"."0.0.1";
+  by-spec."commoner"."^0.10.0" =
+    self.by-version."commoner"."0.10.1";
+  by-version."commoner"."0.10.1" = self.buildNodePackage {
+    name = "commoner-0.10.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commoner/-/commoner-0.10.1.tgz";
+      name = "commoner-0.10.1.tgz";
+      sha1 = "53ab254aeb93ec0b19e9a1ca14e1d0e5fe998588";
+    };
+    deps = {
+      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "recast-0.9.15" = self.by-version."recast"."0.9.15";
+      "commander-2.5.1" = self.by-version."commander"."2.5.1";
+      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "glob-4.2.2" = self.by-version."glob"."4.2.2";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "private-0.1.6" = self.by-version."private"."0.1.6";
+      "install-0.1.8" = self.by-version."install"."0.1.8";
+      "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6";
+    };
+    peerDependencies = [];
+  };
   by-spec."compact2string"."^1.2.0" =
     self.by-version."compact2string"."1.4.0";
-  by-version."compact2string"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."compact2string"."1.4.0" = self.buildNodePackage {
     name = "compact2string-1.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz";
-        name = "compact2string-1.4.0.tgz";
-        sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."compact2string" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz";
+      name = "compact2string-1.4.0.tgz";
+      sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49";
+    };
     deps = {
       "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "compact2string" ];
+    peerDependencies = [];
+  };
+  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";
+    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 = {
+    };
+    peerDependencies = [];
   };
   by-spec."component-emitter"."1.1.2" =
     self.by-version."component-emitter"."1.1.2";
-  by-version."component-emitter"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."component-emitter"."1.1.2" = self.buildNodePackage {
     name = "component-emitter-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."component-emitter" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "component-emitter" ];
+    peerDependencies = [];
+  };
+  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";
+    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 = {
+    };
+    peerDependencies = [];
   };
   by-spec."compress-commons"."~0.1.0" =
     self.by-version."compress-commons"."0.1.6";
-  by-version."compress-commons"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."compress-commons"."0.1.6" = self.buildNodePackage {
     name = "compress-commons-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz";
-        name = "compress-commons-0.1.6.tgz";
-        sha1 = "0c740870fde58cba516f0ac0c822e33a0b85dfa3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."compress-commons" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz";
+      name = "compress-commons-0.1.6.tgz";
+      sha1 = "0c740870fde58cba516f0ac0c822e33a0b85dfa3";
+    };
     deps = {
       "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
       "crc32-stream-0.3.1" = self.by-version."crc32-stream"."0.3.1";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "compress-commons" ];
+    peerDependencies = [];
   };
   by-spec."compressible"."1.0.0" =
     self.by-version."compressible"."1.0.0";
-  by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."compressible"."1.0.0" = self.buildNodePackage {
     name = "compressible-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
-        name = "compressible-1.0.0.tgz";
-        sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."compressible" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
+      name = "compressible-1.0.0.tgz";
+      sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "compressible" ];
+    peerDependencies = [];
   };
   by-spec."compressible"."~2.0.1" =
     self.by-version."compressible"."2.0.1";
-  by-version."compressible"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."compressible"."2.0.1" = self.buildNodePackage {
     name = "compressible-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/compressible/-/compressible-2.0.1.tgz";
-        name = "compressible-2.0.1.tgz";
-        sha1 = "3550115793eb3435f7eb16775afe05df1a333ebc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."compressible" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/compressible/-/compressible-2.0.1.tgz";
+      name = "compressible-2.0.1.tgz";
+      sha1 = "3550115793eb3435f7eb16775afe05df1a333ebc";
+    };
     deps = {
       "mime-db-1.5.0" = self.by-version."mime-db"."1.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "compressible" ];
+    peerDependencies = [];
   };
   by-spec."compression"."1.0.0" =
     self.by-version."compression"."1.0.0";
-  by-version."compression"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."compression"."1.0.0" = self.buildNodePackage {
     name = "compression-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
-        name = "compression-1.0.0.tgz";
-        sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."compression" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
+      name = "compression-1.0.0.tgz";
+      sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020";
+    };
     deps = {
       "bytes-0.2.1" = self.by-version."bytes"."0.2.1";
       "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
       "compressible-1.0.0" = self.by-version."compressible"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "compression" ];
+    peerDependencies = [];
   };
   by-spec."compression"."~1.1.2" =
     self.by-version."compression"."1.1.2";
-  by-version."compression"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."compression"."1.1.2" = self.buildNodePackage {
     name = "compression-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/compression/-/compression-1.1.2.tgz";
-        name = "compression-1.1.2.tgz";
-        sha1 = "f93fb7fcdb3573ec4c7d5398984caae230e2a8d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."compression" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/compression/-/compression-1.1.2.tgz";
+      name = "compression-1.1.2.tgz";
+      sha1 = "f93fb7fcdb3573ec4c7d5398984caae230e2a8d7";
+    };
     deps = {
       "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
@@ -5290,24 +5617,18 @@
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "compression" ];
+    peerDependencies = [];
   };
   by-spec."compression"."~1.3.0" =
     self.by-version."compression"."1.3.0";
-  by-version."compression"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."compression"."1.3.0" = self.buildNodePackage {
     name = "compression-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/compression/-/compression-1.3.0.tgz";
-        name = "compression-1.3.0.tgz";
-        sha1 = "03289a1d45e1dbbf8bd509dba50d036657b7bac8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."compression" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/compression/-/compression-1.3.0.tgz";
+      name = "compression-1.3.0.tgz";
+      sha1 = "03289a1d45e1dbbf8bd509dba50d036657b7bac8";
+    };
     deps = {
       "accepts-1.2.2" = self.by-version."accepts"."1.2.2";
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
@@ -5316,57 +5637,41 @@
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "compression" ];
+    peerDependencies = [];
   };
   by-spec."concat-map"."0.0.1" =
     self.by-version."concat-map"."0.0.1";
-  by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."concat-map"."0.0.1" = self.buildNodePackage {
     name = "concat-map-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        name = "concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."concat-map" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+      name = "concat-map-0.0.1.tgz";
+      sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "concat-map" ];
+    peerDependencies = [];
   };
   by-spec."concat-stream"."*" =
     self.by-version."concat-stream"."1.4.7";
-  by-version."concat-stream"."1.4.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."concat-stream"."1.4.7" = self.buildNodePackage {
     name = "concat-stream-1.4.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz";
-        name = "concat-stream-1.4.7.tgz";
-        sha1 = "0ceaa47b87a581d2a7a782b92b81d5020c3f9925";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."concat-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz";
+      name = "concat-stream-1.4.7.tgz";
+      sha1 = "0ceaa47b87a581d2a7a782b92b81d5020c3f9925";
+    };
     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-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "concat-stream" ];
+    peerDependencies = [];
   };
   by-spec."concat-stream"."^1.4.1" =
     self.by-version."concat-stream"."1.4.7";
-  by-spec."concat-stream"."^1.4.5" =
-    self.by-version."concat-stream"."1.4.7";
   by-spec."concat-stream"."^1.4.6" =
     self.by-version."concat-stream"."1.4.7";
   by-spec."concat-stream"."~1.4.1" =
@@ -5375,118 +5680,104 @@
     self.by-version."concat-stream"."1.4.7";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
-  by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
+  by-version."config"."0.4.15" = self.buildNodePackage {
     name = "config-0.4.15";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz";
-        name = "config-0.4.15.tgz";
-        sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."config" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz";
+      name = "config-0.4.15.tgz";
+      sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18";
+    };
     deps = {
       "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7";
       "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0";
       "vows-0.9.0-rc2" = self.by-version."vows"."0.9.0-rc2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "config" ];
+    peerDependencies = [];
+  };
+  by-spec."config"."0.4.36" =
+    self.by-version."config"."0.4.36";
+  by-version."config"."0.4.36" = self.buildNodePackage {
+    name = "config-0.4.36";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/config/-/config-0.4.36.tgz";
+      name = "config-0.4.36.tgz";
+      sha1 = "02af1237f519c00f1e3aac22f9a034148fc3e786";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."config-chain"."~1.1.1" =
     self.by-version."config-chain"."1.1.8";
-  by-version."config-chain"."1.1.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."config-chain"."1.1.8" = self.buildNodePackage {
     name = "config-chain-1.1.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz";
-        name = "config-chain-1.1.8.tgz";
-        sha1 = "0943d0b7227213a20d4eaff4434f4a1c0a052cad";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."config-chain" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz";
+      name = "config-chain-1.1.8.tgz";
+      sha1 = "0943d0b7227213a20d4eaff4434f4a1c0a052cad";
+    };
     deps = {
       "proto-list-1.2.3" = self.by-version."proto-list"."1.2.3";
       "ini-1.3.2" = self.by-version."ini"."1.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "config-chain" ];
+    peerDependencies = [];
   };
   by-spec."config-chain"."~1.1.8" =
     self.by-version."config-chain"."1.1.8";
   by-spec."configstore"."^0.3.0" =
     self.by-version."configstore"."0.3.2";
-  by-version."configstore"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."configstore"."0.3.2" = self.buildNodePackage {
     name = "configstore-0.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz";
-        name = "configstore-0.3.2.tgz";
-        sha1 = "25e4c16c3768abf75c5a65bc61761f495055b459";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."configstore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz";
+      name = "configstore-0.3.2.tgz";
+      sha1 = "25e4c16c3768abf75c5a65bc61761f495055b459";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "js-yaml-3.2.5" = self.by-version."js-yaml"."3.2.5";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
       "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "user-home-1.1.0" = self.by-version."user-home"."1.1.0";
+      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
-      "xdg-basedir-1.0.0" = self.by-version."xdg-basedir"."1.0.0";
+      "xdg-basedir-1.0.1" = self.by-version."xdg-basedir"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "configstore" ];
+    peerDependencies = [];
   };
   by-spec."configstore"."^0.3.1" =
     self.by-version."configstore"."0.3.2";
   by-spec."connect"."1.x" =
     self.by-version."connect"."1.9.2";
-  by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect"."1.9.2" = self.buildNodePackage {
     name = "connect-1.9.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
-        name = "connect-1.9.2.tgz";
-        sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
+      name = "connect-1.9.2.tgz";
+      sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807";
+    };
     deps = {
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "formidable-1.0.16" = self.by-version."formidable"."1.0.16";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
+    peerDependencies = [];
   };
   by-spec."connect"."2.11.0" =
     self.by-version."connect"."2.11.0";
-  by-version."connect"."2.11.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect"."2.11.0" = self.buildNodePackage {
     name = "connect-2.11.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
-        name = "connect-2.11.0.tgz";
-        sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
+      name = "connect-2.11.0.tgz";
+      sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284";
+    };
     deps = {
       "qs-0.6.5" = self.by-version."qs"."0.6.5";
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
@@ -5503,24 +5794,18 @@
       "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
       "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
+    peerDependencies = [];
   };
   by-spec."connect"."2.14.5" =
     self.by-version."connect"."2.14.5";
-  by-version."connect"."2.14.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect"."2.14.5" = self.buildNodePackage {
     name = "connect-2.14.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.14.5.tgz";
-        name = "connect-2.14.5.tgz";
-        sha1 = "73217513152c152ebe049c499fa09211b8c476f4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.14.5.tgz";
+      name = "connect-2.14.5.tgz";
+      sha1 = "73217513152c152ebe049c499fa09211b8c476f4";
+    };
     deps = {
       "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
       "cookie-parser-1.0.1" = self.by-version."cookie-parser"."1.0.1";
@@ -5546,27 +5831,21 @@
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
       "multiparty-2.2.0" = self.by-version."multiparty"."2.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
-  };
-  by-spec."connect"."2.28.1" =
-    self.by-version."connect"."2.28.1";
-  by-version."connect"."2.28.1" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.28.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.28.1.tgz";
-        name = "connect-2.28.1.tgz";
-        sha1 = "b4164b7deef1a90480f7aaa5846b60b3a1df14e1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
+    peerDependencies = [];
+  };
+  by-spec."connect"."2.28.2" =
+    self.by-version."connect"."2.28.2";
+  by-version."connect"."2.28.2" = self.buildNodePackage {
+    name = "connect-2.28.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.28.2.tgz";
+      name = "connect-2.28.2.tgz";
+      sha1 = "dafae5c221c973e2b0883a5a5c9a615000d8260f";
+    };
     deps = {
       "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
-      "body-parser-1.10.1" = self.by-version."body-parser"."1.10.1";
+      "body-parser-1.10.2" = self.by-version."body-parser"."1.10.2";
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3";
@@ -5591,30 +5870,24 @@
       "response-time-2.2.0" = self.by-version."response-time"."2.2.0";
       "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
       "serve-index-1.6.0" = self.by-version."serve-index"."1.6.0";
-      "serve-static-1.8.0" = self.by-version."serve-static"."1.8.0";
+      "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1";
       "type-is-1.5.5" = self.by-version."type-is"."1.5.5";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
       "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
+    peerDependencies = [];
   };
   by-spec."connect"."2.3.x" =
     self.by-version."connect"."2.3.9";
-  by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect"."2.3.9" = self.buildNodePackage {
     name = "connect-2.3.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
-        name = "connect-2.3.9.tgz";
-        sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
+      name = "connect-2.3.9.tgz";
+      sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52";
+    };
     deps = {
       "qs-0.4.2" = self.by-version."qs"."0.4.2";
       "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
@@ -5625,24 +5898,18 @@
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
+    peerDependencies = [];
   };
   by-spec."connect"."2.7.5" =
     self.by-version."connect"."2.7.5";
-  by-version."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect"."2.7.5" = self.buildNodePackage {
     name = "connect-2.7.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
-        name = "connect-2.7.5.tgz";
-        sha1 = "139111b4b03f0533a524927a88a646ae467b2c02";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
+      name = "connect-2.7.5.tgz";
+      sha1 = "139111b4b03f0533a524927a88a646ae467b2c02";
+    };
     deps = {
       "qs-0.5.1" = self.by-version."qs"."0.5.1";
       "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
@@ -5655,24 +5922,18 @@
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
+    peerDependencies = [];
   };
   by-spec."connect"."2.7.6" =
     self.by-version."connect"."2.7.6";
-  by-version."connect"."2.7.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect"."2.7.6" = self.buildNodePackage {
     name = "connect-2.7.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
-        name = "connect-2.7.6.tgz";
-        sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
+      name = "connect-2.7.6.tgz";
+      sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
+    };
     deps = {
       "qs-0.5.1" = self.by-version."qs"."0.5.1";
       "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
@@ -5685,26 +5946,40 @@
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
+    peerDependencies = [];
   };
+  by-spec."connect"."3.0.2" =
+    self.by-version."connect"."3.0.2";
+  by-version."connect"."3.0.2" = self.buildNodePackage {
+    name = "connect-3.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-3.0.2.tgz";
+      name = "connect-3.0.2.tgz";
+      sha1 = "1f90b4672fe009fa2876df860442d30db18609a2";
+    };
+    deps = {
+      "debug-1.0.3" = self.by-version."debug"."1.0.3";
+      "finalhandler-0.0.2" = self.by-version."finalhandler"."0.0.2";
+      "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."connect"."^2.14.5" =
+    self.by-version."connect"."2.28.2";
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.28.1";
+    self.by-version."connect"."2.28.2";
   by-spec."connect"."~2.26.0" =
     self.by-version."connect"."2.26.6";
-  by-version."connect"."2.26.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect"."2.26.6" = self.buildNodePackage {
     name = "connect-2.26.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.26.6.tgz";
-        name = "connect-2.26.6.tgz";
-        sha1 = "94f3eef3fdeeb405806ea46dc036ee0b2acae700";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect/-/connect-2.26.6.tgz";
+      name = "connect-2.26.6.tgz";
+      sha1 = "94f3eef3fdeeb405806ea46dc036ee0b2acae700";
+    };
     deps = {
       "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
       "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4";
@@ -5736,679 +6011,582 @@
       "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
+    peerDependencies = [];
   };
   by-spec."connect-flash"."*" =
     self.by-version."connect-flash"."0.1.1";
-  by-version."connect-flash"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect-flash"."0.1.1" = self.buildNodePackage {
     name = "connect-flash-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
-        name = "connect-flash-0.1.1.tgz";
-        sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect-flash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
+      name = "connect-flash-0.1.1.tgz";
+      sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect-flash" ];
+    peerDependencies = [];
   };
   "connect-flash" = self.by-version."connect-flash"."0.1.1";
   by-spec."connect-flash"."0.1.0" =
     self.by-version."connect-flash"."0.1.0";
-  by-version."connect-flash"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect-flash"."0.1.0" = self.buildNodePackage {
     name = "connect-flash-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
-        name = "connect-flash-0.1.0.tgz";
-        sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect-flash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
+      name = "connect-flash-0.1.0.tgz";
+      sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect-flash" ];
+    peerDependencies = [];
   };
   by-spec."connect-jade-static"."*" =
-    self.by-version."connect-jade-static"."0.1.4";
-  by-version."connect-jade-static"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-jade-static-0.1.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.4.tgz";
-        name = "connect-jade-static-0.1.4.tgz";
-        sha1 = "d6cc8b768ff6e5ac26f759480e69408f64eb55e4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect-jade-static" or []);
-    deps = {
-      "jade-1.8.2" = self.by-version."jade"."1.8.2";
+    self.by-version."connect-jade-static"."0.1.5";
+  by-version."connect-jade-static"."0.1.5" = self.buildNodePackage {
+    name = "connect-jade-static-0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.5.tgz";
+      name = "connect-jade-static-0.1.5.tgz";
+      sha1 = "25b456ba526b45926a5152678af3081c7cde0086";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect-jade-static" ];
+    deps = {
+      "jade-1.9.1" = self.by-version."jade"."1.9.1";
+    };
+    peerDependencies = [];
   };
-  "connect-jade-static" = self.by-version."connect-jade-static"."0.1.4";
+  "connect-jade-static" = self.by-version."connect-jade-static"."0.1.5";
   by-spec."connect-mongo"."*" =
-    self.by-version."connect-mongo"."0.5.3";
-  by-version."connect-mongo"."0.5.3" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-mongo-0.5.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.5.3.tgz";
-        name = "connect-mongo-0.5.3.tgz";
-        sha1 = "88298a3dcb5bee65fb316b17c2a0e5f6f7c42481";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect-mongo" or []);
+    self.by-version."connect-mongo"."0.7.0";
+  by-version."connect-mongo"."0.7.0" = self.buildNodePackage {
+    name = "connect-mongo-0.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.7.0.tgz";
+      name = "connect-mongo-0.7.0.tgz";
+      sha1 = "8870bbebabff6c99aab77c8ad9787abe730b62db";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "mongodb-2.0.13" = self.by-version."mongodb"."2.0.13";
+      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "mongodb-2.0.14" = self.by-version."mongodb"."2.0.14";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect-mongo" ];
+    peerDependencies = [];
+  };
+  "connect-mongo" = self.by-version."connect-mongo"."0.7.0";
+  by-spec."connect-mongo".">=0.4.0" =
+    self.by-version."connect-mongo"."0.7.0";
+  by-spec."connect-multiparty"."^1.2.5" =
+    self.by-version."connect-multiparty"."1.2.5";
+  by-version."connect-multiparty"."1.2.5" = self.buildNodePackage {
+    name = "connect-multiparty-1.2.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz";
+      name = "connect-multiparty-1.2.5.tgz";
+      sha1 = "2fabecfdc1a8a774ba19484dce660c818a8555e7";
+    };
+    deps = {
+      "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
+      "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
+      "qs-2.2.5" = self.by-version."qs"."2.2.5";
+      "type-is-1.5.5" = self.by-version."type-is"."1.5.5";
+    };
+    peerDependencies = [];
+  };
+  by-spec."connect-restreamer"."*" =
+    self.by-version."connect-restreamer"."1.0.1";
+  by-version."connect-restreamer"."1.0.1" = self.buildNodePackage {
+    name = "connect-restreamer-1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.1.tgz";
+      name = "connect-restreamer-1.0.1.tgz";
+      sha1 = "3eb3093da34094fbfd24720779acdaabb80a4155";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
-  "connect-mongo" = self.by-version."connect-mongo"."0.5.3";
   by-spec."connect-timeout"."1.0.0" =
     self.by-version."connect-timeout"."1.0.0";
-  by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect-timeout"."1.0.0" = self.buildNodePackage {
     name = "connect-timeout-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
-        name = "connect-timeout-1.0.0.tgz";
-        sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect-timeout" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
+      name = "connect-timeout-1.0.0.tgz";
+      sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect-timeout" ];
+    peerDependencies = [];
   };
   by-spec."connect-timeout"."~1.3.0" =
     self.by-version."connect-timeout"."1.3.0";
-  by-version."connect-timeout"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect-timeout"."1.3.0" = self.buildNodePackage {
     name = "connect-timeout-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz";
-        name = "connect-timeout-1.3.0.tgz";
-        sha1 = "d9d1d2df2900d490ed54190809f37e6b4508a1ec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect-timeout" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz";
+      name = "connect-timeout-1.3.0.tgz";
+      sha1 = "d9d1d2df2900d490ed54190809f37e6b4508a1ec";
+    };
     deps = {
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect-timeout" ];
+    peerDependencies = [];
   };
   by-spec."connect-timeout"."~1.5.0" =
     self.by-version."connect-timeout"."1.5.0";
-  by-version."connect-timeout"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."connect-timeout"."1.5.0" = self.buildNodePackage {
     name = "connect-timeout-1.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.5.0.tgz";
-        name = "connect-timeout-1.5.0.tgz";
-        sha1 = "f9a18b06d5074d06d6f7db0cdf0ebd4bd6467621";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect-timeout" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.5.0.tgz";
+      name = "connect-timeout-1.5.0.tgz";
+      sha1 = "f9a18b06d5074d06d6f7db0cdf0ebd4bd6467621";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8";
       "ms-0.7.0" = self.by-version."ms"."0.7.0";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect-timeout" ];
+    peerDependencies = [];
   };
   by-spec."connection-parse"."0.0.x" =
     self.by-version."connection-parse"."0.0.7";
-  by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."connection-parse"."0.0.7" = self.buildNodePackage {
     name = "connection-parse-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
-        name = "connection-parse-0.0.7.tgz";
-        sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connection-parse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
+      name = "connection-parse-0.0.7.tgz";
+      sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "connection-parse" ];
+    peerDependencies = [];
   };
   by-spec."console-browserify"."1.1.x" =
     self.by-version."console-browserify"."1.1.0";
-  by-version."console-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."console-browserify"."1.1.0" = self.buildNodePackage {
     name = "console-browserify-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        name = "console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."console-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+      name = "console-browserify-1.1.0.tgz";
+      sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+    };
     deps = {
       "date-now-0.1.4" = self.by-version."date-now"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "console-browserify" ];
+    peerDependencies = [];
   };
   by-spec."console-browserify"."^1.1.0" =
     self.by-version."console-browserify"."1.1.0";
   by-spec."console-browserify"."~1.0.1" =
     self.by-version."console-browserify"."1.0.3";
-  by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."console-browserify"."1.0.3" = self.buildNodePackage {
     name = "console-browserify-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz";
-        name = "console-browserify-1.0.3.tgz";
-        sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."console-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz";
+      name = "console-browserify-1.0.3.tgz";
+      sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "console-browserify" ];
+    peerDependencies = [];
   };
   by-spec."constantinople"."~1.0.1" =
     self.by-version."constantinople"."1.0.2";
-  by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."constantinople"."1.0.2" = self.buildNodePackage {
     name = "constantinople-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz";
-        name = "constantinople-1.0.2.tgz";
-        sha1 = "0e64747dc836644d3f659247efd95231b48c3e71";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."constantinople" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz";
+      name = "constantinople-1.0.2.tgz";
+      sha1 = "0e64747dc836644d3f659247efd95231b48c3e71";
+    };
     deps = {
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "constantinople" ];
+    peerDependencies = [];
   };
   by-spec."constantinople"."~1.0.2" =
     self.by-version."constantinople"."1.0.2";
   by-spec."constantinople"."~3.0.1" =
     self.by-version."constantinople"."3.0.1";
-  by-version."constantinople"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."constantinople"."3.0.1" = self.buildNodePackage {
     name = "constantinople-3.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz";
-        name = "constantinople-3.0.1.tgz";
-        sha1 = "1ddf9deac0d14c4367c1d5b3f16fb2763f123108";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."constantinople" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz";
+      name = "constantinople-3.0.1.tgz";
+      sha1 = "1ddf9deac0d14c4367c1d5b3f16fb2763f123108";
+    };
     deps = {
-      "acorn-globals-1.0.1" = self.by-version."acorn-globals"."1.0.1";
+      "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "constantinople" ];
+    peerDependencies = [];
   };
   by-spec."constants-browserify"."~0.0.1" =
     self.by-version."constants-browserify"."0.0.1";
-  by-version."constants-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."constants-browserify"."0.0.1" = self.buildNodePackage {
     name = "constants-browserify-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
-        name = "constants-browserify-0.0.1.tgz";
-        sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."constants-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
+      name = "constants-browserify-0.0.1.tgz";
+      sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "constants-browserify" ];
+    peerDependencies = [];
   };
   by-spec."content-disposition"."0.5.0" =
     self.by-version."content-disposition"."0.5.0";
-  by-version."content-disposition"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."content-disposition"."0.5.0" = self.buildNodePackage {
     name = "content-disposition-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."content-disposition" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "content-disposition" ];
+    peerDependencies = [];
+  };
+  by-spec."contextify"."~0.1.5" =
+    self.by-version."contextify"."0.1.11";
+  by-version."contextify"."0.1.11" = self.buildNodePackage {
+    name = "contextify-0.1.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/contextify/-/contextify-0.1.11.tgz";
+      name = "contextify-0.1.11.tgz";
+      sha1 = "8abffb2b63ad7182a04c5fe36101fc2c237cdfdd";
+    };
+    deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "nan-1.3.0" = self.by-version."nan"."1.3.0";
+    };
+    peerDependencies = [];
   };
   by-spec."convert-source-map"."~0.3.0" =
     self.by-version."convert-source-map"."0.3.5";
-  by-version."convert-source-map"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."convert-source-map"."0.3.5" = self.buildNodePackage {
     name = "convert-source-map-0.3.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
-        name = "convert-source-map-0.3.5.tgz";
-        sha1 = "f1d802950af7dd2631a1febe0596550c86ab3190";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."convert-source-map" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
+      name = "convert-source-map-0.3.5.tgz";
+      sha1 = "f1d802950af7dd2631a1febe0596550c86ab3190";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "convert-source-map" ];
+    peerDependencies = [];
   };
   by-spec."cookie"."0.0.4" =
     self.by-version."cookie"."0.0.4";
-  by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie"."0.0.4" = self.buildNodePackage {
     name = "cookie-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
-        name = "cookie-0.0.4.tgz";
-        sha1 = "5456bd47aee2666eac976ea80a6105940483fe98";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
+      name = "cookie-0.0.4.tgz";
+      sha1 = "5456bd47aee2666eac976ea80a6105940483fe98";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie" ];
+    peerDependencies = [];
   };
   by-spec."cookie"."0.0.5" =
     self.by-version."cookie"."0.0.5";
-  by-version."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie"."0.0.5" = self.buildNodePackage {
     name = "cookie-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
-        name = "cookie-0.0.5.tgz";
-        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
+      name = "cookie-0.0.5.tgz";
+      sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie" ];
+    peerDependencies = [];
   };
   by-spec."cookie"."0.1.0" =
     self.by-version."cookie"."0.1.0";
-  by-version."cookie"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie"."0.1.0" = self.buildNodePackage {
     name = "cookie-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
-        name = "cookie-0.1.0.tgz";
-        sha1 = "90eb469ddce905c866de687efc43131d8801f9d0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
+      name = "cookie-0.1.0.tgz";
+      sha1 = "90eb469ddce905c866de687efc43131d8801f9d0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie" ];
+    peerDependencies = [];
   };
   by-spec."cookie"."0.1.2" =
     self.by-version."cookie"."0.1.2";
-  by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie"."0.1.2" = self.buildNodePackage {
     name = "cookie-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
-        name = "cookie-0.1.2.tgz";
-        sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+      name = "cookie-0.1.2.tgz";
+      sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie" ];
+    peerDependencies = [];
   };
   by-spec."cookie-jar"."~0.2.0" =
     self.by-version."cookie-jar"."0.2.0";
-  by-version."cookie-jar"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie-jar"."0.2.0" = self.buildNodePackage {
     name = "cookie-jar-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
-        name = "cookie-jar-0.2.0.tgz";
-        sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-jar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
+      name = "cookie-jar-0.2.0.tgz";
+      sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-jar" ];
+    peerDependencies = [];
   };
   by-spec."cookie-jar"."~0.3.0" =
     self.by-version."cookie-jar"."0.3.0";
-  by-version."cookie-jar"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie-jar"."0.3.0" = self.buildNodePackage {
     name = "cookie-jar-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
-        name = "cookie-jar-0.3.0.tgz";
-        sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-jar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
+      name = "cookie-jar-0.3.0.tgz";
+      sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-jar" ];
+    peerDependencies = [];
   };
   by-spec."cookie-parser"."1.0.1" =
     self.by-version."cookie-parser"."1.0.1";
-  by-version."cookie-parser"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie-parser"."1.0.1" = self.buildNodePackage {
     name = "cookie-parser-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
-        name = "cookie-parser-1.0.1.tgz";
-        sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
+      name = "cookie-parser-1.0.1.tgz";
+      sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0";
+    };
     deps = {
       "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
       "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-parser" ];
+    peerDependencies = [];
   };
-  by-spec."cookie-parser"."~1.3.3" =
+  by-spec."cookie-parser"."^1.0.1" =
     self.by-version."cookie-parser"."1.3.3";
-  by-version."cookie-parser"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie-parser"."1.3.3" = self.buildNodePackage {
     name = "cookie-parser-1.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.3.tgz";
-        name = "cookie-parser-1.3.3.tgz";
-        sha1 = "7e3a2c745f4b460d5a340e578a0baa5d7725fe37";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.3.tgz";
+      name = "cookie-parser-1.3.3.tgz";
+      sha1 = "7e3a2c745f4b460d5a340e578a0baa5d7725fe37";
+    };
     deps = {
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-parser" ];
+    peerDependencies = [];
   };
+  by-spec."cookie-parser"."~1.3.3" =
+    self.by-version."cookie-parser"."1.3.3";
   by-spec."cookie-signature"."1.0.0" =
     self.by-version."cookie-signature"."1.0.0";
-  by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie-signature"."1.0.0" = self.buildNodePackage {
     name = "cookie-signature-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz";
-        name = "cookie-signature-1.0.0.tgz";
-        sha1 = "0044f332ac623df851c914e88eacc57f0c9704fe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-signature" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz";
+      name = "cookie-signature-1.0.0.tgz";
+      sha1 = "0044f332ac623df851c914e88eacc57f0c9704fe";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-signature" ];
+    peerDependencies = [];
   };
   by-spec."cookie-signature"."1.0.1" =
     self.by-version."cookie-signature"."1.0.1";
-  by-version."cookie-signature"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie-signature"."1.0.1" = self.buildNodePackage {
     name = "cookie-signature-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
-        name = "cookie-signature-1.0.1.tgz";
-        sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-signature" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
+      name = "cookie-signature-1.0.1.tgz";
+      sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-signature" ];
+    peerDependencies = [];
   };
   by-spec."cookie-signature"."1.0.3" =
     self.by-version."cookie-signature"."1.0.3";
-  by-version."cookie-signature"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie-signature"."1.0.3" = self.buildNodePackage {
     name = "cookie-signature-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz";
-        name = "cookie-signature-1.0.3.tgz";
-        sha1 = "91cd997cc51fb641595738c69cda020328f50ff9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-signature" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz";
+      name = "cookie-signature-1.0.3.tgz";
+      sha1 = "91cd997cc51fb641595738c69cda020328f50ff9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-signature" ];
+    peerDependencies = [];
+  };
+  by-spec."cookie-signature"."1.0.4" =
+    self.by-version."cookie-signature"."1.0.4";
+  by-version."cookie-signature"."1.0.4" = self.buildNodePackage {
+    name = "cookie-signature-1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
+      name = "cookie-signature-1.0.4.tgz";
+      sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."cookie-signature"."1.0.5" =
     self.by-version."cookie-signature"."1.0.5";
-  by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookie-signature"."1.0.5" = self.buildNodePackage {
     name = "cookie-signature-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
-        name = "cookie-signature-1.0.5.tgz";
-        sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-signature" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
+      name = "cookie-signature-1.0.5.tgz";
+      sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-signature" ];
+    peerDependencies = [];
+  };
+  by-spec."cookiejar"."1.3.0" =
+    self.by-version."cookiejar"."1.3.0";
+  by-version."cookiejar"."1.3.0" = self.buildNodePackage {
+    name = "cookiejar-1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz";
+      name = "cookiejar-1.3.0.tgz";
+      sha1 = "dd00b35679021e99cbd4e855b9ad041913474765";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."cookiejar"."2.0.1" =
     self.by-version."cookiejar"."2.0.1";
-  by-version."cookiejar"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookiejar"."2.0.1" = self.buildNodePackage {
     name = "cookiejar-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
-        name = "cookiejar-2.0.1.tgz";
-        sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookiejar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
+      name = "cookiejar-2.0.1.tgz";
+      sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookiejar" ];
+    peerDependencies = [];
+  };
+  by-spec."cookies"."0.1.x" =
+    self.by-version."cookies"."0.1.6";
+  by-version."cookies"."0.1.6" = self.buildNodePackage {
+    name = "cookies-0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookies/-/cookies-0.1.6.tgz";
+      name = "cookies-0.1.6.tgz";
+      sha1 = "2129588b8b1e382ffba990d9f9cf9ddf2c142846";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."cookies".">= 0.2.2" =
     self.by-version."cookies"."0.5.0";
-  by-version."cookies"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cookies"."0.5.0" = self.buildNodePackage {
     name = "cookies-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
-        name = "cookies-0.5.0.tgz";
-        sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookies" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
+      name = "cookies-0.5.0.tgz";
+      sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025";
+    };
     deps = {
       "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookies" ];
+    peerDependencies = [];
   };
   by-spec."cordova"."*" =
     self.by-version."cordova"."4.2.0";
-  by-version."cordova"."4.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cordova"."4.2.0" = self.buildNodePackage {
     name = "cordova-4.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cordova/-/cordova-4.2.0.tgz";
-        name = "cordova-4.2.0.tgz";
-        sha1 = "e4519197040b09b1bd131ecebc847716a2a7d7d0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cordova" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cordova/-/cordova-4.2.0.tgz";
+      name = "cordova-4.2.0.tgz";
+      sha1 = "e4519197040b09b1bd131ecebc847716a2a7d7d0";
+    };
     deps = {
       "cordova-lib-4.2.0" = self.by-version."cordova-lib"."4.2.0";
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cordova" ];
+    peerDependencies = [];
   };
   "cordova" = self.by-version."cordova"."4.2.0";
   by-spec."cordova-js"."3.7.3" =
     self.by-version."cordova-js"."3.7.3";
-  by-version."cordova-js"."3.7.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."cordova-js"."3.7.3" = self.buildNodePackage {
     name = "cordova-js-3.7.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cordova-js/-/cordova-js-3.7.3.tgz";
-        name = "cordova-js-3.7.3.tgz";
-        sha1 = "c7d9bbb7cc2d72183ef64339dc259be6326d0093";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cordova-js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cordova-js/-/cordova-js-3.7.3.tgz";
+      name = "cordova-js-3.7.3.tgz";
+      sha1 = "c7d9bbb7cc2d72183ef64339dc259be6326d0093";
+    };
     deps = {
       "browserify-7.1.0" = self.by-version."browserify"."7.1.0";
       "through-2.3.4" = self.by-version."through"."2.3.4";
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cordova-js" ];
+    peerDependencies = [];
   };
   by-spec."cordova-lib"."4.2.0" =
     self.by-version."cordova-lib"."4.2.0";
-  by-version."cordova-lib"."4.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."cordova-lib"."4.2.0" = self.buildNodePackage {
     name = "cordova-lib-4.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cordova-lib/-/cordova-lib-4.2.0.tgz";
-        name = "cordova-lib-4.2.0.tgz";
-        sha1 = "ce4f565ce970bfada900a3161625344e87139e64";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cordova-lib" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cordova-lib/-/cordova-lib-4.2.0.tgz";
+      name = "cordova-lib-4.2.0.tgz";
+      sha1 = "ce4f565ce970bfada900a3161625344e87139e64";
+    };
     deps = {
       "bplist-parser-0.0.6" = self.by-version."bplist-parser"."0.0.6";
       "dep-graph-1.1.0" = self.by-version."dep-graph"."1.1.0";
@@ -6434,841 +6612,782 @@
       "valid-identifier-0.0.1" = self.by-version."valid-identifier"."0.0.1";
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cordova-lib" ];
+    peerDependencies = [];
   };
   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" = lib.makeOverridable self.buildNodePackage {
+  by-version."core-util-is"."1.0.1" = self.buildNodePackage {
     name = "core-util-is-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."core-util-is" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "core-util-is" ];
+    peerDependencies = [];
   };
   by-spec."couch-login"."~0.1.15" =
     self.by-version."couch-login"."0.1.20";
-  by-version."couch-login"."0.1.20" = lib.makeOverridable self.buildNodePackage {
+  by-version."couch-login"."0.1.20" = self.buildNodePackage {
     name = "couch-login-0.1.20";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
-        name = "couch-login-0.1.20.tgz";
-        sha1 = "007c70ef80089dbae6f59eeeec37480799b39595";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."couch-login" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
+      name = "couch-login-0.1.20.tgz";
+      sha1 = "007c70ef80089dbae6f59eeeec37480799b39595";
+    };
     deps = {
       "request-2.51.0" = self.by-version."request"."2.51.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "couch-login" ];
+    peerDependencies = [];
   };
   by-spec."coveralls"."*" =
     self.by-version."coveralls"."2.11.2";
-  by-version."coveralls"."2.11.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."coveralls"."2.11.2" = self.buildNodePackage {
     name = "coveralls-2.11.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz";
-        name = "coveralls-2.11.2.tgz";
-        sha1 = "d4d982016cb2f9da89d77ab204d86a8537e6a12d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."coveralls" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz";
+      name = "coveralls-2.11.2.tgz";
+      sha1 = "d4d982016cb2f9da89d77ab204d86a8537e6a12d";
+    };
     deps = {
       "js-yaml-3.0.1" = self.by-version."js-yaml"."3.0.1";
       "lcov-parse-0.0.6" = self.by-version."lcov-parse"."0.0.6";
       "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4";
       "request-2.40.0" = self.by-version."request"."2.40.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "coveralls" ];
+    peerDependencies = [];
   };
   "coveralls" = self.by-version."coveralls"."2.11.2";
+  by-spec."coveralls"."^2.11.2" =
+    self.by-version."coveralls"."2.11.2";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
-  by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."crc"."0.2.0" = self.buildNodePackage {
     name = "crc-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
-        name = "crc-0.2.0.tgz";
-        sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."crc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
+      name = "crc-0.2.0.tgz";
+      sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "crc" ];
+    peerDependencies = [];
   };
   by-spec."crc"."3.0.0" =
     self.by-version."crc"."3.0.0";
-  by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."crc"."3.0.0" = self.buildNodePackage {
     name = "crc-3.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz";
-        name = "crc-3.0.0.tgz";
-        sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."crc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz";
+      name = "crc-3.0.0.tgz";
+      sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "crc" ];
+    peerDependencies = [];
   };
   by-spec."crc"."3.2.1" =
     self.by-version."crc"."3.2.1";
-  by-version."crc"."3.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."crc"."3.2.1" = self.buildNodePackage {
     name = "crc-3.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
-        name = "crc-3.2.1.tgz";
-        sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."crc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
+      name = "crc-3.2.1.tgz";
+      sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "crc" ];
+    peerDependencies = [];
   };
   by-spec."crc32-stream"."~0.3.1" =
     self.by-version."crc32-stream"."0.3.1";
-  by-version."crc32-stream"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."crc32-stream"."0.3.1" = self.buildNodePackage {
     name = "crc32-stream-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.1.tgz";
-        name = "crc32-stream-0.3.1.tgz";
-        sha1 = "615fcf05ed08342a3d1e938041aed84430ce7837";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."crc32-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.1.tgz";
+      name = "crc32-stream-0.3.1.tgz";
+      sha1 = "615fcf05ed08342a3d1e938041aed84430ce7837";
+    };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "crc32-stream" ];
+    peerDependencies = [];
   };
   by-spec."create-ecdh"."1.0.3" =
     self.by-version."create-ecdh"."1.0.3";
-  by-version."create-ecdh"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."create-ecdh"."1.0.3" = self.buildNodePackage {
     name = "create-ecdh-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/create-ecdh/-/create-ecdh-1.0.3.tgz";
-        name = "create-ecdh-1.0.3.tgz";
-        sha1 = "ff6fce0d36747adf3a87918b97b93e302541a157";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."create-ecdh" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/create-ecdh/-/create-ecdh-1.0.3.tgz";
+      name = "create-ecdh-1.0.3.tgz";
+      sha1 = "ff6fce0d36747adf3a87918b97b93e302541a157";
+    };
     deps = {
       "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
-      "elliptic-1.0.0" = self.by-version."elliptic"."1.0.0";
+      "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "create-ecdh" ];
+    peerDependencies = [];
+  };
+  by-spec."create-hash"."^1.1.0" =
+    self.by-version."create-hash"."1.1.0";
+  by-version."create-hash"."1.1.0" = self.buildNodePackage {
+    name = "create-hash-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/create-hash/-/create-hash-1.1.0.tgz";
+      name = "create-hash-1.1.0.tgz";
+      sha1 = "c2ab96b5d4ece5f22df2ef4306803d14da6931e7";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "ripemd160-1.0.0" = self.by-version."ripemd160"."1.0.0";
+      "sha.js-2.3.6" = self.by-version."sha.js"."2.3.6";
+    };
+    peerDependencies = [];
+  };
+  by-spec."create-hmac"."^1.1.0" =
+    self.by-version."create-hmac"."1.1.0";
+  by-version."create-hmac"."1.1.0" = self.buildNodePackage {
+    name = "create-hmac-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.0.tgz";
+      name = "create-hmac-1.1.0.tgz";
+      sha1 = "92f8b6378471f4bc67eefc9dee6622df6b8754be";
+    };
+    deps = {
+      "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    peerDependencies = [];
   };
+  by-spec."cron".">=1.0.1" =
+    self.by-version."cron"."1.0.6";
+  by-version."cron"."1.0.6" = self.buildNodePackage {
+    name = "cron-1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cron/-/cron-1.0.6.tgz";
+      name = "cron-1.0.6.tgz";
+      sha1 = "92a32920a8d0fa433248e9de46768d53c55269d7";
+    };
+    deps = {
+      "moment-timezone-0.2.4" = self.by-version."moment-timezone"."0.2.4";
+    };
+    peerDependencies = [];
+  };
+  by-spec."cron"."^1.0.4" =
+    self.by-version."cron"."1.0.6";
   by-spec."crossroads"."~0.12.0" =
     self.by-version."crossroads"."0.12.0";
-  by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."crossroads"."0.12.0" = self.buildNodePackage {
     name = "crossroads-0.12.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz";
-        name = "crossroads-0.12.0.tgz";
-        sha1 = "24114f9de3abfa0271df66b4ec56c3b984b7f56e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."crossroads" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz";
+      name = "crossroads-0.12.0.tgz";
+      sha1 = "24114f9de3abfa0271df66b4ec56c3b984b7f56e";
+    };
     deps = {
       "signals-1.0.0" = self.by-version."signals"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "crossroads" ];
+    peerDependencies = [];
   };
   by-spec."cryptiles"."0.1.x" =
     self.by-version."cryptiles"."0.1.3";
-  by-version."cryptiles"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."cryptiles"."0.1.3" = self.buildNodePackage {
     name = "cryptiles-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
-        name = "cryptiles-0.1.3.tgz";
-        sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cryptiles" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
+      name = "cryptiles-0.1.3.tgz";
+      sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c";
+    };
     deps = {
       "boom-0.3.8" = self.by-version."boom"."0.3.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cryptiles" ];
+    peerDependencies = [];
   };
   by-spec."cryptiles"."0.2.x" =
     self.by-version."cryptiles"."0.2.2";
-  by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."cryptiles"."0.2.2" = self.buildNodePackage {
     name = "cryptiles-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
-        name = "cryptiles-0.2.2.tgz";
-        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cryptiles" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+      name = "cryptiles-0.2.2.tgz";
+      sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+    };
     deps = {
       "boom-0.4.2" = self.by-version."boom"."0.4.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cryptiles" ];
+    peerDependencies = [];
   };
   by-spec."crypto"."0.0.3" =
     self.by-version."crypto"."0.0.3";
-  by-version."crypto"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."crypto"."0.0.3" = self.buildNodePackage {
     name = "crypto-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
-        name = "crypto-0.0.3.tgz";
-        sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."crypto" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
+      name = "crypto-0.0.3.tgz";
+      sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "crypto" ];
+    peerDependencies = [];
   };
   by-spec."crypto-browserify"."^3.0.0" =
-    self.by-version."crypto-browserify"."3.9.1";
-  by-version."crypto-browserify"."3.9.1" = lib.makeOverridable self.buildNodePackage {
-    name = "crypto-browserify-3.9.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.1.tgz";
-        name = "crypto-browserify-3.9.1.tgz";
-        sha1 = "020319381171e3895c5d30480b281f417d583359";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."crypto-browserify" or []);
-    deps = {
-      "browserify-aes-0.8.1" = self.by-version."browserify-aes"."0.8.1";
+    self.by-version."crypto-browserify"."3.9.9";
+  by-version."crypto-browserify"."3.9.9" = self.buildNodePackage {
+    name = "crypto-browserify-3.9.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.9.tgz";
+      name = "crypto-browserify-3.9.9.tgz";
+      sha1 = "1296ad1fb0168fb621b44af68dcc7939df0d4af6";
+    };
+    deps = {
+      "browserify-aes-1.0.0" = self.by-version."browserify-aes"."1.0.0";
+      "browserify-sign-2.8.0" = self.by-version."browserify-sign"."2.8.0";
       "create-ecdh-1.0.3" = self.by-version."create-ecdh"."1.0.3";
+      "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0";
+      "create-hmac-1.1.0" = self.by-version."create-hmac"."1.1.0";
       "diffie-hellman-2.2.3" = self.by-version."diffie-hellman"."2.2.3";
-      "browserify-sign-2.7.5" = self.by-version."browserify-sign"."2.7.5";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1";
       "public-encrypt-1.1.2" = self.by-version."public-encrypt"."1.1.2";
-      "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0";
-      "sha.js-2.3.0" = self.by-version."sha.js"."2.3.0";
+      "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "crypto-browserify" ];
+    peerDependencies = [];
   };
+  by-spec."crypto-browserify"."^3.2.6" =
+    self.by-version."crypto-browserify"."3.9.9";
   by-spec."crypto-browserify"."~1.0.9" =
     self.by-version."crypto-browserify"."1.0.9";
-  by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."crypto-browserify"."1.0.9" = self.buildNodePackage {
     name = "crypto-browserify-1.0.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
-        name = "crypto-browserify-1.0.9.tgz";
-        sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."crypto-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
+      name = "crypto-browserify-1.0.9.tgz";
+      sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "crypto-browserify" ];
+    peerDependencies = [];
   };
   by-spec."csrf"."~2.0.4" =
     self.by-version."csrf"."2.0.4";
-  by-version."csrf"."2.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."csrf"."2.0.4" = self.buildNodePackage {
     name = "csrf-2.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/csrf/-/csrf-2.0.4.tgz";
-        name = "csrf-2.0.4.tgz";
-        sha1 = "4366ddea0e08924aa324b4c7cf5649e413891f46";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."csrf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/csrf/-/csrf-2.0.4.tgz";
+      name = "csrf-2.0.4.tgz";
+      sha1 = "4366ddea0e08924aa324b4c7cf5649e413891f46";
+    };
     deps = {
       "base64-url-1.1.0" = self.by-version."base64-url"."1.1.0";
       "rndm-1.1.0" = self.by-version."rndm"."1.1.0";
       "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
       "uid-safe-1.0.2" = self.by-version."uid-safe"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "csrf" ];
+    peerDependencies = [];
   };
   by-spec."css"."~1.0.8" =
     self.by-version."css"."1.0.8";
-  by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."css"."1.0.8" = self.buildNodePackage {
     name = "css-1.0.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
-        name = "css-1.0.8.tgz";
-        sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."css" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
+      name = "css-1.0.8.tgz";
+      sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
+    };
     deps = {
       "css-parse-1.0.4" = self.by-version."css-parse"."1.0.4";
       "css-stringify-1.0.5" = self.by-version."css-stringify"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "css" ];
+    peerDependencies = [];
   };
   by-spec."css-parse"."1.0.4" =
     self.by-version."css-parse"."1.0.4";
-  by-version."css-parse"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."css-parse"."1.0.4" = self.buildNodePackage {
     name = "css-parse-1.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
-        name = "css-parse-1.0.4.tgz";
-        sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."css-parse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
+      name = "css-parse-1.0.4.tgz";
+      sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "css-parse" ];
+    peerDependencies = [];
   };
   by-spec."css-parse"."1.7.x" =
     self.by-version."css-parse"."1.7.0";
-  by-version."css-parse"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."css-parse"."1.7.0" = self.buildNodePackage {
     name = "css-parse-1.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
-        name = "css-parse-1.7.0.tgz";
-        sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."css-parse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
+      name = "css-parse-1.7.0.tgz";
+      sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "css-parse" ];
+    peerDependencies = [];
   };
   by-spec."css-stringify"."1.0.5" =
     self.by-version."css-stringify"."1.0.5";
-  by-version."css-stringify"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."css-stringify"."1.0.5" = self.buildNodePackage {
     name = "css-stringify-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
-        name = "css-stringify-1.0.5.tgz";
-        sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."css-stringify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
+      name = "css-stringify-1.0.5.tgz";
+      sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "css-stringify" ];
+    peerDependencies = [];
+  };
+  by-spec."cssom"."0.3.x" =
+    self.by-version."cssom"."0.3.0";
+  by-version."cssom"."0.3.0" = self.buildNodePackage {
+    name = "cssom-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cssom/-/cssom-0.3.0.tgz";
+      name = "cssom-0.3.0.tgz";
+      sha1 = "386d5135528fe65c1ee1bc7c4e55a38854dbcf7a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."cssom"."~0.3.0" =
+    self.by-version."cssom"."0.3.0";
+  by-spec."cssstyle"."~0.2.9" =
+    self.by-version."cssstyle"."0.2.22";
+  by-version."cssstyle"."0.2.22" = self.buildNodePackage {
+    name = "cssstyle-0.2.22";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cssstyle/-/cssstyle-0.2.22.tgz";
+      name = "cssstyle-0.2.22.tgz";
+      sha1 = "a1ce15f5fe15a45d6705be0fbc4f833fe75c4f8d";
+    };
+    deps = {
+      "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
+    };
+    peerDependencies = [];
   };
   by-spec."csurf"."1.1.0" =
     self.by-version."csurf"."1.1.0";
-  by-version."csurf"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."csurf"."1.1.0" = self.buildNodePackage {
     name = "csurf-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
-        name = "csurf-1.1.0.tgz";
-        sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."csurf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
+      name = "csurf-1.1.0.tgz";
+      sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2";
+    };
     deps = {
       "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
       "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "csurf" ];
+    peerDependencies = [];
   };
   by-spec."csurf"."~1.6.2" =
     self.by-version."csurf"."1.6.5";
-  by-version."csurf"."1.6.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."csurf"."1.6.5" = self.buildNodePackage {
     name = "csurf-1.6.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/csurf/-/csurf-1.6.5.tgz";
-        name = "csurf-1.6.5.tgz";
-        sha1 = "da67819fd73d44be3553f5ad1362497264a658ad";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."csurf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/csurf/-/csurf-1.6.5.tgz";
+      name = "csurf-1.6.5.tgz";
+      sha1 = "da67819fd73d44be3553f5ad1362497264a658ad";
+    };
     deps = {
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
       "csrf-2.0.4" = self.by-version."csrf"."2.0.4";
       "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "csurf" ];
+    peerDependencies = [];
   };
   by-spec."csurf"."~1.6.5" =
     self.by-version."csurf"."1.6.5";
   by-spec."ctype"."0.5.0" =
     self.by-version."ctype"."0.5.0";
-  by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ctype"."0.5.0" = self.buildNodePackage {
     name = "ctype-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz";
-        name = "ctype-0.5.0.tgz";
-        sha1 = "672673ec67587eb495c1ed694da1abb964ff65e3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ctype" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz";
+      name = "ctype-0.5.0.tgz";
+      sha1 = "672673ec67587eb495c1ed694da1abb964ff65e3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ctype" ];
+    peerDependencies = [];
   };
   by-spec."ctype"."0.5.2" =
     self.by-version."ctype"."0.5.2";
-  by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ctype"."0.5.2" = self.buildNodePackage {
     name = "ctype-0.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
-        name = "ctype-0.5.2.tgz";
-        sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ctype" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
+      name = "ctype-0.5.2.tgz";
+      sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ctype" ];
+    peerDependencies = [];
   };
   by-spec."ctype"."0.5.3" =
     self.by-version."ctype"."0.5.3";
-  by-version."ctype"."0.5.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."ctype"."0.5.3" = self.buildNodePackage {
     name = "ctype-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ctype" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+      name = "ctype-0.5.3.tgz";
+      sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ctype" ];
+    peerDependencies = [];
   };
   by-spec."cycle"."1.0.x" =
     self.by-version."cycle"."1.0.3";
-  by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."cycle"."1.0.3" = self.buildNodePackage {
     name = "cycle-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
-        name = "cycle-1.0.3.tgz";
-        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cycle" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+      name = "cycle-1.0.3.tgz";
+      sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cycle" ];
+    peerDependencies = [];
   };
   by-spec."d"."~0.1.1" =
     self.by-version."d"."0.1.1";
-  by-version."d"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."d"."0.1.1" = self.buildNodePackage {
     name = "d-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz";
-        name = "d-0.1.1.tgz";
-        sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."d" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz";
+      name = "d-0.1.1.tgz";
+      sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309";
+    };
     deps = {
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "d" ];
+    peerDependencies = [];
   };
   by-spec."d8"."0.4.4" =
     self.by-version."d8"."0.4.4";
-  by-version."d8"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."d8"."0.4.4" = self.buildNodePackage {
     name = "d8-0.4.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/d8/-/d8-0.4.4.tgz";
-        name = "d8-0.4.4.tgz";
-        sha1 = "5989dd62b90bdd853d3978f1261a4bc76bcf6485";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."d8" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/d8/-/d8-0.4.4.tgz";
+      name = "d8-0.4.4.tgz";
+      sha1 = "5989dd62b90bdd853d3978f1261a4bc76bcf6485";
+    };
     deps = {
       "m8-0.4.4" = self.by-version."m8"."0.4.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "d8" ];
+    peerDependencies = [];
   };
   by-spec."dashdash"."1.3.2" =
     self.by-version."dashdash"."1.3.2";
-  by-version."dashdash"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."dashdash"."1.3.2" = self.buildNodePackage {
     name = "dashdash-1.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dashdash/-/dashdash-1.3.2.tgz";
-        name = "dashdash-1.3.2.tgz";
-        sha1 = "1e76d13fadf25f8f50e70212c98a25beb1b3b8eb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dashdash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.3.2.tgz";
+      name = "dashdash-1.3.2.tgz";
+      sha1 = "1e76d13fadf25f8f50e70212c98a25beb1b3b8eb";
+    };
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dashdash" ];
+    peerDependencies = [];
   };
   by-spec."dashdash"."1.5.0" =
     self.by-version."dashdash"."1.5.0";
-  by-version."dashdash"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."dashdash"."1.5.0" = self.buildNodePackage {
     name = "dashdash-1.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dashdash/-/dashdash-1.5.0.tgz";
-        name = "dashdash-1.5.0.tgz";
-        sha1 = "fa5aa8a9415a7c5c3928be18bd4975458e666452";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dashdash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.5.0.tgz";
+      name = "dashdash-1.5.0.tgz";
+      sha1 = "fa5aa8a9415a7c5c3928be18bd4975458e666452";
+    };
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dashdash" ];
+    peerDependencies = [];
+  };
+  by-spec."data-uri-to-buffer"."0" =
+    self.by-version."data-uri-to-buffer"."0.0.3";
+  by-version."data-uri-to-buffer"."0.0.3" = self.buildNodePackage {
+    name = "data-uri-to-buffer-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz";
+      name = "data-uri-to-buffer-0.0.3.tgz";
+      sha1 = "18ae979a6a0ca994b0625853916d2662bbae0b1a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."date-now"."^0.1.4" =
     self.by-version."date-now"."0.1.4";
-  by-version."date-now"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."date-now"."0.1.4" = self.buildNodePackage {
     name = "date-now-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
-        name = "date-now-0.1.4.tgz";
-        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."date-now" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+      name = "date-now-0.1.4.tgz";
+      sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "date-now" ];
+    peerDependencies = [];
   };
   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" = lib.makeOverridable self.buildNodePackage {
+  by-version."dateformat"."1.0.2-1.2.3" = self.buildNodePackage {
     name = "dateformat-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dateformat" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dateformat" ];
+    peerDependencies = [];
+  };
+  by-spec."dateformat"."1.0.7-1.2.3" =
+    self.by-version."dateformat"."1.0.7-1.2.3";
+  by-version."dateformat"."1.0.7-1.2.3" = self.buildNodePackage {
+    name = "dateformat-1.0.7-1.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz";
+      name = "dateformat-1.0.7-1.2.3.tgz";
+      sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."dateformat"."^1.0.11" =
     self.by-version."dateformat"."1.0.11";
-  by-version."dateformat"."1.0.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."dateformat"."1.0.11" = self.buildNodePackage {
     name = "dateformat-1.0.11";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz";
-        name = "dateformat-1.0.11.tgz";
-        sha1 = "f27cbee7a012bbfb82ea051562d3977f6093dbb1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dateformat" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz";
+      name = "dateformat-1.0.11.tgz";
+      sha1 = "f27cbee7a012bbfb82ea051562d3977f6093dbb1";
+    };
     deps = {
-      "get-stdin-3.0.2" = self.by-version."get-stdin"."3.0.2";
-      "meow-2.1.0" = self.by-version."meow"."2.1.0";
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+      "meow-3.0.0" = self.by-version."meow"."3.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dateformat" ];
+    peerDependencies = [];
   };
   by-spec."dateformat"."~1.0.6" =
     self.by-version."dateformat"."1.0.11";
+  by-spec."datejs".">=0.0.2" =
+    self.by-version."datejs"."1.0.0-rc3";
+  by-version."datejs"."1.0.0-rc3" = self.buildNodePackage {
+    name = "datejs-1.0.0-rc3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/datejs/-/datejs-1.0.0-rc3.tgz";
+      name = "datejs-1.0.0-rc3.tgz";
+      sha1 = "bffa1efedefeb41fdd8a242af55afa01fb58de57";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."debug"."*" =
     self.by-version."debug"."2.1.1";
-  by-version."debug"."2.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."debug"."2.1.1" = self.buildNodePackage {
     name = "debug-2.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-2.1.1.tgz";
-        name = "debug-2.1.1.tgz";
-        sha1 = "e0c548cc607adc22b537540dc3639c4236fdf90c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.1.1.tgz";
+      name = "debug-2.1.1.tgz";
+      sha1 = "e0c548cc607adc22b537540dc3639c4236fdf90c";
+    };
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
+    peerDependencies = [];
+  };
+  by-spec."debug"."0" =
+    self.by-version."debug"."0.8.1";
+  by-version."debug"."0.8.1" = self.buildNodePackage {
+    name = "debug-0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
+      name = "debug-0.8.1.tgz";
+      sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."debug"."0.5.0" =
     self.by-version."debug"."0.5.0";
-  by-version."debug"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."debug"."0.5.0" = self.buildNodePackage {
     name = "debug-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
-        name = "debug-0.5.0.tgz";
-        sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
+      name = "debug-0.5.0.tgz";
+      sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
+    peerDependencies = [];
+  };
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.6.0.tgz";
+      name = "debug-0.6.0.tgz";
+      sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."debug"."0.7.4" =
     self.by-version."debug"."0.7.4";
-  by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."debug"."0.7.4" = self.buildNodePackage {
     name = "debug-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+      name = "debug-0.7.4.tgz";
+      sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
+    peerDependencies = [];
   };
   by-spec."debug"."0.8.0" =
     self.by-version."debug"."0.8.0";
-  by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."debug"."0.8.0" = self.buildNodePackage {
     name = "debug-0.8.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
-        name = "debug-0.8.0.tgz";
-        sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
+      name = "debug-0.8.0.tgz";
+      sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
+    peerDependencies = [];
+  };
+  by-spec."debug"."0.8.1" =
+    self.by-version."debug"."0.8.1";
+  by-spec."debug"."1.0.2" =
+    self.by-version."debug"."1.0.2";
+  by-version."debug"."1.0.2" = self.buildNodePackage {
+    name = "debug-1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-1.0.2.tgz";
+      name = "debug-1.0.2.tgz";
+      sha1 = "3849591c10cce648476c3c7c2e2e3416db5963c4";
+    };
+    deps = {
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+    };
+    peerDependencies = [];
+  };
+  by-spec."debug"."1.0.3" =
+    self.by-version."debug"."1.0.3";
+  by-version."debug"."1.0.3" = self.buildNodePackage {
+    name = "debug-1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-1.0.3.tgz";
+      name = "debug-1.0.3.tgz";
+      sha1 = "fc8c6b2d6002804b4081c0208e0f6460ba1fa3e4";
+    };
+    deps = {
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+    };
+    peerDependencies = [];
   };
   by-spec."debug"."2" =
     self.by-version."debug"."2.1.1";
   by-spec."debug"."2.0.0" =
     self.by-version."debug"."2.0.0";
-  by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."debug"."2.0.0" = self.buildNodePackage {
     name = "debug-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
+    peerDependencies = [];
   };
   by-spec."debug".">= 0.7.0" =
     self.by-version."debug"."2.1.1";
   by-spec."debug".">= 0.7.3 < 1" =
     self.by-version."debug"."0.8.1";
-  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "debug-0.8.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
-        name = "debug-0.8.1.tgz";
-        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
-  };
   by-spec."debug"."^0.8.1" =
     self.by-version."debug"."0.8.1";
   by-spec."debug"."^1.0" =
     self.by-version."debug"."1.0.4";
-  by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."debug"."1.0.4" = self.buildNodePackage {
     name = "debug-1.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
-        name = "debug-1.0.4.tgz";
-        sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+      name = "debug-1.0.4.tgz";
+      sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+    };
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
+    peerDependencies = [];
   };
   by-spec."debug"."^1.0.0" =
     self.by-version."debug"."1.0.4";
@@ -7298,38 +7417,28 @@
     self.by-version."debug"."2.1.1";
   by-spec."debuglog"."^1.0.1" =
     self.by-version."debuglog"."1.0.1";
-  by-version."debuglog"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."debuglog"."1.0.1" = self.buildNodePackage {
     name = "debuglog-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";
-        name = "debuglog-1.0.1.tgz";
-        sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debuglog" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";
+      name = "debuglog-1.0.1.tgz";
+      sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debuglog" ];
+    peerDependencies = [];
   };
   by-spec."decompress-zip"."0.0.8" =
     self.by-version."decompress-zip"."0.0.8";
-  by-version."decompress-zip"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."decompress-zip"."0.0.8" = self.buildNodePackage {
     name = "decompress-zip-0.0.8";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz";
-        name = "decompress-zip-0.0.8.tgz";
-        sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."decompress-zip" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz";
+      name = "decompress-zip-0.0.8.tgz";
+      sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3";
+    };
     deps = {
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "mkpath-0.1.0" = self.by-version."mkpath"."0.1.0";
@@ -7339,499 +7448,443 @@
       "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "decompress-zip" ];
+    peerDependencies = [];
   };
   by-spec."deep-eql"."0.1.3" =
     self.by-version."deep-eql"."0.1.3";
-  by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."deep-eql"."0.1.3" = self.buildNodePackage {
     name = "deep-eql-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
-        name = "deep-eql-0.1.3.tgz";
-        sha1 = "ef558acab8de25206cd713906d74e56930eb69f2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-eql" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
+      name = "deep-eql-0.1.3.tgz";
+      sha1 = "ef558acab8de25206cd713906d74e56930eb69f2";
+    };
     deps = {
       "type-detect-0.1.1" = self.by-version."type-detect"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-eql" ];
+    peerDependencies = [];
   };
   by-spec."deep-equal"."*" =
     self.by-version."deep-equal"."0.2.1";
-  by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."deep-equal"."0.2.1" = self.buildNodePackage {
     name = "deep-equal-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
-        name = "deep-equal-0.2.1.tgz";
-        sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-equal" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
+      name = "deep-equal-0.2.1.tgz";
+      sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-equal" ];
+    peerDependencies = [];
   };
   by-spec."deep-equal"."0.0.0" =
     self.by-version."deep-equal"."0.0.0";
-  by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."deep-equal"."0.0.0" = self.buildNodePackage {
     name = "deep-equal-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
-        name = "deep-equal-0.0.0.tgz";
-        sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-equal" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+      name = "deep-equal-0.0.0.tgz";
+      sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-equal" ];
+    peerDependencies = [];
   };
   by-spec."deep-equal"."~0.0.0" =
     self.by-version."deep-equal"."0.0.0";
   by-spec."deep-equal"."~0.1.0" =
     self.by-version."deep-equal"."0.1.2";
-  by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."deep-equal"."0.1.2" = self.buildNodePackage {
     name = "deep-equal-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
-        name = "deep-equal-0.1.2.tgz";
-        sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-equal" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
+      name = "deep-equal-0.1.2.tgz";
+      sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-equal" ];
+    peerDependencies = [];
   };
   by-spec."deep-equal"."~0.2.1" =
     self.by-version."deep-equal"."0.2.1";
   by-spec."deep-extend"."~0.2.5" =
     self.by-version."deep-extend"."0.2.11";
-  by-version."deep-extend"."0.2.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."deep-extend"."0.2.11" = self.buildNodePackage {
     name = "deep-extend-0.2.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz";
-        name = "deep-extend-0.2.11.tgz";
-        sha1 = "7a16ba69729132340506170494bc83f7076fe08f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-extend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz";
+      name = "deep-extend-0.2.11.tgz";
+      sha1 = "7a16ba69729132340506170494bc83f7076fe08f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-extend" ];
+    peerDependencies = [];
   };
   by-spec."deep-extend"."~0.3.2" =
     self.by-version."deep-extend"."0.3.2";
-  by-version."deep-extend"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."deep-extend"."0.3.2" = self.buildNodePackage {
     name = "deep-extend-0.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.3.2.tgz";
-        name = "deep-extend-0.3.2.tgz";
-        sha1 = "c75dff89f1c639e98438894d156c30b4f87b3a56";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-extend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.3.2.tgz";
+      name = "deep-extend-0.3.2.tgz";
+      sha1 = "c75dff89f1c639e98438894d156c30b4f87b3a56";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-extend" ];
+    peerDependencies = [];
   };
-  by-spec."deep-is"."~0.1.2" =
+  by-spec."deep-is"."0.1.x" =
     self.by-version."deep-is"."0.1.3";
-  by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."deep-is"."0.1.3" = self.buildNodePackage {
     name = "deep-is-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
-        name = "deep-is-0.1.3.tgz";
-        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-is" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+      name = "deep-is-0.1.3.tgz";
+      sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-is" ];
+    peerDependencies = [];
   };
+  by-spec."deep-is"."~0.1.2" =
+    self.by-version."deep-is"."0.1.3";
   by-spec."deepmerge"."*" =
     self.by-version."deepmerge"."0.2.7";
-  by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."deepmerge"."0.2.7" = self.buildNodePackage {
     name = "deepmerge-0.2.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz";
-        name = "deepmerge-0.2.7.tgz";
-        sha1 = "3a5ab8d37311c4d1aefb22209693afe0a91a0563";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deepmerge" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz";
+      name = "deepmerge-0.2.7.tgz";
+      sha1 = "3a5ab8d37311c4d1aefb22209693afe0a91a0563";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deepmerge" ];
+    peerDependencies = [];
   };
   "deepmerge" = self.by-version."deepmerge"."0.2.7";
+  by-spec."defaultable"."~0.7.2" =
+    self.by-version."defaultable"."0.7.2";
+  by-version."defaultable"."0.7.2" = self.buildNodePackage {
+    name = "defaultable-0.7.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/defaultable/-/defaultable-0.7.2.tgz";
+      name = "defaultable-0.7.2.tgz";
+      sha1 = "7c1564ca14f9eca4c4127a539790777d44085bd7";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."defaults"."^1.0.0" =
     self.by-version."defaults"."1.0.0";
-  by-version."defaults"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."defaults"."1.0.0" = self.buildNodePackage {
     name = "defaults-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz";
-        name = "defaults-1.0.0.tgz";
-        sha1 = "3ae25f44416c6c01f9809a25fcdd285912d2a6b1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."defaults" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz";
+      name = "defaults-1.0.0.tgz";
+      sha1 = "3ae25f44416c6c01f9809a25fcdd285912d2a6b1";
+    };
     deps = {
       "clone-0.1.19" = self.by-version."clone"."0.1.19";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "defaults" ];
+    peerDependencies = [];
   };
   by-spec."defined"."0.0.0" =
     self.by-version."defined"."0.0.0";
-  by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."defined"."0.0.0" = self.buildNodePackage {
     name = "defined-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
-        name = "defined-0.0.0.tgz";
-        sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."defined" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
+      name = "defined-0.0.0.tgz";
+      sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "defined" ];
+    peerDependencies = [];
   };
   by-spec."defined"."~0.0.0" =
     self.by-version."defined"."0.0.0";
+  by-spec."defs"."~0.6.2" =
+    self.by-version."defs"."0.6.2";
+  by-version."defs"."0.6.2" = self.buildNodePackage {
+    name = "defs-0.6.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/defs/-/defs-0.6.2.tgz";
+      name = "defs-0.6.2.tgz";
+      sha1 = "c4e05855d29a7a3a9cd9cca4a40813503418d907";
+    };
+    deps = {
+      "alter-0.2.0" = self.by-version."alter"."0.2.0";
+      "breakable-0.1.0" = self.by-version."breakable"."0.1.0";
+      "ast-traverse-0.1.1" = self.by-version."ast-traverse"."0.1.1";
+      "simple-fmt-0.1.0" = self.by-version."simple-fmt"."0.1.0";
+      "simple-is-0.2.0" = self.by-version."simple-is"."0.2.0";
+      "stringmap-0.2.2" = self.by-version."stringmap"."0.2.2";
+      "stringset-0.2.1" = self.by-version."stringset"."0.2.1";
+      "tryor-0.1.2" = self.by-version."tryor"."0.1.2";
+      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+    };
+    peerDependencies = [];
+  };
+  by-spec."degenerator"."~1.0.0" =
+    self.by-version."degenerator"."1.0.0";
+  by-version."degenerator"."1.0.0" = self.buildNodePackage {
+    name = "degenerator-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/degenerator/-/degenerator-1.0.0.tgz";
+      name = "degenerator-1.0.0.tgz";
+      sha1 = "9cb6976fa1b860a9f2e913cbf18689113318dd8f";
+    };
+    deps = {
+      "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony";
+      "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
+      "ast-types-0.3.38" = self.by-version."ast-types"."0.3.38";
+    };
+    peerDependencies = [];
+  };
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
-  by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
     name = "delayed-stream-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
-        name = "delayed-stream-0.0.5.tgz";
-        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."delayed-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+      name = "delayed-stream-0.0.5.tgz";
+      sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "delayed-stream" ];
+    peerDependencies = [];
   };
   by-spec."delegates"."^0.1.0" =
     self.by-version."delegates"."0.1.0";
-  by-version."delegates"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."delegates"."0.1.0" = self.buildNodePackage {
     name = "delegates-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz";
-        name = "delegates-0.1.0.tgz";
-        sha1 = "b4b57be11a1653517a04b27f0949bdc327dfe390";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."delegates" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz";
+      name = "delegates-0.1.0.tgz";
+      sha1 = "b4b57be11a1653517a04b27f0949bdc327dfe390";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "delegates" ];
+    peerDependencies = [];
   };
   by-spec."dep-graph"."1.1.0" =
     self.by-version."dep-graph"."1.1.0";
-  by-version."dep-graph"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."dep-graph"."1.1.0" = self.buildNodePackage {
     name = "dep-graph-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz";
-        name = "dep-graph-1.1.0.tgz";
-        sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dep-graph" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz";
+      name = "dep-graph-1.1.0.tgz";
+      sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe";
+    };
     deps = {
       "underscore-1.2.1" = self.by-version."underscore"."1.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dep-graph" ];
+    peerDependencies = [];
+  };
+  by-spec."depd"."0.3.0" =
+    self.by-version."depd"."0.3.0";
+  by-version."depd"."0.3.0" = self.buildNodePackage {
+    name = "depd-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/depd/-/depd-0.3.0.tgz";
+      name = "depd-0.3.0.tgz";
+      sha1 = "11c9bc28e425325fbd8b38940beff69fa5326883";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."depd"."0.4.2" =
+    self.by-version."depd"."0.4.2";
+  by-version."depd"."0.4.2" = self.buildNodePackage {
+    name = "depd-0.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/depd/-/depd-0.4.2.tgz";
+      name = "depd-0.4.2.tgz";
+      sha1 = "a4bc8a0e4801770a66363daa6d35138f3e3b54dd";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."depd"."0.4.5" =
     self.by-version."depd"."0.4.5";
-  by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."depd"."0.4.5" = self.buildNodePackage {
     name = "depd-0.4.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz";
-        name = "depd-0.4.5.tgz";
-        sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."depd" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz";
+      name = "depd-0.4.5.tgz";
+      sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "depd" ];
+    peerDependencies = [];
   };
   by-spec."depd".">= 0.4.0" =
     self.by-version."depd"."1.0.0";
-  by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."depd"."1.0.0" = self.buildNodePackage {
     name = "depd-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz";
-        name = "depd-1.0.0.tgz";
-        sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."depd" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz";
+      name = "depd-1.0.0.tgz";
+      sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "depd" ];
+    peerDependencies = [];
   };
   by-spec."depd"."~1.0.0" =
     self.by-version."depd"."1.0.0";
   by-spec."deprecated"."^0.0.1" =
     self.by-version."deprecated"."0.0.1";
-  by-version."deprecated"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."deprecated"."0.0.1" = self.buildNodePackage {
     name = "deprecated-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz";
-        name = "deprecated-0.0.1.tgz";
-        sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deprecated" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz";
+      name = "deprecated-0.0.1.tgz";
+      sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deprecated" ];
+    peerDependencies = [];
   };
   by-spec."deps-sort"."^1.3.5" =
     self.by-version."deps-sort"."1.3.5";
-  by-version."deps-sort"."1.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."deps-sort"."1.3.5" = self.buildNodePackage {
     name = "deps-sort-1.3.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz";
-        name = "deps-sort-1.3.5.tgz";
-        sha1 = "89dc3c323504080558f9909bf57df1f7837c5c6f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deps-sort" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz";
+      name = "deps-sort-1.3.5.tgz";
+      sha1 = "89dc3c323504080558f9909bf57df1f7837c5c6f";
+    };
     deps = {
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
-      "shasum-1.0.0" = self.by-version."shasum"."1.0.0";
+      "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deps-sort" ];
+    peerDependencies = [];
   };
   by-spec."deps-sort"."~0.1.1" =
     self.by-version."deps-sort"."0.1.2";
-  by-version."deps-sort"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."deps-sort"."0.1.2" = self.buildNodePackage {
     name = "deps-sort-0.1.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz";
-        name = "deps-sort-0.1.2.tgz";
-        sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deps-sort" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz";
+      name = "deps-sort-0.1.2.tgz";
+      sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a";
+    };
     deps = {
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deps-sort" ];
+    peerDependencies = [];
   };
   by-spec."derequire"."~0.6.0" =
     self.by-version."derequire"."0.6.1";
-  by-version."derequire"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."derequire"."0.6.1" = self.buildNodePackage {
     name = "derequire-0.6.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz";
-        name = "derequire-0.6.1.tgz";
-        sha1 = "cce8ee25380de715deb61900f0bdd38222928788";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."derequire" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz";
+      name = "derequire-0.6.1.tgz";
+      sha1 = "cce8ee25380de715deb61900f0bdd38222928788";
+    };
     deps = {
       "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
       "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
       "esrefactor-0.1.0" = self.by-version."esrefactor"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "derequire" ];
+    peerDependencies = [];
   };
   by-spec."destroy"."1.0.3" =
     self.by-version."destroy"."1.0.3";
-  by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."destroy"."1.0.3" = self.buildNodePackage {
     name = "destroy-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."destroy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+      name = "destroy-1.0.3.tgz";
+      sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "destroy" ];
+    peerDependencies = [];
   };
   by-spec."detective"."^4.0.0" =
     self.by-version."detective"."4.0.0";
-  by-version."detective"."4.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."detective"."4.0.0" = self.buildNodePackage {
     name = "detective-4.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/detective/-/detective-4.0.0.tgz";
-        name = "detective-4.0.0.tgz";
-        sha1 = "9ffdb5555ddb1571fdbdc6f4ceac08e5e4cf8467";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."detective" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/detective/-/detective-4.0.0.tgz";
+      name = "detective-4.0.0.tgz";
+      sha1 = "9ffdb5555ddb1571fdbdc6f4ceac08e5e4cf8467";
+    };
     deps = {
       "acorn-0.9.0" = self.by-version."acorn"."0.9.0";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "escodegen-1.5.0" = self.by-version."escodegen"."1.5.0";
+      "escodegen-1.6.0" = self.by-version."escodegen"."1.6.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "detective" ];
+    peerDependencies = [];
   };
   by-spec."detective"."~2.1.2" =
     self.by-version."detective"."2.1.2";
-  by-version."detective"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."detective"."2.1.2" = self.buildNodePackage {
     name = "detective-2.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/detective/-/detective-2.1.2.tgz";
-        name = "detective-2.1.2.tgz";
-        sha1 = "d22ad9f18c82efb3f55fee2e244883da6bbb8e37";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."detective" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/detective/-/detective-2.1.2.tgz";
+      name = "detective-2.1.2.tgz";
+      sha1 = "d22ad9f18c82efb3f55fee2e244883da6bbb8e37";
+    };
     deps = {
       "esprima-1.0.2" = self.by-version."esprima"."1.0.2";
       "escodegen-0.0.15" = self.by-version."escodegen"."0.0.15";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "detective" ];
+    peerDependencies = [];
   };
   by-spec."dezalgo"."^1.0.0" =
     self.by-version."dezalgo"."1.0.1";
-  by-version."dezalgo"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."dezalgo"."1.0.1" = self.buildNodePackage {
     name = "dezalgo-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz";
-        name = "dezalgo-1.0.1.tgz";
-        sha1 = "12bde135060807900d5a7aebb607c2abb7c76937";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dezalgo" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz";
+      name = "dezalgo-1.0.1.tgz";
+      sha1 = "12bde135060807900d5a7aebb607c2abb7c76937";
+    };
     deps = {
       "asap-1.0.0" = self.by-version."asap"."1.0.0";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dezalgo" ];
+    peerDependencies = [];
   };
   by-spec."dezalgo"."^1.0.1" =
     self.by-version."dezalgo"."1.0.1";
@@ -7839,1377 +7892,1445 @@
     self.by-version."dezalgo"."1.0.1";
   by-spec."di"."~0.0.1" =
     self.by-version."di"."0.0.1";
-  by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."di"."0.0.1" = self.buildNodePackage {
     name = "di-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz";
-        name = "di-0.0.1.tgz";
-        sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."di" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz";
+      name = "di-0.0.1.tgz";
+      sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "di" ];
+    peerDependencies = [];
+  };
+  by-spec."dicer"."0.2.3" =
+    self.by-version."dicer"."0.2.3";
+  by-version."dicer"."0.2.3" = self.buildNodePackage {
+    name = "dicer-0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dicer/-/dicer-0.2.3.tgz";
+      name = "dicer-0.2.3.tgz";
+      sha1 = "f00281189a55c2351ef80490a4fe9fb2c59c4939";
+    };
+    deps = {
+      "streamsearch-0.1.2" = self.by-version."streamsearch"."0.1.2";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    peerDependencies = [];
   };
   by-spec."diff"."1.0.7" =
     self.by-version."diff"."1.0.7";
-  by-version."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."diff"."1.0.7" = self.buildNodePackage {
     name = "diff-1.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz";
-        name = "diff-1.0.7.tgz";
-        sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."diff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz";
+      name = "diff-1.0.7.tgz";
+      sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "diff" ];
+    peerDependencies = [];
   };
   by-spec."diff"."1.0.8" =
     self.by-version."diff"."1.0.8";
-  by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."diff"."1.0.8" = self.buildNodePackage {
     name = "diff-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."diff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
+      name = "diff-1.0.8.tgz";
+      sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "diff" ];
+    peerDependencies = [];
   };
   by-spec."diff"."~1.0.7" =
     self.by-version."diff"."1.0.8";
   by-spec."diff"."~1.2.0" =
     self.by-version."diff"."1.2.1";
-  by-version."diff"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."diff"."1.2.1" = self.buildNodePackage {
     name = "diff-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/diff/-/diff-1.2.1.tgz";
-        name = "diff-1.2.1.tgz";
-        sha1 = "82ef7ffcd80039d1f1f25eb6b10500f656236b7a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."diff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diff/-/diff-1.2.1.tgz";
+      name = "diff-1.2.1.tgz";
+      sha1 = "82ef7ffcd80039d1f1f25eb6b10500f656236b7a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "diff" ];
+    peerDependencies = [];
   };
   by-spec."diffie-hellman"."2.2.3" =
     self.by-version."diffie-hellman"."2.2.3";
-  by-version."diffie-hellman"."2.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."diffie-hellman"."2.2.3" = self.buildNodePackage {
     name = "diffie-hellman-2.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-2.2.3.tgz";
-        name = "diffie-hellman-2.2.3.tgz";
-        sha1 = "aaf1edb9ed285d91374fba8a1d0f5204681e529a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."diffie-hellman" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-2.2.3.tgz";
+      name = "diffie-hellman-2.2.3.tgz";
+      sha1 = "aaf1edb9ed285d91374fba8a1d0f5204681e529a";
+    };
     deps = {
       "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
       "miller-rabin-1.1.5" = self.by-version."miller-rabin"."1.1.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "diffie-hellman" ];
+    peerDependencies = [];
+  };
+  by-spec."difflet"."~0.2.0" =
+    self.by-version."difflet"."0.2.6";
+  by-version."difflet"."0.2.6" = self.buildNodePackage {
+    name = "difflet-0.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
+      name = "difflet-0.2.6.tgz";
+      sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
+    };
+    deps = {
+      "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
+      "charm-0.1.2" = self.by-version."charm"."0.1.2";
+      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."directmail"."~0.1.7" =
+    self.by-version."directmail"."0.1.8";
+  by-version."directmail"."0.1.8" = self.buildNodePackage {
+    name = "directmail-0.1.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/directmail/-/directmail-0.1.8.tgz";
+      name = "directmail-0.1.8.tgz";
+      sha1 = "e4852c8a0c5519bef4904fcd96d760822f42a446";
+    };
+    deps = {
+      "simplesmtp-0.3.34" = self.by-version."simplesmtp"."0.3.34";
+    };
+    peerDependencies = [];
   };
   by-spec."director"."1.2.7" =
     self.by-version."director"."1.2.7";
-  by-version."director"."1.2.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."director"."1.2.7" = self.buildNodePackage {
     name = "director-1.2.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/director/-/director-1.2.7.tgz";
-        name = "director-1.2.7.tgz";
-        sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."director" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/director/-/director-1.2.7.tgz";
+      name = "director-1.2.7.tgz";
+      sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "director" ];
+    peerDependencies = [];
   };
   by-spec."dkim-signer"."~0.1.1" =
     self.by-version."dkim-signer"."0.1.2";
-  by-version."dkim-signer"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."dkim-signer"."0.1.2" = self.buildNodePackage {
     name = "dkim-signer-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
-        name = "dkim-signer-0.1.2.tgz";
-        sha1 = "2ff5d61c87d8fbff5a8b131cffc5ec3ba1c25553";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dkim-signer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
+      name = "dkim-signer-0.1.2.tgz";
+      sha1 = "2ff5d61c87d8fbff5a8b131cffc5ec3ba1c25553";
+    };
     deps = {
       "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
       "mimelib-0.2.18" = self.by-version."mimelib"."0.2.18";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dkim-signer" ];
+    peerDependencies = [];
+  };
+  by-spec."dns"."^0.2.2" =
+    self.by-version."dns"."0.2.2";
+  by-version."dns"."0.2.2" = self.buildNodePackage {
+    name = "dns-0.2.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dns/-/dns-0.2.2.tgz";
+      name = "dns-0.2.2.tgz";
+      sha1 = "a8477ca26b835842c3125204d8cbcdd6af98c9ec";
+    };
+    deps = {
+      "winston-0.7.3" = self.by-version."winston"."0.7.3";
+      "hbo-dnsd-0.9.8" = self.by-version."hbo-dnsd"."0.9.8";
+      "native-dns-0.6.1" = self.by-version."native-dns"."0.6.1";
+      "node-options-0.0.6" = self.by-version."node-options"."0.0.6";
+      "tomahawk-0.1.6" = self.by-version."tomahawk"."0.1.6";
+      "tomahawk-plugin-kv-memory-store-0.0.3" = self.by-version."tomahawk-plugin-kv-memory-store"."0.0.3";
+    };
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
   };
   by-spec."domain-browser"."~1.1.0" =
     self.by-version."domain-browser"."1.1.3";
-  by-version."domain-browser"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."domain-browser"."1.1.3" = self.buildNodePackage {
     name = "domain-browser-1.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.3.tgz";
-        name = "domain-browser-1.1.3.tgz";
-        sha1 = "ee8b336f1c53dc990b302eac12b4c7fee24923c1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domain-browser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.3.tgz";
+      name = "domain-browser-1.1.3.tgz";
+      sha1 = "ee8b336f1c53dc990b302eac12b4c7fee24923c1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "domain-browser" ];
+    peerDependencies = [];
   };
   by-spec."domelementtype"."1" =
     self.by-version."domelementtype"."1.1.3";
-  by-version."domelementtype"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."domelementtype"."1.1.3" = self.buildNodePackage {
     name = "domelementtype-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domelementtype" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
+      name = "domelementtype-1.1.3.tgz";
+      sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "domelementtype" ];
+    peerDependencies = [];
+  };
+  by-spec."domelementtype"."~1.1.1" =
+    self.by-version."domelementtype"."1.1.3";
+  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";
+    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.1.3" = self.by-version."domelementtype"."1.1.3";
+    };
+    peerDependencies = [];
   };
   by-spec."domhandler"."2.3" =
     self.by-version."domhandler"."2.3.0";
-  by-version."domhandler"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."domhandler"."2.3.0" = self.buildNodePackage {
     name = "domhandler-2.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
-        name = "domhandler-2.3.0.tgz";
-        sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domhandler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
+      name = "domhandler-2.3.0.tgz";
+      sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
+    };
     deps = {
       "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "domhandler" ];
+    peerDependencies = [];
+  };
+  by-spec."domino"."~1.0.18" =
+    self.by-version."domino"."1.0.18";
+  by-version."domino"."1.0.18" = self.buildNodePackage {
+    name = "domino-1.0.18";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domino/-/domino-1.0.18.tgz";
+      name = "domino-1.0.18.tgz";
+      sha1 = "3a9bcf9db6d693e1ffb7d06d96c9138e1d331a7b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  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";
+    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.1.3" = self.by-version."domelementtype"."1.1.3";
+    };
+    peerDependencies = [];
   };
   by-spec."domutils"."1.5" =
     self.by-version."domutils"."1.5.0";
-  by-version."domutils"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."domutils"."1.5.0" = self.buildNodePackage {
     name = "domutils-1.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.5.0.tgz";
-        name = "domutils-1.5.0.tgz";
-        sha1 = "bfa4ceb8b7ab6f9423fe59154e04da6cc3ff3949";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domutils" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domutils/-/domutils-1.5.0.tgz";
+      name = "domutils-1.5.0.tgz";
+      sha1 = "bfa4ceb8b7ab6f9423fe59154e04da6cc3ff3949";
+    };
     deps = {
       "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "domutils" ];
+    peerDependencies = [];
   };
   by-spec."dox"."~0.4.4" =
     self.by-version."dox"."0.4.6";
-  by-version."dox"."0.4.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."dox"."0.4.6" = self.buildNodePackage {
     name = "dox-0.4.6";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dox/-/dox-0.4.6.tgz";
-        name = "dox-0.4.6.tgz";
-        sha1 = "b1f53ccd1aa0d7f712fdca22124a666e3ed37215";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dox" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dox/-/dox-0.4.6.tgz";
+      name = "dox-0.4.6.tgz";
+      sha1 = "b1f53ccd1aa0d7f712fdca22124a666e3ed37215";
+    };
     deps = {
       "marked-0.3.2" = self.by-version."marked"."0.3.2";
       "commander-0.6.1" = self.by-version."commander"."0.6.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dox" ];
+    peerDependencies = [];
+  };
+  by-spec."dropbox"."=0.9.2" =
+    self.by-version."dropbox"."0.9.2";
+  by-version."dropbox"."0.9.2" = self.buildNodePackage {
+    name = "dropbox-0.9.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dropbox/-/dropbox-0.9.2.tgz";
+      name = "dropbox-0.9.2.tgz";
+      sha1 = "b516a0483d136c16dd52acf729687e87578425cb";
+    };
+    deps = {
+      "open-0.0.5" = self.by-version."open"."0.0.5";
+      "xhr2-0.1.1" = self.by-version."xhr2"."0.1.1";
+    };
+    peerDependencies = [];
   };
   by-spec."dtrace-provider"."0.2.8" =
     self.by-version."dtrace-provider"."0.2.8";
-  by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."dtrace-provider"."0.2.8" = self.buildNodePackage {
     name = "dtrace-provider-0.2.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
-        name = "dtrace-provider-0.2.8.tgz";
-        sha1 = "e243f19219aa95fbf0d8f2ffb07f5bd64e94fe20";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dtrace-provider" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
+      name = "dtrace-provider-0.2.8.tgz";
+      sha1 = "e243f19219aa95fbf0d8f2ffb07f5bd64e94fe20";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "dtrace-provider" ];
+    peerDependencies = [];
   };
   by-spec."duplexer"."~0.1.1" =
     self.by-version."duplexer"."0.1.1";
-  by-version."duplexer"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."duplexer"."0.1.1" = self.buildNodePackage {
     name = "duplexer-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."duplexer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+      name = "duplexer-0.1.1.tgz";
+      sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "duplexer" ];
+    peerDependencies = [];
   };
   by-spec."duplexer2"."0.0.2" =
     self.by-version."duplexer2"."0.0.2";
-  by-version."duplexer2"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."duplexer2"."0.0.2" = self.buildNodePackage {
     name = "duplexer2-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
-        name = "duplexer2-0.0.2.tgz";
-        sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."duplexer2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
+      name = "duplexer2-0.0.2.tgz";
+      sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
+    };
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "duplexer2" ];
+    peerDependencies = [];
   };
   by-spec."duplexer2"."~0.0.2" =
     self.by-version."duplexer2"."0.0.2";
   by-spec."each-async"."^1.1.0" =
     self.by-version."each-async"."1.1.1";
-  by-version."each-async"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."each-async"."1.1.1" = self.buildNodePackage {
     name = "each-async-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz";
-        name = "each-async-1.1.1.tgz";
-        sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."each-async" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz";
+      name = "each-async-1.1.1.tgz";
+      sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
+    };
     deps = {
       "onetime-1.0.0" = self.by-version."onetime"."1.0.0";
       "set-immediate-shim-1.0.0" = self.by-version."set-immediate-shim"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "each-async" ];
+    peerDependencies = [];
+  };
+  by-spec."ecurve"."1.0.0" =
+    self.by-version."ecurve"."1.0.0";
+  by-version."ecurve"."1.0.0" = self.buildNodePackage {
+    name = "ecurve-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ecurve/-/ecurve-1.0.0.tgz";
+      name = "ecurve-1.0.0.tgz";
+      sha1 = "32cfd5ce5f421e9351206a33d4e3cfd36f3465a4";
+    };
+    deps = {
+      "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
+    };
+    peerDependencies = [];
   };
   by-spec."editor"."~0.1.0" =
     self.by-version."editor"."0.1.0";
-  by-version."editor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."editor"."0.1.0" = self.buildNodePackage {
     name = "editor-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz";
-        name = "editor-0.1.0.tgz";
-        sha1 = "542f4662c6a8c88e862fc11945e204e51981b9a1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."editor" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz";
+      name = "editor-0.1.0.tgz";
+      sha1 = "542f4662c6a8c88e862fc11945e204e51981b9a1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "editor" ];
+    peerDependencies = [];
+  };
+  by-spec."ee-first"."1.0.3" =
+    self.by-version."ee-first"."1.0.3";
+  by-version."ee-first"."1.0.3" = self.buildNodePackage {
+    name = "ee-first-1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz";
+      name = "ee-first-1.0.3.tgz";
+      sha1 = "6c98c4089abecb5a7b85c1ac449aa603d3b3dabe";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."ee-first"."1.0.5" =
     self.by-version."ee-first"."1.0.5";
-  by-version."ee-first"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."ee-first"."1.0.5" = self.buildNodePackage {
     name = "ee-first-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
-        name = "ee-first-1.0.5.tgz";
-        sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ee-first" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
+      name = "ee-first-1.0.5.tgz";
+      sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ee-first" ];
+    peerDependencies = [];
   };
   by-spec."ee-first"."1.1.0" =
     self.by-version."ee-first"."1.1.0";
-  by-version."ee-first"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ee-first"."1.1.0" = self.buildNodePackage {
     name = "ee-first-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
-        name = "ee-first-1.1.0.tgz";
-        sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ee-first" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
+      name = "ee-first-1.1.0.tgz";
+      sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ee-first" ];
+    peerDependencies = [];
+  };
+  by-spec."ejs"."0.7.1" =
+    self.by-version."ejs"."0.7.1";
+  by-version."ejs"."0.7.1" = self.buildNodePackage {
+    name = "ejs-0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ejs/-/ejs-0.7.1.tgz";
+      name = "ejs-0.7.1.tgz";
+      sha1 = "6dab41cbdee572986db328a2a8d22040f20fba7c";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."ejs"."0.8.3" =
     self.by-version."ejs"."0.8.3";
-  by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."ejs"."0.8.3" = self.buildNodePackage {
     name = "ejs-0.8.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
-        name = "ejs-0.8.3.tgz";
-        sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ejs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
+      name = "ejs-0.8.3.tgz";
+      sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ejs" ];
+    peerDependencies = [];
+  };
+  by-spec."ejs".">=0.7.1" =
+    self.by-version."ejs"."2.2.3";
+  by-version."ejs"."2.2.3" = self.buildNodePackage {
+    name = "ejs-2.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ejs/-/ejs-2.2.3.tgz";
+      name = "ejs-2.2.3.tgz";
+      sha1 = "8d78070eeb2689d94de660279bb9898de9df1ba0";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."elementtree"."0.1.5" =
     self.by-version."elementtree"."0.1.5";
-  by-version."elementtree"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."elementtree"."0.1.5" = self.buildNodePackage {
     name = "elementtree-0.1.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz";
-        name = "elementtree-0.1.5.tgz";
-        sha1 = "8d5fd80440b4be806c4a01b63914b40e0daab9ff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."elementtree" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz";
+      name = "elementtree-0.1.5.tgz";
+      sha1 = "8d5fd80440b4be806c4a01b63914b40e0daab9ff";
+    };
     deps = {
       "sax-0.3.5" = self.by-version."sax"."0.3.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "elementtree" ];
+    peerDependencies = [];
   };
   by-spec."elliptic"."^1.0.0" =
-    self.by-version."elliptic"."1.0.0";
-  by-version."elliptic"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "elliptic-1.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/elliptic/-/elliptic-1.0.0.tgz";
-        name = "elliptic-1.0.0.tgz";
-        sha1 = "28d927ae8c16c6f65e452a714b36da4095603e39";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."elliptic" or []);
+    self.by-version."elliptic"."1.0.1";
+  by-version."elliptic"."1.0.1" = self.buildNodePackage {
+    name = "elliptic-1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz";
+      name = "elliptic-1.0.1.tgz";
+      sha1 = "d180376b66a17d74995c837796362ac4d22aefe3";
+    };
     deps = {
       "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
       "brorand-1.0.5" = self.by-version."brorand"."1.0.5";
       "hash.js-1.0.2" = self.by-version."hash.js"."1.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "elliptic" ];
+    peerDependencies = [];
+  };
+  by-spec."embedly".">=1.0.2" =
+    self.by-version."embedly"."1.0.2";
+  by-version."embedly"."1.0.2" = self.buildNodePackage {
+    name = "embedly-1.0.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/embedly/-/embedly-1.0.2.tgz";
+      name = "embedly-1.0.2.tgz";
+      sha1 = "0b4002da894869fa5952ea8883a2c8cb88332740";
+    };
+    deps = {
+      "batbelt-0.0.2" = self.by-version."batbelt"."0.0.2";
+      "superagent-0.13.0" = self.by-version."superagent"."0.13.0";
+      "sprintf-0.1.1" = self.by-version."sprintf"."0.1.1";
+      "hashish-0.0.4" = self.by-version."hashish"."0.0.4";
+    };
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  by-spec."emitter-component"."0.0.6" =
+    self.by-version."emitter-component"."0.0.6";
+  by-version."emitter-component"."0.0.6" = self.buildNodePackage {
+    name = "emitter-component-0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/emitter-component/-/emitter-component-0.0.6.tgz";
+      name = "emitter-component-0.0.6.tgz";
+      sha1 = "c155d82f6d0c01b5bee856d58074a4cc59795bca";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."empty-trash"."*" =
-    self.by-version."empty-trash"."1.1.0";
-  by-version."empty-trash"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "empty-trash-1.1.0";
+    self.by-version."empty-trash"."1.1.2";
+  by-version."empty-trash"."1.1.2" = self.buildNodePackage {
+    name = "empty-trash-1.1.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.0.tgz";
-        name = "empty-trash-1.1.0.tgz";
-        sha1 = "6b3527ffb5edc2a27ed7e15886414af37a2c3e8e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."empty-trash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.2.tgz";
+      name = "empty-trash-1.1.2.tgz";
+      sha1 = "98a28646afff863c26bea58bd9f7cb47bf461633";
+    };
     deps = {
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "meow-2.1.0" = self.by-version."meow"."2.1.0";
       "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1";
-      "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2";
+      "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0";
       "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "empty-trash" ];
+    peerDependencies = [];
   };
-  "empty-trash" = self.by-version."empty-trash"."1.1.0";
+  "empty-trash" = self.by-version."empty-trash"."1.1.2";
   by-spec."encoding"."~0.1.7" =
     self.by-version."encoding"."0.1.11";
-  by-version."encoding"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."encoding"."0.1.11" = self.buildNodePackage {
     name = "encoding-0.1.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz";
-        name = "encoding-0.1.11.tgz";
-        sha1 = "52c65ac15aab467f1338451e2615f988eccc0258";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."encoding" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz";
+      name = "encoding-0.1.11.tgz";
+      sha1 = "52c65ac15aab467f1338451e2615f988eccc0258";
+    };
     deps = {
-      "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5";
+      "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "encoding" ];
+    peerDependencies = [];
   };
   by-spec."end-of-stream"."^0.1.4" =
     self.by-version."end-of-stream"."0.1.5";
-  by-version."end-of-stream"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."end-of-stream"."0.1.5" = self.buildNodePackage {
     name = "end-of-stream-0.1.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
-        name = "end-of-stream-0.1.5.tgz";
-        sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."end-of-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
+      name = "end-of-stream-0.1.5.tgz";
+      sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
+    };
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "end-of-stream" ];
+    peerDependencies = [];
   };
   by-spec."end-of-stream"."^1.0.0" =
     self.by-version."end-of-stream"."1.1.0";
-  by-version."end-of-stream"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."end-of-stream"."1.1.0" = self.buildNodePackage {
     name = "end-of-stream-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
-        name = "end-of-stream-1.1.0.tgz";
-        sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."end-of-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
+      name = "end-of-stream-1.1.0.tgz";
+      sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07";
+    };
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "end-of-stream" ];
+    peerDependencies = [];
   };
   by-spec."end-of-stream"."~0.1.5" =
     self.by-version."end-of-stream"."0.1.5";
   by-spec."end-of-stream"."~1.0.0" =
     self.by-version."end-of-stream"."1.0.0";
-  by-version."end-of-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."end-of-stream"."1.0.0" = self.buildNodePackage {
     name = "end-of-stream-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
-        name = "end-of-stream-1.0.0.tgz";
-        sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."end-of-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
+      name = "end-of-stream-1.0.0.tgz";
+      sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
+    };
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "end-of-stream" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
   };
   by-spec."entities"."1.0" =
     self.by-version."entities"."1.0.0";
-  by-version."entities"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."entities"."1.0.0" = self.buildNodePackage {
     name = "entities-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."entities" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+      name = "entities-1.0.0.tgz";
+      sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "entities" ];
+    peerDependencies = [];
+  };
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
+      name = "entities-1.1.1.tgz";
+      sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."envify"."^3.0.0" =
     self.by-version."envify"."3.2.0";
-  by-version."envify"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."envify"."3.2.0" = self.buildNodePackage {
     name = "envify-3.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/envify/-/envify-3.2.0.tgz";
-        name = "envify-3.2.0.tgz";
-        sha1 = "dda33c49ce4cc20efd1fda60dab9dd317c38ef7c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."envify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/envify/-/envify-3.2.0.tgz";
+      name = "envify-3.2.0.tgz";
+      sha1 = "dda33c49ce4cc20efd1fda60dab9dd317c38ef7c";
+    };
     deps = {
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "jstransform-7.0.0" = self.by-version."jstransform"."7.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "envify" ];
+    peerDependencies = [];
   };
   by-spec."errorhandler"."1.0.0" =
     self.by-version."errorhandler"."1.0.0";
-  by-version."errorhandler"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."errorhandler"."1.0.0" = self.buildNodePackage {
     name = "errorhandler-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
-        name = "errorhandler-1.0.0.tgz";
-        sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."errorhandler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
+      name = "errorhandler-1.0.0.tgz";
+      sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "errorhandler" ];
+    peerDependencies = [];
   };
-  by-spec."errorhandler"."~1.2.2" =
-    self.by-version."errorhandler"."1.2.4";
-  by-version."errorhandler"."1.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "errorhandler-1.2.4";
+  by-spec."errorhandler"."1.1.1" =
+    self.by-version."errorhandler"."1.1.1";
+  by-version."errorhandler"."1.1.1" = self.buildNodePackage {
+    name = "errorhandler-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.4.tgz";
-        name = "errorhandler-1.2.4.tgz";
-        sha1 = "4726630d6c6c2c11a7cd589b7376f7336473d6aa";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."errorhandler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz";
+      name = "errorhandler-1.1.1.tgz";
+      sha1 = "18defd436d8ca2efe0a2d886c5c4d6ee6d76d691";
+    };
     deps = {
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
+      "accepts-1.0.7" = self.by-version."accepts"."1.0.7";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "errorhandler" ];
+    peerDependencies = [];
   };
-  by-spec."errorhandler"."~1.3.2" =
+  by-spec."errorhandler"."^1.1.1" =
     self.by-version."errorhandler"."1.3.2";
-  by-version."errorhandler"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."errorhandler"."1.3.2" = self.buildNodePackage {
     name = "errorhandler-1.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.2.tgz";
-        name = "errorhandler-1.3.2.tgz";
-        sha1 = "c14f31c3a506d643afd8108b393350ee4c89d61b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."errorhandler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.2.tgz";
+      name = "errorhandler-1.3.2.tgz";
+      sha1 = "c14f31c3a506d643afd8108b393350ee4c89d61b";
+    };
     deps = {
       "accepts-1.2.2" = self.by-version."accepts"."1.2.2";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "errorhandler" ];
+    peerDependencies = [];
+  };
+  by-spec."errorhandler"."~1.2.2" =
+    self.by-version."errorhandler"."1.2.4";
+  by-version."errorhandler"."1.2.4" = self.buildNodePackage {
+    name = "errorhandler-1.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.4.tgz";
+      name = "errorhandler-1.2.4.tgz";
+      sha1 = "4726630d6c6c2c11a7cd589b7376f7336473d6aa";
+    };
+    deps = {
+      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+    };
+    peerDependencies = [];
   };
+  by-spec."errorhandler"."~1.3.2" =
+    self.by-version."errorhandler"."1.3.2";
   by-spec."es5-ext"."~0.10.2" =
-    self.by-version."es5-ext"."0.10.4";
-  by-version."es5-ext"."0.10.4" = lib.makeOverridable self.buildNodePackage {
-    name = "es5-ext-0.10.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.4.tgz";
-        name = "es5-ext-0.10.4.tgz";
-        sha1 = "f4d7d85d45acfbe93379d4c0948fbae6466ec876";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."es5-ext" or []);
+    self.by-version."es5-ext"."0.10.5";
+  by-version."es5-ext"."0.10.5" = self.buildNodePackage {
+    name = "es5-ext-0.10.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.5.tgz";
+      name = "es5-ext-0.10.5.tgz";
+      sha1 = "8393db0e26248dd4fbb16777cae6c51b012564fd";
+    };
     deps = {
       "es6-iterator-0.1.2" = self.by-version."es6-iterator"."0.1.2";
       "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "es5-ext" ];
+    peerDependencies = [];
   };
   by-spec."es5-ext"."~0.10.4" =
-    self.by-version."es5-ext"."0.10.4";
+    self.by-version."es5-ext"."0.10.5";
+  by-spec."es5-ext"."~0.10.5" =
+    self.by-version."es5-ext"."0.10.5";
   by-spec."es6-iterator"."~0.1.1" =
     self.by-version."es6-iterator"."0.1.2";
-  by-version."es6-iterator"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."es6-iterator"."0.1.2" = self.buildNodePackage {
     name = "es6-iterator-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.2.tgz";
-        name = "es6-iterator-0.1.2.tgz";
-        sha1 = "a37429ead74e5c9ed95068b0dc904c568d9a9b6a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."es6-iterator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.2.tgz";
+      name = "es6-iterator-0.1.2.tgz";
+      sha1 = "a37429ead74e5c9ed95068b0dc904c568d9a9b6a";
+    };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
       "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "es6-iterator" ];
+    peerDependencies = [];
+  };
+  by-spec."es6-iterator"."~0.1.2" =
+    self.by-version."es6-iterator"."0.1.2";
+  by-spec."es6-promise"."^2.0.0" =
+    self.by-version."es6-promise"."2.0.1";
+  by-version."es6-promise"."2.0.1" = self.buildNodePackage {
+    name = "es6-promise-2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/es6-promise/-/es6-promise-2.0.1.tgz";
+      name = "es6-promise-2.0.1.tgz";
+      sha1 = "ccc4963e679f0ca9fb187c777b9e583d3c7573c2";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."es6-shim".">=0.10.0 <1.0.0-0" =
+    self.by-version."es6-shim"."0.22.2";
+  by-version."es6-shim"."0.22.2" = self.buildNodePackage {
+    name = "es6-shim-0.22.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.22.2.tgz";
+      name = "es6-shim-0.22.2.tgz";
+      sha1 = "4afe7c54bb92b178e5d464dd5d9c31c5742d7521";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."es6-shim"."~0.16.0" =
+    self.by-version."es6-shim"."0.16.0";
+  by-version."es6-shim"."0.16.0" = self.buildNodePackage {
+    name = "es6-shim-0.16.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.16.0.tgz";
+      name = "es6-shim-0.16.0.tgz";
+      sha1 = "07e122909722d0fce581b17f64d1505c98094454";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."es6-symbol"."0.1.x" =
     self.by-version."es6-symbol"."0.1.1";
-  by-version."es6-symbol"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."es6-symbol"."0.1.1" = self.buildNodePackage {
     name = "es6-symbol-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz";
-        name = "es6-symbol-0.1.1.tgz";
-        sha1 = "9cf7fab2edaff1b1da8fe8e68bfe3f5aca6ca218";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."es6-symbol" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz";
+      name = "es6-symbol-0.1.1.tgz";
+      sha1 = "9cf7fab2edaff1b1da8fe8e68bfe3f5aca6ca218";
+    };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "es6-symbol" ];
+    peerDependencies = [];
   };
   by-spec."es6-symbol"."~0.1.1" =
     self.by-version."es6-symbol"."0.1.1";
   by-spec."es6-weak-map"."~0.1.2" =
     self.by-version."es6-weak-map"."0.1.2";
-  by-version."es6-weak-map"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."es6-weak-map"."0.1.2" = self.buildNodePackage {
     name = "es6-weak-map-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz";
-        name = "es6-weak-map-0.1.2.tgz";
-        sha1 = "bc5b5fab73f68f6f77a6b39c481fce3d7856d385";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."es6-weak-map" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz";
+      name = "es6-weak-map-0.1.2.tgz";
+      sha1 = "bc5b5fab73f68f6f77a6b39c481fce3d7856d385";
+    };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
       "es6-iterator-0.1.2" = self.by-version."es6-iterator"."0.1.2";
       "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "es6-weak-map" ];
+    peerDependencies = [];
   };
   by-spec."escape-html"."*" =
     self.by-version."escape-html"."1.0.1";
-  by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."escape-html"."1.0.1" = self.buildNodePackage {
     name = "escape-html-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
-        name = "escape-html-1.0.1.tgz";
-        sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escape-html" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
+      name = "escape-html-1.0.1.tgz";
+      sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escape-html" ];
+    peerDependencies = [];
   };
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
   by-spec."escape-string-applescript"."^1.0.0" =
     self.by-version."escape-string-applescript"."1.0.0";
-  by-version."escape-string-applescript"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."escape-string-applescript"."1.0.0" = self.buildNodePackage {
     name = "escape-string-applescript-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-1.0.0.tgz";
-        name = "escape-string-applescript-1.0.0.tgz";
-        sha1 = "6f1c2294245d82c63bc03338dc19a94aa8428892";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escape-string-applescript" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-1.0.0.tgz";
+      name = "escape-string-applescript-1.0.0.tgz";
+      sha1 = "6f1c2294245d82c63bc03338dc19a94aa8428892";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escape-string-applescript" ];
+    peerDependencies = [];
   };
   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" = lib.makeOverridable self.buildNodePackage {
+  by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage {
     name = "escape-string-regexp-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escape-string-regexp" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escape-string-regexp" ];
+    peerDependencies = [];
   };
   by-spec."escape-string-regexp"."^1.0.0" =
     self.by-version."escape-string-regexp"."1.0.2";
   by-spec."escodegen"."0.0.15" =
     self.by-version."escodegen"."0.0.15";
-  by-version."escodegen"."0.0.15" = lib.makeOverridable self.buildNodePackage {
+  by-version."escodegen"."0.0.15" = self.buildNodePackage {
     name = "escodegen-0.0.15";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz";
-        name = "escodegen-0.0.15.tgz";
-        sha1 = "ffda9cb26b70b34f7cc19f1d88756539afb543bd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escodegen" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz";
+      name = "escodegen-0.0.15.tgz";
+      sha1 = "ffda9cb26b70b34f7cc19f1d88756539afb543bd";
+    };
     deps = {
-      "esprima-1.2.2" = self.by-version."esprima"."1.2.2";
+      "esprima-1.2.3" = self.by-version."esprima"."1.2.3";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escodegen" ];
+    peerDependencies = [];
   };
   by-spec."escodegen"."0.0.17" =
     self.by-version."escodegen"."0.0.17";
-  by-version."escodegen"."0.0.17" = lib.makeOverridable self.buildNodePackage {
+  by-version."escodegen"."0.0.17" = self.buildNodePackage {
     name = "escodegen-0.0.17";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz";
-        name = "escodegen-0.0.17.tgz";
-        sha1 = "1e78d17df1004fd7a88f2fed3b8b8592f3217f9c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escodegen" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz";
+      name = "escodegen-0.0.17.tgz";
+      sha1 = "1e78d17df1004fd7a88f2fed3b8b8592f3217f9c";
+    };
     deps = {
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
       "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escodegen" ];
+    peerDependencies = [];
   };
   by-spec."escodegen"."1.3.x" =
     self.by-version."escodegen"."1.3.3";
-  by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."escodegen"."1.3.3" = self.buildNodePackage {
     name = "escodegen-1.3.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
-        name = "escodegen-1.3.3.tgz";
-        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escodegen" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+      name = "escodegen-1.3.3.tgz";
+      sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
+    };
     deps = {
       "esutils-1.0.0" = self.by-version."esutils"."1.0.0";
       "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
       "esprima-1.1.1" = self.by-version."esprima"."1.1.1";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escodegen" ];
+    peerDependencies = [];
   };
   by-spec."escodegen"."^1.4.1" =
-    self.by-version."escodegen"."1.5.0";
-  by-version."escodegen"."1.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.5.0";
+    self.by-version."escodegen"."1.6.0";
+  by-version."escodegen"."1.6.0" = self.buildNodePackage {
+    name = "escodegen-1.6.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.5.0.tgz";
-        name = "escodegen-1.5.0.tgz";
-        sha1 = "17fa592aa0d7b38d89e7de2e94b8200d58bb3261";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escodegen" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.6.0.tgz";
+      name = "escodegen-1.6.0.tgz";
+      sha1 = "b7dbcbd6586915d9da977f74ba2650d2e82bccfb";
+    };
     deps = {
       "estraverse-1.9.1" = self.by-version."estraverse"."1.9.1";
       "esutils-1.1.6" = self.by-version."esutils"."1.1.6";
-      "esprima-1.2.2" = self.by-version."esprima"."1.2.2";
+      "esprima-1.2.3" = self.by-version."esprima"."1.2.3";
       "optionator-0.5.0" = self.by-version."optionator"."0.5.0";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escodegen" ];
+    peerDependencies = [];
   };
+  by-spec."escodegen"."~1.3.1" =
+    self.by-version."escodegen"."1.3.3";
   by-spec."escope"."~0.0.13" =
     self.by-version."escope"."0.0.16";
-  by-version."escope"."0.0.16" = lib.makeOverridable self.buildNodePackage {
+  by-version."escope"."0.0.16" = self.buildNodePackage {
     name = "escope-0.0.16";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz";
-        name = "escope-0.0.16.tgz";
-        sha1 = "418c7a0afca721dafe659193fd986283e746538f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escope" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz";
+      name = "escope-0.0.16.tgz";
+      sha1 = "418c7a0afca721dafe659193fd986283e746538f";
+    };
     deps = {
       "estraverse-1.9.1" = self.by-version."estraverse"."1.9.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escope" ];
+    peerDependencies = [];
   };
   by-spec."esprima"."1.0.2" =
     self.by-version."esprima"."1.0.2";
-  by-version."esprima"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."esprima"."1.0.2" = self.buildNodePackage {
     name = "esprima-1.0.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz";
-        name = "esprima-1.0.2.tgz";
-        sha1 = "8039bf9ceac4d9d2c15f623264fb292b5502ceaf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz";
+      name = "esprima-1.0.2.tgz";
+      sha1 = "8039bf9ceac4d9d2c15f623264fb292b5502ceaf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima" ];
+    peerDependencies = [];
   };
-  by-spec."esprima"."1.2.x" =
+  by-spec."esprima"."1.2.2" =
     self.by-version."esprima"."1.2.2";
-  by-version."esprima"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."esprima"."1.2.2" = self.buildNodePackage {
     name = "esprima-1.2.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz";
-        name = "esprima-1.2.2.tgz";
-        sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz";
+      name = "esprima-1.2.2.tgz";
+      sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima" ];
+    peerDependencies = [];
+  };
+  by-spec."esprima"."1.2.x" =
+    self.by-version."esprima"."1.2.3";
+  by-version."esprima"."1.2.3" = self.buildNodePackage {
+    name = "esprima-1.2.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.2.3.tgz";
+      name = "esprima-1.2.3.tgz";
+      sha1 = "173c9c28d0ec7753afb977b6b21b3017367aac1b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."esprima".">= 1.0.0" =
-    self.by-version."esprima"."1.2.2";
+    self.by-version."esprima"."1.2.3";
   by-spec."esprima"."^1.2.2" =
-    self.by-version."esprima"."1.2.2";
+    self.by-version."esprima"."1.2.3";
+  by-spec."esprima"."git+https://github.com/ariya/esprima.git#harmony" =
+    self.by-version."esprima"."1.1.0-dev-harmony";
+  by-version."esprima"."1.1.0-dev-harmony" = self.buildNodePackage {
+    name = "esprima-1.1.0-dev-harmony";
+    bin = true;
+    src = fetchgit {
+      url = "https://github.com/ariya/esprima.git";
+      rev = "216189496afc6bd3f7021a05253c64f9858b6ff9";
+      sha256 = "bdfe327bcc19a2adca183c0f1f5517cff87afdfbadce1a77e43841c1539cedca";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."esprima"."git://github.com/ariya/esprima.git#harmony" =
+    self.by-version."esprima"."1.1.0-dev-harmony";
   by-spec."esprima"."~ 1.0.2" =
     self.by-version."esprima"."1.0.4";
-  by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."esprima"."1.0.4" = self.buildNodePackage {
     name = "esprima-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+      name = "esprima-1.0.4.tgz";
+      sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima" ];
+    peerDependencies = [];
   };
   by-spec."esprima"."~0.9.9" =
     self.by-version."esprima"."0.9.9";
-  by-version."esprima"."0.9.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."esprima"."0.9.9" = self.buildNodePackage {
     name = "esprima-0.9.9";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-0.9.9.tgz";
-        name = "esprima-0.9.9.tgz";
-        sha1 = "1b90925c975d632d7282939c3bb9c3a423c30490";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-0.9.9.tgz";
+      name = "esprima-0.9.9.tgz";
+      sha1 = "1b90925c975d632d7282939c3bb9c3a423c30490";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima" ];
+    peerDependencies = [];
   };
+  by-spec."esprima"."~1.0.0" =
+    self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.2" =
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.4" =
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.1.1" =
     self.by-version."esprima"."1.1.1";
-  by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."esprima"."1.1.1" = self.buildNodePackage {
     name = "esprima-1.1.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
-        name = "esprima-1.1.1.tgz";
-        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+      name = "esprima-1.1.1.tgz";
+      sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima" ];
+    peerDependencies = [];
   };
   by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
-  by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage {
+  by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = self.buildNodePackage {
     name = "esprima-fb-3001.1.0-dev-harmony-fb";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz";
-        name = "esprima-fb-3001.1.0-dev-harmony-fb.tgz";
-        sha1 = "b77d37abcd38ea0b77426bb8bc2922ce6b426411";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima-fb" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz";
+      name = "esprima-fb-3001.1.0-dev-harmony-fb.tgz";
+      sha1 = "b77d37abcd38ea0b77426bb8bc2922ce6b426411";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima-fb" ];
+    peerDependencies = [];
+  };
+  by-spec."esprima-fb"."8001.1001.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb";
+  by-version."esprima-fb"."8001.1001.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-8001.1001.0-dev-harmony-fb";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-8001.1001.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-8001.1001.0-dev-harmony-fb.tgz";
+      sha1 = "c3190b05341d45643e093af70485ab4988e34d5e";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."esprima-fb"."~10001.1.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
+  by-version."esprima-fb"."10001.1.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-10001.1.0-dev-harmony-fb";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-10001.1.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-10001.1.0-dev-harmony-fb.tgz";
+      sha1 = "f7efb452d3c8006dde6b3c59678604f7114a882c";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."esprima-fb"."~7001.0001.0000-dev-harmony-fb" =
     self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb";
-  by-version."esprima-fb"."7001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage {
+  by-version."esprima-fb"."7001.1.0-dev-harmony-fb" = self.buildNodePackage {
     name = "esprima-fb-7001.1.0-dev-harmony-fb";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-7001.1.0-dev-harmony-fb.tgz";
-        name = "esprima-fb-7001.1.0-dev-harmony-fb.tgz";
-        sha1 = "907e20919575a667dd1b42335de00cf6646d77b3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima-fb" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-7001.1.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-7001.1.0-dev-harmony-fb.tgz";
+      sha1 = "907e20919575a667dd1b42335de00cf6646d77b3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima-fb" ];
+    peerDependencies = [];
   };
   by-spec."esprima-six"."0.0.3" =
     self.by-version."esprima-six"."0.0.3";
-  by-version."esprima-six"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."esprima-six"."0.0.3" = self.buildNodePackage {
     name = "esprima-six-0.0.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz";
-        name = "esprima-six-0.0.3.tgz";
-        sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima-six" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz";
+      name = "esprima-six-0.0.3.tgz";
+      sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima-six" ];
+    peerDependencies = [];
   };
   by-spec."esprima-six"."~0.0.3" =
     self.by-version."esprima-six"."0.0.3";
   by-spec."esrefactor"."~0.1.0" =
     self.by-version."esrefactor"."0.1.0";
-  by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."esrefactor"."0.1.0" = self.buildNodePackage {
     name = "esrefactor-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz";
-        name = "esrefactor-0.1.0.tgz";
-        sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esrefactor" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz";
+      name = "esrefactor-0.1.0.tgz";
+      sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13";
+    };
     deps = {
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
       "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4";
       "escope-0.0.16" = self.by-version."escope"."0.0.16";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esrefactor" ];
+    peerDependencies = [];
   };
   by-spec."estraverse".">= 0.0.2" =
     self.by-version."estraverse"."1.9.1";
-  by-version."estraverse"."1.9.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."estraverse"."1.9.1" = self.buildNodePackage {
     name = "estraverse-1.9.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.1.tgz";
-        name = "estraverse-1.9.1.tgz";
-        sha1 = "553a74829ef763ea6153807f86b90ccde5e32231";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."estraverse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.1.tgz";
+      name = "estraverse-1.9.1.tgz";
+      sha1 = "553a74829ef763ea6153807f86b90ccde5e32231";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "estraverse" ];
+    peerDependencies = [];
   };
   by-spec."estraverse"."^1.9.1" =
     self.by-version."estraverse"."1.9.1";
   by-spec."estraverse"."~0.0.4" =
     self.by-version."estraverse"."0.0.4";
-  by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."estraverse"."0.0.4" = self.buildNodePackage {
     name = "estraverse-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz";
-        name = "estraverse-0.0.4.tgz";
-        sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."estraverse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz";
+      name = "estraverse-0.0.4.tgz";
+      sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "estraverse" ];
+    peerDependencies = [];
   };
   by-spec."estraverse"."~1.5.0" =
     self.by-version."estraverse"."1.5.1";
-  by-version."estraverse"."1.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."estraverse"."1.5.1" = self.buildNodePackage {
     name = "estraverse-1.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
-        name = "estraverse-1.5.1.tgz";
-        sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."estraverse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
+      name = "estraverse-1.5.1.tgz";
+      sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "estraverse" ];
+    peerDependencies = [];
   };
   by-spec."estraverse"."~1.8.0" =
     self.by-version."estraverse"."1.8.0";
-  by-version."estraverse"."1.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."estraverse"."1.8.0" = self.buildNodePackage {
     name = "estraverse-1.8.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz";
-        name = "estraverse-1.8.0.tgz";
-        sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."estraverse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz";
+      name = "estraverse-1.8.0.tgz";
+      sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "estraverse" ];
+    peerDependencies = [];
   };
   by-spec."esutils"."^1.1.6" =
     self.by-version."esutils"."1.1.6";
-  by-version."esutils"."1.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."esutils"."1.1.6" = self.buildNodePackage {
     name = "esutils-1.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
-        name = "esutils-1.1.6.tgz";
-        sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esutils" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
+      name = "esutils-1.1.6.tgz";
+      sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esutils" ];
+    peerDependencies = [];
   };
   by-spec."esutils"."~1.0.0" =
     self.by-version."esutils"."1.0.0";
-  by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."esutils"."1.0.0" = self.buildNodePackage {
     name = "esutils-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
-        name = "esutils-1.0.0.tgz";
-        sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esutils" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
+      name = "esutils-1.0.0.tgz";
+      sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "esutils" ];
+    peerDependencies = [];
   };
   by-spec."etag"."~1.4.0" =
     self.by-version."etag"."1.4.0";
-  by-version."etag"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."etag"."1.4.0" = self.buildNodePackage {
     name = "etag-1.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz";
-        name = "etag-1.4.0.tgz";
-        sha1 = "3050991615857707c04119d075ba2088e0701225";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."etag" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz";
+      name = "etag-1.4.0.tgz";
+      sha1 = "3050991615857707c04119d075ba2088e0701225";
+    };
     deps = {
       "crc-3.0.0" = self.by-version."crc"."3.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "etag" ];
+    peerDependencies = [];
   };
   by-spec."etag"."~1.5.0" =
     self.by-version."etag"."1.5.1";
-  by-version."etag"."1.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."etag"."1.5.1" = self.buildNodePackage {
     name = "etag-1.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz";
-        name = "etag-1.5.1.tgz";
-        sha1 = "54c50de04ee42695562925ac566588291be7e9ea";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."etag" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz";
+      name = "etag-1.5.1.tgz";
+      sha1 = "54c50de04ee42695562925ac566588291be7e9ea";
+    };
     deps = {
       "crc-3.2.1" = self.by-version."crc"."3.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "etag" ];
+    peerDependencies = [];
   };
   by-spec."etag"."~1.5.1" =
     self.by-version."etag"."1.5.1";
   by-spec."event-emitter"."~0.3.1" =
-    self.by-version."event-emitter"."0.3.1";
-  by-version."event-emitter"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "event-emitter-0.3.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.1.tgz";
-        name = "event-emitter-0.3.1.tgz";
-        sha1 = "1425ca9c5649a1a31ba835bd9dba6bfad3880238";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."event-emitter" or []);
-    deps = {
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+    self.by-version."event-emitter"."0.3.2";
+  by-version."event-emitter"."0.3.2" = self.buildNodePackage {
+    name = "event-emitter-0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.2.tgz";
+      name = "event-emitter-0.3.2.tgz";
+      sha1 = "a16acce48a6cddbafb494c1f8b46e8aa98758164";
+    };
+    deps = {
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
       "d-0.1.1" = self.by-version."d"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "event-emitter" ];
+    peerDependencies = [];
   };
   by-spec."event-stream"."~0.5" =
     self.by-version."event-stream"."0.5.3";
-  by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."event-stream"."0.5.3" = self.buildNodePackage {
     name = "event-stream-0.5.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
-        name = "event-stream-0.5.3.tgz";
-        sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."event-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
+      name = "event-stream-0.5.3.tgz";
+      sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c";
+    };
     deps = {
       "optimist-0.2.8" = self.by-version."optimist"."0.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "event-stream" ];
+    peerDependencies = [];
   };
   by-spec."eventemitter2"."0.4.14" =
     self.by-version."eventemitter2"."0.4.14";
-  by-version."eventemitter2"."0.4.14" = lib.makeOverridable self.buildNodePackage {
+  by-version."eventemitter2"."0.4.14" = self.buildNodePackage {
     name = "eventemitter2-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."eventemitter2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+      name = "eventemitter2-0.4.14.tgz";
+      sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "eventemitter2" ];
+    peerDependencies = [];
   };
   by-spec."eventemitter2"."~0.4.13" =
     self.by-version."eventemitter2"."0.4.14";
@@ -9217,78 +9338,71 @@
     self.by-version."eventemitter2"."0.4.14";
   by-spec."eventemitter3"."*" =
     self.by-version."eventemitter3"."0.1.6";
-  by-version."eventemitter3"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."eventemitter3"."0.1.6" = self.buildNodePackage {
     name = "eventemitter3-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz";
-        name = "eventemitter3-0.1.6.tgz";
-        sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."eventemitter3" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz";
+      name = "eventemitter3-0.1.6.tgz";
+      sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "eventemitter3" ];
+    peerDependencies = [];
   };
   by-spec."events"."~1.0.0" =
     self.by-version."events"."1.0.2";
-  by-version."events"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."events"."1.0.2" = self.buildNodePackage {
     name = "events-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/events/-/events-1.0.2.tgz";
-        name = "events-1.0.2.tgz";
-        sha1 = "75849dcfe93d10fb057c30055afdbd51d06a8e24";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."events" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/events/-/events-1.0.2.tgz";
+      name = "events-1.0.2.tgz";
+      sha1 = "75849dcfe93d10fb057c30055afdbd51d06a8e24";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "events" ];
+    peerDependencies = [];
   };
   by-spec."events.node".">= 0.4.0" =
     self.by-version."events.node"."0.4.9";
-  by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."events.node"."0.4.9" = self.buildNodePackage {
     name = "events.node-0.4.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
-        name = "events.node-0.4.9.tgz";
-        sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."events.node" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
+      name = "events.node-0.4.9.tgz";
+      sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "events.node" ];
+    peerDependencies = [];
+  };
+  by-spec."evernote"."^1.25.3" =
+    self.by-version."evernote"."1.25.4";
+  by-version."evernote"."1.25.4" = self.buildNodePackage {
+    name = "evernote-1.25.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/evernote/-/evernote-1.25.4.tgz";
+      name = "evernote-1.25.4.tgz";
+      sha1 = "b2dea7683c4b26ab2af0fc965fdade2d6d022849";
+    };
+    deps = {
+      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+    };
+    peerDependencies = [];
   };
   by-spec."everyauth"."0.4.5" =
     self.by-version."everyauth"."0.4.5";
-  by-version."everyauth"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."everyauth"."0.4.5" = self.buildNodePackage {
     name = "everyauth-0.4.5";
     bin = false;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
-        name = "everyauth-0.4.5.tgz";
-        sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."everyauth" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
+      name = "everyauth-0.4.5.tgz";
+      sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189";
+    };
     deps = {
       "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
       "request-2.9.203" = self.by-version."request"."2.9.203";
@@ -9298,31 +9412,23 @@
       "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1";
       "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1";
       "debug-0.5.0" = self.by-version."debug"."0.5.0";
-      "express-3.19.0" = self.by-version."express"."3.19.0";
+      "express-3.19.1" = self.by-version."express"."3.19.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "everyauth" ];
+    peerDependencies = [];
   };
   by-spec."exit"."0.1.2" =
     self.by-version."exit"."0.1.2";
-  by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."exit"."0.1.2" = self.buildNodePackage {
     name = "exit-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."exit" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
+      name = "exit-0.1.2.tgz";
+      sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "exit" ];
+    peerDependencies = [];
   };
   by-spec."exit"."0.1.x" =
     self.by-version."exit"."0.1.2";
@@ -9330,18 +9436,14 @@
     self.by-version."exit"."0.1.2";
   by-spec."express"."*" =
     self.by-version."express"."5.0.0-alpha.1";
-  by-version."express"."5.0.0-alpha.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."express"."5.0.0-alpha.1" = self.buildNodePackage {
     name = "express-5.0.0-alpha.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-5.0.0-alpha.1.tgz";
-        name = "express-5.0.0-alpha.1.tgz";
-        sha1 = "415df02c51ae01c221362fca59b03591d956b2d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-5.0.0-alpha.1.tgz";
+      name = "express-5.0.0-alpha.1.tgz";
+      sha1 = "415df02c51ae01c221362fca59b03591d956b2d7";
+    };
     deps = {
       "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
@@ -9368,49 +9470,72 @@
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
+    peerDependencies = [];
   };
   "express" = self.by-version."express"."5.0.0-alpha.1";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
-  by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."express"."2.5.11" = self.buildNodePackage {
     name = "express-2.5.11";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz";
-        name = "express-2.5.11.tgz";
-        sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz";
+      name = "express-2.5.11.tgz";
+      sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
+    };
     deps = {
       "connect-1.9.2" = self.by-version."connect"."1.9.2";
       "mime-1.2.4" = self.by-version."mime"."1.2.4";
       "qs-0.4.2" = self.by-version."qs"."0.4.2";
       "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
+    peerDependencies = [];
+  };
+  by-spec."express"."3.*" =
+    self.by-version."express"."3.19.1";
+  by-version."express"."3.19.1" = self.buildNodePackage {
+    name = "express-3.19.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-3.19.1.tgz";
+      name = "express-3.19.1.tgz";
+      sha1 = "2b65f584a4c9856ff656595680f522a106b81693";
+    };
+    deps = {
+      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
+      "connect-2.28.2" = self.by-version."connect"."2.28.2";
+      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
+      "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "etag-1.5.1" = self.by-version."etag"."1.5.1";
+      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "methods-1.1.1" = self.by-version."methods"."1.1.1";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "proxy-addr-1.0.5" = self.by-version."proxy-addr"."1.0.5";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "send-0.11.1" = self.by-version."send"."0.11.1";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+    };
+    peerDependencies = [];
   };
   by-spec."express"."3.2.0" =
     self.by-version."express"."3.2.0";
-  by-version."express"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."express"."3.2.0" = self.buildNodePackage {
     name = "express-3.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz";
-        name = "express-3.2.0.tgz";
-        sha1 = "7b66d6c66b038038eedf452804222b3077374ae0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz";
+      name = "express-3.2.0.tgz";
+      sha1 = "7b66d6c66b038038eedf452804222b3077374ae0";
+    };
     deps = {
       "connect-2.7.6" = self.by-version."connect"."2.7.6";
       "commander-0.6.1" = self.by-version."commander"."0.6.1";
@@ -9424,24 +9549,18 @@
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
+    peerDependencies = [];
   };
   by-spec."express"."3.4.4" =
     self.by-version."express"."3.4.4";
-  by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."express"."3.4.4" = self.buildNodePackage {
     name = "express-3.4.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz";
-        name = "express-3.4.4.tgz";
-        sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz";
+      name = "express-3.4.4.tgz";
+      sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86";
+    };
     deps = {
       "connect-2.11.0" = self.by-version."connect"."2.11.0";
       "commander-1.3.2" = self.by-version."commander"."1.3.2";
@@ -9455,69 +9574,62 @@
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
+    peerDependencies = [];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.19.0";
-  by-version."express"."3.19.0" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.19.0";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.19.0.tgz";
-        name = "express-3.19.0.tgz";
-        sha1 = "cdac51029ccd012840d74c8c9a05834ac3a23a25";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
-    deps = {
-      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "connect-2.28.1" = self.by-version."connect"."2.28.1";
-      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+    self.by-version."express"."3.19.1";
+  by-spec."express"."4.6.1" =
+    self.by-version."express"."4.6.1";
+  by-version."express"."4.6.1" = self.buildNodePackage {
+    name = "express-4.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-4.6.1.tgz";
+      name = "express-4.6.1.tgz";
+      sha1 = "c806e51755cb453ba17fac2f343caff6af885df4";
+    };
+    deps = {
+      "accepts-1.0.7" = self.by-version."accepts"."1.0.7";
+      "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3";
+      "debug-1.0.3" = self.by-version."debug"."1.0.3";
+      "depd-0.3.0" = self.by-version."depd"."0.3.0";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "proxy-addr-1.0.5" = self.by-version."proxy-addr"."1.0.5";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.11.0" = self.by-version."send"."0.11.0";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "finalhandler-0.0.3" = self.by-version."finalhandler"."0.0.3";
+      "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0";
+      "methods-1.1.0" = self.by-version."methods"."1.1.0";
+      "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3";
+      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
+      "proxy-addr-1.0.1" = self.by-version."proxy-addr"."1.0.1";
+      "range-parser-1.0.0" = self.by-version."range-parser"."1.0.0";
+      "send-0.6.0" = self.by-version."send"."0.6.0";
+      "serve-static-1.3.2" = self.by-version."serve-static"."1.3.2";
+      "type-is-1.3.2" = self.by-version."type-is"."1.3.2";
+      "vary-0.1.0" = self.by-version."vary"."0.1.0";
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "fresh-0.2.2" = self.by-version."fresh"."0.2.2";
+      "cookie-signature-1.0.4" = self.by-version."cookie-signature"."1.0.4";
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
+    peerDependencies = [];
   };
   by-spec."express".">=3.0.0" =
     self.by-version."express"."5.0.0-alpha.1";
+  by-spec."express".">=4.0.0" =
+    self.by-version."express"."5.0.0-alpha.1";
   by-spec."express"."^4.0" =
-    self.by-version."express"."4.10.7";
-  by-version."express"."4.10.7" = lib.makeOverridable self.buildNodePackage {
-    name = "express-4.10.7";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-4.10.7.tgz";
-        name = "express-4.10.7.tgz";
-        sha1 = "0652f8cd5d0e2949d77b7dea7c5208161ec81ac6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
+    self.by-version."express"."4.11.1";
+  by-version."express"."4.11.1" = self.buildNodePackage {
+    name = "express-4.11.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-4.11.1.tgz";
+      name = "express-4.11.1.tgz";
+      sha1 = "36d04dd27aa1667634e987529767f9c99de7903f";
+    };
     deps = {
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
+      "accepts-1.2.2" = self.by-version."accepts"."1.2.2";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
@@ -9534,32 +9646,28 @@
       "proxy-addr-1.0.5" = self.by-version."proxy-addr"."1.0.5";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.10.1" = self.by-version."send"."0.10.1";
-      "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2";
+      "send-0.11.1" = self.by-version."send"."0.11.1";
+      "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1";
       "type-is-1.5.5" = self.by-version."type-is"."1.5.5";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
+    peerDependencies = [];
   };
+  by-spec."express"."~2.5.11" =
+    self.by-version."express"."2.5.11";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
-  by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."express"."3.1.2" = self.buildNodePackage {
     name = "express-3.1.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
-        name = "express-3.1.2.tgz";
-        sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
+      name = "express-3.1.2.tgz";
+      sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7";
+    };
     deps = {
       "connect-2.7.5" = self.by-version."connect"."2.7.5";
       "commander-0.6.1" = self.by-version."commander"."0.6.1";
@@ -9573,24 +9681,18 @@
       "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
+    peerDependencies = [];
   };
   by-spec."express"."~3.5.1" =
     self.by-version."express"."3.5.3";
-  by-version."express"."3.5.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."express"."3.5.3" = self.buildNodePackage {
     name = "express-3.5.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.5.3.tgz";
-        name = "express-3.5.3.tgz";
-        sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-3.5.3.tgz";
+      name = "express-3.5.3.tgz";
+      sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
+    };
     deps = {
       "connect-2.14.5" = self.by-version."connect"."2.14.5";
       "commander-1.3.2" = self.by-version."commander"."1.3.2";
@@ -9605,71 +9707,89 @@
       "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
+    peerDependencies = [];
   };
   by-spec."express"."~4.10.3" =
-    self.by-version."express"."4.10.7";
+    self.by-version."express"."4.10.8";
+  by-version."express"."4.10.8" = self.buildNodePackage {
+    name = "express-4.10.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-4.10.8.tgz";
+      name = "express-4.10.8.tgz";
+      sha1 = "2d83571e065c0efb2679c0a5f9ae66aeaa47024a";
+    };
+    deps = {
+      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
+      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
+      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "etag-1.5.1" = self.by-version."etag"."1.5.1";
+      "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
+      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "methods-1.1.1" = self.by-version."methods"."1.1.1";
+      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
+      "proxy-addr-1.0.5" = self.by-version."proxy-addr"."1.0.5";
+      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "send-0.10.1" = self.by-version."send"."0.10.1";
+      "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2";
+      "type-is-1.5.5" = self.by-version."type-is"."1.5.5";
+      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."express-form"."*" =
     self.by-version."express-form"."0.12.4";
-  by-version."express-form"."0.12.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."express-form"."0.12.4" = self.buildNodePackage {
     name = "express-form-0.12.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express-form/-/express-form-0.12.4.tgz";
-        name = "express-form-0.12.4.tgz";
-        sha1 = "d671fa5887acf32a005618ce8b652f67b30e2cb1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express-form" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express-form/-/express-form-0.12.4.tgz";
+      name = "express-form-0.12.4.tgz";
+      sha1 = "d671fa5887acf32a005618ce8b652f67b30e2cb1";
+    };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "object-additions-0.5.1" = self.by-version."object-additions"."0.5.1";
       "validator-2.1.0" = self.by-version."validator"."2.1.0";
     };
     peerDependencies = [
-      self.by-version."express"."5.0.0-alpha.1"
-    ];
-    passthru.names = [ "express-form" ];
+      self.by-version."express"."5.0.0-alpha.1"];
   };
   "express-form" = self.by-version."express-form"."0.12.4";
   by-spec."express-partials"."0.0.6" =
     self.by-version."express-partials"."0.0.6";
-  by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."express-partials"."0.0.6" = self.buildNodePackage {
     name = "express-partials-0.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
-        name = "express-partials-0.0.6.tgz";
-        sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express-partials" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
+      name = "express-partials-0.0.6.tgz";
+      sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express-partials" ];
+    peerDependencies = [];
   };
   by-spec."express-session"."1.0.2" =
     self.by-version."express-session"."1.0.2";
-  by-version."express-session"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."express-session"."1.0.2" = self.buildNodePackage {
     name = "express-session-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
-        name = "express-session-1.0.2.tgz";
-        sha1 = "004478c742561774411ceb79733155a56b6d49eb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express-session" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
+      name = "express-session-1.0.2.tgz";
+      sha1 = "004478c742561774411ceb79733155a56b6d49eb";
+    };
     deps = {
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
       "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
@@ -9678,24 +9798,18 @@
       "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1";
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express-session" ];
+    peerDependencies = [];
   };
-  by-spec."express-session"."~1.10.1" =
+  by-spec."express-session"."^1.0.4" =
     self.by-version."express-session"."1.10.1";
-  by-version."express-session"."1.10.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."express-session"."1.10.1" = self.buildNodePackage {
     name = "express-session-1.10.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.10.1.tgz";
-        name = "express-session-1.10.1.tgz";
-        sha1 = "d5421585df601addbb82a99b05222eeaec2b49d1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express-session" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express-session/-/express-session-1.10.1.tgz";
+      name = "express-session-1.10.1.tgz";
+      sha1 = "d5421585df601addbb82a99b05222eeaec2b49d1";
+    };
     deps = {
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
@@ -9707,24 +9821,20 @@
       "uid-safe-1.0.2" = self.by-version."uid-safe"."1.0.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express-session" ];
+    peerDependencies = [];
   };
+  by-spec."express-session"."~1.10.1" =
+    self.by-version."express-session"."1.10.1";
   by-spec."express-session"."~1.8.2" =
     self.by-version."express-session"."1.8.2";
-  by-version."express-session"."1.8.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."express-session"."1.8.2" = self.buildNodePackage {
     name = "express-session-1.8.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz";
-        name = "express-session-1.8.2.tgz";
-        sha1 = "c4011e728a2349b3c18f117a5409908985e83483";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express-session" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz";
+      name = "express-session-1.8.2.tgz";
+      sha1 = "c4011e728a2349b3c18f117a5409908985e83483";
+    };
     deps = {
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
@@ -9736,24 +9846,18 @@
       "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express-session" ];
+    peerDependencies = [];
   };
   by-spec."express-session"."~1.9.2" =
     self.by-version."express-session"."1.9.3";
-  by-version."express-session"."1.9.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."express-session"."1.9.3" = self.buildNodePackage {
     name = "express-session-1.9.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz";
-        name = "express-session-1.9.3.tgz";
-        sha1 = "7d2fc387af6fd928775213bfe9d635a5705a84ce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express-session" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz";
+      name = "express-session-1.9.3.tgz";
+      sha1 = "7d2fc387af6fd928775213bfe9d635a5705a84ce";
+    };
     deps = {
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
@@ -9765,171 +9869,139 @@
       "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "express-session" ];
+    peerDependencies = [];
   };
   by-spec."extend"."*" =
     self.by-version."extend"."2.0.0";
-  by-version."extend"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."extend"."2.0.0" = self.buildNodePackage {
     name = "extend-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extend/-/extend-2.0.0.tgz";
-        name = "extend-2.0.0.tgz";
-        sha1 = "cc3c1e238521df4c28e3f30868b7324bb5898a5c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-2.0.0.tgz";
+      name = "extend-2.0.0.tgz";
+      sha1 = "cc3c1e238521df4c28e3f30868b7324bb5898a5c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "extend" ];
+    peerDependencies = [];
   };
   "extend" = self.by-version."extend"."2.0.0";
+  by-spec."extend".">=1.1.3" =
+    self.by-version."extend"."2.0.0";
+  by-spec."extend"."^2.0.0" =
+    self.by-version."extend"."2.0.0";
   by-spec."extend"."~1.2.1" =
     self.by-version."extend"."1.2.1";
-  by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."extend"."1.2.1" = self.buildNodePackage {
     name = "extend-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
-        name = "extend-1.2.1.tgz";
-        sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+      name = "extend-1.2.1.tgz";
+      sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "extend" ];
+    peerDependencies = [];
   };
   by-spec."extend"."~1.3.0" =
     self.by-version."extend"."1.3.0";
-  by-version."extend"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."extend"."1.3.0" = self.buildNodePackage {
     name = "extend-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
-        name = "extend-1.3.0.tgz";
-        sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
+      name = "extend-1.3.0.tgz";
+      sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "extend" ];
+    peerDependencies = [];
   };
   by-spec."extend.js"."0.0.2" =
     self.by-version."extend.js"."0.0.2";
-  by-version."extend.js"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."extend.js"."0.0.2" = self.buildNodePackage {
     name = "extend.js-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz";
-        name = "extend.js-0.0.2.tgz";
-        sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extend.js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz";
+      name = "extend.js-0.0.2.tgz";
+      sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "extend.js" ];
+    peerDependencies = [];
   };
   by-spec."extract-opts"."~2.2.0" =
     self.by-version."extract-opts"."2.2.0";
-  by-version."extract-opts"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."extract-opts"."2.2.0" = self.buildNodePackage {
     name = "extract-opts-2.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
-        name = "extract-opts-2.2.0.tgz";
-        sha1 = "1fa28eba7352c6db480f885ceb71a46810be6d7d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extract-opts" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
+      name = "extract-opts-2.2.0.tgz";
+      sha1 = "1fa28eba7352c6db480f885ceb71a46810be6d7d";
+    };
     deps = {
       "typechecker-2.0.8" = self.by-version."typechecker"."2.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "extract-opts" ];
+    peerDependencies = [];
   };
   by-spec."extsprintf"."1.0.0" =
     self.by-version."extsprintf"."1.0.0";
-  by-version."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."extsprintf"."1.0.0" = self.buildNodePackage {
     name = "extsprintf-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
-        name = "extsprintf-1.0.0.tgz";
-        sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extsprintf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
+      name = "extsprintf-1.0.0.tgz";
+      sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "extsprintf" ];
+    peerDependencies = [];
   };
   by-spec."extsprintf"."1.0.2" =
     self.by-version."extsprintf"."1.0.2";
-  by-version."extsprintf"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."extsprintf"."1.0.2" = self.buildNodePackage {
     name = "extsprintf-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
-        name = "extsprintf-1.0.2.tgz";
-        sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extsprintf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+      name = "extsprintf-1.0.2.tgz";
+      sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "extsprintf" ];
+    peerDependencies = [];
+  };
+  by-spec."extsprintf"."1.2.0" =
+    self.by-version."extsprintf"."1.2.0";
+  by-version."extsprintf"."1.2.0" = self.buildNodePackage {
+    name = "extsprintf-1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
+      name = "extsprintf-1.2.0.tgz";
+      sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."eyes"."0.1.x" =
     self.by-version."eyes"."0.1.8";
-  by-version."eyes"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."eyes"."0.1.8" = self.buildNodePackage {
     name = "eyes-0.1.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
-        name = "eyes-0.1.8.tgz";
-        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."eyes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+      name = "eyes-0.1.8.tgz";
+      sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "eyes" ];
+    peerDependencies = [];
   };
   by-spec."eyes"."~0.1.6" =
     self.by-version."eyes"."0.1.8";
@@ -9937,65 +10009,68 @@
     self.by-version."eyes"."0.1.8";
   by-spec."falafel"."~0.1.6" =
     self.by-version."falafel"."0.1.6";
-  by-version."falafel"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."falafel"."0.1.6" = self.buildNodePackage {
     name = "falafel-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz";
-        name = "falafel-0.1.6.tgz";
-        sha1 = "3084cf3d41b59d15c813be6f259557fdc82b0660";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."falafel" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz";
+      name = "falafel-0.1.6.tgz";
+      sha1 = "3084cf3d41b59d15c813be6f259557fdc82b0660";
+    };
     deps = {
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "falafel" ];
+    peerDependencies = [];
   };
   by-spec."fast-levenshtein"."~1.0.0" =
     self.by-version."fast-levenshtein"."1.0.6";
-  by-version."fast-levenshtein"."1.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."fast-levenshtein"."1.0.6" = self.buildNodePackage {
     name = "fast-levenshtein-1.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz";
-        name = "fast-levenshtein-1.0.6.tgz";
-        sha1 = "3bedb184e39f95cb0d88928688e6b1ee3273446a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fast-levenshtein" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz";
+      name = "fast-levenshtein-1.0.6.tgz";
+      sha1 = "3bedb184e39f95cb0d88928688e6b1ee3273446a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fast-levenshtein" ];
+    peerDependencies = [];
+  };
+  by-spec."favitest"."^1.0.3" =
+    self.by-version."favitest"."1.0.7";
+  by-version."favitest"."1.0.7" = self.buildNodePackage {
+    name = "favitest-1.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/favitest/-/favitest-1.0.7.tgz";
+      name = "favitest-1.0.7.tgz";
+      sha1 = "efa1ee02866f6e2f0f619a889a6c993269a0b603";
+    };
+    deps = {
+      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19";
+    };
+    peerDependencies = [];
   };
+  by-spec."favitest"."^1.0.7" =
+    self.by-version."favitest"."1.0.7";
   by-spec."faye-websocket"."*" =
     self.by-version."faye-websocket"."0.9.2";
-  by-version."faye-websocket"."0.9.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."faye-websocket"."0.9.2" = self.buildNodePackage {
     name = "faye-websocket-0.9.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.2.tgz";
-        name = "faye-websocket-0.9.2.tgz";
-        sha1 = "872e633049fa10c3a55381f9ecac80bfb3053405";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."faye-websocket" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.2.tgz";
+      name = "faye-websocket-0.9.2.tgz";
+      sha1 = "872e633049fa10c3a55381f9ecac80bfb3053405";
+    };
     deps = {
       "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "faye-websocket" ];
+    peerDependencies = [];
   };
   "faye-websocket" = self.by-version."faye-websocket"."0.9.2";
   by-spec."faye-websocket".">= 0.4.1" =
@@ -10004,411 +10079,431 @@
     self.by-version."faye-websocket"."0.9.2";
   by-spec."faye-websocket"."~0.7.0" =
     self.by-version."faye-websocket"."0.7.3";
-  by-version."faye-websocket"."0.7.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."faye-websocket"."0.7.3" = self.buildNodePackage {
     name = "faye-websocket-0.7.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.3.tgz";
-        name = "faye-websocket-0.7.3.tgz";
-        sha1 = "cc4074c7f4a4dfd03af54dd65c354b135132ce11";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."faye-websocket" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.3.tgz";
+      name = "faye-websocket-0.7.3.tgz";
+      sha1 = "cc4074c7f4a4dfd03af54dd65c354b135132ce11";
+    };
     deps = {
       "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "faye-websocket" ];
+    peerDependencies = [];
+  };
+  by-spec."fb".">=0.0.9" =
+    self.by-version."fb"."0.7.0";
+  by-version."fb"."0.7.0" = self.buildNodePackage {
+    name = "fb-0.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fb/-/fb-0.7.0.tgz";
+      name = "fb-0.7.0.tgz";
+      sha1 = "599994a3604d7898eff3108c48c6d3112de10563";
+    };
+    deps = {
+      "request-2.9.203" = self.by-version."request"."2.9.203";
+      "crypto-0.0.3" = self.by-version."crypto"."0.0.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."feedparser".">=0.16.2" =
+    self.by-version."feedparser"."0.19.2";
+  by-version."feedparser"."0.19.2" = self.buildNodePackage {
+    name = "feedparser-0.19.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/feedparser/-/feedparser-0.19.2.tgz";
+      name = "feedparser-0.19.2.tgz";
+      sha1 = "9de04f1621e755f2c151daf39f0ea662a0e392b7";
+    };
+    deps = {
+      "sax-0.6.1" = self.by-version."sax"."0.6.1";
+      "addressparser-0.1.3" = self.by-version."addressparser"."0.1.3";
+      "array-indexofobject-0.0.1" = self.by-version."array-indexofobject"."0.0.1";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "resanitize-0.3.0" = self.by-version."resanitize"."0.3.0";
+    };
+    peerDependencies = [];
   };
   by-spec."fetch-bower".">=2 <3" =
     self.by-version."fetch-bower"."2.0.0";
-  by-version."fetch-bower"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."fetch-bower"."2.0.0" = self.buildNodePackage {
     name = "fetch-bower-2.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz";
-        name = "fetch-bower-2.0.0.tgz";
-        sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fetch-bower" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz";
+      name = "fetch-bower-2.0.0.tgz";
+      sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f";
+    };
     deps = {
       "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1";
       "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1";
       "bower-1.3.12" = self.by-version."bower"."1.3.12";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fetch-bower" ];
+    peerDependencies = [];
+  };
+  by-spec."fibers"."1.0.2" =
+    self.by-version."fibers"."1.0.2";
+  by-version."fibers"."1.0.2" = self.buildNodePackage {
+    name = "fibers-1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fibers/-/fibers-1.0.2.tgz";
+      name = "fibers-1.0.2.tgz";
+      sha1 = "5e24eb5bd929c2be607047dbf88fa758514d3927";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."fields"."~0.1.11" =
     self.by-version."fields"."0.1.23";
-  by-version."fields"."0.1.23" = lib.makeOverridable self.buildNodePackage {
+  by-version."fields"."0.1.23" = self.buildNodePackage {
     name = "fields-0.1.23";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fields/-/fields-0.1.23.tgz";
-        name = "fields-0.1.23.tgz";
-        sha1 = "6ad465e4294a78870aaeb4a63517576f704732f3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fields" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fields/-/fields-0.1.23.tgz";
+      name = "fields-0.1.23.tgz";
+      sha1 = "6ad465e4294a78870aaeb4a63517576f704732f3";
+    };
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fields" ];
+    peerDependencies = [];
   };
   by-spec."fifo"."^0.1.4" =
     self.by-version."fifo"."0.1.4";
-  by-version."fifo"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."fifo"."0.1.4" = self.buildNodePackage {
     name = "fifo-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz";
-        name = "fifo-0.1.4.tgz";
-        sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fifo" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz";
+      name = "fifo-0.1.4.tgz";
+      sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fifo" ];
+    peerDependencies = [];
   };
   by-spec."figures"."^1.0.1" =
     self.by-version."figures"."1.3.5";
-  by-version."figures"."1.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."figures"."1.3.5" = self.buildNodePackage {
     name = "figures-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."figures" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/figures/-/figures-1.3.5.tgz";
+      name = "figures-1.3.5.tgz";
+      sha1 = "d1a31f4e1d2c2938ecde5c06aa16134cf29f4771";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "figures" ];
+    peerDependencies = [];
   };
   by-spec."figures"."^1.3.2" =
     self.by-version."figures"."1.3.5";
+  by-spec."file-uri-to-path"."0" =
+    self.by-version."file-uri-to-path"."0.0.2";
+  by-version."file-uri-to-path"."0.0.2" = self.buildNodePackage {
+    name = "file-uri-to-path-0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-0.0.2.tgz";
+      name = "file-uri-to-path-0.0.2.tgz";
+      sha1 = "37cdd1b5b905404b3f05e1b23645be694ff70f82";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
-  by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."fileset"."0.1.5" = self.buildNodePackage {
     name = "fileset-0.1.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz";
-        name = "fileset-0.1.5.tgz";
-        sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fileset" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz";
+      name = "fileset-0.1.5.tgz";
+      sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94";
+    };
     deps = {
       "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fileset" ];
+    peerDependencies = [];
+  };
+  by-spec."finalhandler"."0.0.2" =
+    self.by-version."finalhandler"."0.0.2";
+  by-version."finalhandler"."0.0.2" = self.buildNodePackage {
+    name = "finalhandler-0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.2.tgz";
+      name = "finalhandler-0.0.2.tgz";
+      sha1 = "0603d875ee87d567a266692815cc8ad44fcceeda";
+    };
+    deps = {
+      "debug-1.0.2" = self.by-version."debug"."1.0.2";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."finalhandler"."0.0.3" =
+    self.by-version."finalhandler"."0.0.3";
+  by-version."finalhandler"."0.0.3" = self.buildNodePackage {
+    name = "finalhandler-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.3.tgz";
+      name = "finalhandler-0.0.3.tgz";
+      sha1 = "5a86b7bc4dca3d1275eb0532c81ee81d747504df";
+    };
+    deps = {
+      "debug-1.0.3" = self.by-version."debug"."1.0.3";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+    };
+    peerDependencies = [];
   };
   by-spec."finalhandler"."0.2.0" =
     self.by-version."finalhandler"."0.2.0";
-  by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."finalhandler"."0.2.0" = self.buildNodePackage {
     name = "finalhandler-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz";
-        name = "finalhandler-0.2.0.tgz";
-        sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."finalhandler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz";
+      name = "finalhandler-0.2.0.tgz";
+      sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d";
+    };
     deps = {
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "finalhandler" ];
+    peerDependencies = [];
   };
   by-spec."finalhandler"."0.3.2" =
     self.by-version."finalhandler"."0.3.2";
-  by-version."finalhandler"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."finalhandler"."0.3.2" = self.buildNodePackage {
     name = "finalhandler-0.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.2.tgz";
-        name = "finalhandler-0.3.2.tgz";
-        sha1 = "7b389b0fd3647a6f90bd564e22624bf8a4a77fb5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."finalhandler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.2.tgz";
+      name = "finalhandler-0.3.2.tgz";
+      sha1 = "7b389b0fd3647a6f90bd564e22624bf8a4a77fb5";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "finalhandler" ];
+    peerDependencies = [];
   };
   by-spec."finalhandler"."0.3.3" =
     self.by-version."finalhandler"."0.3.3";
-  by-version."finalhandler"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."finalhandler"."0.3.3" = self.buildNodePackage {
     name = "finalhandler-0.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
-        name = "finalhandler-0.3.3.tgz";
-        sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."finalhandler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
+      name = "finalhandler-0.3.3.tgz";
+      sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "finalhandler" ];
+    peerDependencies = [];
   };
   by-spec."find-index"."^0.1.1" =
     self.by-version."find-index"."0.1.1";
-  by-version."find-index"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."find-index"."0.1.1" = self.buildNodePackage {
     name = "find-index-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz";
-        name = "find-index-0.1.1.tgz";
-        sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."find-index" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz";
+      name = "find-index-0.1.1.tgz";
+      sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "find-index" ];
+    peerDependencies = [];
   };
   by-spec."findit".">=1.1.0 <2.0.0" =
     self.by-version."findit"."1.2.0";
-  by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."findit"."1.2.0" = self.buildNodePackage {
     name = "findit-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
-        name = "findit-1.2.0.tgz";
-        sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."findit" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
+      name = "findit-1.2.0.tgz";
+      sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "findit" ];
+    peerDependencies = [];
   };
   by-spec."findup-sync"."~0.1.0" =
     self.by-version."findup-sync"."0.1.3";
-  by-version."findup-sync"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."findup-sync"."0.1.3" = self.buildNodePackage {
     name = "findup-sync-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."findup-sync" or []);
+    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.1" = self.by-version."lodash"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "findup-sync" ];
+    peerDependencies = [];
   };
   by-spec."findup-sync"."~0.1.2" =
     self.by-version."findup-sync"."0.1.3";
+  by-spec."finished"."1.2.2" =
+    self.by-version."finished"."1.2.2";
+  by-version."finished"."1.2.2" = self.buildNodePackage {
+    name = "finished-1.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finished/-/finished-1.2.2.tgz";
+      name = "finished-1.2.2.tgz";
+      sha1 = "41608eafadfd65683b46a1220bc4b1ec3daedcd8";
+    };
+    deps = {
+      "ee-first-1.0.3" = self.by-version."ee-first"."1.0.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."finished"."~1.2.2" =
+    self.by-version."finished"."1.2.2";
   by-spec."first-chunk-stream"."^1.0.0" =
     self.by-version."first-chunk-stream"."1.0.0";
-  by-version."first-chunk-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."first-chunk-stream"."1.0.0" = self.buildNodePackage {
     name = "first-chunk-stream-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz";
-        name = "first-chunk-stream-1.0.0.tgz";
-        sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."first-chunk-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz";
+      name = "first-chunk-stream-1.0.0.tgz";
+      sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "first-chunk-stream" ];
+    peerDependencies = [];
   };
   by-spec."flagged-respawn"."~0.3.0" =
     self.by-version."flagged-respawn"."0.3.1";
-  by-version."flagged-respawn"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."flagged-respawn"."0.3.1" = self.buildNodePackage {
     name = "flagged-respawn-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz";
-        name = "flagged-respawn-0.3.1.tgz";
-        sha1 = "397700925df6e12452202a71e89d89545fbbbe9d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."flagged-respawn" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz";
+      name = "flagged-respawn-0.3.1.tgz";
+      sha1 = "397700925df6e12452202a71e89d89545fbbbe9d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "flagged-respawn" ];
+    peerDependencies = [];
   };
   by-spec."flatiron"."*" =
     self.by-version."flatiron"."0.4.3";
-  by-version."flatiron"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."flatiron"."0.4.3" = self.buildNodePackage {
     name = "flatiron-0.4.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz";
-        name = "flatiron-0.4.3.tgz";
-        sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."flatiron" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz";
+      name = "flatiron-0.4.3.tgz";
+      sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
+    };
     deps = {
       "broadway-0.3.6" = self.by-version."broadway"."0.3.6";
       "optimist-0.6.0" = self.by-version."optimist"."0.6.0";
       "prompt-0.2.14" = self.by-version."prompt"."0.2.14";
       "director-1.2.7" = self.by-version."director"."1.2.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "flatiron" ];
+    peerDependencies = [];
   };
   "flatiron" = self.by-version."flatiron"."0.4.3";
   by-spec."flatiron"."~0.4.2" =
     self.by-version."flatiron"."0.4.3";
+  by-spec."flickrapi".">=0.3.12" =
+    self.by-version."flickrapi"."0.3.28";
+  by-version."flickrapi"."0.3.28" = self.buildNodePackage {
+    name = "flickrapi-0.3.28";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/flickrapi/-/flickrapi-0.3.28.tgz";
+      name = "flickrapi-0.3.28.tgz";
+      sha1 = "7aae812b877e7ba10e100ea0cf4b2abeb0038fda";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "open-0.0.5" = self.by-version."open"."0.0.5";
+      "progress-1.1.4" = self.by-version."progress"."1.1.4";
+      "prompt-0.2.14" = self.by-version."prompt"."0.2.14";
+      "request-2.26.0" = self.by-version."request"."2.26.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."fluent-ffmpeg"."^2.0.0-rc3" =
+    self.by-version."fluent-ffmpeg"."2.0.0-rc3";
+  by-version."fluent-ffmpeg"."2.0.0-rc3" = self.buildNodePackage {
+    name = "fluent-ffmpeg-2.0.0-rc3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.0.0-rc3.tgz";
+      name = "fluent-ffmpeg-2.0.0-rc3.tgz";
+      sha1 = "c5a933fe1902fd829c9c060332f6b503d879b083";
+    };
+    deps = {
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."follow-redirects"."0.0.3" =
     self.by-version."follow-redirects"."0.0.3";
-  by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."follow-redirects"."0.0.3" = self.buildNodePackage {
     name = "follow-redirects-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
-        name = "follow-redirects-0.0.3.tgz";
-        sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."follow-redirects" or []);
-    deps = {
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
+      name = "follow-redirects-0.0.3.tgz";
+      sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "follow-redirects" ];
-  };
-  by-spec."forEachAsync"."~2.2" =
-    self.by-version."forEachAsync"."2.2.1";
-  by-version."forEachAsync"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "forEachAsync-2.2.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz";
-        name = "forEachAsync-2.2.1.tgz";
-        sha1 = "e3723f00903910e1eb4b1db3ad51b5c64a319fec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."forEachAsync" or []);
     deps = {
-      "sequence-2.2.1" = self.by-version."sequence"."2.2.1";
+      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "forEachAsync" ];
+    peerDependencies = [];
   };
   by-spec."foreachasync"."^3.0.0" =
     self.by-version."foreachasync"."3.0.0";
-  by-version."foreachasync"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."foreachasync"."3.0.0" = self.buildNodePackage {
     name = "foreachasync-3.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
-        name = "foreachasync-3.0.0.tgz";
-        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."foreachasync" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+      name = "foreachasync-3.0.0.tgz";
+      sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "foreachasync" ];
+    peerDependencies = [];
   };
   by-spec."forever"."*" =
     self.by-version."forever"."0.13.0";
-  by-version."forever"."0.13.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."forever"."0.13.0" = self.buildNodePackage {
     name = "forever-0.13.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/forever/-/forever-0.13.0.tgz";
-        name = "forever-0.13.0.tgz";
-        sha1 = "30857921b37994295a23ca1266628fb3aa2c2c00";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."forever" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever/-/forever-0.13.0.tgz";
+      name = "forever-0.13.0.tgz";
+      sha1 = "30857921b37994295a23ca1266628fb3aa2c2c00";
+    };
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cliff-0.1.10" = self.by-version."cliff"."0.1.10";
@@ -10421,65 +10516,47 @@
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "forever" ];
+    peerDependencies = [];
   };
   "forever" = self.by-version."forever"."0.13.0";
   by-spec."forever-agent"."~0.2.0" =
     self.by-version."forever-agent"."0.2.0";
-  by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."forever-agent"."0.2.0" = self.buildNodePackage {
     name = "forever-agent-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
-        name = "forever-agent-0.2.0.tgz";
-        sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."forever-agent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
+      name = "forever-agent-0.2.0.tgz";
+      sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "forever-agent" ];
+    peerDependencies = [];
   };
   by-spec."forever-agent"."~0.5.0" =
     self.by-version."forever-agent"."0.5.2";
-  by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."forever-agent"."0.5.2" = self.buildNodePackage {
     name = "forever-agent-0.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
-        name = "forever-agent-0.5.2.tgz";
-        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."forever-agent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+      name = "forever-agent-0.5.2.tgz";
+      sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "forever-agent" ];
+    peerDependencies = [];
   };
   by-spec."forever-monitor"."*" =
     self.by-version."forever-monitor"."1.5.2";
-  by-version."forever-monitor"."1.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."forever-monitor"."1.5.2" = self.buildNodePackage {
     name = "forever-monitor-1.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.5.2.tgz";
-        name = "forever-monitor-1.5.2.tgz";
-        sha1 = "279388dfa93b085363d6b28a823ef0a6aeeb35d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."forever-monitor" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.5.2.tgz";
+      name = "forever-monitor-1.5.2.tgz";
+      sha1 = "279388dfa93b085363d6b28a823ef0a6aeeb35d7";
+    };
     deps = {
       "broadway-0.3.6" = self.by-version."broadway"."0.3.6";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
@@ -10487,25 +10564,19 @@
       "watch-0.13.0" = self.by-version."watch"."0.13.0";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "forever-monitor" ];
+    peerDependencies = [];
   };
   "forever-monitor" = self.by-version."forever-monitor"."1.5.2";
   by-spec."forever-monitor"."1.1.0" =
     self.by-version."forever-monitor"."1.1.0";
-  by-version."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."forever-monitor"."1.1.0" = self.buildNodePackage {
     name = "forever-monitor-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
-        name = "forever-monitor-1.1.0.tgz";
-        sha1 = "439ce036f999601cff551aea7f5151001a869ef9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."forever-monitor" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
+      name = "forever-monitor-1.1.0.tgz";
+      sha1 = "439ce036f999601cff551aea7f5151001a869ef9";
+    };
     deps = {
       "broadway-0.2.10" = self.by-version."broadway"."0.2.10";
       "minimatch-0.0.5" = self.by-version."minimatch"."0.0.5";
@@ -10514,536 +10585,426 @@
       "watch-0.5.1" = self.by-version."watch"."0.5.1";
       "utile-0.1.7" = self.by-version."utile"."0.1.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "forever-monitor" ];
+    peerDependencies = [];
   };
   by-spec."forever-monitor"."~1.5.1" =
     self.by-version."forever-monitor"."1.5.2";
   by-spec."form-data"."0.1.3" =
     self.by-version."form-data"."0.1.3";
-  by-version."form-data"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."form-data"."0.1.3" = self.buildNodePackage {
     name = "form-data-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
-        name = "form-data-0.1.3.tgz";
-        sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."form-data" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
+      name = "form-data-0.1.3.tgz";
+      sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
+    };
     deps = {
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "async-0.9.0" = self.by-version."async"."0.9.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "form-data" ];
+    peerDependencies = [];
   };
-  by-spec."form-data"."~0.0.3" =
-    self.by-version."form-data"."0.0.10";
-  by-version."form-data"."0.0.10" = lib.makeOverridable self.buildNodePackage {
-    name = "form-data-0.0.10";
+  by-spec."form-data".">=0.1.2" =
+    self.by-version."form-data"."0.2.0";
+  by-version."form-data"."0.2.0" = self.buildNodePackage {
+    name = "form-data-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
-        name = "form-data-0.0.10.tgz";
-        sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."form-data" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
+      name = "form-data-0.2.0.tgz";
+      sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
+    };
     deps = {
+      "async-0.9.0" = self.by-version."async"."0.9.0";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "form-data" ];
+    peerDependencies = [];
   };
-  by-spec."form-data"."~0.1.0" =
+  by-spec."form-data"."^0.1.2" =
     self.by-version."form-data"."0.1.4";
-  by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."form-data"."0.1.4" = self.buildNodePackage {
     name = "form-data-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
-        name = "form-data-0.1.4.tgz";
-        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."form-data" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+      name = "form-data-0.1.4.tgz";
+      sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+    };
     deps = {
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "async-0.9.0" = self.by-version."async"."0.9.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "form-data" ];
+    peerDependencies = [];
   };
-  by-spec."form-data"."~0.2.0" =
-    self.by-version."form-data"."0.2.0";
-  by-version."form-data"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "form-data-0.2.0";
+  by-spec."form-data"."~0.0.3" =
+    self.by-version."form-data"."0.0.10";
+  by-version."form-data"."0.0.10" = self.buildNodePackage {
+    name = "form-data-0.0.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
-        name = "form-data-0.2.0.tgz";
-        sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."form-data" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
+      name = "form-data-0.0.10.tgz";
+      sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed";
+    };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "async-0.2.10" = self.by-version."async"."0.2.10";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "form-data" ];
+    peerDependencies = [];
   };
+  by-spec."form-data"."~0.1.0" =
+    self.by-version."form-data"."0.1.4";
+  by-spec."form-data"."~0.2.0" =
+    self.by-version."form-data"."0.2.0";
   by-spec."formatio"."1.1.1" =
     self.by-version."formatio"."1.1.1";
-  by-version."formatio"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."formatio"."1.1.1" = self.buildNodePackage {
     name = "formatio-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz";
-        name = "formatio-1.1.1.tgz";
-        sha1 = "5ed3ccd636551097383465d996199100e86161e9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."formatio" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz";
+      name = "formatio-1.1.1.tgz";
+      sha1 = "5ed3ccd636551097383465d996199100e86161e9";
+    };
     deps = {
       "samsam-1.1.2" = self.by-version."samsam"."1.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "formatio" ];
+    peerDependencies = [];
   };
   by-spec."formidable"."1.0.11" =
     self.by-version."formidable"."1.0.11";
-  by-version."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."formidable"."1.0.11" = self.buildNodePackage {
     name = "formidable-1.0.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
-        name = "formidable-1.0.11.tgz";
-        sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."formidable" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
+      name = "formidable-1.0.11.tgz";
+      sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "formidable" ];
+    peerDependencies = [];
   };
   by-spec."formidable"."1.0.13" =
     self.by-version."formidable"."1.0.13";
-  by-version."formidable"."1.0.13" = lib.makeOverridable self.buildNodePackage {
+  by-version."formidable"."1.0.13" = self.buildNodePackage {
     name = "formidable-1.0.13";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz";
-        name = "formidable-1.0.13.tgz";
-        sha1 = "70caf0f9d69692a77e04021ddab4f46b01c82aea";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."formidable" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz";
+      name = "formidable-1.0.13.tgz";
+      sha1 = "70caf0f9d69692a77e04021ddab4f46b01c82aea";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "formidable" ];
+    peerDependencies = [];
   };
   by-spec."formidable"."1.0.14" =
     self.by-version."formidable"."1.0.14";
-  by-version."formidable"."1.0.14" = lib.makeOverridable self.buildNodePackage {
+  by-version."formidable"."1.0.14" = self.buildNodePackage {
     name = "formidable-1.0.14";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
-        name = "formidable-1.0.14.tgz";
-        sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."formidable" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
+      name = "formidable-1.0.14.tgz";
+      sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "formidable" ];
+    peerDependencies = [];
+  };
+  by-spec."formidable"."1.0.9" =
+    self.by-version."formidable"."1.0.9";
+  by-version."formidable"."1.0.9" = self.buildNodePackage {
+    name = "formidable-1.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz";
+      name = "formidable-1.0.9.tgz";
+      sha1 = "419e3bccead3e8874d539f5b3e72a4c503b31a98";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."formidable"."1.0.x" =
     self.by-version."formidable"."1.0.16";
-  by-version."formidable"."1.0.16" = lib.makeOverridable self.buildNodePackage {
+  by-version."formidable"."1.0.16" = self.buildNodePackage {
     name = "formidable-1.0.16";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.16.tgz";
-        name = "formidable-1.0.16.tgz";
-        sha1 = "4916cfdfc4cbed020b257a6a9505a9ab38c2cd0e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."formidable" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.16.tgz";
+      name = "formidable-1.0.16.tgz";
+      sha1 = "4916cfdfc4cbed020b257a6a9505a9ab38c2cd0e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "formidable" ];
+    peerDependencies = [];
   };
   by-spec."forwarded"."~0.1.0" =
     self.by-version."forwarded"."0.1.0";
-  by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."forwarded"."0.1.0" = self.buildNodePackage {
     name = "forwarded-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."forwarded" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
+      name = "forwarded-0.1.0.tgz";
+      sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "forwarded" ];
+    peerDependencies = [];
   };
   by-spec."fresh"."0.1.0" =
     self.by-version."fresh"."0.1.0";
-  by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."fresh"."0.1.0" = self.buildNodePackage {
     name = "fresh-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
-        name = "fresh-0.1.0.tgz";
-        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fresh" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
+      name = "fresh-0.1.0.tgz";
+      sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fresh" ];
+    peerDependencies = [];
   };
   by-spec."fresh"."0.2.0" =
     self.by-version."fresh"."0.2.0";
-  by-version."fresh"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."fresh"."0.2.0" = self.buildNodePackage {
     name = "fresh-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
-        name = "fresh-0.2.0.tgz";
-        sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fresh" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
+      name = "fresh-0.2.0.tgz";
+      sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fresh" ];
+    peerDependencies = [];
   };
   by-spec."fresh"."0.2.2" =
     self.by-version."fresh"."0.2.2";
-  by-version."fresh"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."fresh"."0.2.2" = self.buildNodePackage {
     name = "fresh-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
-        name = "fresh-0.2.2.tgz";
-        sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fresh" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
+      name = "fresh-0.2.2.tgz";
+      sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fresh" ];
+    peerDependencies = [];
   };
   by-spec."fresh"."0.2.4" =
     self.by-version."fresh"."0.2.4";
-  by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."fresh"."0.2.4" = self.buildNodePackage {
     name = "fresh-0.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
-        name = "fresh-0.2.4.tgz";
-        sha1 = "3582499206c9723714190edd74b4604feb4a614c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fresh" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
+      name = "fresh-0.2.4.tgz";
+      sha1 = "3582499206c9723714190edd74b4604feb4a614c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fresh" ];
+    peerDependencies = [];
   };
   by-spec."fresh"."~0.2.1" =
     self.by-version."fresh"."0.2.4";
   by-spec."fs-extended"."^0.2.0" =
     self.by-version."fs-extended"."0.2.0";
-  by-version."fs-extended"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."fs-extended"."0.2.0" = self.buildNodePackage {
     name = "fs-extended-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fs-extended/-/fs-extended-0.2.0.tgz";
-        name = "fs-extended-0.2.0.tgz";
-        sha1 = "9523d413a014d1a6e35b2a64baa5e66d17f0c6fe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fs-extended" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-extended/-/fs-extended-0.2.0.tgz";
+      name = "fs-extended-0.2.0.tgz";
+      sha1 = "9523d413a014d1a6e35b2a64baa5e66d17f0c6fe";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fs-extended" ];
+    peerDependencies = [];
   };
   by-spec."fs-extra"."^0.12.0" =
     self.by-version."fs-extra"."0.12.0";
-  by-version."fs-extra"."0.12.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."fs-extra"."0.12.0" = self.buildNodePackage {
     name = "fs-extra-0.12.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz";
-        name = "fs-extra-0.12.0.tgz";
-        sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fs-extra" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz";
+      name = "fs-extra-0.12.0.tgz";
+      sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868";
+    };
     deps = {
       "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fs-extra" ];
+    peerDependencies = [];
   };
   by-spec."fs-extra"."~0.6.1" =
     self.by-version."fs-extra"."0.6.4";
-  by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."fs-extra"."0.6.4" = self.buildNodePackage {
     name = "fs-extra-0.6.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
-        name = "fs-extra-0.6.4.tgz";
-        sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fs-extra" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
+      name = "fs-extra-0.6.4.tgz";
+      sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
+    };
     deps = {
       "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "jsonfile-1.0.1" = self.by-version."jsonfile"."1.0.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fs-extra" ];
+    peerDependencies = [];
+  };
+  by-spec."fs-extra"."~0.7.0" =
+    self.by-version."fs-extra"."0.7.1";
+  by-version."fs-extra"."0.7.1" = self.buildNodePackage {
+    name = "fs-extra-0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.7.1.tgz";
+      name = "fs-extra-0.7.1.tgz";
+      sha1 = "516505a3be70c1bead91df000ceb9955ab1b5f8b";
+    };
+    deps = {
+      "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "jsonfile-1.1.1" = self.by-version."jsonfile"."1.1.1";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+    };
+    peerDependencies = [];
   };
   by-spec."fs-vacuum"."~1.2.5" =
     self.by-version."fs-vacuum"."1.2.5";
-  by-version."fs-vacuum"."1.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."fs-vacuum"."1.2.5" = self.buildNodePackage {
     name = "fs-vacuum-1.2.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.5.tgz";
-        name = "fs-vacuum-1.2.5.tgz";
-        sha1 = "a5cbaa844b4b3a7cff139f3cc90e7f7007e5fbb8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fs-vacuum" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.5.tgz";
+      name = "fs-vacuum-1.2.5.tgz";
+      sha1 = "a5cbaa844b4b3a7cff139f3cc90e7f7007e5fbb8";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fs-vacuum" ];
+    peerDependencies = [];
   };
   by-spec."fs-walk"."*" =
     self.by-version."fs-walk"."0.0.1";
-  by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."fs-walk"."0.0.1" = self.buildNodePackage {
     name = "fs-walk-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
-        name = "fs-walk-0.0.1.tgz";
-        sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fs-walk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
+      name = "fs-walk-0.0.1.tgz";
+      sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335";
+    };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fs-walk" ];
+    peerDependencies = [];
   };
   "fs-walk" = self.by-version."fs-walk"."0.0.1";
   by-spec."fs-write-stream-atomic"."~1.0.2" =
     self.by-version."fs-write-stream-atomic"."1.0.2";
-  by-version."fs-write-stream-atomic"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."fs-write-stream-atomic"."1.0.2" = self.buildNodePackage {
     name = "fs-write-stream-atomic-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz";
-        name = "fs-write-stream-atomic-1.0.2.tgz";
-        sha1 = "fe0c6cec75256072b2fef8180d97e309fe3f5efb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fs-write-stream-atomic" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz";
+      name = "fs-write-stream-atomic-1.0.2.tgz";
+      sha1 = "fe0c6cec75256072b2fef8180d97e309fe3f5efb";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fs-write-stream-atomic" ];
+    peerDependencies = [];
   };
   by-spec."fs.extra".">=1.2.0 <2.0.0" =
-    self.by-version."fs.extra"."1.3.0";
-  by-version."fs.extra"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "fs.extra-1.3.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.3.0.tgz";
-        name = "fs.extra-1.3.0.tgz";
-        sha1 = "18483439c758449cc0735d8326650c2368ee1cd1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fs.extra" or []);
+    self.by-version."fs.extra"."1.3.2";
+  by-version."fs.extra"."1.3.2" = self.buildNodePackage {
+    name = "fs.extra-1.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
+      name = "fs.extra-1.3.2.tgz";
+      sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
+    };
     deps = {
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "fs-extra-0.6.4" = self.by-version."fs-extra"."0.6.4";
-      "walk-2.2.1" = self.by-version."walk"."2.2.1";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "walk-2.3.9" = self.by-version."walk"."2.3.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fs.extra" ];
+    peerDependencies = [];
   };
   by-spec."fs.extra".">=1.2.1 <2" =
-    self.by-version."fs.extra"."1.3.0";
+    self.by-version."fs.extra"."1.3.2";
   by-spec."fsevents"."~0.3.1" =
-    self.by-version."fsevents"."0.3.1";
-  by-version."fsevents"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "fsevents-0.3.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.1.tgz";
-        name = "fsevents-0.3.1.tgz";
-        sha1 = "47d60e5c28887055d7388833ea5d54d4882c8f6f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fsevents" or []);
+    self.by-version."fsevents"."0.3.4";
+  by-version."fsevents"."0.3.4" = self.buildNodePackage {
+    name = "fsevents-0.3.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.4.tgz";
+      name = "fsevents-0.3.4.tgz";
+      sha1 = "cd9769e92f803578f2ccc4a3a4da2b8556823d02";
+    };
     deps = {
-      "nan-1.3.0" = self.by-version."nan"."1.3.0";
+      "nan-1.5.3" = self.by-version."nan"."1.5.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fsevents" ];
+    peerDependencies = [];
   };
   by-spec."fstream"."^1.0.0" =
-    self.by-version."fstream"."1.0.3";
-  by-version."fstream"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "fstream-1.0.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fstream/-/fstream-1.0.3.tgz";
-        name = "fstream-1.0.3.tgz";
-        sha1 = "5ce69767710d7a39c8cd9232470d9426790195da";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fstream" or []);
+    self.by-version."fstream"."1.0.4";
+  by-version."fstream"."1.0.4" = self.buildNodePackage {
+    name = "fstream-1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz";
+      name = "fstream-1.0.4.tgz";
+      sha1 = "6c52298473fd6351fd22fc4bf9254fcfebe80f2b";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fstream" ];
+    peerDependencies = [];
   };
   by-spec."fstream"."^1.0.2" =
-    self.by-version."fstream"."1.0.3";
+    self.by-version."fstream"."1.0.4";
   by-spec."fstream"."~0.1.17" =
     self.by-version."fstream"."0.1.31";
-  by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
+  by-version."fstream"."0.1.31" = self.buildNodePackage {
     name = "fstream-0.1.31";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
-        name = "fstream-0.1.31.tgz";
-        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fstream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+      name = "fstream-0.1.31.tgz";
+      sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fstream" ];
+    peerDependencies = [];
   };
   by-spec."fstream"."~0.1.22" =
     self.by-version."fstream"."0.1.31";
@@ -11052,428 +11013,414 @@
   by-spec."fstream"."~0.1.8" =
     self.by-version."fstream"."0.1.31";
   by-spec."fstream"."~1.0.2" =
-    self.by-version."fstream"."1.0.3";
+    self.by-version."fstream"."1.0.4";
   by-spec."fstream"."~1.0.3" =
-    self.by-version."fstream"."1.0.3";
+    self.by-version."fstream"."1.0.4";
   by-spec."fstream-ignore"."0.0.7" =
     self.by-version."fstream-ignore"."0.0.7";
-  by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."fstream-ignore"."0.0.7" = self.buildNodePackage {
     name = "fstream-ignore-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
-        name = "fstream-ignore-0.0.7.tgz";
-        sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fstream-ignore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
+      name = "fstream-ignore-0.0.7.tgz";
+      sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
+    };
     deps = {
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
       "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fstream-ignore" ];
+    peerDependencies = [];
   };
   by-spec."fstream-ignore"."^1.0.0" =
     self.by-version."fstream-ignore"."1.0.2";
-  by-version."fstream-ignore"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."fstream-ignore"."1.0.2" = self.buildNodePackage {
     name = "fstream-ignore-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz";
-        name = "fstream-ignore-1.0.2.tgz";
-        sha1 = "18c891db01b782a74a7bff936a0f24997741c7ab";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fstream-ignore" or []);
-    deps = {
-      "fstream-1.0.3" = self.by-version."fstream"."1.0.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz";
+      name = "fstream-ignore-1.0.2.tgz";
+      sha1 = "18c891db01b782a74a7bff936a0f24997741c7ab";
+    };
+    deps = {
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fstream-ignore" ];
+    peerDependencies = [];
   };
   by-spec."fstream-ignore"."~1.0.1" =
     self.by-version."fstream-ignore"."1.0.2";
   by-spec."fstream-npm"."~1.0.0" =
     self.by-version."fstream-npm"."1.0.1";
-  by-version."fstream-npm"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."fstream-npm"."1.0.1" = self.buildNodePackage {
     name = "fstream-npm-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.1.tgz";
-        name = "fstream-npm-1.0.1.tgz";
-        sha1 = "1e35c77f0fa24f5d6367e6d447ae7d6ddb482db2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fstream-npm" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.1.tgz";
+      name = "fstream-npm-1.0.1.tgz";
+      sha1 = "1e35c77f0fa24f5d6367e6d447ae7d6ddb482db2";
+    };
     deps = {
       "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fstream-npm" ];
+    peerDependencies = [];
   };
   by-spec."fstream-npm"."~1.0.1" =
     self.by-version."fstream-npm"."1.0.1";
+  by-spec."ftp"."~0.3.5" =
+    self.by-version."ftp"."0.3.8";
+  by-version."ftp"."0.3.8" = self.buildNodePackage {
+    name = "ftp-0.3.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ftp/-/ftp-0.3.8.tgz";
+      name = "ftp-0.3.8.tgz";
+      sha1 = "d9764f8bb3eeffa3319429b88ecc4b8e75396632";
+    };
+    deps = {
+      "xregexp-2.0.0" = self.by-version."xregexp"."2.0.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    peerDependencies = [];
+  };
+  by-spec."gapitoken"."~0.1.2" =
+    self.by-version."gapitoken"."0.1.3";
+  by-version."gapitoken"."0.1.3" = self.buildNodePackage {
+    name = "gapitoken-0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.3.tgz";
+      name = "gapitoken-0.1.3.tgz";
+      sha1 = "b873f1172603d043f930a71a0a4846330f385b41";
+    };
+    deps = {
+      "jws-0.0.2" = self.by-version."jws"."0.0.2";
+    };
+    peerDependencies = [];
+  };
   by-spec."gauge"."~1.0.2" =
     self.by-version."gauge"."1.0.2";
-  by-version."gauge"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."gauge"."1.0.2" = self.buildNodePackage {
     name = "gauge-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gauge/-/gauge-1.0.2.tgz";
-        name = "gauge-1.0.2.tgz";
-        sha1 = "53e25965dfaf1c85be3a2a0633306a24a67dc2f9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gauge" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gauge/-/gauge-1.0.2.tgz";
+      name = "gauge-1.0.2.tgz";
+      sha1 = "53e25965dfaf1c85be3a2a0633306a24a67dc2f9";
+    };
     deps = {
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
       "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "gauge" ];
+    peerDependencies = [];
   };
   by-spec."gaze"."^0.5.1" =
     self.by-version."gaze"."0.5.1";
-  by-version."gaze"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."gaze"."0.5.1" = self.buildNodePackage {
     name = "gaze-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gaze" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "gaze" ];
+    peerDependencies = [];
+  };
+  by-spec."gelf-stream"."~0.2.4" =
+    self.by-version."gelf-stream"."0.2.4";
+  by-version."gelf-stream"."0.2.4" = self.buildNodePackage {
+    name = "gelf-stream-0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
+      name = "gelf-stream-0.2.4.tgz";
+      sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
+    };
+    deps = {
+      "gelfling-0.2.0" = self.by-version."gelfling"."0.2.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."gelfling"."~0.2.0" =
+    self.by-version."gelfling"."0.2.0";
+  by-version."gelfling"."0.2.0" = self.buildNodePackage {
+    name = "gelfling-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
+      name = "gelfling-0.2.0.tgz";
+      sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."get-stdin"."*" =
-    self.by-version."get-stdin"."3.0.2";
-  by-version."get-stdin"."3.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "get-stdin-3.0.2";
+    self.by-version."get-stdin"."4.0.1";
+  by-version."get-stdin"."4.0.1" = self.buildNodePackage {
+    name = "get-stdin-4.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz";
-        name = "get-stdin-3.0.2.tgz";
-        sha1 = "c1ced24b9039b38ded85bdf161e57713b6dd4abe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."get-stdin" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+      name = "get-stdin-4.0.1.tgz";
+      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "get-stdin" ];
+    peerDependencies = [];
   };
   by-spec."get-stdin"."^1.0.0" =
     self.by-version."get-stdin"."1.0.0";
-  by-version."get-stdin"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."get-stdin"."1.0.0" = self.buildNodePackage {
     name = "get-stdin-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/get-stdin/-/get-stdin-1.0.0.tgz";
-        name = "get-stdin-1.0.0.tgz";
-        sha1 = "00bd5a494c81c372f5629bea103bbffe7a1da3ce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."get-stdin" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-1.0.0.tgz";
+      name = "get-stdin-1.0.0.tgz";
+      sha1 = "00bd5a494c81c372f5629bea103bbffe7a1da3ce";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "get-stdin" ];
+    peerDependencies = [];
   };
   by-spec."get-stdin"."^3.0.0" =
     self.by-version."get-stdin"."3.0.2";
+  by-version."get-stdin"."3.0.2" = self.buildNodePackage {
+    name = "get-stdin-3.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz";
+      name = "get-stdin-3.0.2.tgz";
+      sha1 = "c1ced24b9039b38ded85bdf161e57713b6dd4abe";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."get-uri"."~0.1.0" =
+    self.by-version."get-uri"."0.1.3";
+  by-version."get-uri"."0.1.3" = self.buildNodePackage {
+    name = "get-uri-0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-uri/-/get-uri-0.1.3.tgz";
+      name = "get-uri-0.1.3.tgz";
+      sha1 = "b1b3f9dfe0da1c0909097b1ca1ce4d4b72a8d1ab";
+    };
+    deps = {
+      "data-uri-to-buffer-0.0.3" = self.by-version."data-uri-to-buffer"."0.0.3";
+      "ftp-0.3.8" = self.by-version."ftp"."0.3.8";
+      "debug-0.8.1" = self.by-version."debug"."0.8.1";
+      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "file-uri-to-path-0.0.2" = self.by-version."file-uri-to-path"."0.0.2";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    peerDependencies = [];
+  };
   by-spec."get-youtube-id"."^0.1.3" =
     self.by-version."get-youtube-id"."0.1.3";
-  by-version."get-youtube-id"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."get-youtube-id"."0.1.3" = self.buildNodePackage {
     name = "get-youtube-id-0.1.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/get-youtube-id/-/get-youtube-id-0.1.3.tgz";
-        name = "get-youtube-id-0.1.3.tgz";
-        sha1 = "eb76a0534cb7e9d1fcce5d4b61a0820d32d6855d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."get-youtube-id" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-youtube-id/-/get-youtube-id-0.1.3.tgz";
+      name = "get-youtube-id-0.1.3.tgz";
+      sha1 = "eb76a0534cb7e9d1fcce5d4b61a0820d32d6855d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "get-youtube-id" ];
+    peerDependencies = [];
   };
   by-spec."getmac"."~1.0.6" =
     self.by-version."getmac"."1.0.6";
-  by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."getmac"."1.0.6" = self.buildNodePackage {
     name = "getmac-1.0.6";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz";
-        name = "getmac-1.0.6.tgz";
-        sha1 = "f222c8178be9de24899df5a04e77557fbaf4e522";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."getmac" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz";
+      name = "getmac-1.0.6.tgz";
+      sha1 = "f222c8178be9de24899df5a04e77557fbaf4e522";
+    };
     deps = {
       "extract-opts-2.2.0" = self.by-version."extract-opts"."2.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "getmac" ];
+    peerDependencies = [];
   };
   by-spec."getobject"."~0.1.0" =
     self.by-version."getobject"."0.1.0";
-  by-version."getobject"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."getobject"."0.1.0" = self.buildNodePackage {
     name = "getobject-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."getobject" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
+      name = "getobject-0.1.0.tgz";
+      sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "getobject" ];
+    peerDependencies = [];
   };
   by-spec."git-run"."*" =
     self.by-version."git-run"."0.3.1";
-  by-version."git-run"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."git-run"."0.3.1" = self.buildNodePackage {
     name = "git-run-0.3.1";
     bin = true;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/git-run/-/git-run-0.3.1.tgz";
-        name = "git-run-0.3.1.tgz";
-        sha1 = "34a59d4a90c1501d491ea87d478d26c877808415";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."git-run" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/git-run/-/git-run-0.3.1.tgz";
+      name = "git-run-0.3.1.tgz";
+      sha1 = "34a59d4a90c1501d491ea87d478d26c877808415";
+    };
     deps = {
       "minilog-2.0.6" = self.by-version."minilog"."2.0.6";
       "tabtab-0.0.2" = self.by-version."tabtab"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "git-run" ];
+    peerDependencies = [];
   };
   "git-run" = self.by-version."git-run"."0.3.1";
   by-spec."github-url-from-git"."^1.3.0" =
     self.by-version."github-url-from-git"."1.4.0";
-  by-version."github-url-from-git"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."github-url-from-git"."1.4.0" = self.buildNodePackage {
     name = "github-url-from-git-1.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz";
-        name = "github-url-from-git-1.4.0.tgz";
-        sha1 = "285e6b520819001bde128674704379e4ff03e0de";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."github-url-from-git" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz";
+      name = "github-url-from-git-1.4.0.tgz";
+      sha1 = "285e6b520819001bde128674704379e4ff03e0de";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "github-url-from-git" ];
+    peerDependencies = [];
   };
   by-spec."github-url-from-git"."~1.4.0" =
     self.by-version."github-url-from-git"."1.4.0";
   by-spec."github-url-from-username-repo"."^1.0.0" =
     self.by-version."github-url-from-username-repo"."1.0.2";
-  by-version."github-url-from-username-repo"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."github-url-from-username-repo"."1.0.2" = self.buildNodePackage {
     name = "github-url-from-username-repo-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz";
-        name = "github-url-from-username-repo-1.0.2.tgz";
-        sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."github-url-from-username-repo" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz";
+      name = "github-url-from-username-repo-1.0.2.tgz";
+      sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "github-url-from-username-repo" ];
+    peerDependencies = [];
   };
   by-spec."github-url-from-username-repo"."~1.0.0" =
     self.by-version."github-url-from-username-repo"."1.0.2";
   by-spec."github-url-from-username-repo"."~1.0.2" =
     self.by-version."github-url-from-username-repo"."1.0.2";
   by-spec."glob"."3 || 4" =
-    self.by-version."glob"."4.3.2";
-  by-version."glob"."4.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "glob-4.3.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-4.3.2.tgz";
-        name = "glob-4.3.2.tgz";
-        sha1 = "351ec7dafc29256b253ad86cd6b48c5a3404b76d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob" or []);
+    self.by-version."glob"."4.3.5";
+  by-version."glob"."4.3.5" = self.buildNodePackage {
+    name = "glob-4.3.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-4.3.5.tgz";
+      name = "glob-4.3.5.tgz";
+      sha1 = "80fbb08ca540f238acce5d11d1e9bc41e75173d3";
+    };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
+    peerDependencies = [];
   };
   by-spec."glob"."3.2.3" =
     self.by-version."glob"."3.2.3";
-  by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."glob"."3.2.3" = self.buildNodePackage {
     name = "glob-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
+    peerDependencies = [];
   };
   by-spec."glob"."3.2.x" =
     self.by-version."glob"."3.2.11";
-  by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."glob"."3.2.11" = self.buildNodePackage {
     name = "glob-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
+    peerDependencies = [];
   };
   by-spec."glob"."3.x" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."4.0.6" =
     self.by-version."glob"."4.0.6";
-  by-version."glob"."4.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."glob"."4.0.6" = self.buildNodePackage {
     name = "glob-4.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
-        name = "glob-4.0.6.tgz";
-        sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
+      name = "glob-4.0.6.tgz";
+      sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
+    peerDependencies = [];
   };
   by-spec."glob"."4.x" =
-    self.by-version."glob"."4.3.2";
+    self.by-version."glob"."4.3.5";
   by-spec."glob".">=3.2.7 <4" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."^3.2.1" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."^4.0.2" =
-    self.by-version."glob"."4.3.2";
+    self.by-version."glob"."4.3.5";
   by-spec."glob"."^4.0.5" =
-    self.by-version."glob"."4.3.2";
+    self.by-version."glob"."4.3.5";
   by-spec."glob"."^4.3.1" =
-    self.by-version."glob"."4.3.2";
+    self.by-version."glob"."4.3.5";
   by-spec."glob"."~ 3.2.1" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.1.21" =
     self.by-version."glob"."3.1.21";
-  by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage {
+  by-version."glob"."3.1.21" = self.buildNodePackage {
     name = "glob-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
+    peerDependencies = [];
   };
+  by-spec."glob"."~3.2.6" =
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.7" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.9" =
@@ -11484,204 +11431,234 @@
     self.by-version."glob"."4.0.6";
   by-spec."glob"."~4.0.6" =
     self.by-version."glob"."4.0.6";
+  by-spec."glob"."~4.2.1" =
+    self.by-version."glob"."4.2.2";
+  by-version."glob"."4.2.2" = self.buildNodePackage {
+    name = "glob-4.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-4.2.2.tgz";
+      name = "glob-4.2.2.tgz";
+      sha1 = "ad2b047653a58c387e15deb43a19497f83fd2a80";
+    };
+    deps = {
+      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+      "once-1.3.1" = self.by-version."once"."1.3.1";
+    };
+    peerDependencies = [];
+  };
   by-spec."glob"."~4.3.1" =
-    self.by-version."glob"."4.3.2";
+    self.by-version."glob"."4.3.5";
   by-spec."glob"."~4.3.2" =
-    self.by-version."glob"."4.3.2";
+    self.by-version."glob"."4.3.5";
+  by-spec."glob"."~4.3.5" =
+    self.by-version."glob"."4.3.5";
+  by-spec."glob-parent"."~1.0.0" =
+    self.by-version."glob-parent"."1.0.0";
+  by-version."glob-parent"."1.0.0" = self.buildNodePackage {
+    name = "glob-parent-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob-parent/-/glob-parent-1.0.0.tgz";
+      name = "glob-parent-1.0.0.tgz";
+      sha1 = "3344e0e0534fbdd478a7c1f1480f2d8851650a21";
+    };
+    deps = {
+      "is-glob-0.3.0" = self.by-version."is-glob"."0.3.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."glob-stream"."^3.1.5" =
     self.by-version."glob-stream"."3.1.18";
-  by-version."glob-stream"."3.1.18" = lib.makeOverridable self.buildNodePackage {
+  by-version."glob-stream"."3.1.18" = self.buildNodePackage {
     name = "glob-stream-3.1.18";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz";
-        name = "glob-stream-3.1.18.tgz";
-        sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob-stream" or []);
-    deps = {
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz";
+      name = "glob-stream-3.1.18.tgz";
+      sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b";
+    };
+    deps = {
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
       "ordered-read-streams-0.1.0" = self.by-version."ordered-read-streams"."0.1.0";
       "glob2base-0.0.12" = self.by-version."glob2base"."0.0.12";
       "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0";
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob-stream" ];
+    peerDependencies = [];
   };
   by-spec."glob-watcher"."^0.0.6" =
     self.by-version."glob-watcher"."0.0.6";
-  by-version."glob-watcher"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."glob-watcher"."0.0.6" = self.buildNodePackage {
     name = "glob-watcher-0.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
-        name = "glob-watcher-0.0.6.tgz";
-        sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob-watcher" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
+      name = "glob-watcher-0.0.6.tgz";
+      sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b";
+    };
     deps = {
       "gaze-0.5.1" = self.by-version."gaze"."0.5.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob-watcher" ];
+    peerDependencies = [];
   };
   by-spec."glob2base"."^0.0.12" =
     self.by-version."glob2base"."0.0.12";
-  by-version."glob2base"."0.0.12" = lib.makeOverridable self.buildNodePackage {
+  by-version."glob2base"."0.0.12" = self.buildNodePackage {
     name = "glob2base-0.0.12";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz";
-        name = "glob2base-0.0.12.tgz";
-        sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob2base" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz";
+      name = "glob2base-0.0.12.tgz";
+      sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56";
+    };
     deps = {
       "find-index-0.1.1" = self.by-version."find-index"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob2base" ];
+    peerDependencies = [];
+  };
+  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";
+    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 = {
+    };
+    peerDependencies = [];
   };
   by-spec."globule"."~0.1.0" =
     self.by-version."globule"."0.1.0";
-  by-version."globule"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."globule"."0.1.0" = self.buildNodePackage {
     name = "globule-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."globule" or []);
+    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.1" = self.by-version."lodash"."1.0.1";
       "glob-3.1.21" = self.by-version."glob"."3.1.21";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "globule" ];
+    peerDependencies = [];
+  };
+  by-spec."googleapis"."0.8.0" =
+    self.by-version."googleapis"."0.8.0";
+  by-version."googleapis"."0.8.0" = self.buildNodePackage {
+    name = "googleapis-0.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/googleapis/-/googleapis-0.8.0.tgz";
+      name = "googleapis-0.8.0.tgz";
+      sha1 = "b7bdf177ee839f1bab5cf5e65cb4d0d74f27a86b";
+    };
+    deps = {
+      "request-2.34.0" = self.by-version."request"."2.34.0";
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "gapitoken-0.1.3" = self.by-version."gapitoken"."0.1.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."googleapis"."^1.0.20" =
+    self.by-version."googleapis"."1.1.1";
+  by-version."googleapis"."1.1.1" = self.buildNodePackage {
+    name = "googleapis-1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/googleapis/-/googleapis-1.1.1.tgz";
+      name = "googleapis-1.1.1.tgz";
+      sha1 = "cb9da9584f9cd6825df7ce39b4145514fc503b02";
+    };
+    deps = {
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "gapitoken-0.1.3" = self.by-version."gapitoken"."0.1.3";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "string-template-0.2.0" = self.by-version."string-template"."0.2.0";
+    };
+    peerDependencies = [];
   };
   by-spec."got"."^0.3.0" =
     self.by-version."got"."0.3.0";
-  by-version."got"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."got"."0.3.0" = self.buildNodePackage {
     name = "got-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/got/-/got-0.3.0.tgz";
-        name = "got-0.3.0.tgz";
-        sha1 = "888ec66ca4bc735ab089dbe959496d0f79485493";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."got" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/got/-/got-0.3.0.tgz";
+      name = "got-0.3.0.tgz";
+      sha1 = "888ec66ca4bc735ab089dbe959496d0f79485493";
+    };
     deps = {
       "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "got" ];
+    peerDependencies = [];
   };
   by-spec."got"."^1.0.1" =
     self.by-version."got"."1.2.2";
-  by-version."got"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."got"."1.2.2" = self.buildNodePackage {
     name = "got-1.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz";
-        name = "got-1.2.2.tgz";
-        sha1 = "d9430ba32f6a30218243884418767340aafc0400";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."got" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz";
+      name = "got-1.2.2.tgz";
+      sha1 = "d9430ba32f6a30218243884418767340aafc0400";
+    };
     deps = {
       "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "got" ];
+    peerDependencies = [];
   };
   by-spec."got"."^1.2.2" =
     self.by-version."got"."1.2.2";
   by-spec."graceful-fs"."1.2" =
     self.by-version."graceful-fs"."1.2.3";
-  by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."graceful-fs"."1.2.3" = self.buildNodePackage {
     name = "graceful-fs-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."graceful-fs" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "graceful-fs" ];
+    peerDependencies = [];
   };
   by-spec."graceful-fs"."2" =
     self.by-version."graceful-fs"."2.0.3";
-  by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."graceful-fs"."2.0.3" = self.buildNodePackage {
     name = "graceful-fs-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."graceful-fs" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "graceful-fs" ];
+    peerDependencies = [];
   };
   by-spec."graceful-fs"."2 || 3" =
     self.by-version."graceful-fs"."3.0.5";
-  by-version."graceful-fs"."3.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."graceful-fs"."3.0.5" = self.buildNodePackage {
     name = "graceful-fs-3.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz";
-        name = "graceful-fs-3.0.5.tgz";
-        sha1 = "4a880474bdeb716fe3278cf29792dec38dfac418";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."graceful-fs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz";
+      name = "graceful-fs-3.0.5.tgz";
+      sha1 = "4a880474bdeb716fe3278cf29792dec38dfac418";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "graceful-fs" ];
+    peerDependencies = [];
   };
   by-spec."graceful-fs"."3" =
     self.by-version."graceful-fs"."3.0.5";
@@ -11709,83 +11686,63 @@
     self.by-version."graceful-fs"."3.0.5";
   by-spec."graceful-fs"."~3.0.2" =
     self.by-version."graceful-fs"."3.0.5";
+  by-spec."graceful-fs"."~3.0.4" =
+    self.by-version."graceful-fs"."3.0.5";
   by-spec."graceful-fs"."~3.0.5" =
     self.by-version."graceful-fs"."3.0.5";
   by-spec."gridfs-stream"."*" =
     self.by-version."gridfs-stream"."0.5.3";
-  by-version."gridfs-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."gridfs-stream"."0.5.3" = self.buildNodePackage {
     name = "gridfs-stream-0.5.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.3.tgz";
-        name = "gridfs-stream-0.5.3.tgz";
-        sha1 = "c0896728fa3ea83f5fa3c9ced461afb7a036d149";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gridfs-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.3.tgz";
+      name = "gridfs-stream-0.5.3.tgz";
+      sha1 = "c0896728fa3ea83f5fa3c9ced461afb7a036d149";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "gridfs-stream" ];
+    peerDependencies = [];
   };
   "gridfs-stream" = self.by-version."gridfs-stream"."0.5.3";
   by-spec."growl"."1.7.x" =
     self.by-version."growl"."1.7.0";
-  by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."growl"."1.7.0" = self.buildNodePackage {
     name = "growl-1.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
-        name = "growl-1.7.0.tgz";
-        sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."growl" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
+      name = "growl-1.7.0.tgz";
+      sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "growl" ];
+    peerDependencies = [];
   };
   by-spec."growl"."1.8.1" =
     self.by-version."growl"."1.8.1";
-  by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."growl"."1.8.1" = self.buildNodePackage {
     name = "growl-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."growl" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
+      name = "growl-1.8.1.tgz";
+      sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "growl" ];
+    peerDependencies = [];
   };
   by-spec."grunt"."0.4.x" =
     self.by-version."grunt"."0.4.5";
-  by-version."grunt"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt"."0.4.5" = self.buildNodePackage {
     name = "grunt-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt" or []);
+    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";
@@ -11808,9 +11765,7 @@
       "grunt-legacy-util-0.2.0" = self.by-version."grunt-legacy-util"."0.2.0";
       "grunt-legacy-log-0.1.1" = self.by-version."grunt-legacy-log"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "grunt" ];
+    peerDependencies = [];
   };
   by-spec."grunt".">=0.4.0" =
     self.by-version."grunt"."0.4.5";
@@ -11822,91 +11777,69 @@
     self.by-version."grunt"."0.4.5";
   by-spec."grunt-cli"."*" =
     self.by-version."grunt-cli"."0.1.13";
-  by-version."grunt-cli"."0.1.13" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-cli"."0.1.13" = self.buildNodePackage {
     name = "grunt-cli-0.1.13";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz";
-        name = "grunt-cli-0.1.13.tgz";
-        sha1 = "e9ebc4047631f5012d922770c39378133cad10f4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-cli" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz";
+      name = "grunt-cli-0.1.13.tgz";
+      sha1 = "e9ebc4047631f5012d922770c39378133cad10f4";
+    };
     deps = {
       "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
       "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
       "resolve-0.3.1" = self.by-version."resolve"."0.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "grunt-cli" ];
+    peerDependencies = [];
   };
   "grunt-cli" = self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
     self.by-version."grunt-contrib-cssmin"."0.11.0";
-  by-version."grunt-contrib-cssmin"."0.11.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-contrib-cssmin"."0.11.0" = self.buildNodePackage {
     name = "grunt-contrib-cssmin-0.11.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.11.0.tgz";
-        name = "grunt-contrib-cssmin-0.11.0.tgz";
-        sha1 = "0b0888de9d8549c3d844a7fc79a279b4276a7bc7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-contrib-cssmin" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.11.0.tgz";
+      name = "grunt-contrib-cssmin-0.11.0.tgz";
+      sha1 = "0b0888de9d8549c3d844a7fc79a279b4276a7bc7";
+    };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "clean-css-3.0.3" = self.by-version."clean-css"."3.0.3";
+      "clean-css-3.0.7" = self.by-version."clean-css"."3.0.7";
       "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0";
     };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
-    ];
-    passthru.names = [ "grunt-contrib-cssmin" ];
+      self.by-version."grunt"."0.4.5"];
   };
   "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.11.0";
   by-spec."grunt-contrib-jshint"."*" =
-    self.by-version."grunt-contrib-jshint"."0.10.0";
-  by-version."grunt-contrib-jshint"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "grunt-contrib-jshint-0.10.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.10.0.tgz";
-        name = "grunt-contrib-jshint-0.10.0.tgz";
-        sha1 = "57ebccca87e8f327af6645d8a3c586d4845e4d81";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-contrib-jshint" or []);
-    deps = {
-      "jshint-2.5.11" = self.by-version."jshint"."2.5.11";
+    self.by-version."grunt-contrib-jshint"."0.11.0";
+  by-version."grunt-contrib-jshint"."0.11.0" = self.buildNodePackage {
+    name = "grunt-contrib-jshint-0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.11.0.tgz";
+      name = "grunt-contrib-jshint-0.11.0.tgz";
+      sha1 = "2ba17953d30471c3ba58792a5aa92e447059de45";
+    };
+    deps = {
       "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+      "jshint-2.6.0" = self.by-version."jshint"."2.6.0";
     };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
-    ];
-    passthru.names = [ "grunt-contrib-jshint" ];
+      self.by-version."grunt"."0.4.5"];
   };
-  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.10.0";
+  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.11.0";
   by-spec."grunt-contrib-less"."*" =
     self.by-version."grunt-contrib-less"."1.0.0";
-  by-version."grunt-contrib-less"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-contrib-less"."1.0.0" = self.buildNodePackage {
     name = "grunt-contrib-less-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.0.tgz";
-        name = "grunt-contrib-less-1.0.0.tgz";
-        sha1 = "370e5f18682bf4ea72a622fece416a08bb194523";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-contrib-less" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.0.tgz";
+      name = "grunt-contrib-less-1.0.0.tgz";
+      sha1 = "370e5f18682bf4ea72a622fece416a08bb194523";
+    };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
@@ -11914,48 +11847,36 @@
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
     };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
-    ];
-    passthru.names = [ "grunt-contrib-less" ];
+      self.by-version."grunt"."0.4.5"];
   };
   "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.0.0";
   by-spec."grunt-contrib-requirejs"."*" =
     self.by-version."grunt-contrib-requirejs"."0.4.4";
-  by-version."grunt-contrib-requirejs"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-contrib-requirejs"."0.4.4" = self.buildNodePackage {
     name = "grunt-contrib-requirejs-0.4.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz";
-        name = "grunt-contrib-requirejs-0.4.4.tgz";
-        sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-contrib-requirejs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz";
+      name = "grunt-contrib-requirejs-0.4.4.tgz";
+      sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972";
+    };
     deps = {
       "requirejs-2.1.15" = self.by-version."requirejs"."2.1.15";
     };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
-    ];
-    passthru.names = [ "grunt-contrib-requirejs" ];
+      self.by-version."grunt"."0.4.5"];
   };
   "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4";
   by-spec."grunt-contrib-uglify"."*" =
     self.by-version."grunt-contrib-uglify"."0.7.0";
-  by-version."grunt-contrib-uglify"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-contrib-uglify"."0.7.0" = self.buildNodePackage {
     name = "grunt-contrib-uglify-0.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.7.0.tgz";
-        name = "grunt-contrib-uglify-0.7.0.tgz";
-        sha1 = "79dde81a62cec6ffa35b47a32833706744f8e787";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-contrib-uglify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.7.0.tgz";
+      name = "grunt-contrib-uglify-0.7.0.tgz";
+      sha1 = "79dde81a62cec6ffa35b47a32833706744f8e787";
+    };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
@@ -11964,73 +11885,55 @@
       "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2";
     };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
-    ];
-    passthru.names = [ "grunt-contrib-uglify" ];
+      self.by-version."grunt"."0.4.5"];
   };
   "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.7.0";
   by-spec."grunt-karma"."*" =
     self.by-version."grunt-karma"."0.10.1";
-  by-version."grunt-karma"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-karma"."0.10.1" = self.buildNodePackage {
     name = "grunt-karma-0.10.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.10.1.tgz";
-        name = "grunt-karma-0.10.1.tgz";
-        sha1 = "255fae402bb04409cf95c6ac77e8c1968934924b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-karma" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.10.1.tgz";
+      name = "grunt-karma-0.10.1.tgz";
+      sha1 = "255fae402bb04409cf95c6ac77e8c1968934924b";
+    };
     deps = {
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
     };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"
-      self.by-version."karma"."0.12.31"
-    ];
-    passthru.names = [ "grunt-karma" ];
+      self.by-version."karma"."0.12.31"];
   };
   "grunt-karma" = self.by-version."grunt-karma"."0.10.1";
   by-spec."grunt-legacy-log"."~0.1.0" =
     self.by-version."grunt-legacy-log"."0.1.1";
-  by-version."grunt-legacy-log"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-legacy-log"."0.1.1" = self.buildNodePackage {
     name = "grunt-legacy-log-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz";
-        name = "grunt-legacy-log-0.1.1.tgz";
-        sha1 = "d41f1a6abc9b0b1256a2b5ff02f4c3298dfcd57a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-legacy-log" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz";
+      name = "grunt-legacy-log-0.1.1.tgz";
+      sha1 = "d41f1a6abc9b0b1256a2b5ff02f4c3298dfcd57a";
+    };
     deps = {
       "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "grunt-legacy-log" ];
+    peerDependencies = [];
   };
   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" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-legacy-util"."0.2.0" = self.buildNodePackage {
     name = "grunt-legacy-util-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-legacy-util" or []);
+    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";
@@ -12040,73 +11943,55 @@
       "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "grunt-legacy-util" ];
+    peerDependencies = [];
   };
   by-spec."grunt-sed"."*" =
     self.by-version."grunt-sed"."0.1.1";
-  by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."grunt-sed"."0.1.1" = self.buildNodePackage {
     name = "grunt-sed-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz";
-        name = "grunt-sed-0.1.1.tgz";
-        sha1 = "2613d486909319b3f8f4bd75dafb46a642ec3f82";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."grunt-sed" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz";
+      name = "grunt-sed-0.1.1.tgz";
+      sha1 = "2613d486909319b3f8f4bd75dafb46a642ec3f82";
+    };
     deps = {
       "replace-0.2.10" = self.by-version."replace"."0.2.10";
     };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
-    ];
-    passthru.names = [ "grunt-sed" ];
+      self.by-version."grunt"."0.4.5"];
   };
   "grunt-sed" = self.by-version."grunt-sed"."0.1.1";
   by-spec."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " =
     self.by-version."guifi-earth"."0.2.1";
-  by-version."guifi-earth"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."guifi-earth"."0.2.1" = self.buildNodePackage {
     name = "guifi-earth-0.2.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854";
-        name = "guifi-earth-0.2.1.tgz";
-        sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."guifi-earth" or []);
+    src = fetchurl {
+      url = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854";
+      name = "guifi-earth-0.2.1.tgz";
+      sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
+    };
     deps = {
       "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0";
-      "jade-1.8.2" = self.by-version."jade"."1.8.2";
+      "jade-1.9.1" = self.by-version."jade"."1.9.1";
       "q-2.0.2" = self.by-version."q"."2.0.2";
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
       "msgpack-0.2.4" = self.by-version."msgpack"."0.2.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "guifi-earth" ];
+    peerDependencies = [];
   };
   "guifi-earth" = self.by-version."guifi-earth"."0.2.1";
   by-spec."gulp"."*" =
     self.by-version."gulp"."3.8.10";
-  by-version."gulp"."3.8.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."gulp"."3.8.10" = self.buildNodePackage {
     name = "gulp-3.8.10";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gulp/-/gulp-3.8.10.tgz";
-        name = "gulp-3.8.10.tgz";
-        sha1 = "bfb8fc156be97820f02a7f8b3af61a86666f9e31";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gulp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gulp/-/gulp-3.8.10.tgz";
+      name = "gulp-3.8.10.tgz";
+      sha1 = "bfb8fc156be97820f02a7f8b3af61a86666f9e31";
+    };
     deps = {
       "archy-1.0.0" = self.by-version."archy"."1.0.0";
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
@@ -12122,25 +12007,19 @@
       "v8flags-1.0.8" = self.by-version."v8flags"."1.0.8";
       "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "gulp" ];
+    peerDependencies = [];
   };
   "gulp" = self.by-version."gulp"."3.8.10";
   by-spec."gulp-util"."^3.0.0" =
     self.by-version."gulp-util"."3.0.2";
-  by-version."gulp-util"."3.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."gulp-util"."3.0.2" = self.buildNodePackage {
     name = "gulp-util-3.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.2.tgz";
-        name = "gulp-util-3.0.2.tgz";
-        sha1 = "7f1ed0be6d8c1e6563d2105c27217c2c9b744883";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gulp-util" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.2.tgz";
+      name = "gulp-util-3.0.2.tgz";
+      sha1 = "7f1ed0be6d8c1e6563d2105c27217c2c9b744883";
+    };
     deps = {
       "array-differ-1.0.0" = self.by-version."array-differ"."1.0.0";
       "array-uniq-1.0.2" = self.by-version."array-uniq"."1.0.2";
@@ -12156,242 +12035,223 @@
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "gulp-util" ];
+    peerDependencies = [];
   };
   by-spec."gzip-size"."^1.0.0" =
     self.by-version."gzip-size"."1.0.0";
-  by-version."gzip-size"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."gzip-size"."1.0.0" = self.buildNodePackage {
     name = "gzip-size-1.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz";
-        name = "gzip-size-1.0.0.tgz";
-        sha1 = "66cf8b101047227b95bace6ea1da0c177ed5c22f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gzip-size" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz";
+      name = "gzip-size-1.0.0.tgz";
+      sha1 = "66cf8b101047227b95bace6ea1da0c177ed5c22f";
+    };
     deps = {
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "gzip-size" ];
+    peerDependencies = [];
   };
   by-spec."gzippo"."*" =
     self.by-version."gzippo"."0.2.0";
-  by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."gzippo"."0.2.0" = self.buildNodePackage {
     name = "gzippo-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
-        name = "gzippo-0.2.0.tgz";
-        sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gzippo" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
+      name = "gzippo-0.2.0.tgz";
+      sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
+    };
     deps = {
-      "send-0.11.0" = self.by-version."send"."0.11.0";
+      "send-0.11.1" = self.by-version."send"."0.11.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "gzippo" ];
+    peerDependencies = [];
   };
   "gzippo" = self.by-version."gzippo"."0.2.0";
   by-spec."handlebars"."1.3.x" =
     self.by-version."handlebars"."1.3.0";
-  by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."handlebars"."1.3.0" = self.buildNodePackage {
     name = "handlebars-1.3.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
-        name = "handlebars-1.3.0.tgz";
-        sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."handlebars" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
+      name = "handlebars-1.3.0.tgz";
+      sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34";
+    };
     deps = {
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
       "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "handlebars" ];
+    peerDependencies = [];
   };
+  by-spec."handlebars"."~1.3.0" =
+    self.by-version."handlebars"."1.3.0";
   by-spec."handlebars"."~2.0.0" =
     self.by-version."handlebars"."2.0.0";
-  by-version."handlebars"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."handlebars"."2.0.0" = self.buildNodePackage {
     name = "handlebars-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."handlebars" or []);
+    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";
       "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "handlebars" ];
+    peerDependencies = [];
   };
   by-spec."has-ansi"."^0.1.0" =
     self.by-version."has-ansi"."0.1.0";
-  by-version."has-ansi"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."has-ansi"."0.1.0" = self.buildNodePackage {
     name = "has-ansi-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."has-ansi" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "has-ansi" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
   };
   by-spec."has-color"."~0.1.0" =
     self.by-version."has-color"."0.1.7";
-  by-version."has-color"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."has-color"."0.1.7" = self.buildNodePackage {
     name = "has-color-0.1.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
-        name = "has-color-0.1.7.tgz";
-        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."has-color" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
+      name = "has-color-0.1.7.tgz";
+      sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "has-color" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
   };
   by-spec."has-unicode"."^1.0.0" =
     self.by-version."has-unicode"."1.0.0";
-  by-version."has-unicode"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."has-unicode"."1.0.0" = self.buildNodePackage {
     name = "has-unicode-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz";
-        name = "has-unicode-1.0.0.tgz";
-        sha1 = "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."has-unicode" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz";
+      name = "has-unicode-1.0.0.tgz";
+      sha1 = "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "has-unicode" ];
+    peerDependencies = [];
   };
   by-spec."hash.js"."^1.0.0" =
     self.by-version."hash.js"."1.0.2";
-  by-version."hash.js"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."hash.js"."1.0.2" = self.buildNodePackage {
     name = "hash.js-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz";
-        name = "hash.js-1.0.2.tgz";
-        sha1 = "bc7d601f4e0d05a32f3526d11fe39f7a5eb8c187";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hash.js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz";
+      name = "hash.js-1.0.2.tgz";
+      sha1 = "bc7d601f4e0d05a32f3526d11fe39f7a5eb8c187";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hash.js" ];
+    peerDependencies = [];
   };
   by-spec."hasher"."~1.2.0" =
     self.by-version."hasher"."1.2.0";
-  by-version."hasher"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."hasher"."1.2.0" = self.buildNodePackage {
     name = "hasher-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
-        name = "hasher-1.2.0.tgz";
-        sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hasher" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
+      name = "hasher-1.2.0.tgz";
+      sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
+    };
     deps = {
       "signals-1.0.0" = self.by-version."signals"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hasher" ];
+    peerDependencies = [];
   };
+  by-spec."hashish"."*" =
+    self.by-version."hashish"."0.0.4";
+  by-version."hashish"."0.0.4" = self.buildNodePackage {
+    name = "hashish-0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz";
+      name = "hashish-0.0.4.tgz";
+      sha1 = "6d60bc6ffaf711b6afd60e426d077988014e6554";
+    };
+    deps = {
+      "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
+    };
+    peerDependencies = [];
+  };
+  by-spec."hashish"."0.0.4" =
+    self.by-version."hashish"."0.0.4";
   by-spec."hashring"."1.0.1" =
     self.by-version."hashring"."1.0.1";
-  by-version."hashring"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."hashring"."1.0.1" = self.buildNodePackage {
     name = "hashring-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
-        name = "hashring-1.0.1.tgz";
-        sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hashring" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
+      name = "hashring-1.0.1.tgz";
+      sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
+    };
     deps = {
       "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
       "simple-lru-cache-0.0.1" = self.by-version."simple-lru-cache"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hashring" ];
+    peerDependencies = [];
   };
   by-spec."hat"."*" =
     self.by-version."hat"."0.0.3";
-  by-version."hat"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."hat"."0.0.3" = self.buildNodePackage {
     name = "hat-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
-        name = "hat-0.0.3.tgz";
-        sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hat" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
+      name = "hat-0.0.3.tgz";
+      sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hat" ];
+    peerDependencies = [];
   };
   by-spec."hat"."0.0.3" =
     self.by-version."hat"."0.0.3";
@@ -12401,237 +12261,281 @@
     self.by-version."hat"."0.0.3";
   by-spec."hawk"."1.1.1" =
     self.by-version."hawk"."1.1.1";
-  by-version."hawk"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."hawk"."1.1.1" = self.buildNodePackage {
     name = "hawk-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
-        name = "hawk-1.1.1.tgz";
-        sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hawk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
+      name = "hawk-1.1.1.tgz";
+      sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
+    };
     deps = {
       "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
       "boom-0.4.2" = self.by-version."boom"."0.4.2";
       "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
       "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hawk" ];
+    peerDependencies = [];
   };
   by-spec."hawk"."~0.10.2" =
     self.by-version."hawk"."0.10.2";
-  by-version."hawk"."0.10.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."hawk"."0.10.2" = self.buildNodePackage {
     name = "hawk-0.10.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
-        name = "hawk-0.10.2.tgz";
-        sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hawk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
+      name = "hawk-0.10.2.tgz";
+      sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
+    };
     deps = {
       "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
       "boom-0.3.8" = self.by-version."boom"."0.3.8";
       "cryptiles-0.1.3" = self.by-version."cryptiles"."0.1.3";
       "sntp-0.1.4" = self.by-version."sntp"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hawk" ];
+    peerDependencies = [];
   };
   by-spec."hawk"."~1.0.0" =
     self.by-version."hawk"."1.0.0";
-  by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."hawk"."1.0.0" = self.buildNodePackage {
     name = "hawk-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
-        name = "hawk-1.0.0.tgz";
-        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hawk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+      name = "hawk-1.0.0.tgz";
+      sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+    };
     deps = {
       "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
       "boom-0.4.2" = self.by-version."boom"."0.4.2";
       "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
       "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hawk" ];
+    peerDependencies = [];
+  };
+  by-spec."hbo-dnsd"."0.9.8" =
+    self.by-version."hbo-dnsd"."0.9.8";
+  by-version."hbo-dnsd"."0.9.8" = self.buildNodePackage {
+    name = "hbo-dnsd-0.9.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hbo-dnsd/-/hbo-dnsd-0.9.8.tgz";
+      name = "hbo-dnsd-0.9.8.tgz";
+      sha1 = "ab964f34cf13b40ea7d412f125d576716c551ef2";
+    };
+    deps = {
+      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+      "defaultable-0.7.2" = self.by-version."defaultable"."0.7.2";
+    };
+    peerDependencies = [];
   };
   by-spec."he"."~0.3.6" =
     self.by-version."he"."0.3.6";
-  by-version."he"."0.3.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."he"."0.3.6" = self.buildNodePackage {
     name = "he-0.3.6";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz";
-        name = "he-0.3.6.tgz";
-        sha1 = "9d7bc446e77963933301dd602d5731cb861135e0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."he" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz";
+      name = "he-0.3.6.tgz";
+      sha1 = "9d7bc446e77963933301dd602d5731cb861135e0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "he" ];
+    peerDependencies = [];
+  };
+  by-spec."heapdump"."^0.2.9" =
+    self.by-version."heapdump"."0.2.10";
+  by-version."heapdump"."0.2.10" = self.buildNodePackage {
+    name = "heapdump-0.2.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/heapdump/-/heapdump-0.2.10.tgz";
+      name = "heapdump-0.2.10.tgz";
+      sha1 = "e4fc818f5a33f361238e6dfd59c650ba2da74624";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."hipache"."*" =
     self.by-version."hipache"."0.3.1";
-  by-version."hipache"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."hipache"."0.3.1" = self.buildNodePackage {
     name = "hipache-0.3.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
-        name = "hipache-0.3.1.tgz";
-        sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hipache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
+      name = "hipache-0.3.1.tgz";
+      sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5";
+    };
     deps = {
       "http-proxy-1.0.2" = self.by-version."http-proxy"."1.0.2";
       "redis-0.10.3" = self.by-version."redis"."0.10.3";
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hipache" ];
+    peerDependencies = [];
   };
   "hipache" = self.by-version."hipache"."0.3.1";
   by-spec."hiredis"."*" =
     self.by-version."hiredis"."0.1.17";
-  by-version."hiredis"."0.1.17" = lib.makeOverridable self.buildNodePackage {
+  by-version."hiredis"."0.1.17" = self.buildNodePackage {
     name = "hiredis-0.1.17";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz";
-        name = "hiredis-0.1.17.tgz";
-        sha1 = "60a33a968efc9a974e7ebb832f33aa965d3d354e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hiredis" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz";
+      name = "hiredis-0.1.17.tgz";
+      sha1 = "60a33a968efc9a974e7ebb832f33aa965d3d354e";
+    };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "nan-1.1.2" = self.by-version."nan"."1.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hiredis" ];
+    peerDependencies = [];
   };
   by-spec."hoek"."0.7.x" =
     self.by-version."hoek"."0.7.6";
-  by-version."hoek"."0.7.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."hoek"."0.7.6" = self.buildNodePackage {
     name = "hoek-0.7.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
-        name = "hoek-0.7.6.tgz";
-        sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hoek" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
+      name = "hoek-0.7.6.tgz";
+      sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hoek" ];
+    peerDependencies = [];
   };
   by-spec."hoek"."0.9.x" =
     self.by-version."hoek"."0.9.1";
-  by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."hoek"."0.9.1" = self.buildNodePackage {
     name = "hoek-0.9.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
-        name = "hoek-0.9.1.tgz";
-        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hoek" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+      name = "hoek-0.9.1.tgz";
+      sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hoek" ];
+    peerDependencies = [];
   };
   by-spec."hooker"."~0.2.3" =
     self.by-version."hooker"."0.2.3";
-  by-version."hooker"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."hooker"."0.2.3" = self.buildNodePackage {
     name = "hooker-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hooker" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
+      name = "hooker-0.2.3.tgz";
+      sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hooker" ];
+    peerDependencies = [];
   };
   by-spec."hooks"."0.2.1" =
     self.by-version."hooks"."0.2.1";
-  by-version."hooks"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."hooks"."0.2.1" = self.buildNodePackage {
     name = "hooks-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
-        name = "hooks-0.2.1.tgz";
-        sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hooks" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
+      name = "hooks-0.2.1.tgz";
+      sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hooks" ];
+    peerDependencies = [];
+  };
+  by-spec."hooks"."0.3.2" =
+    self.by-version."hooks"."0.3.2";
+  by-version."hooks"."0.3.2" = self.buildNodePackage {
+    name = "hooks-0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hooks/-/hooks-0.3.2.tgz";
+      name = "hooks-0.3.2.tgz";
+      sha1 = "a31f060c2026cea6cf1ca3eb178430e718e1c4a3";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."hosted-git-info"."^1.4.0" =
+    self.by-version."hosted-git-info"."1.5.3";
+  by-version."hosted-git-info"."1.5.3" = self.buildNodePackage {
+    name = "hosted-git-info-1.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-1.5.3.tgz";
+      name = "hosted-git-info-1.5.3.tgz";
+      sha1 = "1f46e25e9c0e207852fb7a4b94422ed5f09a03f5";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."html-md"."^3.0.2" =
+    self.by-version."html-md"."3.0.2";
+  by-version."html-md"."3.0.2" = self.buildNodePackage {
+    name = "html-md-3.0.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/html-md/-/html-md-3.0.2.tgz";
+      name = "html-md-3.0.2.tgz";
+      sha1 = "becac66f3c7d27aa99409d0a17f1131f16fe510f";
+    };
+    deps = {
+      "commander-2.0.0" = self.by-version."commander"."2.0.0";
+      "fs-extra-0.7.1" = self.by-version."fs-extra"."0.7.1";
+      "jsdom-0.8.11" = self.by-version."jsdom"."0.8.11";
+    };
+    peerDependencies = [];
+  };
+  by-spec."html5"."~1.0.5" =
+    self.by-version."html5"."1.0.5";
+  by-version."html5"."1.0.5" = self.buildNodePackage {
+    name = "html5-1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/html5/-/html5-1.0.5.tgz";
+      name = "html5-1.0.5.tgz";
+      sha1 = "c9e6ce4e07a70521904bee1b318a4c48feab5848";
+    };
+    deps = {
+      "opts-1.2.2" = self.by-version."opts"."1.2.2";
+      "html5-entities-1.0.0" = self.by-version."html5-entities"."1.0.0";
+      "jsdom-0.11.1" = self.by-version."jsdom"."0.11.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."html5-entities"."^1.0.0" =
+    self.by-version."html5-entities"."1.0.0";
+  by-version."html5-entities"."1.0.0" = self.buildNodePackage {
+    name = "html5-entities-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz";
+      name = "html5-entities-1.0.0.tgz";
+      sha1 = "e568fd84d8efb52c806b16c98b92dad548ebe370";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
+  by-spec."html5-entities"."~1.0.0" =
+    self.by-version."html5-entities"."1.0.0";
   by-spec."htmlparser2"."3.8.x" =
     self.by-version."htmlparser2"."3.8.2";
-  by-version."htmlparser2"."3.8.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."htmlparser2"."3.8.2" = self.buildNodePackage {
     name = "htmlparser2-3.8.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz";
-        name = "htmlparser2-3.8.2.tgz";
-        sha1 = "0d6bc3471d01e9766fc2c274cbac1d55b36c009c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."htmlparser2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz";
+      name = "htmlparser2-3.8.2.tgz";
+      sha1 = "0d6bc3471d01e9766fc2c274cbac1d55b36c009c";
+    };
     deps = {
       "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
       "domutils-1.5.0" = self.by-version."domutils"."1.5.0";
@@ -12639,286 +12543,267 @@
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "entities-1.0.0" = self.by-version."entities"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "htmlparser2" ];
+    peerDependencies = [];
+  };
+  by-spec."htmlparser2".">= 3.1.5 <4" =
+    self.by-version."htmlparser2"."3.8.2";
+  by-spec."htmlparser2".">=3.4.0" =
+    self.by-version."htmlparser2"."3.8.2";
+  by-spec."htmlparser2"."^3.8.2" =
+    self.by-version."htmlparser2"."3.8.2";
+  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";
+    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.0" = self.by-version."domutils"."1.5.0";
+      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "entities-1.0.0" = self.by-version."entities"."1.0.0";
+    };
+    peerDependencies = [];
   };
   by-spec."http-auth"."2.0.7" =
     self.by-version."http-auth"."2.0.7";
-  by-version."http-auth"."2.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."http-auth"."2.0.7" = self.buildNodePackage {
     name = "http-auth-2.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
-        name = "http-auth-2.0.7.tgz";
-        sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-auth" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
+      name = "http-auth-2.0.7.tgz";
+      sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3";
+    };
     deps = {
       "coffee-script-1.6.3" = self.by-version."coffee-script"."1.6.3";
       "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-auth" ];
+    peerDependencies = [];
   };
   by-spec."http-browserify"."^1.4.0" =
     self.by-version."http-browserify"."1.7.0";
-  by-version."http-browserify"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."http-browserify"."1.7.0" = self.buildNodePackage {
     name = "http-browserify-1.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
-        name = "http-browserify-1.7.0.tgz";
-        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
+      name = "http-browserify-1.7.0.tgz";
+      sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
+    };
     deps = {
       "Base64-0.2.1" = self.by-version."Base64"."0.2.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-browserify" ];
+    peerDependencies = [];
   };
   by-spec."http-browserify"."~1.1.0" =
     self.by-version."http-browserify"."1.1.0";
-  by-version."http-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."http-browserify"."1.1.0" = self.buildNodePackage {
     name = "http-browserify-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.1.0.tgz";
-        name = "http-browserify-1.1.0.tgz";
-        sha1 = "20d0f6fdab370d1fe778d44a7bc48ddb7260206d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.1.0.tgz";
+      name = "http-browserify-1.1.0.tgz";
+      sha1 = "20d0f6fdab370d1fe778d44a7bc48ddb7260206d";
+    };
     deps = {
       "Base64-0.2.1" = self.by-version."Base64"."0.2.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-browserify" ];
+    peerDependencies = [];
   };
   by-spec."http-errors"."~1.2.8" =
     self.by-version."http-errors"."1.2.8";
-  by-version."http-errors"."1.2.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."http-errors"."1.2.8" = self.buildNodePackage {
     name = "http-errors-1.2.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz";
-        name = "http-errors-1.2.8.tgz";
-        sha1 = "8ee5fe0b51982221d796c0c4712d76f72097a4d0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-errors" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz";
+      name = "http-errors-1.2.8.tgz";
+      sha1 = "8ee5fe0b51982221d796c0c4712d76f72097a4d0";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "statuses-1.2.0" = self.by-version."statuses"."1.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-errors" ];
+    peerDependencies = [];
   };
   by-spec."http-proxy"."1.0.2" =
     self.by-version."http-proxy"."1.0.2";
-  by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."http-proxy"."1.0.2" = self.buildNodePackage {
     name = "http-proxy-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz";
-        name = "http-proxy-1.0.2.tgz";
-        sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-proxy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz";
+      name = "http-proxy-1.0.2.tgz";
+      sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254";
+    };
     deps = {
       "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-proxy" ];
+    peerDependencies = [];
   };
   by-spec."http-proxy"."~0.10" =
     self.by-version."http-proxy"."0.10.4";
-  by-version."http-proxy"."0.10.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."http-proxy"."0.10.4" = self.buildNodePackage {
     name = "http-proxy-0.10.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz";
-        name = "http-proxy-0.10.4.tgz";
-        sha1 = "14ba0ceaa2197f89fa30dea9e7b09e19cd93c22f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-proxy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz";
+      name = "http-proxy-0.10.4.tgz";
+      sha1 = "14ba0ceaa2197f89fa30dea9e7b09e19cd93c22f";
+    };
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-proxy" ];
+    peerDependencies = [];
+  };
+  by-spec."http-proxy-agent"."0" =
+    self.by-version."http-proxy-agent"."0.2.6";
+  by-version."http-proxy-agent"."0.2.6" = self.buildNodePackage {
+    name = "http-proxy-agent-0.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.6.tgz";
+      name = "http-proxy-agent-0.2.6.tgz";
+      sha1 = "d4a0a2350a75d4fb5102299e8f8c41f625873caa";
+    };
+    deps = {
+      "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
+      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+    };
+    peerDependencies = [];
   };
   by-spec."http-signature"."0.9.11" =
     self.by-version."http-signature"."0.9.11";
-  by-version."http-signature"."0.9.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."http-signature"."0.9.11" = self.buildNodePackage {
     name = "http-signature-0.9.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
-        name = "http-signature-0.9.11.tgz";
-        sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-signature" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
+      name = "http-signature-0.9.11.tgz";
+      sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
+    };
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
       "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
       "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-signature" ];
+    peerDependencies = [];
   };
   by-spec."http-signature"."~0.10.0" =
     self.by-version."http-signature"."0.10.1";
-  by-version."http-signature"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."http-signature"."0.10.1" = self.buildNodePackage {
     name = "http-signature-0.10.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-        name = "http-signature-0.10.1.tgz";
-        sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-signature" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+      name = "http-signature-0.10.1.tgz";
+      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+    };
     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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-signature" ];
+    peerDependencies = [];
   };
   by-spec."https-browserify"."~0.0.0" =
     self.by-version."https-browserify"."0.0.0";
-  by-version."https-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."https-browserify"."0.0.0" = self.buildNodePackage {
     name = "https-browserify-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
-        name = "https-browserify-0.0.0.tgz";
-        sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."https-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
+      name = "https-browserify-0.0.0.tgz";
+      sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "https-browserify" ];
+    peerDependencies = [];
+  };
+  by-spec."https-proxy-agent"."0" =
+    self.by-version."https-proxy-agent"."0.3.5";
+  by-version."https-proxy-agent"."0.3.5" = self.buildNodePackage {
+    name = "https-proxy-agent-0.3.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.5.tgz";
+      name = "https-proxy-agent-0.3.5.tgz";
+      sha1 = "d41d43a912c0592f17552fc1a29cd484a2145648";
+    };
+    deps = {
+      "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
+      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+    };
+    peerDependencies = [];
   };
   by-spec."humanize"."~0.0.9" =
     self.by-version."humanize"."0.0.9";
-  by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."humanize"."0.0.9" = self.buildNodePackage {
     name = "humanize-0.0.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
-        name = "humanize-0.0.9.tgz";
-        sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."humanize" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
+      name = "humanize-0.0.9.tgz";
+      sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "humanize" ];
+    peerDependencies = [];
   };
   by-spec."i"."0.3.x" =
     self.by-version."i"."0.3.2";
-  by-version."i"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."i"."0.3.2" = self.buildNodePackage {
     name = "i-0.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz";
-        name = "i-0.3.2.tgz";
-        sha1 = "b2e2d6ef47900bd924e281231ff4c5cc798d9ea8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."i" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz";
+      name = "i-0.3.2.tgz";
+      sha1 = "b2e2d6ef47900bd924e281231ff4c5cc798d9ea8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "i" ];
+    peerDependencies = [];
   };
   by-spec."i18next"."*" =
-    self.by-version."i18next"."1.7.8";
-  by-version."i18next"."1.7.8" = lib.makeOverridable self.buildNodePackage {
-    name = "i18next-1.7.8";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.8.tgz";
-        name = "i18next-1.7.8.tgz";
-        sha1 = "d100ad29ec5906b61de766479786fe00ce68e5c3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."i18next" or []);
+    self.by-version."i18next"."1.7.9";
+  by-version."i18next"."1.7.9" = self.buildNodePackage {
+    name = "i18next-1.7.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/i18next/-/i18next-1.7.9.tgz";
+      name = "i18next-1.7.9.tgz";
+      sha1 = "91e37d8383c899cf9f84057f96cfdcaacf55afbf";
+    };
     deps = {
       "cookies-0.5.0" = self.by-version."cookies"."0.5.0";
       "json5-0.2.0" = self.by-version."json5"."0.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "i18next" ];
+    peerDependencies = [];
   };
-  "i18next" = self.by-version."i18next"."1.7.8";
+  "i18next" = self.by-version."i18next"."1.7.9";
   by-spec."ibrik"."~2.0.0" =
     self.by-version."ibrik"."2.0.0";
-  by-version."ibrik"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ibrik"."2.0.0" = self.buildNodePackage {
     name = "ibrik-2.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ibrik/-/ibrik-2.0.0.tgz";
-        name = "ibrik-2.0.0.tgz";
-        sha1 = "89a2434f2a5c82b92166c3d97de3b5636eea2e9c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ibrik" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ibrik/-/ibrik-2.0.0.tgz";
+      name = "ibrik-2.0.0.tgz";
+      sha1 = "89a2434f2a5c82b92166c3d97de3b5636eea2e9c";
+    };
     deps = {
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0";
@@ -12927,228 +12812,226 @@
       "which-1.0.8" = self.by-version."which"."1.0.8";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "esprima-1.2.2" = self.by-version."esprima"."1.2.2";
+      "esprima-1.2.3" = self.by-version."esprima"."1.2.3";
       "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ibrik" ];
+    peerDependencies = [];
   };
   by-spec."iconv-lite"."0.4.4" =
     self.by-version."iconv-lite"."0.4.4";
-  by-version."iconv-lite"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."iconv-lite"."0.4.4" = self.buildNodePackage {
     name = "iconv-lite-0.4.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
-        name = "iconv-lite-0.4.4.tgz";
-        sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."iconv-lite" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
+      name = "iconv-lite-0.4.4.tgz";
+      sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "iconv-lite" ];
+    peerDependencies = [];
   };
   by-spec."iconv-lite"."0.4.5" =
     self.by-version."iconv-lite"."0.4.5";
-  by-version."iconv-lite"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."iconv-lite"."0.4.5" = self.buildNodePackage {
     name = "iconv-lite-0.4.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz";
-        name = "iconv-lite-0.4.5.tgz";
-        sha1 = "9c574b70c30d615859f2064d2be4335ad6b1a8d6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."iconv-lite" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz";
+      name = "iconv-lite-0.4.5.tgz";
+      sha1 = "9c574b70c30d615859f2064d2be4335ad6b1a8d6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "iconv-lite" ];
+    peerDependencies = [];
+  };
+  by-spec."iconv-lite"."0.4.6" =
+    self.by-version."iconv-lite"."0.4.6";
+  by-version."iconv-lite"."0.4.6" = self.buildNodePackage {
+    name = "iconv-lite-0.4.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.6.tgz";
+      name = "iconv-lite-0.4.6.tgz";
+      sha1 = "e39c682610a791f3eedc27382ff49e263f91fa09";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
-  by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."iconv-lite"."0.2.11" = self.buildNodePackage {
     name = "iconv-lite-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."iconv-lite" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "iconv-lite" ];
+    peerDependencies = [];
   };
   by-spec."iconv-lite"."~0.4.4" =
-    self.by-version."iconv-lite"."0.4.5";
+    self.by-version."iconv-lite"."0.4.6";
+  by-spec."iconv-lite"."~0.4.5" =
+    self.by-version."iconv-lite"."0.4.6";
   by-spec."ieee754"."^1.1.4" =
     self.by-version."ieee754"."1.1.4";
-  by-version."ieee754"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."ieee754"."1.1.4" = self.buildNodePackage {
     name = "ieee754-1.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz";
-        name = "ieee754-1.1.4.tgz";
-        sha1 = "e3ec65200d4ad531d359aabdb6d3ec812699a30b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ieee754" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz";
+      name = "ieee754-1.1.4.tgz";
+      sha1 = "e3ec65200d4ad531d359aabdb6d3ec812699a30b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ieee754" ];
+    peerDependencies = [];
   };
   by-spec."ieee754"."~1.1.1" =
     self.by-version."ieee754"."1.1.4";
   by-spec."image-size"."~0.3.5" =
     self.by-version."image-size"."0.3.5";
-  by-version."image-size"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."image-size"."0.3.5" = self.buildNodePackage {
     name = "image-size-0.3.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz";
-        name = "image-size-0.3.5.tgz";
-        sha1 = "83240eab2fb5b00b04aab8c74b0471e9cba7ad8c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."image-size" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz";
+      name = "image-size-0.3.5.tgz";
+      sha1 = "83240eab2fb5b00b04aab8c74b0471e9cba7ad8c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "image-size" ];
+    peerDependencies = [];
+  };
+  by-spec."imagemagick".">=0.1.3" =
+    self.by-version."imagemagick"."0.1.3";
+  by-version."imagemagick"."0.1.3" = self.buildNodePackage {
+    name = "imagemagick-0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/imagemagick/-/imagemagick-0.1.3.tgz";
+      name = "imagemagick-0.1.3.tgz";
+      sha1 = "7483cea093b4d9f2e2f396857adc8821b537c56a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."indent-string"."^1.1.0" =
     self.by-version."indent-string"."1.2.0";
-  by-version."indent-string"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."indent-string"."1.2.0" = self.buildNodePackage {
     name = "indent-string-1.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz";
-        name = "indent-string-1.2.0.tgz";
-        sha1 = "4d747797d66745bd54c6a289f5ce19f51750a4b9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."indent-string" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz";
+      name = "indent-string-1.2.0.tgz";
+      sha1 = "4d747797d66745bd54c6a289f5ce19f51750a4b9";
+    };
     deps = {
       "get-stdin-3.0.2" = self.by-version."get-stdin"."3.0.2";
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
       "repeating-1.1.1" = self.by-version."repeating"."1.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "indent-string" ];
+    peerDependencies = [];
   };
   by-spec."indexof"."0.0.1" =
     self.by-version."indexof"."0.0.1";
-  by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."indexof"."0.0.1" = self.buildNodePackage {
     name = "indexof-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."indexof" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+      name = "indexof-0.0.1.tgz";
+      sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "indexof" ];
+    peerDependencies = [];
+  };
+  by-spec."inflection"."~1.3.0" =
+    self.by-version."inflection"."1.3.8";
+  by-version."inflection"."1.3.8" = self.buildNodePackage {
+    name = "inflection-1.3.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz";
+      name = "inflection-1.3.8.tgz";
+      sha1 = "cbd160da9f75b14c3cc63578d4f396784bf3014e";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."inflection"."~1.5.3" =
+    self.by-version."inflection"."1.5.3";
+  by-version."inflection"."1.5.3" = self.buildNodePackage {
+    name = "inflection-1.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inflection/-/inflection-1.5.3.tgz";
+      name = "inflection-1.5.3.tgz";
+      sha1 = "192a6d80f666d11b10012311d7f330ee40dbc01e";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."inflight"."^1.0.4" =
     self.by-version."inflight"."1.0.4";
-  by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."inflight"."1.0.4" = self.buildNodePackage {
     name = "inflight-1.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
-        name = "inflight-1.0.4.tgz";
-        sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inflight" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
+      name = "inflight-1.0.4.tgz";
+      sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
+    };
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "inflight" ];
+    peerDependencies = [];
   };
   by-spec."inflight"."~1.0.1" =
     self.by-version."inflight"."1.0.4";
   by-spec."inflight"."~1.0.4" =
     self.by-version."inflight"."1.0.4";
+  by-spec."inherits"."*" =
+    self.by-version."inherits"."2.0.1";
+  by-version."inherits"."2.0.1" = self.buildNodePackage {
+    name = "inherits-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 = {
+    };
+    peerDependencies = [];
+  };
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.0";
-  by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."inherits"."1.0.0" = self.buildNodePackage {
     name = "inherits-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inherits" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
+      name = "inherits-1.0.0.tgz";
+      sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "inherits" ];
+    peerDependencies = [];
   };
   by-spec."inherits"."1.x" =
     self.by-version."inherits"."1.0.0";
   by-spec."inherits"."2" =
     self.by-version."inherits"."2.0.1";
-  by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "inherits-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inherits" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "inherits" ];
-  };
   by-spec."inherits"."2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-spec."inherits"."^2.0.1" =
@@ -13161,23 +13044,17 @@
     self.by-version."inherits"."2.0.1";
   by-spec."ini"."1" =
     self.by-version."ini"."1.3.2";
-  by-version."ini"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ini"."1.3.2" = self.buildNodePackage {
     name = "ini-1.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ini/-/ini-1.3.2.tgz";
-        name = "ini-1.3.2.tgz";
-        sha1 = "9ebf4a44daf9d89acd07aab9f89a083d887f6dec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ini" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ini/-/ini-1.3.2.tgz";
+      name = "ini-1.3.2.tgz";
+      sha1 = "9ebf4a44daf9d89acd07aab9f89a083d887f6dec";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ini" ];
+    peerDependencies = [];
   };
   by-spec."ini"."1.x.x" =
     self.by-version."ini"."1.3.2";
@@ -13185,43 +13062,31 @@
     self.by-version."ini"."1.3.2";
   by-spec."ini"."~1.1.0" =
     self.by-version."ini"."1.1.0";
-  by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ini"."1.1.0" = self.buildNodePackage {
     name = "ini-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
-        name = "ini-1.1.0.tgz";
-        sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ini" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+      name = "ini-1.1.0.tgz";
+      sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ini" ];
+    peerDependencies = [];
   };
   by-spec."ini"."~1.2.0" =
     self.by-version."ini"."1.2.1";
-  by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."ini"."1.2.1" = self.buildNodePackage {
     name = "ini-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz";
-        name = "ini-1.2.1.tgz";
-        sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ini" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz";
+      name = "ini-1.2.1.tgz";
+      sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ini" ];
+    peerDependencies = [];
   };
   by-spec."ini"."~1.3.0" =
     self.by-version."ini"."1.3.2";
@@ -13229,144 +13094,152 @@
     self.by-version."ini"."1.3.2";
   by-spec."init-package-json"."~1.0.0" =
     self.by-version."init-package-json"."1.0.1";
-  by-version."init-package-json"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."init-package-json"."1.0.1" = self.buildNodePackage {
     name = "init-package-json-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.0.1.tgz";
-        name = "init-package-json-1.0.1.tgz";
-        sha1 = "c01b08cc90504ebc448d57b468e66fc08293e8a8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."init-package-json" or []);
-    deps = {
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.0.1.tgz";
+      name = "init-package-json-1.0.1.tgz";
+      sha1 = "c01b08cc90504ebc448d57b468e66fc08293e8a8";
+    };
+    deps = {
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "promzard-0.2.2" = self.by-version."promzard"."0.2.2";
       "read-1.0.5" = self.by-version."read"."1.0.5";
       "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
       "semver-4.2.0" = self.by-version."semver"."4.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "init-package-json" ];
+    peerDependencies = [];
   };
   by-spec."init-package-json"."~1.1.3" =
     self.by-version."init-package-json"."1.1.3";
-  by-version."init-package-json"."1.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."init-package-json"."1.1.3" = self.buildNodePackage {
     name = "init-package-json-1.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.3.tgz";
-        name = "init-package-json-1.1.3.tgz";
-        sha1 = "1d633c151a4909891afc8ee13cace8b336c0c9c2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."init-package-json" or []);
-    deps = {
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.3.tgz";
+      name = "init-package-json-1.1.3.tgz";
+      sha1 = "1d633c151a4909891afc8ee13cace8b336c0c9c2";
+    };
+    deps = {
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
+      "promzard-0.2.2" = self.by-version."promzard"."0.2.2";
+      "read-1.0.5" = self.by-version."read"."1.0.5";
+      "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
+      "semver-4.2.0" = self.by-version."semver"."4.2.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."init-package-json"."~1.2.0" =
+    self.by-version."init-package-json"."1.2.0";
+  by-version."init-package-json"."1.2.0" = self.buildNodePackage {
+    name = "init-package-json-1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.2.0.tgz";
+      name = "init-package-json-1.2.0.tgz";
+      sha1 = "b9f027514403b3b3f582c148592ab75214003348";
+    };
+    deps = {
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "promzard-0.2.2" = self.by-version."promzard"."0.2.2";
       "read-1.0.5" = self.by-version."read"."1.0.5";
       "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
       "semver-4.2.0" = self.by-version."semver"."4.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "init-package-json" ];
+    peerDependencies = [];
   };
   by-spec."inline-source-map"."~0.3.0" =
     self.by-version."inline-source-map"."0.3.0";
-  by-version."inline-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."inline-source-map"."0.3.0" = self.buildNodePackage {
     name = "inline-source-map-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz";
-        name = "inline-source-map-0.3.0.tgz";
-        sha1 = "ad2acca97d82fcb9d0a56221ee72e8043116424a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inline-source-map" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz";
+      name = "inline-source-map-0.3.0.tgz";
+      sha1 = "ad2acca97d82fcb9d0a56221ee72e8043116424a";
+    };
     deps = {
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "inline-source-map" ];
+    peerDependencies = [];
   };
   by-spec."inquirer"."0.7.1" =
     self.by-version."inquirer"."0.7.1";
-  by-version."inquirer"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."inquirer"."0.7.1" = self.buildNodePackage {
     name = "inquirer-0.7.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz";
-        name = "inquirer-0.7.1.tgz";
-        sha1 = "b8acf140165bd581862ed1198fb6d26430091fac";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inquirer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz";
+      name = "inquirer-0.7.1.tgz";
+      sha1 = "b8acf140165bd581862ed1198fb6d26430091fac";
+    };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2";
       "figures-1.3.5" = self.by-version."figures"."1.3.5";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
-      "readline2-0.1.0" = self.by-version."readline2"."0.1.0";
-      "rx-2.3.22" = self.by-version."rx"."2.3.22";
+      "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
+      "rx-2.3.24" = self.by-version."rx"."2.3.24";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "inquirer" ];
+    peerDependencies = [];
+  };
+  by-spec."inquirer".">=0.2.4" =
+    self.by-version."inquirer"."0.8.0";
+  by-version."inquirer"."0.8.0" = self.buildNodePackage {
+    name = "inquirer-0.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inquirer/-/inquirer-0.8.0.tgz";
+      name = "inquirer-0.8.0.tgz";
+      sha1 = "525d4dd827d4f3d506b453726068f90deb99b443";
+    };
+    deps = {
+      "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0";
+      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2";
+      "figures-1.3.5" = self.by-version."figures"."1.3.5";
+      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
+      "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
+      "rx-2.3.24" = self.by-version."rx"."2.3.24";
+      "through-2.3.6" = self.by-version."through"."2.3.6";
+    };
+    peerDependencies = [];
   };
   by-spec."inquirer"."^0.6.0" =
     self.by-version."inquirer"."0.6.0";
-  by-version."inquirer"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."inquirer"."0.6.0" = self.buildNodePackage {
     name = "inquirer-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz";
-        name = "inquirer-0.6.0.tgz";
-        sha1 = "614d7bb3e48f9e6a8028e94a0c38f23ef29823d3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inquirer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz";
+      name = "inquirer-0.6.0.tgz";
+      sha1 = "614d7bb3e48f9e6a8028e94a0c38f23ef29823d3";
+    };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
-      "readline2-0.1.0" = self.by-version."readline2"."0.1.0";
-      "rx-2.3.22" = self.by-version."rx"."2.3.22";
+      "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
+      "rx-2.3.24" = self.by-version."rx"."2.3.24";
       "through-2.3.6" = self.by-version."through"."2.3.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "inquirer" ];
+    peerDependencies = [];
   };
   by-spec."insert-module-globals"."^6.1.0" =
     self.by-version."insert-module-globals"."6.2.0";
-  by-version."insert-module-globals"."6.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."insert-module-globals"."6.2.0" = self.buildNodePackage {
     name = "insert-module-globals-6.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.0.tgz";
-        name = "insert-module-globals-6.2.0.tgz";
-        sha1 = "4f75ce864f0a23c2edc73f9a582d23b6581484ff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."insert-module-globals" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.0.tgz";
+      name = "insert-module-globals-6.2.0.tgz";
+      sha1 = "4f75ce864f0a23c2edc73f9a582d23b6581484ff";
+    };
     deps = {
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
@@ -13376,26 +13249,20 @@
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "insert-module-globals" ];
+    peerDependencies = [];
   };
   by-spec."insert-module-globals"."^6.2.0" =
     self.by-version."insert-module-globals"."6.2.0";
   by-spec."insert-module-globals"."~2.3.0" =
     self.by-version."insert-module-globals"."2.3.4";
-  by-version."insert-module-globals"."2.3.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."insert-module-globals"."2.3.4" = self.buildNodePackage {
     name = "insert-module-globals-2.3.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-2.3.4.tgz";
-        name = "insert-module-globals-2.3.4.tgz";
-        sha1 = "e920cd470bcf1f47713eac6cc5cc13437e1a9e7e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."insert-module-globals" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-2.3.4.tgz";
+      name = "insert-module-globals-2.3.4.tgz";
+      sha1 = "e920cd470bcf1f47713eac6cc5cc13437e1a9e7e";
+    };
     deps = {
       "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
       "lexical-scope-0.0.15" = self.by-version."lexical-scope"."0.0.15";
@@ -13407,24 +13274,18 @@
       "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17";
       "browserify-3.24.13" = self.by-version."browserify"."3.24.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "insert-module-globals" ];
+    peerDependencies = [];
   };
   by-spec."insert-module-globals"."~3.1.2" =
     self.by-version."insert-module-globals"."3.1.3";
-  by-version."insert-module-globals"."3.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."insert-module-globals"."3.1.3" = self.buildNodePackage {
     name = "insert-module-globals-3.1.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.1.3.tgz";
-        name = "insert-module-globals-3.1.3.tgz";
-        sha1 = "d5b80e3a9c86d2bf9a522baee3c14f00d931038a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."insert-module-globals" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.1.3.tgz";
+      name = "insert-module-globals-3.1.3.tgz";
+      sha1 = "d5b80e3a9c86d2bf9a522baee3c14f00d931038a";
+    };
     deps = {
       "lexical-scope-0.1.0" = self.by-version."lexical-scope"."0.1.0";
       "process-0.5.2" = self.by-version."process"."0.5.2";
@@ -13432,24 +13293,18 @@
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "insert-module-globals" ];
+    peerDependencies = [];
   };
   by-spec."insight"."0.4.3" =
     self.by-version."insight"."0.4.3";
-  by-version."insight"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."insight"."0.4.3" = self.buildNodePackage {
     name = "insight-0.4.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/insight/-/insight-0.4.3.tgz";
-        name = "insight-0.4.3.tgz";
-        sha1 = "76d653c5c0d8048b03cdba6385a6948f74614af0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."insight" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/insight/-/insight-0.4.3.tgz";
+      name = "insight-0.4.3.tgz";
+      sha1 = "76d653c5c0d8048b03cdba6385a6948f74614af0";
+    };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
@@ -13457,173 +13312,157 @@
       "inquirer-0.6.0" = self.by-version."inquirer"."0.6.0";
       "lodash.debounce-2.4.1" = self.by-version."lodash.debounce"."2.4.1";
       "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
-      "os-name-1.0.1" = self.by-version."os-name"."1.0.1";
+      "os-name-1.0.2" = self.by-version."os-name"."1.0.2";
       "request-2.51.0" = self.by-version."request"."2.51.0";
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "insight" ];
+    peerDependencies = [];
+  };
+  by-spec."install"."~0.1.7" =
+    self.by-version."install"."0.1.8";
+  by-version."install"."0.1.8" = self.buildNodePackage {
+    name = "install-0.1.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/install/-/install-0.1.8.tgz";
+      name = "install-0.1.8.tgz";
+      sha1 = "9980ef93e30dfb534778d163bc86ddd472ad5fe8";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."internal-ip"."^1.0.0" =
     self.by-version."internal-ip"."1.0.0";
-  by-version."internal-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."internal-ip"."1.0.0" = self.buildNodePackage {
     name = "internal-ip-1.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/internal-ip/-/internal-ip-1.0.0.tgz";
-        name = "internal-ip-1.0.0.tgz";
-        sha1 = "b484048e9051d07251bcc7e4396df547f4e3497e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."internal-ip" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/internal-ip/-/internal-ip-1.0.0.tgz";
+      name = "internal-ip-1.0.0.tgz";
+      sha1 = "b484048e9051d07251bcc7e4396df547f4e3497e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "internal-ip" ];
+    peerDependencies = [];
   };
   by-spec."interpret"."^0.3.2" =
     self.by-version."interpret"."0.3.10";
-  by-version."interpret"."0.3.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."interpret"."0.3.10" = self.buildNodePackage {
     name = "interpret-0.3.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz";
-        name = "interpret-0.3.10.tgz";
-        sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."interpret" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz";
+      name = "interpret-0.3.10.tgz";
+      sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "interpret" ];
+    peerDependencies = [];
   };
   by-spec."intersect"."~0.0.3" =
     self.by-version."intersect"."0.0.3";
-  by-version."intersect"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."intersect"."0.0.3" = self.buildNodePackage {
     name = "intersect-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz";
-        name = "intersect-0.0.3.tgz";
-        sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."intersect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz";
+      name = "intersect-0.0.3.tgz";
+      sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "intersect" ];
+    peerDependencies = [];
   };
   by-spec."ip"."^0.3.0" =
     self.by-version."ip"."0.3.2";
-  by-version."ip"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ip"."0.3.2" = self.buildNodePackage {
     name = "ip-0.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ip/-/ip-0.3.2.tgz";
-        name = "ip-0.3.2.tgz";
-        sha1 = "7d5ed34326688b36b6ab81f1865ea8266c28f0db";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ip" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ip/-/ip-0.3.2.tgz";
+      name = "ip-0.3.2.tgz";
+      sha1 = "7d5ed34326688b36b6ab81f1865ea8266c28f0db";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ip" ];
+    peerDependencies = [];
   };
   by-spec."ip-regex"."^1.0.0" =
     self.by-version."ip-regex"."1.0.2";
-  by-version."ip-regex"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ip-regex"."1.0.2" = self.buildNodePackage {
     name = "ip-regex-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.2.tgz";
-        name = "ip-regex-1.0.2.tgz";
-        sha1 = "1e7daad2c2d0c268729ecca91f8ec463ad58f56b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ip-regex" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.2.tgz";
+      name = "ip-regex-1.0.2.tgz";
+      sha1 = "1e7daad2c2d0c268729ecca91f8ec463ad58f56b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ip-regex" ];
+    peerDependencies = [];
   };
   by-spec."ip-set"."^1.0.0" =
     self.by-version."ip-set"."1.0.0";
-  by-version."ip-set"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ip-set"."1.0.0" = self.buildNodePackage {
     name = "ip-set-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ip-set/-/ip-set-1.0.0.tgz";
-        name = "ip-set-1.0.0.tgz";
-        sha1 = "54782fb5ae37ab6e697a2b49e07748d9e069dda6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ip-set" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ip-set/-/ip-set-1.0.0.tgz";
+      name = "ip-set-1.0.0.tgz";
+      sha1 = "54782fb5ae37ab6e697a2b49e07748d9e069dda6";
+    };
     deps = {
       "ip-0.3.2" = self.by-version."ip"."0.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ip-set" ];
+    peerDependencies = [];
+  };
+  by-spec."ipaddr.js"."0.1.2" =
+    self.by-version."ipaddr.js"."0.1.2";
+  by-version."ipaddr.js"."0.1.2" = self.buildNodePackage {
+    name = "ipaddr.js-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
+      name = "ipaddr.js-0.1.2.tgz";
+      sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."ipaddr.js"."0.1.6" =
     self.by-version."ipaddr.js"."0.1.6";
-  by-version."ipaddr.js"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."ipaddr.js"."0.1.6" = self.buildNodePackage {
     name = "ipaddr.js-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.6.tgz";
-        name = "ipaddr.js-0.1.6.tgz";
-        sha1 = "8f0530b217993873025fd4b72bdfd69bc56a9a12";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ipaddr.js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.6.tgz";
+      name = "ipaddr.js-0.1.6.tgz";
+      sha1 = "8f0530b217993873025fd4b72bdfd69bc56a9a12";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ipaddr.js" ];
+    peerDependencies = [];
   };
+  by-spec."ipaddr.js".">= 0.1.1" =
+    self.by-version."ipaddr.js"."0.1.6";
   by-spec."ipaddr.js".">= 0.1.5" =
     self.by-version."ipaddr.js"."0.1.6";
+  by-spec."ipaddr.js".">=0.1.2" =
+    self.by-version."ipaddr.js"."0.1.6";
   by-spec."ipaddr.js"."^0.1.5" =
     self.by-version."ipaddr.js"."0.1.6";
   by-spec."ironhorse"."*" =
     self.by-version."ironhorse"."0.0.10";
-  by-version."ironhorse"."0.0.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."ironhorse"."0.0.10" = self.buildNodePackage {
     name = "ironhorse-0.0.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.10.tgz";
-        name = "ironhorse-0.0.10.tgz";
-        sha1 = "98c1c9e29889fabbaaea0ce558501c47f9319856";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ironhorse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.10.tgz";
+      name = "ironhorse-0.0.10.tgz";
+      sha1 = "98c1c9e29889fabbaaea0ce558501c47f9319856";
+    };
     deps = {
       "underscore-1.5.2" = self.by-version."underscore"."1.5.2";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
@@ -13631,221 +13470,175 @@
       "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1";
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1";
-      "jade-1.8.2" = self.by-version."jade"."1.8.2";
+      "jade-1.9.1" = self.by-version."jade"."1.9.1";
       "passport-0.2.1" = self.by-version."passport"."0.2.1";
       "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2";
       "js-yaml-3.2.5" = self.by-version."js-yaml"."3.2.5";
-      "mongoose-3.8.21" = self.by-version."mongoose"."3.8.21";
+      "mongoose-3.8.22" = self.by-version."mongoose"."3.8.22";
       "gridfs-stream-0.5.3" = self.by-version."gridfs-stream"."0.5.3";
       "temp-0.8.1" = self.by-version."temp"."0.8.1";
       "kue-0.8.11" = self.by-version."kue"."0.8.11";
       "redis-0.12.1" = self.by-version."redis"."0.12.1";
       "hiredis-0.1.17" = self.by-version."hiredis"."0.1.17";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ironhorse" ];
+    peerDependencies = [];
   };
   "ironhorse" = self.by-version."ironhorse"."0.0.10";
   by-spec."is-array"."^1.0.1" =
     self.by-version."is-array"."1.0.1";
-  by-version."is-array"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."is-array"."1.0.1" = self.buildNodePackage {
     name = "is-array-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz";
-        name = "is-array-1.0.1.tgz";
-        sha1 = "e9850cc2cc860c3bc0977e84ccf0dd464584279a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-array" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz";
+      name = "is-array-1.0.1.tgz";
+      sha1 = "e9850cc2cc860c3bc0977e84ccf0dd464584279a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-array" ];
+    peerDependencies = [];
   };
   by-spec."is-finite"."^1.0.0" =
     self.by-version."is-finite"."1.0.0";
-  by-version."is-finite"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."is-finite"."1.0.0" = self.buildNodePackage {
     name = "is-finite-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz";
-        name = "is-finite-1.0.0.tgz";
-        sha1 = "2b1dbad1162cdca6a4dc89f12b2f3dae12393282";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-finite" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz";
+      name = "is-finite-1.0.0.tgz";
+      sha1 = "2b1dbad1162cdca6a4dc89f12b2f3dae12393282";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-finite" ];
+    peerDependencies = [];
+  };
+  by-spec."is-glob"."^0.3.0" =
+    self.by-version."is-glob"."0.3.0";
+  by-version."is-glob"."0.3.0" = self.buildNodePackage {
+    name = "is-glob-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-glob/-/is-glob-0.3.0.tgz";
+      name = "is-glob-0.3.0.tgz";
+      sha1 = "36f358abccfb33836406c44075b121a58736a382";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."is-ip"."^1.0.0" =
     self.by-version."is-ip"."1.0.0";
-  by-version."is-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."is-ip"."1.0.0" = self.buildNodePackage {
     name = "is-ip-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz";
-        name = "is-ip-1.0.0.tgz";
-        sha1 = "2bb6959f797ccd6f9fdc812758bcbc87c4c59074";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-ip" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz";
+      name = "is-ip-1.0.0.tgz";
+      sha1 = "2bb6959f797ccd6f9fdc812758bcbc87c4c59074";
+    };
     deps = {
       "ip-regex-1.0.2" = self.by-version."ip-regex"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-ip" ];
+    peerDependencies = [];
   };
   by-spec."is-npm"."^1.0.0" =
     self.by-version."is-npm"."1.0.0";
-  by-version."is-npm"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."is-npm"."1.0.0" = self.buildNodePackage {
     name = "is-npm-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
-        name = "is-npm-1.0.0.tgz";
-        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-npm" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
+      name = "is-npm-1.0.0.tgz";
+      sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-npm" ];
+    peerDependencies = [];
   };
   by-spec."is-promise"."~1" =
     self.by-version."is-promise"."1.0.1";
-  by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."is-promise"."1.0.1" = self.buildNodePackage {
     name = "is-promise-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
-        name = "is-promise-1.0.1.tgz";
-        sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-promise" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
+      name = "is-promise-1.0.1.tgz";
+      sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-promise" ];
+    peerDependencies = [];
   };
   by-spec."is-root"."~1.0.0" =
     self.by-version."is-root"."1.0.0";
-  by-version."is-root"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."is-root"."1.0.0" = self.buildNodePackage {
     name = "is-root-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz";
-        name = "is-root-1.0.0.tgz";
-        sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-root" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz";
+      name = "is-root-1.0.0.tgz";
+      sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-root" ];
+    peerDependencies = [];
   };
   by-spec."is-utf8"."^0.2.0" =
     self.by-version."is-utf8"."0.2.0";
-  by-version."is-utf8"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."is-utf8"."0.2.0" = self.buildNodePackage {
     name = "is-utf8-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz";
-        name = "is-utf8-0.2.0.tgz";
-        sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-utf8" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz";
+      name = "is-utf8-0.2.0.tgz";
+      sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-utf8" ];
+    peerDependencies = [];
   };
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
-  by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."isarray"."0.0.1" = self.buildNodePackage {
     name = "isarray-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."isarray" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+      name = "isarray-0.0.1.tgz";
+      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "isarray" ];
+    peerDependencies = [];
   };
   by-spec."isarray"."~0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-spec."isstream"."0.1.x" =
     self.by-version."isstream"."0.1.1";
-  by-version."isstream"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."isstream"."0.1.1" = self.buildNodePackage {
     name = "isstream-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz";
-        name = "isstream-0.1.1.tgz";
-        sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."isstream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz";
+      name = "isstream-0.1.1.tgz";
+      sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "isstream" ];
+    peerDependencies = [];
   };
   by-spec."istanbul"."*" =
     self.by-version."istanbul"."0.3.5";
-  by-version."istanbul"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."istanbul"."0.3.5" = self.buildNodePackage {
     name = "istanbul-0.3.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
-        name = "istanbul-0.3.5.tgz";
-        sha1 = "ef9ca4c1d5e6a5deac2245842051b59763a2de37";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."istanbul" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
+      name = "istanbul-0.3.5.tgz";
+      sha1 = "ef9ca4c1d5e6a5deac2245842051b59763a2de37";
+    };
     deps = {
-      "esprima-1.2.2" = self.by-version."esprima"."1.2.2";
+      "esprima-1.2.3" = self.by-version."esprima"."1.2.3";
       "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
       "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
@@ -13859,9 +13652,7 @@
       "js-yaml-3.2.5" = self.by-version."js-yaml"."3.2.5";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "istanbul" ];
+    peerDependencies = [];
   };
   "istanbul" = self.by-version."istanbul"."0.3.5";
   by-spec."istanbul"."~0.3.0" =
@@ -13869,91 +13660,70 @@
   by-spec."istanbul"."~0.3.2" =
     self.by-version."istanbul"."0.3.5";
   by-spec."jade"."*" =
-    self.by-version."jade"."1.8.2";
-  by-version."jade"."1.8.2" = lib.makeOverridable self.buildNodePackage {
-    name = "jade-1.8.2";
+    self.by-version."jade"."1.9.1";
+  by-version."jade"."1.9.1" = self.buildNodePackage {
+    name = "jade-1.9.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-1.8.2.tgz";
-        name = "jade-1.8.2.tgz";
-        sha1 = "0db3630b2cb8145f6bf144d760b56e6b0bbb0aa0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jade" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jade/-/jade-1.9.1.tgz";
+      name = "jade-1.9.1.tgz";
+      sha1 = "5cf8da5b1edb6973dc26d6d9245d0e8ba005cd26";
+    };
     deps = {
       "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1";
-      "commander-2.5.1" = self.by-version."commander"."2.5.1";
+      "commander-2.6.0" = self.by-version."commander"."2.6.0";
       "constantinople-3.0.1" = self.by-version."constantinople"."3.0.1";
+      "coveralls-2.11.2" = self.by-version."coveralls"."2.11.2";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
       "void-elements-1.0.0" = self.by-version."void-elements"."1.0.0";
       "with-4.0.0" = self.by-version."with"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jade" ];
+    peerDependencies = [];
   };
-  "jade" = self.by-version."jade"."1.8.2";
+  "jade" = self.by-version."jade"."1.9.1";
   by-spec."jade"."0.26.3" =
     self.by-version."jade"."0.26.3";
-  by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."jade"."0.26.3" = self.buildNodePackage {
     name = "jade-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jade" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jade" ];
+    peerDependencies = [];
   };
   by-spec."jade"."0.27.0" =
     self.by-version."jade"."0.27.0";
-  by-version."jade"."0.27.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."jade"."0.27.0" = self.buildNodePackage {
     name = "jade-0.27.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
-        name = "jade-0.27.0.tgz";
-        sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jade" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
+      name = "jade-0.27.0.tgz";
+      sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31";
+    };
     deps = {
       "commander-0.6.1" = self.by-version."commander"."0.6.1";
       "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jade" ];
+    peerDependencies = [];
   };
   by-spec."jade"."1.1.5" =
     self.by-version."jade"."1.1.5";
-  by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."jade"."1.1.5" = self.buildNodePackage {
     name = "jade-1.1.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz";
-        name = "jade-1.1.5.tgz";
-        sha1 = "e884d3d3565807e280f5ba760f68addb176627a3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jade" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz";
+      name = "jade-1.1.5.tgz";
+      sha1 = "e884d3d3565807e280f5ba760f68addb176627a3";
+    };
     deps = {
       "commander-2.1.0" = self.by-version."commander"."2.1.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
@@ -13963,26 +13733,20 @@
       "with-2.0.0" = self.by-version."with"."2.0.0";
       "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jade" ];
+    peerDependencies = [];
   };
   by-spec."jade".">= 0.0.1" =
-    self.by-version."jade"."1.8.2";
+    self.by-version."jade"."1.9.1";
   by-spec."jade"."~0.35.0" =
     self.by-version."jade"."0.35.0";
-  by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."jade"."0.35.0" = self.buildNodePackage {
     name = "jade-0.35.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz";
-        name = "jade-0.35.0.tgz";
-        sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jade" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz";
+      name = "jade-0.35.0.tgz";
+      sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9";
+    };
     deps = {
       "commander-2.0.0" = self.by-version."commander"."2.0.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
@@ -13992,143 +13756,119 @@
       "with-1.1.1" = self.by-version."with"."1.1.1";
       "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jade" ];
+    peerDependencies = [];
   };
   by-spec."jayschema"."*" =
     self.by-version."jayschema"."0.3.1";
-  by-version."jayschema"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."jayschema"."0.3.1" = self.buildNodePackage {
     name = "jayschema-0.3.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
-        name = "jayschema-0.3.1.tgz";
-        sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jayschema" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
+      name = "jayschema-0.3.1.tgz";
+      sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
+    };
     deps = {
       "when-3.4.6" = self.by-version."when"."3.4.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jayschema" ];
+    peerDependencies = [];
   };
   "jayschema" = self.by-version."jayschema"."0.3.1";
   by-spec."jfs"."*" =
     self.by-version."jfs"."0.2.5";
-  by-version."jfs"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."jfs"."0.2.5" = self.buildNodePackage {
     name = "jfs-0.2.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jfs/-/jfs-0.2.5.tgz";
-        name = "jfs-0.2.5.tgz";
-        sha1 = "c1ae4c89905724ae8caf79859783c0613254249f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jfs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jfs/-/jfs-0.2.5.tgz";
+      name = "jfs-0.2.5.tgz";
+      sha1 = "c1ae4c89905724ae8caf79859783c0613254249f";
+    };
     deps = {
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "clone-0.2.0" = self.by-version."clone"."0.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jfs" ];
+    peerDependencies = [];
   };
   "jfs" = self.by-version."jfs"."0.2.5";
+  by-spec."js-string-escape"."^1.0.0" =
+    self.by-version."js-string-escape"."1.0.0";
+  by-version."js-string-escape"."1.0.0" = self.buildNodePackage {
+    name = "js-string-escape-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.0.tgz";
+      name = "js-string-escape-1.0.0.tgz";
+      sha1 = "d2d2365fd2e6b3948b8374ac7628ac0e84d00002";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."js-yaml"."*" =
     self.by-version."js-yaml"."3.2.5";
-  by-version."js-yaml"."3.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."js-yaml"."3.2.5" = self.buildNodePackage {
     name = "js-yaml-3.2.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.5.tgz";
-        name = "js-yaml-3.2.5.tgz";
-        sha1 = "c29ee9a9e503e7ab83f071ccacdd0dac25ff9e22";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."js-yaml" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.5.tgz";
+      name = "js-yaml-3.2.5.tgz";
+      sha1 = "c29ee9a9e503e7ab83f071ccacdd0dac25ff9e22";
+    };
     deps = {
       "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "js-yaml" ];
+    peerDependencies = [];
   };
   "js-yaml" = self.by-version."js-yaml"."3.2.5";
   by-spec."js-yaml"."0.3.x" =
     self.by-version."js-yaml"."0.3.7";
-  by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."js-yaml"."0.3.7" = self.buildNodePackage {
     name = "js-yaml-0.3.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
-        name = "js-yaml-0.3.7.tgz";
-        sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."js-yaml" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
+      name = "js-yaml-0.3.7.tgz";
+      sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "js-yaml" ];
+    peerDependencies = [];
   };
   by-spec."js-yaml"."2.1.0" =
     self.by-version."js-yaml"."2.1.0";
-  by-version."js-yaml"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."js-yaml"."2.1.0" = self.buildNodePackage {
     name = "js-yaml-2.1.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
-        name = "js-yaml-2.1.0.tgz";
-        sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."js-yaml" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
+      name = "js-yaml-2.1.0.tgz";
+      sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
+    };
     deps = {
       "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "js-yaml" ];
+    peerDependencies = [];
   };
   by-spec."js-yaml"."3.0.1" =
     self.by-version."js-yaml"."3.0.1";
-  by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."js-yaml"."3.0.1" = self.buildNodePackage {
     name = "js-yaml-3.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
-        name = "js-yaml-3.0.1.tgz";
-        sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."js-yaml" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
+      name = "js-yaml-3.0.1.tgz";
+      sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe";
+    };
     deps = {
       "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "js-yaml" ];
+    peerDependencies = [];
   };
   by-spec."js-yaml"."3.x" =
     self.by-version."js-yaml"."3.2.5";
@@ -14136,62 +13876,109 @@
     self.by-version."js-yaml"."3.2.5";
   by-spec."js-yaml"."~2.0.5" =
     self.by-version."js-yaml"."2.0.5";
-  by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."js-yaml"."2.0.5" = self.buildNodePackage {
     name = "js-yaml-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."js-yaml" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "js-yaml" ];
+    peerDependencies = [];
+  };
+  by-spec."jsdom"."^0.10.5" =
+    self.by-version."jsdom"."0.10.6";
+  by-version."jsdom"."0.10.6" = self.buildNodePackage {
+    name = "jsdom-0.10.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsdom/-/jsdom-0.10.6.tgz";
+      name = "jsdom-0.10.6.tgz";
+      sha1 = "a3b1d875454ba0165575829679939ec006bf5ab8";
+    };
+    deps = {
+      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
+      "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
+      "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
+      "contextify-0.1.11" = self.by-version."contextify"."0.1.11";
+    };
+    peerDependencies = [];
+  };
+  by-spec."jsdom"."^0.11.0" =
+    self.by-version."jsdom"."0.11.1";
+  by-version."jsdom"."0.11.1" = self.buildNodePackage {
+    name = "jsdom-0.11.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz";
+      name = "jsdom-0.11.1.tgz";
+      sha1 = "f1a79756ebc2116932caef8c6bfde7022dacdbfb";
+    };
+    deps = {
+      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
+      "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
+      "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
+      "contextify-0.1.11" = self.by-version."contextify"."0.1.11";
+    };
+    peerDependencies = [];
+  };
+  by-spec."jsdom"."~0.8.6" =
+    self.by-version."jsdom"."0.8.11";
+  by-version."jsdom"."0.8.11" = self.buildNodePackage {
+    name = "jsdom-0.8.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsdom/-/jsdom-0.8.11.tgz";
+      name = "jsdom-0.8.11.tgz";
+      sha1 = "2a065f72863ac491137d19bd762ce9be1955527b";
+    };
+    deps = {
+      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
+      "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
+      "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
+      "contextify-0.1.11" = self.by-version."contextify"."0.1.11";
+    };
+    peerDependencies = [];
   };
   by-spec."jsesc"."0.4.3" =
     self.by-version."jsesc"."0.4.3";
-  by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."jsesc"."0.4.3" = self.buildNodePackage {
     name = "jsesc-0.4.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz";
-        name = "jsesc-0.4.3.tgz";
-        sha1 = "a9c7f90afd5a1bf2ee64df6c416dab61672d2ae9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jsesc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz";
+      name = "jsesc-0.4.3.tgz";
+      sha1 = "a9c7f90afd5a1bf2ee64df6c416dab61672d2ae9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jsesc" ];
+    peerDependencies = [];
   };
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.5.11";
-  by-version."jshint"."2.5.11" = lib.makeOverridable self.buildNodePackage {
-    name = "jshint-2.5.11";
+    self.by-version."jshint"."2.6.0";
+  by-version."jshint"."2.6.0" = self.buildNodePackage {
+    name = "jshint-2.6.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz";
-        name = "jshint-2.5.11.tgz";
-        sha1 = "e2d95858bbb1aa78300108a2e81099fb095622e0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jshint" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jshint/-/jshint-2.6.0.tgz";
+      name = "jshint-2.6.0.tgz";
+      sha1 = "04e59d04da83aa32301d89115628274871597f33";
+    };
     deps = {
       "cli-0.6.5" = self.by-version."cli"."0.6.5";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
@@ -14202,320 +13989,394 @@
       "strip-json-comments-1.0.2" = self.by-version."strip-json-comments"."1.0.2";
       "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jshint" ];
+    peerDependencies = [];
+  };
+  "jshint" = self.by-version."jshint"."2.6.0";
+  by-spec."jshint"."~2.6.0" =
+    self.by-version."jshint"."2.6.0";
+  by-spec."json"."*" =
+    self.by-version."json"."9.0.3";
+  by-version."json"."9.0.3" = self.buildNodePackage {
+    name = "json-9.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json/-/json-9.0.3.tgz";
+      name = "json-9.0.3.tgz";
+      sha1 = "08dd0eda9dda30a40d978cc8823c2ce72df5d4f1";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  "json" = self.by-version."json"."9.0.3";
+  by-spec."json-middleware"."^1.0.2" =
+    self.by-version."json-middleware"."1.0.2";
+  by-version."json-middleware"."1.0.2" = self.buildNodePackage {
+    name = "json-middleware-1.0.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-middleware/-/json-middleware-1.0.2.tgz";
+      name = "json-middleware-1.0.2.tgz";
+      sha1 = "bc55c6d43231df6846df6ba880f72454e2a32596";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
-  "jshint" = self.by-version."jshint"."2.5.11";
-  by-spec."jshint"."~2.5.0" =
-    self.by-version."jshint"."2.5.11";
   by-spec."json-schema"."0.2.2" =
     self.by-version."json-schema"."0.2.2";
-  by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."json-schema"."0.2.2" = self.buildNodePackage {
     name = "json-schema-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
-        name = "json-schema-0.2.2.tgz";
-        sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."json-schema" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+      name = "json-schema-0.2.2.tgz";
+      sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "json-schema" ];
+    peerDependencies = [];
   };
   by-spec."json-stable-stringify"."~0.0.0" =
     self.by-version."json-stable-stringify"."0.0.1";
-  by-version."json-stable-stringify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."json-stable-stringify"."0.0.1" = self.buildNodePackage {
     name = "json-stable-stringify-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
-        name = "json-stable-stringify-0.0.1.tgz";
-        sha1 = "611c23e814db375527df851193db59dd2af27f45";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."json-stable-stringify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
+      name = "json-stable-stringify-0.0.1.tgz";
+      sha1 = "611c23e814db375527df851193db59dd2af27f45";
+    };
     deps = {
       "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "json-stable-stringify" ];
+    peerDependencies = [];
   };
   by-spec."json-stringify-safe"."~3.0.0" =
     self.by-version."json-stringify-safe"."3.0.0";
-  by-version."json-stringify-safe"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."json-stringify-safe"."3.0.0" = self.buildNodePackage {
     name = "json-stringify-safe-3.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
-        name = "json-stringify-safe-3.0.0.tgz";
-        sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."json-stringify-safe" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
+      name = "json-stringify-safe-3.0.0.tgz";
+      sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "json-stringify-safe" ];
+    peerDependencies = [];
   };
   by-spec."json-stringify-safe"."~5.0.0" =
     self.by-version."json-stringify-safe"."5.0.0";
-  by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage {
     name = "json-stringify-safe-5.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
-        name = "json-stringify-safe-5.0.0.tgz";
-        sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."json-stringify-safe" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
+      name = "json-stringify-safe-5.0.0.tgz";
+      sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "json-stringify-safe" ];
+    peerDependencies = [];
+  };
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
+      name = "json3-3.2.6.tgz";
+      sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."json5"."^0.2.0" =
     self.by-version."json5"."0.2.0";
-  by-version."json5"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."json5"."0.2.0" = self.buildNodePackage {
     name = "json5-0.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/json5/-/json5-0.2.0.tgz";
-        name = "json5-0.2.0.tgz";
-        sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."json5" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json5/-/json5-0.2.0.tgz";
+      name = "json5-0.2.0.tgz";
+      sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "json5" ];
+    peerDependencies = [];
   };
   by-spec."jsonfile"."^2.0.0" =
     self.by-version."jsonfile"."2.0.0";
-  by-version."jsonfile"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."jsonfile"."2.0.0" = self.buildNodePackage {
     name = "jsonfile-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz";
-        name = "jsonfile-2.0.0.tgz";
-        sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jsonfile" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz";
+      name = "jsonfile-2.0.0.tgz";
+      sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jsonfile" ];
+    peerDependencies = [];
   };
   by-spec."jsonfile"."~1.0.1" =
     self.by-version."jsonfile"."1.0.1";
-  by-version."jsonfile"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."jsonfile"."1.0.1" = self.buildNodePackage {
     name = "jsonfile-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
-        name = "jsonfile-1.0.1.tgz";
-        sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jsonfile" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
+      name = "jsonfile-1.0.1.tgz";
+      sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jsonfile" ];
+    peerDependencies = [];
+  };
+  by-spec."jsonfile"."~1.1.0" =
+    self.by-version."jsonfile"."1.1.1";
+  by-version."jsonfile"."1.1.1" = self.buildNodePackage {
+    name = "jsonfile-1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz";
+      name = "jsonfile-1.1.1.tgz";
+      sha1 = "da4fd6ad77f1a255203ea63c7bc32dc31ef64433";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."jsonify"."~0.0.0" =
     self.by-version."jsonify"."0.0.0";
-  by-version."jsonify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."jsonify"."0.0.0" = self.buildNodePackage {
     name = "jsonify-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
-        name = "jsonify-0.0.0.tgz";
-        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jsonify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+      name = "jsonify-0.0.0.tgz";
+      sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jsonify" ];
+    peerDependencies = [];
   };
   by-spec."jsonparse"."0.0.5" =
     self.by-version."jsonparse"."0.0.5";
-  by-version."jsonparse"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."jsonparse"."0.0.5" = self.buildNodePackage {
     name = "jsonparse-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz";
-        name = "jsonparse-0.0.5.tgz";
-        sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jsonparse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz";
+      name = "jsonparse-0.0.5.tgz";
+      sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jsonparse" ];
+    peerDependencies = [];
   };
   by-spec."jsontool"."*" =
     self.by-version."jsontool"."7.0.2";
-  by-version."jsontool"."7.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."jsontool"."7.0.2" = self.buildNodePackage {
     name = "jsontool-7.0.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
-        name = "jsontool-7.0.2.tgz";
-        sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jsontool" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
+      name = "jsontool-7.0.2.tgz";
+      sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jsontool" ];
+    peerDependencies = [];
   };
   "jsontool" = self.by-version."jsontool"."7.0.2";
+  by-spec."jsonwebtoken"."^1.1.1" =
+    self.by-version."jsonwebtoken"."1.3.0";
+  by-version."jsonwebtoken"."1.3.0" = self.buildNodePackage {
+    name = "jsonwebtoken-1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-1.3.0.tgz";
+      name = "jsonwebtoken-1.3.0.tgz";
+      sha1 = "683ceee1bbe09a92d9e026ab25e67f97bcf3c3e2";
+    };
+    deps = {
+      "jws-0.2.6" = self.by-version."jws"."0.2.6";
+    };
+    peerDependencies = [];
+  };
   by-spec."jsprim"."0.3.0" =
     self.by-version."jsprim"."0.3.0";
-  by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."jsprim"."0.3.0" = self.buildNodePackage {
     name = "jsprim-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
-        name = "jsprim-0.3.0.tgz";
-        sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jsprim" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
+      name = "jsprim-0.3.0.tgz";
+      sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
+    };
     deps = {
       "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
       "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
       "verror-1.3.3" = self.by-version."verror"."1.3.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jsprim" ];
+    peerDependencies = [];
   };
   by-spec."jstransform"."^7.0.0" =
     self.by-version."jstransform"."7.0.0";
-  by-version."jstransform"."7.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."jstransform"."7.0.0" = self.buildNodePackage {
     name = "jstransform-7.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jstransform/-/jstransform-7.0.0.tgz";
-        name = "jstransform-7.0.0.tgz";
-        sha1 = "4f5b7fd0dce2d2ba8b7d0a3190b278ee8bf68a6c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jstransform" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jstransform/-/jstransform-7.0.0.tgz";
+      name = "jstransform-7.0.0.tgz";
+      sha1 = "4f5b7fd0dce2d2ba8b7d0a3190b278ee8bf68a6c";
+    };
     deps = {
       "base62-0.1.1" = self.by-version."base62"."0.1.1";
       "esprima-fb-7001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb";
       "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jstransform" ];
+    peerDependencies = [];
+  };
+  by-spec."jstransform"."^8.0.0" =
+    self.by-version."jstransform"."8.2.0";
+  by-version."jstransform"."8.2.0" = self.buildNodePackage {
+    name = "jstransform-8.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jstransform/-/jstransform-8.2.0.tgz";
+      name = "jstransform-8.2.0.tgz";
+      sha1 = "e43f697f7cc01a1e7c827dd9df5a79d29d0c50bb";
+    };
+    deps = {
+      "base62-0.1.1" = self.by-version."base62"."0.1.1";
+      "esprima-fb-8001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb";
+      "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
+    };
+    peerDependencies = [];
   };
   by-spec."junk"."~1.0.0" =
     self.by-version."junk"."1.0.0";
-  by-version."junk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."junk"."1.0.0" = self.buildNodePackage {
     name = "junk-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/junk/-/junk-1.0.0.tgz";
-        name = "junk-1.0.0.tgz";
-        sha1 = "22b05ee710f40c44f82fb260602ffecd489223b8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."junk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/junk/-/junk-1.0.0.tgz";
+      name = "junk-1.0.0.tgz";
+      sha1 = "22b05ee710f40c44f82fb260602ffecd489223b8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "junk" ];
+    peerDependencies = [];
+  };
+  by-spec."jwa"."0.0.1" =
+    self.by-version."jwa"."0.0.1";
+  by-version."jwa"."0.0.1" = self.buildNodePackage {
+    name = "jwa-0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jwa/-/jwa-0.0.1.tgz";
+      name = "jwa-0.0.1.tgz";
+      sha1 = "2d05f54d68f170648c30fe45944731a388cd07cc";
+    };
+    deps = {
+      "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
+    };
+    peerDependencies = [];
+  };
+  by-spec."jws"."0.0.2" =
+    self.by-version."jws"."0.0.2";
+  by-version."jws"."0.0.2" = self.buildNodePackage {
+    name = "jws-0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz";
+      name = "jws-0.0.2.tgz";
+      sha1 = "8c6916977183cce3361da48c8c2e0c606e7a95c6";
+    };
+    deps = {
+      "tap-0.3.3" = self.by-version."tap"."0.3.3";
+      "base64url-0.0.3" = self.by-version."base64url"."0.0.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."jws"."~0.2.6" =
+    self.by-version."jws"."0.2.6";
+  by-version."jws"."0.2.6" = self.buildNodePackage {
+    name = "jws-0.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jws/-/jws-0.2.6.tgz";
+      name = "jws-0.2.6.tgz";
+      sha1 = "e9b7e9ac8d2ac1067413233bc6c20fbd8868e9ba";
+    };
+    deps = {
+      "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
+      "jwa-0.0.1" = self.by-version."jwa"."0.0.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."jwt-simple"."0.1.x" =
+    self.by-version."jwt-simple"."0.1.0";
+  by-version."jwt-simple"."0.1.0" = self.buildNodePackage {
+    name = "jwt-simple-0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jwt-simple/-/jwt-simple-0.1.0.tgz";
+      name = "jwt-simple-0.1.0.tgz";
+      sha1 = "546b34aab02e3cd49c43a4279498b34d940041e3";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."k-bucket"."^0.4.2" =
     self.by-version."k-bucket"."0.4.2";
-  by-version."k-bucket"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."k-bucket"."0.4.2" = self.buildNodePackage {
     name = "k-bucket-0.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.4.2.tgz";
-        name = "k-bucket-0.4.2.tgz";
-        sha1 = "150ab92307e9ec818a9c4e39a5f930eb3aaaa23a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."k-bucket" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.4.2.tgz";
+      name = "k-bucket-0.4.2.tgz";
+      sha1 = "150ab92307e9ec818a9c4e39a5f930eb3aaaa23a";
+    };
     deps = {
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "k-bucket" ];
+    peerDependencies = [];
+  };
+  by-spec."kareem"."0.0.4" =
+    self.by-version."kareem"."0.0.4";
+  by-version."kareem"."0.0.4" = self.buildNodePackage {
+    name = "kareem-0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kareem/-/kareem-0.0.4.tgz";
+      name = "kareem-0.0.4.tgz";
+      sha1 = "a8475defd74cf829b0071d20e6971bf15d911d2b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."karma"."*" =
     self.by-version."karma"."0.12.31";
-  by-version."karma"."0.12.31" = lib.makeOverridable self.buildNodePackage {
+  by-version."karma"."0.12.31" = self.buildNodePackage {
     name = "karma-0.12.31";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.12.31.tgz";
-        name = "karma-0.12.31.tgz";
-        sha1 = "806aa7c2acb13a39edb9374a7a477e643a5e94c9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/karma/-/karma-0.12.31.tgz";
+      name = "karma-0.12.31.tgz";
+      sha1 = "806aa7c2acb13a39edb9374a7a477e643a5e94c9";
+    };
     deps = {
       "di-0.0.1" = self.by-version."di"."0.0.1";
       "socket.io-0.9.16" = self.by-version."socket.io"."0.9.16";
-      "chokidar-0.12.6" = self.by-version."chokidar"."0.12.6";
+      "chokidar-1.0.0-rc2" = self.by-version."chokidar"."1.0.0-rc2";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
       "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4";
@@ -14531,9 +14392,7 @@
       "connect-2.26.6" = self.by-version."connect"."2.26.6";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "karma" ];
+    peerDependencies = [];
   };
   "karma" = self.by-version."karma"."0.12.31";
   by-spec."karma".">=0.11.11" =
@@ -14548,40 +14407,30 @@
     self.by-version."karma"."0.12.31";
   by-spec."karma-chrome-launcher"."*" =
     self.by-version."karma-chrome-launcher"."0.1.7";
-  by-version."karma-chrome-launcher"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."karma-chrome-launcher"."0.1.7" = self.buildNodePackage {
     name = "karma-chrome-launcher-0.1.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.7.tgz";
-        name = "karma-chrome-launcher-0.1.7.tgz";
-        sha1 = "c248cc01d5ae17dafdb16319d0badf637dfb6e59";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma-chrome-launcher" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.7.tgz";
+      name = "karma-chrome-launcher-0.1.7.tgz";
+      sha1 = "c248cc01d5ae17dafdb16319d0badf637dfb6e59";
+    };
     deps = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"
-    ];
-    passthru.names = [ "karma-chrome-launcher" ];
+      self.by-version."karma"."0.12.31"];
   };
   "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.7";
   by-spec."karma-coverage"."*" =
     self.by-version."karma-coverage"."0.2.7";
-  by-version."karma-coverage"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."karma-coverage"."0.2.7" = self.buildNodePackage {
     name = "karma-coverage-0.2.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.7.tgz";
-        name = "karma-coverage-0.2.7.tgz";
-        sha1 = "f76740b275bbf30a0ab9f41d8cf56843a0994576";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma-coverage" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.7.tgz";
+      name = "karma-coverage-0.2.7.tgz";
+      sha1 = "f76740b275bbf30a0ab9f41d8cf56843a0994576";
+    };
     deps = {
       "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5";
       "ibrik-2.0.0" = self.by-version."ibrik"."2.0.0";
@@ -14589,94 +14438,70 @@
       "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"
-    ];
-    passthru.names = [ "karma-coverage" ];
+      self.by-version."karma"."0.12.31"];
   };
   "karma-coverage" = self.by-version."karma-coverage"."0.2.7";
   by-spec."karma-junit-reporter"."*" =
     self.by-version."karma-junit-reporter"."0.2.2";
-  by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."karma-junit-reporter"."0.2.2" = self.buildNodePackage {
     name = "karma-junit-reporter-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz";
-        name = "karma-junit-reporter-0.2.2.tgz";
-        sha1 = "4cdd4e21affd3e090e7ba73e3c766ea9e13c45ba";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma-junit-reporter" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz";
+      name = "karma-junit-reporter-0.2.2.tgz";
+      sha1 = "4cdd4e21affd3e090e7ba73e3c766ea9e13c45ba";
+    };
     deps = {
       "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"
-    ];
-    passthru.names = [ "karma-junit-reporter" ];
+      self.by-version."karma"."0.12.31"];
   };
   "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2";
   by-spec."karma-mocha"."*" =
     self.by-version."karma-mocha"."0.1.10";
-  by-version."karma-mocha"."0.1.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."karma-mocha"."0.1.10" = self.buildNodePackage {
     name = "karma-mocha-0.1.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.10.tgz";
-        name = "karma-mocha-0.1.10.tgz";
-        sha1 = "29ed51d4b121af1373444ec555b20a905bf42b92";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma-mocha" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.10.tgz";
+      name = "karma-mocha-0.1.10.tgz";
+      sha1 = "29ed51d4b121af1373444ec555b20a905bf42b92";
+    };
     deps = {
     };
     peerDependencies = [
       self.by-version."karma"."0.12.31"
-      self.by-version."mocha"."2.1.0"
-    ];
-    passthru.names = [ "karma-mocha" ];
+      self.by-version."mocha"."2.1.0"];
   };
   "karma-mocha" = self.by-version."karma-mocha"."0.1.10";
   by-spec."karma-requirejs"."*" =
     self.by-version."karma-requirejs"."0.2.2";
-  by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."karma-requirejs"."0.2.2" = self.buildNodePackage {
     name = "karma-requirejs-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz";
-        name = "karma-requirejs-0.2.2.tgz";
-        sha1 = "e497ca0868e2e09a9b8e3f646745c31a935fe8b6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma-requirejs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz";
+      name = "karma-requirejs-0.2.2.tgz";
+      sha1 = "e497ca0868e2e09a9b8e3f646745c31a935fe8b6";
+    };
     deps = {
     };
     peerDependencies = [
       self.by-version."karma"."0.12.31"
-      self.by-version."requirejs"."2.1.15"
-    ];
-    passthru.names = [ "karma-requirejs" ];
+      self.by-version."requirejs"."2.1.15"];
   };
   "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2";
   by-spec."karma-sauce-launcher"."*" =
     self.by-version."karma-sauce-launcher"."0.2.10";
-  by-version."karma-sauce-launcher"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."karma-sauce-launcher"."0.2.10" = self.buildNodePackage {
     name = "karma-sauce-launcher-0.2.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz";
-        name = "karma-sauce-launcher-0.2.10.tgz";
-        sha1 = "9aed0df47934c630d2ceb7faa954f5c454deddb0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."karma-sauce-launcher" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz";
+      name = "karma-sauce-launcher-0.2.10.tgz";
+      sha1 = "9aed0df47934c630d2ceb7faa954f5c454deddb0";
+    };
     deps = {
       "wd-0.3.11" = self.by-version."wd"."0.3.11";
       "sauce-connect-launcher-0.6.1" = self.by-version."sauce-connect-launcher"."0.6.1";
@@ -14684,250 +14509,229 @@
       "saucelabs-0.1.1" = self.by-version."saucelabs"."0.1.1";
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"
-    ];
-    passthru.names = [ "karma-sauce-launcher" ];
+      self.by-version."karma"."0.12.31"];
   };
   "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.10";
-  by-spec."keen.io"."~0.1.3" =
+  by-spec."keen.io"."^0.1.2" =
     self.by-version."keen.io"."0.1.3";
-  by-version."keen.io"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."keen.io"."0.1.3" = self.buildNodePackage {
     name = "keen.io-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz";
-        name = "keen.io-0.1.3.tgz";
-        sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."keen.io" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz";
+      name = "keen.io-0.1.3.tgz";
+      sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
+    };
     deps = {
       "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
       "underscore-1.5.2" = self.by-version."underscore"."1.5.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "keen.io" ];
+    peerDependencies = [];
   };
+  by-spec."keen.io"."~0.1.3" =
+    self.by-version."keen.io"."0.1.3";
   by-spec."keep-alive-agent"."0.0.1" =
     self.by-version."keep-alive-agent"."0.0.1";
-  by-version."keep-alive-agent"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."keep-alive-agent"."0.0.1" = self.buildNodePackage {
     name = "keep-alive-agent-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
-        name = "keep-alive-agent-0.0.1.tgz";
-        sha1 = "44847ca394ce8d6b521ae85816bd64509942b385";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."keep-alive-agent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
+      name = "keep-alive-agent-0.0.1.tgz";
+      sha1 = "44847ca394ce8d6b521ae85816bd64509942b385";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "keep-alive-agent" ];
+    peerDependencies = [];
   };
   by-spec."kerberos"."0.0.3" =
     self.by-version."kerberos"."0.0.3";
-  by-version."kerberos"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."kerberos"."0.0.3" = self.buildNodePackage {
     name = "kerberos-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
-        name = "kerberos-0.0.3.tgz";
-        sha1 = "4285d92a0748db2784062f5adcec9f5956cb818a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."kerberos" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
+      name = "kerberos-0.0.3.tgz";
+      sha1 = "4285d92a0748db2784062f5adcec9f5956cb818a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "kerberos" ];
+    peerDependencies = [];
   };
   by-spec."kerberos"."0.0.4" =
     self.by-version."kerberos"."0.0.4";
-  by-version."kerberos"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."kerberos"."0.0.4" = self.buildNodePackage {
     name = "kerberos-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.4.tgz";
-        name = "kerberos-0.0.4.tgz";
-        sha1 = "11836638f729a2f6c5bae056a7d7a15898c9ba7c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."kerberos" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.4.tgz";
+      name = "kerberos-0.0.4.tgz";
+      sha1 = "11836638f729a2f6c5bae056a7d7a15898c9ba7c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "kerberos" ];
+    peerDependencies = [];
   };
   by-spec."kerberos"."0.0.7" =
     self.by-version."kerberos"."0.0.7";
-  by-version."kerberos"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."kerberos"."0.0.7" = self.buildNodePackage {
     name = "kerberos-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.7.tgz";
-        name = "kerberos-0.0.7.tgz";
-        sha1 = "48db5e268e59ebb1626fd3c76ff8ff7f267a9852";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."kerberos" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.7.tgz";
+      name = "kerberos-0.0.7.tgz";
+      sha1 = "48db5e268e59ebb1626fd3c76ff8ff7f267a9852";
+    };
     deps = {
       "nan-1.3.0" = self.by-version."nan"."1.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "kerberos" ];
+    peerDependencies = [];
+  };
+  by-spec."kerberos"."0.0.8" =
+    self.by-version."kerberos"."0.0.8";
+  by-version."kerberos"."0.0.8" = self.buildNodePackage {
+    name = "kerberos-0.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.8.tgz";
+      name = "kerberos-0.0.8.tgz";
+      sha1 = "5685e97a412c5dc6c6fc7b087feb4e59acfb7755";
+    };
+    deps = {
+      "nan-1.5.1" = self.by-version."nan"."1.5.1";
+    };
+    peerDependencies = [];
   };
   by-spec."kew"."0.4.0" =
     self.by-version."kew"."0.4.0";
-  by-version."kew"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."kew"."0.4.0" = self.buildNodePackage {
     name = "kew-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/kew/-/kew-0.4.0.tgz";
-        name = "kew-0.4.0.tgz";
-        sha1 = "da97484f1b06502146f3c60cec05ac6012cd993f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."kew" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kew/-/kew-0.4.0.tgz";
+      name = "kew-0.4.0.tgz";
+      sha1 = "da97484f1b06502146f3c60cec05ac6012cd993f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "kew" ];
+    peerDependencies = [];
   };
   by-spec."kew"."~0.1.7" =
     self.by-version."kew"."0.1.7";
-  by-version."kew"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."kew"."0.1.7" = self.buildNodePackage {
     name = "kew-0.1.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
-        name = "kew-0.1.7.tgz";
-        sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."kew" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
+      name = "kew-0.1.7.tgz";
+      sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "kew" ];
+    peerDependencies = [];
+  };
+  by-spec."keygrip"."0.2.x" =
+    self.by-version."keygrip"."0.2.4";
+  by-version."keygrip"."0.2.4" = self.buildNodePackage {
+    name = "keygrip-0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keygrip/-/keygrip-0.2.4.tgz";
+      name = "keygrip-0.2.4.tgz";
+      sha1 = "9dd1b2e485a1162c9d4e6f787de87fc50f87bc58";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."keygrip"."~1.0.0" =
     self.by-version."keygrip"."1.0.1";
-  by-version."keygrip"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."keygrip"."1.0.1" = self.buildNodePackage {
     name = "keygrip-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
-        name = "keygrip-1.0.1.tgz";
-        sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."keygrip" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
+      name = "keygrip-1.0.1.tgz";
+      sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "keygrip" ];
+    peerDependencies = [];
   };
   by-spec."keypress"."0.1.x" =
     self.by-version."keypress"."0.1.0";
-  by-version."keypress"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."keypress"."0.1.0" = self.buildNodePackage {
     name = "keypress-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
-        name = "keypress-0.1.0.tgz";
-        sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."keypress" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+      name = "keypress-0.1.0.tgz";
+      sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "keypress" ];
+    peerDependencies = [];
   };
   by-spec."keypress"."^0.2.1" =
     self.by-version."keypress"."0.2.1";
-  by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."keypress"."0.2.1" = self.buildNodePackage {
     name = "keypress-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
-        name = "keypress-0.2.1.tgz";
-        sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."keypress" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
+      name = "keypress-0.2.1.tgz";
+      sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "keypress" ];
+    peerDependencies = [];
   };
   by-spec."keypress"."~0.2.1" =
     self.by-version."keypress"."0.2.1";
+  by-spec."kibana-authentication-proxy"."git://github.com/fangli/kibana-authentication-proxy" =
+    self.by-version."kibana-authentication-proxy"."1.1.0";
+  by-version."kibana-authentication-proxy"."1.1.0" = self.buildNodePackage {
+    name = "kibana-authentication-proxy-1.1.0";
+    bin = false;
+    src = fetchgit {
+      url = "git://github.com/fangli/kibana-authentication-proxy";
+      rev = "0c0173b0cb51b392b7fc04d0cc728ffb64671ef3";
+      sha256 = "dd2e42da959c359bf48d16993c6caf1d810241f7f37dfa4da911dd284571236f";
+    };
+    deps = {
+      "express-3.19.1" = self.by-version."express"."3.19.1";
+      "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
+      "connect-restreamer-1.0.1" = self.by-version."connect-restreamer"."1.0.1";
+      "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
+    };
+    peerDependencies = [];
+  };
+  "kibana-authentication-proxy" = self.by-version."kibana-authentication-proxy"."1.1.0";
   by-spec."knockout"."~3.2.0" =
     self.by-version."knockout"."3.2.0";
-  by-version."knockout"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."knockout"."3.2.0" = self.buildNodePackage {
     name = "knockout-3.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/knockout/-/knockout-3.2.0.tgz";
-        name = "knockout-3.2.0.tgz";
-        sha1 = "3f394eb67d721bea115e2d0d7be082256ca46a11";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."knockout" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/knockout/-/knockout-3.2.0.tgz";
+      name = "knockout-3.2.0.tgz";
+      sha1 = "3f394eb67d721bea115e2d0d7be082256ca46a11";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "knockout" ];
+    peerDependencies = [];
   };
   by-spec."knox"."*" =
     self.by-version."knox"."0.9.2";
-  by-version."knox"."0.9.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."knox"."0.9.2" = self.buildNodePackage {
     name = "knox-0.9.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/knox/-/knox-0.9.2.tgz";
-        name = "knox-0.9.2.tgz";
-        sha1 = "3736593669e24f024fdaf723b6a1dc4afd839a71";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."knox" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/knox/-/knox-0.9.2.tgz";
+      name = "knox-0.9.2.tgz";
+      sha1 = "3736593669e24f024fdaf723b6a1dc4afd839a71";
+    };
     deps = {
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
@@ -14935,25 +14739,19 @@
       "stream-counter-1.0.0" = self.by-version."stream-counter"."1.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "knox" ];
+    peerDependencies = [];
   };
   "knox" = self.by-version."knox"."0.9.2";
   by-spec."kue"."*" =
     self.by-version."kue"."0.8.11";
-  by-version."kue"."0.8.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."kue"."0.8.11" = self.buildNodePackage {
     name = "kue-0.8.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/kue/-/kue-0.8.11.tgz";
-        name = "kue-0.8.11.tgz";
-        sha1 = "0e18c6f827b73deb68a6ee06b55c14d4797450b0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."kue" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kue/-/kue-0.8.11.tgz";
+      name = "kue-0.8.11.tgz";
+      sha1 = "0e18c6f827b73deb68a6ee06b55c14d4797450b0";
+    };
     deps = {
       "redis-0.10.3" = self.by-version."redis"."0.10.3";
       "express-3.1.2" = self.by-version."express"."3.1.2";
@@ -14962,335 +14760,265 @@
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "lodash-deep-1.5.3" = self.by-version."lodash-deep"."1.5.3";
       "nib-0.5.0" = self.by-version."nib"."0.5.0";
-      "reds-0.2.4" = self.by-version."reds"."0.2.4";
+      "reds-0.2.5" = self.by-version."reds"."0.2.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "kue" ];
+    peerDependencies = [];
   };
   "kue" = self.by-version."kue"."0.8.11";
   by-spec."labeled-stream-splicer"."^1.0.0" =
     self.by-version."labeled-stream-splicer"."1.0.2";
-  by-version."labeled-stream-splicer"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."labeled-stream-splicer"."1.0.2" = self.buildNodePackage {
     name = "labeled-stream-splicer-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz";
-        name = "labeled-stream-splicer-1.0.2.tgz";
-        sha1 = "4615331537784981e8fd264e1f3a434c4e0ddd65";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."labeled-stream-splicer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz";
+      name = "labeled-stream-splicer-1.0.2.tgz";
+      sha1 = "4615331537784981e8fd264e1f3a434c4e0ddd65";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "stream-splicer-1.3.1" = self.by-version."stream-splicer"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "labeled-stream-splicer" ];
+    peerDependencies = [];
   };
   by-spec."latest-version"."^0.2.0" =
     self.by-version."latest-version"."0.2.0";
-  by-version."latest-version"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."latest-version"."0.2.0" = self.buildNodePackage {
     name = "latest-version-0.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz";
-        name = "latest-version-0.2.0.tgz";
-        sha1 = "adaf898d5f22380d3f9c45386efdff0a1b5b7501";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."latest-version" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz";
+      name = "latest-version-0.2.0.tgz";
+      sha1 = "adaf898d5f22380d3f9c45386efdff0a1b5b7501";
+    };
     deps = {
       "package-json-0.2.0" = self.by-version."package-json"."0.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "latest-version" ];
+    peerDependencies = [];
   };
   by-spec."latest-version"."^1.0.0" =
     self.by-version."latest-version"."1.0.0";
-  by-version."latest-version"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."latest-version"."1.0.0" = self.buildNodePackage {
     name = "latest-version-1.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz";
-        name = "latest-version-1.0.0.tgz";
-        sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."latest-version" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz";
+      name = "latest-version-1.0.0.tgz";
+      sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9";
+    };
     deps = {
       "package-json-1.0.1" = self.by-version."package-json"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "latest-version" ];
+    peerDependencies = [];
   };
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
-  by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."lazy"."1.0.11" = self.buildNodePackage {
     name = "lazy-1.0.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
-        name = "lazy-1.0.11.tgz";
-        sha1 = "daa068206282542c088288e975c297c1ae77b690";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lazy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
+      name = "lazy-1.0.11.tgz";
+      sha1 = "daa068206282542c088288e975c297c1ae77b690";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lazy" ];
+    peerDependencies = [];
   };
   by-spec."lazystream"."~0.1.0" =
     self.by-version."lazystream"."0.1.0";
-  by-version."lazystream"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lazystream"."0.1.0" = self.buildNodePackage {
     name = "lazystream-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz";
-        name = "lazystream-0.1.0.tgz";
-        sha1 = "1b25d63c772a4c20f0a5ed0a9d77f484b6e16920";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lazystream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz";
+      name = "lazystream-0.1.0.tgz";
+      sha1 = "1b25d63c772a4c20f0a5ed0a9d77f484b6e16920";
+    };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lazystream" ];
+    peerDependencies = [];
   };
   by-spec."lcov-parse"."0.0.6" =
     self.by-version."lcov-parse"."0.0.6";
-  by-version."lcov-parse"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."lcov-parse"."0.0.6" = self.buildNodePackage {
     name = "lcov-parse-0.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
-        name = "lcov-parse-0.0.6.tgz";
-        sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lcov-parse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
+      name = "lcov-parse-0.0.6.tgz";
+      sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lcov-parse" ];
+    peerDependencies = [];
   };
   by-spec."lcov-result-merger"."*" =
     self.by-version."lcov-result-merger"."1.0.1";
-  by-version."lcov-result-merger"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lcov-result-merger"."1.0.1" = self.buildNodePackage {
     name = "lcov-result-merger-1.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.1.tgz";
-        name = "lcov-result-merger-1.0.1.tgz";
-        sha1 = "8e6bd23b8e600e1495032a928e8a705f1d0276d4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lcov-result-merger" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.1.tgz";
+      name = "lcov-result-merger-1.0.1.tgz";
+      sha1 = "8e6bd23b8e600e1495032a928e8a705f1d0276d4";
+    };
     deps = {
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
       "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lcov-result-merger" ];
+    peerDependencies = [];
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.1";
+  by-spec."ldapjs"."^0.7.1" =
+    self.by-version."ldapjs"."0.7.1";
+  by-version."ldapjs"."0.7.1" = self.buildNodePackage {
+    name = "ldapjs-0.7.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ldapjs/-/ldapjs-0.7.1.tgz";
+      name = "ldapjs-0.7.1.tgz";
+      sha1 = "684798a687640bab1afbd802cf532f30492dfb56";
+    };
+    deps = {
+      "asn1-0.2.1" = self.by-version."asn1"."0.2.1";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "bunyan-0.22.1" = self.by-version."bunyan"."0.22.1";
+      "nopt-2.1.1" = self.by-version."nopt"."2.1.1";
+      "pooling-0.4.6" = self.by-version."pooling"."0.4.6";
+      "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
+    };
+    peerDependencies = [];
+  };
   by-spec."less"."*" =
     self.by-version."less"."2.2.0";
-  by-version."less"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."less"."2.2.0" = self.buildNodePackage {
     name = "less-2.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/less/-/less-2.2.0.tgz";
-        name = "less-2.2.0.tgz";
-        sha1 = "86eec2cad0e4c2a979929292d15750394056a7af";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."less" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/less/-/less-2.2.0.tgz";
+      name = "less-2.2.0.tgz";
+      sha1 = "86eec2cad0e4c2a979929292d15750394056a7af";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "request-2.51.0" = self.by-version."request"."2.51.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
-      "promise-6.0.1" = self.by-version."promise"."6.0.1";
+      "promise-6.1.0" = self.by-version."promise"."6.1.0";
       "image-size-0.3.5" = self.by-version."image-size"."0.3.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "less" ];
+    peerDependencies = [];
   };
   "less" = self.by-version."less"."2.2.0";
   by-spec."less"."^2.1.0" =
     self.by-version."less"."2.2.0";
   by-spec."levn"."~0.2.5" =
     self.by-version."levn"."0.2.5";
-  by-version."levn"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."levn"."0.2.5" = self.buildNodePackage {
     name = "levn-0.2.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
-        name = "levn-0.2.5.tgz";
-        sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."levn" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
+      name = "levn-0.2.5.tgz";
+      sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
+    };
     deps = {
       "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1";
       "type-check-0.3.1" = self.by-version."type-check"."0.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "levn" ];
+    peerDependencies = [];
   };
   by-spec."lexical-scope"."~0.0.14" =
     self.by-version."lexical-scope"."0.0.15";
-  by-version."lexical-scope"."0.0.15" = lib.makeOverridable self.buildNodePackage {
+  by-version."lexical-scope"."0.0.15" = self.buildNodePackage {
     name = "lexical-scope-0.0.15";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.0.15.tgz";
-        name = "lexical-scope-0.0.15.tgz";
-        sha1 = "ca595997aaed87b155cb041f48dc0438f48a04dc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lexical-scope" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.0.15.tgz";
+      name = "lexical-scope-0.0.15.tgz";
+      sha1 = "ca595997aaed87b155cb041f48dc0438f48a04dc";
+    };
     deps = {
       "astw-0.0.0" = self.by-version."astw"."0.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lexical-scope" ];
+    peerDependencies = [];
   };
   by-spec."lexical-scope"."~0.1.0" =
     self.by-version."lexical-scope"."0.1.0";
-  by-version."lexical-scope"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lexical-scope"."0.1.0" = self.buildNodePackage {
     name = "lexical-scope-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz";
-        name = "lexical-scope-0.1.0.tgz";
-        sha1 = "8f30004c80234ffac083b990079d7b267e18441b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lexical-scope" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz";
+      name = "lexical-scope-0.1.0.tgz";
+      sha1 = "8f30004c80234ffac083b990079d7b267e18441b";
+    };
     deps = {
       "astw-0.1.0" = self.by-version."astw"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lexical-scope" ];
+    peerDependencies = [];
   };
   by-spec."lexical-scope"."~1.1.0" =
     self.by-version."lexical-scope"."1.1.0";
-  by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lexical-scope"."1.1.0" = self.buildNodePackage {
     name = "lexical-scope-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz";
-        name = "lexical-scope-1.1.0.tgz";
-        sha1 = "899f36c4ec9c5af19736361aae290a6ef2af0800";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lexical-scope" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz";
+      name = "lexical-scope-1.1.0.tgz";
+      sha1 = "899f36c4ec9c5af19736361aae290a6ef2af0800";
+    };
     deps = {
       "astw-1.1.0" = self.by-version."astw"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lexical-scope" ];
+    peerDependencies = [];
   };
   by-spec."libxmljs"."~0.10.0" =
     self.by-version."libxmljs"."0.10.0";
-  by-version."libxmljs"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."libxmljs"."0.10.0" = self.buildNodePackage {
     name = "libxmljs-0.10.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz";
-        name = "libxmljs-0.10.0.tgz";
-        sha1 = "847eb4b0545b02d1c235e1f8371818cf709d3256";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."libxmljs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz";
+      name = "libxmljs-0.10.0.tgz";
+      sha1 = "847eb4b0545b02d1c235e1f8371818cf709d3256";
+    };
     deps = {
       "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
       "nan-1.1.2" = self.by-version."nan"."1.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "libxmljs" ];
+    peerDependencies = [];
   };
   by-spec."libyaml"."*" =
     self.by-version."libyaml"."0.2.5";
-  by-version."libyaml"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."libyaml"."0.2.5" = self.buildNodePackage {
     name = "libyaml-0.2.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.5.tgz";
-        name = "libyaml-0.2.5.tgz";
-        sha1 = "f34a920b728d8c1eddea56a6fa8698c28ceab6df";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."libyaml" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.5.tgz";
+      name = "libyaml-0.2.5.tgz";
+      sha1 = "f34a920b728d8c1eddea56a6fa8698c28ceab6df";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "libyaml" ];
+    peerDependencies = [];
   };
   "libyaml" = self.by-version."libyaml"."0.2.5";
   by-spec."liftoff"."^0.13.2" =
     self.by-version."liftoff"."0.13.6";
-  by-version."liftoff"."0.13.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."liftoff"."0.13.6" = self.buildNodePackage {
     name = "liftoff-0.13.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz";
-        name = "liftoff-0.13.6.tgz";
-        sha1 = "600e8966b92d1e0150eab5b577652569f4c7d1d8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."liftoff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz";
+      name = "liftoff-0.13.6.tgz";
+      sha1 = "600e8966b92d1e0150eab5b577652569f4c7d1d8";
+    };
     deps = {
       "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
       "resolve-1.0.0" = self.by-version."resolve"."1.0.0";
@@ -15298,470 +15026,354 @@
       "extend-1.3.0" = self.by-version."extend"."1.3.0";
       "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "liftoff" ];
+    peerDependencies = [];
   };
   by-spec."lockfile"."~1.0.0" =
     self.by-version."lockfile"."1.0.0";
-  by-version."lockfile"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lockfile"."1.0.0" = self.buildNodePackage {
     name = "lockfile-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz";
-        name = "lockfile-1.0.0.tgz";
-        sha1 = "b3a7609dda6012060083bacb0ab0ecbca58e9203";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lockfile" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz";
+      name = "lockfile-1.0.0.tgz";
+      sha1 = "b3a7609dda6012060083bacb0ab0ecbca58e9203";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lockfile" ];
+    peerDependencies = [];
   };
-  by-spec."lodash"."2.4.1" =
+  by-spec."lodash"."*" =
     self.by-version."lodash"."2.4.1";
-  by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash"."2.4.1" = self.buildNodePackage {
     name = "lodash-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
-        name = "lodash-2.4.1.tgz";
-        sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
+      name = "lodash-2.4.1.tgz";
+      sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
+    peerDependencies = [];
   };
+  by-spec."lodash"."2.4.1" =
+    self.by-version."lodash"."2.4.1";
   by-spec."lodash".">=2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-spec."lodash"."^2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-spec."lodash"."~0.9.2" =
     self.by-version."lodash"."0.9.2";
-  by-version."lodash"."0.9.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash"."0.9.2" = self.buildNodePackage {
     name = "lodash-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
+      name = "lodash-0.9.2.tgz";
+      sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
+    peerDependencies = [];
   };
   by-spec."lodash"."~1.0.1" =
     self.by-version."lodash"."1.0.1";
-  by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash"."1.0.1" = self.buildNodePackage {
     name = "lodash-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
-        name = "lodash-1.0.1.tgz";
-        sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
+      name = "lodash-1.0.1.tgz";
+      sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
+    peerDependencies = [];
+  };
+  by-spec."lodash"."~1.3.1" =
+    self.by-version."lodash"."1.3.1";
+  by-version."lodash"."1.3.1" = self.buildNodePackage {
+    name = "lodash-1.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
+      name = "lodash-1.3.1.tgz";
+      sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-spec."lodash-deep"."^1.1.0" =
     self.by-version."lodash-deep"."1.5.3";
-  by-version."lodash-deep"."1.5.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash-deep"."1.5.3" = self.buildNodePackage {
     name = "lodash-deep-1.5.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.5.3.tgz";
-        name = "lodash-deep-1.5.3.tgz";
-        sha1 = "eeddfdd937ed24c2c903fc242cb15a26362321d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash-deep" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.5.3.tgz";
+      name = "lodash-deep-1.5.3.tgz";
+      sha1 = "eeddfdd937ed24c2c903fc242cb15a26362321d2";
+    };
     deps = {
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash-deep" ];
+    peerDependencies = [];
   };
   by-spec."lodash-node"."~2.4.1" =
     self.by-version."lodash-node"."2.4.1";
-  by-version."lodash-node"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash-node"."2.4.1" = self.buildNodePackage {
     name = "lodash-node-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz";
-        name = "lodash-node-2.4.1.tgz";
-        sha1 = "ea82f7b100c733d1a42af76801e506105e2a80ec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash-node" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz";
+      name = "lodash-node-2.4.1.tgz";
+      sha1 = "ea82f7b100c733d1a42af76801e506105e2a80ec";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash-node" ];
+    peerDependencies = [];
   };
   by-spec."lodash._escapehtmlchar"."~2.4.1" =
     self.by-version."lodash._escapehtmlchar"."2.4.1";
-  by-version."lodash._escapehtmlchar"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash._escapehtmlchar"."2.4.1" = self.buildNodePackage {
     name = "lodash._escapehtmlchar-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz";
-        name = "lodash._escapehtmlchar-2.4.1.tgz";
-        sha1 = "df67c3bb6b7e8e1e831ab48bfa0795b92afe899d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._escapehtmlchar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz";
+      name = "lodash._escapehtmlchar-2.4.1.tgz";
+      sha1 = "df67c3bb6b7e8e1e831ab48bfa0795b92afe899d";
+    };
     deps = {
       "lodash._htmlescapes-2.4.1" = self.by-version."lodash._htmlescapes"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._escapehtmlchar" ];
+    peerDependencies = [];
   };
   by-spec."lodash._escapestringchar"."~2.4.1" =
     self.by-version."lodash._escapestringchar"."2.4.1";
-  by-version."lodash._escapestringchar"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash._escapestringchar"."2.4.1" = self.buildNodePackage {
     name = "lodash._escapestringchar-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz";
-        name = "lodash._escapestringchar-2.4.1.tgz";
-        sha1 = "ecfe22618a2ade50bfeea43937e51df66f0edb72";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._escapestringchar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz";
+      name = "lodash._escapestringchar-2.4.1.tgz";
+      sha1 = "ecfe22618a2ade50bfeea43937e51df66f0edb72";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._escapestringchar" ];
+    peerDependencies = [];
   };
   by-spec."lodash._htmlescapes"."~2.4.1" =
     self.by-version."lodash._htmlescapes"."2.4.1";
-  by-version."lodash._htmlescapes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash._htmlescapes"."2.4.1" = self.buildNodePackage {
     name = "lodash._htmlescapes-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz";
-        name = "lodash._htmlescapes-2.4.1.tgz";
-        sha1 = "32d14bf0844b6de6f8b62a051b4f67c228b624cb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._htmlescapes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz";
+      name = "lodash._htmlescapes-2.4.1.tgz";
+      sha1 = "32d14bf0844b6de6f8b62a051b4f67c228b624cb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._htmlescapes" ];
+    peerDependencies = [];
   };
   by-spec."lodash._isnative"."~2.4.1" =
     self.by-version."lodash._isnative"."2.4.1";
-  by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash._isnative"."2.4.1" = self.buildNodePackage {
     name = "lodash._isnative-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
-        name = "lodash._isnative-2.4.1.tgz";
-        sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._isnative" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
+      name = "lodash._isnative-2.4.1.tgz";
+      sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._isnative" ];
+    peerDependencies = [];
   };
   by-spec."lodash._objecttypes"."~2.4.1" =
     self.by-version."lodash._objecttypes"."2.4.1";
-  by-version."lodash._objecttypes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash._objecttypes"."2.4.1" = self.buildNodePackage {
     name = "lodash._objecttypes-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
-        name = "lodash._objecttypes-2.4.1.tgz";
-        sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._objecttypes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
+      name = "lodash._objecttypes-2.4.1.tgz";
+      sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._objecttypes" ];
+    peerDependencies = [];
   };
   by-spec."lodash._reinterpolate"."^2.4.1" =
     self.by-version."lodash._reinterpolate"."2.4.1";
-  by-version."lodash._reinterpolate"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash._reinterpolate"."2.4.1" = self.buildNodePackage {
     name = "lodash._reinterpolate-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz";
-        name = "lodash._reinterpolate-2.4.1.tgz";
-        sha1 = "4f1227aa5a8711fc632f5b07a1f4607aab8b3222";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._reinterpolate" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz";
+      name = "lodash._reinterpolate-2.4.1.tgz";
+      sha1 = "4f1227aa5a8711fc632f5b07a1f4607aab8b3222";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._reinterpolate" ];
+    peerDependencies = [];
   };
   by-spec."lodash._reinterpolate"."~2.4.1" =
     self.by-version."lodash._reinterpolate"."2.4.1";
   by-spec."lodash._reunescapedhtml"."~2.4.1" =
     self.by-version."lodash._reunescapedhtml"."2.4.1";
-  by-version."lodash._reunescapedhtml"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash._reunescapedhtml"."2.4.1" = self.buildNodePackage {
     name = "lodash._reunescapedhtml-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz";
-        name = "lodash._reunescapedhtml-2.4.1.tgz";
-        sha1 = "747c4fc40103eb3bb8a0976e571f7a2659e93ba7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._reunescapedhtml" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz";
+      name = "lodash._reunescapedhtml-2.4.1.tgz";
+      sha1 = "747c4fc40103eb3bb8a0976e571f7a2659e93ba7";
+    };
     deps = {
       "lodash._htmlescapes-2.4.1" = self.by-version."lodash._htmlescapes"."2.4.1";
       "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._reunescapedhtml" ];
+    peerDependencies = [];
   };
   by-spec."lodash._shimkeys"."~2.4.1" =
     self.by-version."lodash._shimkeys"."2.4.1";
-  by-version."lodash._shimkeys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash._shimkeys"."2.4.1" = self.buildNodePackage {
     name = "lodash._shimkeys-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
-        name = "lodash._shimkeys-2.4.1.tgz";
-        sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._shimkeys" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
+      name = "lodash._shimkeys-2.4.1.tgz";
+      sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203";
+    };
     deps = {
       "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._shimkeys" ];
+    peerDependencies = [];
   };
   by-spec."lodash.debounce"."^2.4.1" =
     self.by-version."lodash.debounce"."2.4.1";
-  by-version."lodash.debounce"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.debounce"."2.4.1" = self.buildNodePackage {
     name = "lodash.debounce-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz";
-        name = "lodash.debounce-2.4.1.tgz";
-        sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.debounce" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz";
+      name = "lodash.debounce-2.4.1.tgz";
+      sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc";
+    };
     deps = {
       "lodash.isfunction-2.4.1" = self.by-version."lodash.isfunction"."2.4.1";
       "lodash.isobject-2.4.1" = self.by-version."lodash.isobject"."2.4.1";
       "lodash.now-2.4.1" = self.by-version."lodash.now"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.debounce" ];
+    peerDependencies = [];
   };
   by-spec."lodash.defaults"."~2.4.1" =
     self.by-version."lodash.defaults"."2.4.1";
-  by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.defaults"."2.4.1" = self.buildNodePackage {
     name = "lodash.defaults-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz";
-        name = "lodash.defaults-2.4.1.tgz";
-        sha1 = "a7e8885f05e68851144b6e12a8f3678026bc4c54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.defaults" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz";
+      name = "lodash.defaults-2.4.1.tgz";
+      sha1 = "a7e8885f05e68851144b6e12a8f3678026bc4c54";
+    };
     deps = {
       "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
       "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.defaults" ];
+    peerDependencies = [];
   };
   by-spec."lodash.escape"."~2.4.1" =
     self.by-version."lodash.escape"."2.4.1";
-  by-version."lodash.escape"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.escape"."2.4.1" = self.buildNodePackage {
     name = "lodash.escape-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz";
-        name = "lodash.escape-2.4.1.tgz";
-        sha1 = "2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.escape" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz";
+      name = "lodash.escape-2.4.1.tgz";
+      sha1 = "2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4";
+    };
     deps = {
       "lodash._escapehtmlchar-2.4.1" = self.by-version."lodash._escapehtmlchar"."2.4.1";
       "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
       "lodash._reunescapedhtml-2.4.1" = self.by-version."lodash._reunescapedhtml"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.escape" ];
+    peerDependencies = [];
   };
   by-spec."lodash.isfunction"."~2.4.1" =
     self.by-version."lodash.isfunction"."2.4.1";
-  by-version."lodash.isfunction"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.isfunction"."2.4.1" = self.buildNodePackage {
     name = "lodash.isfunction-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
-        name = "lodash.isfunction-2.4.1.tgz";
-        sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.isfunction" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
+      name = "lodash.isfunction-2.4.1.tgz";
+      sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.isfunction" ];
+    peerDependencies = [];
   };
   by-spec."lodash.isobject"."~2.4.1" =
     self.by-version."lodash.isobject"."2.4.1";
-  by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.isobject"."2.4.1" = self.buildNodePackage {
     name = "lodash.isobject-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
-        name = "lodash.isobject-2.4.1.tgz";
-        sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.isobject" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
+      name = "lodash.isobject-2.4.1.tgz";
+      sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
+    };
     deps = {
       "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.isobject" ];
+    peerDependencies = [];
   };
   by-spec."lodash.keys"."~2.4.1" =
     self.by-version."lodash.keys"."2.4.1";
-  by-version."lodash.keys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.keys"."2.4.1" = self.buildNodePackage {
     name = "lodash.keys-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz";
-        name = "lodash.keys-2.4.1.tgz";
-        sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.keys" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz";
+      name = "lodash.keys-2.4.1.tgz";
+      sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727";
+    };
     deps = {
       "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1";
       "lodash.isobject-2.4.1" = self.by-version."lodash.isobject"."2.4.1";
       "lodash._shimkeys-2.4.1" = self.by-version."lodash._shimkeys"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.keys" ];
+    peerDependencies = [];
   };
   by-spec."lodash.now"."~2.4.1" =
     self.by-version."lodash.now"."2.4.1";
-  by-version."lodash.now"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.now"."2.4.1" = self.buildNodePackage {
     name = "lodash.now-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz";
-        name = "lodash.now-2.4.1.tgz";
-        sha1 = "6872156500525185faf96785bb7fe7fe15b562c6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.now" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz";
+      name = "lodash.now-2.4.1.tgz";
+      sha1 = "6872156500525185faf96785bb7fe7fe15b562c6";
+    };
     deps = {
       "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.now" ];
+    peerDependencies = [];
   };
   by-spec."lodash.template"."^2.4.1" =
     self.by-version."lodash.template"."2.4.1";
-  by-version."lodash.template"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.template"."2.4.1" = self.buildNodePackage {
     name = "lodash.template-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz";
-        name = "lodash.template-2.4.1.tgz";
-        sha1 = "9e611007edf629129a974ab3c48b817b3e1cf20d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.template" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz";
+      name = "lodash.template-2.4.1.tgz";
+      sha1 = "9e611007edf629129a974ab3c48b817b3e1cf20d";
+    };
     deps = {
       "lodash.defaults-2.4.1" = self.by-version."lodash.defaults"."2.4.1";
       "lodash.escape-2.4.1" = self.by-version."lodash.escape"."2.4.1";
@@ -15771,342 +15383,260 @@
       "lodash.templatesettings-2.4.1" = self.by-version."lodash.templatesettings"."2.4.1";
       "lodash.values-2.4.1" = self.by-version."lodash.values"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.template" ];
+    peerDependencies = [];
   };
   by-spec."lodash.templatesettings"."~2.4.1" =
     self.by-version."lodash.templatesettings"."2.4.1";
-  by-version."lodash.templatesettings"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.templatesettings"."2.4.1" = self.buildNodePackage {
     name = "lodash.templatesettings-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz";
-        name = "lodash.templatesettings-2.4.1.tgz";
-        sha1 = "ea76c75d11eb86d4dbe89a83893bb861929ac699";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.templatesettings" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz";
+      name = "lodash.templatesettings-2.4.1.tgz";
+      sha1 = "ea76c75d11eb86d4dbe89a83893bb861929ac699";
+    };
     deps = {
       "lodash.escape-2.4.1" = self.by-version."lodash.escape"."2.4.1";
       "lodash._reinterpolate-2.4.1" = self.by-version."lodash._reinterpolate"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.templatesettings" ];
+    peerDependencies = [];
   };
   by-spec."lodash.values"."~2.4.1" =
     self.by-version."lodash.values"."2.4.1";
-  by-version."lodash.values"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lodash.values"."2.4.1" = self.buildNodePackage {
     name = "lodash.values-2.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz";
-        name = "lodash.values-2.4.1.tgz";
-        sha1 = "abf514436b3cb705001627978cbcf30b1280eea4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.values" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz";
+      name = "lodash.values-2.4.1.tgz";
+      sha1 = "abf514436b3cb705001627978cbcf30b1280eea4";
+    };
     deps = {
       "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.values" ];
+    peerDependencies = [];
   };
   by-spec."log-driver"."1.2.4" =
     self.by-version."log-driver"."1.2.4";
-  by-version."log-driver"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."log-driver"."1.2.4" = self.buildNodePackage {
     name = "log-driver-1.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
-        name = "log-driver-1.2.4.tgz";
-        sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."log-driver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
+      name = "log-driver-1.2.4.tgz";
+      sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "log-driver" ];
+    peerDependencies = [];
   };
   by-spec."log4js"."~0.6.3" =
     self.by-version."log4js"."0.6.22";
-  by-version."log4js"."0.6.22" = lib.makeOverridable self.buildNodePackage {
+  by-version."log4js"."0.6.22" = self.buildNodePackage {
     name = "log4js-0.6.22";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.22.tgz";
-        name = "log4js-0.6.22.tgz";
-        sha1 = "dd0ed7c961eec19eaf47dad9f39fee2b7dc71a4c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."log4js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/log4js/-/log4js-0.6.22.tgz";
+      name = "log4js-0.6.22.tgz";
+      sha1 = "dd0ed7c961eec19eaf47dad9f39fee2b7dc71a4c";
+    };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "semver-1.1.4" = self.by-version."semver"."1.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "log4js" ];
+    peerDependencies = [];
+  };
+  by-spec."loggly"."0.3.x >=0.3.7" =
+    self.by-version."loggly"."0.3.11";
+  by-version."loggly"."0.3.11" = self.buildNodePackage {
+    name = "loggly-0.3.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/loggly/-/loggly-0.3.11.tgz";
+      name = "loggly-0.3.11.tgz";
+      sha1 = "62c1ec3436772f0954598f26b957d2ad2986b611";
+    };
+    deps = {
+      "request-2.9.203" = self.by-version."request"."2.9.203";
+      "timespan-2.3.0" = self.by-version."timespan"."2.3.0";
+    };
+    peerDependencies = [];
   };
   by-spec."lolex"."1.1.0" =
     self.by-version."lolex"."1.1.0";
-  by-version."lolex"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lolex"."1.1.0" = self.buildNodePackage {
     name = "lolex-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz";
-        name = "lolex-1.1.0.tgz";
-        sha1 = "5dbbbc850395e7523c74b3586f7fbd2626d25b1b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lolex" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz";
+      name = "lolex-1.1.0.tgz";
+      sha1 = "5dbbbc850395e7523c74b3586f7fbd2626d25b1b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lolex" ];
+    peerDependencies = [];
   };
   by-spec."long"."~2 >=2.2.3" =
     self.by-version."long"."2.2.3";
-  by-version."long"."2.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."long"."2.2.3" = self.buildNodePackage {
     name = "long-2.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/long/-/long-2.2.3.tgz";
-        name = "long-2.2.3.tgz";
-        sha1 = "635f5b530b3bd3ecb000a2ffb11281583c7f1e07";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."long" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/long/-/long-2.2.3.tgz";
+      name = "long-2.2.3.tgz";
+      sha1 = "635f5b530b3bd3ecb000a2ffb11281583c7f1e07";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "long" ];
+    peerDependencies = [];
   };
   by-spec."longjohn"."~0.2.2" =
     self.by-version."longjohn"."0.2.4";
-  by-version."longjohn"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."longjohn"."0.2.4" = self.buildNodePackage {
     name = "longjohn-0.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.4.tgz";
-        name = "longjohn-0.2.4.tgz";
-        sha1 = "48436a1f359e7666f678e2170ee1f43bba8f8b4c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."longjohn" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.4.tgz";
+      name = "longjohn-0.2.4.tgz";
+      sha1 = "48436a1f359e7666f678e2170ee1f43bba8f8b4c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "longjohn" ];
+    peerDependencies = [];
   };
   by-spec."lru-cache"."2" =
     self.by-version."lru-cache"."2.5.0";
-  by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lru-cache"."2.5.0" = self.buildNodePackage {
     name = "lru-cache-2.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
-        name = "lru-cache-2.5.0.tgz";
-        sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
+      name = "lru-cache-2.5.0.tgz";
+      sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
+    peerDependencies = [];
   };
   by-spec."lru-cache"."2.2.0" =
     self.by-version."lru-cache"."2.2.0";
-  by-version."lru-cache"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lru-cache"."2.2.0" = self.buildNodePackage {
     name = "lru-cache-2.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
-        name = "lru-cache-2.2.0.tgz";
-        sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
+      name = "lru-cache-2.2.0.tgz";
+      sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
+    peerDependencies = [];
   };
   by-spec."lru-cache"."2.2.x" =
     self.by-version."lru-cache"."2.2.4";
-  by-version."lru-cache"."2.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."lru-cache"."2.2.4" = self.buildNodePackage {
     name = "lru-cache-2.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
-        name = "lru-cache-2.2.4.tgz";
-        sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
+      name = "lru-cache-2.2.4.tgz";
+      sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
+    peerDependencies = [];
   };
   by-spec."lru-cache"."2.3.0" =
     self.by-version."lru-cache"."2.3.0";
-  by-version."lru-cache"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lru-cache"."2.3.0" = self.buildNodePackage {
     name = "lru-cache-2.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
-        name = "lru-cache-2.3.0.tgz";
-        sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
+      name = "lru-cache-2.3.0.tgz";
+      sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
+    peerDependencies = [];
   };
   by-spec."lru-cache"."2.5.x" =
     self.by-version."lru-cache"."2.5.0";
   by-spec."lru-cache"."~1.0.2" =
     self.by-version."lru-cache"."1.0.6";
-  by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."lru-cache"."1.0.6" = self.buildNodePackage {
     name = "lru-cache-1.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
-        name = "lru-cache-1.0.6.tgz";
-        sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
+      name = "lru-cache-1.0.6.tgz";
+      sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
+    peerDependencies = [];
   };
   by-spec."lru-cache"."~2.3.0" =
     self.by-version."lru-cache"."2.3.1";
-  by-version."lru-cache"."2.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."lru-cache"."2.3.1" = self.buildNodePackage {
     name = "lru-cache-2.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
-        name = "lru-cache-2.3.1.tgz";
-        sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
+      name = "lru-cache-2.3.1.tgz";
+      sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
+    peerDependencies = [];
   };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.0";
   by-spec."lru-queue"."0.1" =
     self.by-version."lru-queue"."0.1.0";
-  by-version."lru-queue"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."lru-queue"."0.1.0" = self.buildNodePackage {
     name = "lru-queue-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
-        name = "lru-queue-0.1.0.tgz";
-        sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-queue" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
+      name = "lru-queue-0.1.0.tgz";
+      sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
+    };
     deps = {
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-queue" ];
+    peerDependencies = [];
   };
   by-spec."lsmod"."~0.0.3" =
     self.by-version."lsmod"."0.0.3";
-  by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."lsmod"."0.0.3" = self.buildNodePackage {
     name = "lsmod-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz";
-        name = "lsmod-0.0.3.tgz";
-        sha1 = "17e13d4e1ae91750ea5653548cd89e7147ad0244";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lsmod" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz";
+      name = "lsmod-0.0.3.tgz";
+      sha1 = "17e13d4e1ae91750ea5653548cd89e7147ad0244";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lsmod" ];
+    peerDependencies = [];
   };
   by-spec."ltx"."*" =
     self.by-version."ltx"."0.8.0";
-  by-version."ltx"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ltx"."0.8.0" = self.buildNodePackage {
     name = "ltx-0.8.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ltx/-/ltx-0.8.0.tgz";
-        name = "ltx-0.8.0.tgz";
-        sha1 = "08aeb2f68c4c7d20ab35e9dcb7519fd80824c529";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ltx" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ltx/-/ltx-0.8.0.tgz";
+      name = "ltx-0.8.0.tgz";
+      sha1 = "08aeb2f68c4c7d20ab35e9dcb7519fd80824c529";
+    };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ltx" ];
+    peerDependencies = [];
   };
   "ltx" = self.by-version."ltx"."0.8.0";
   by-spec."ltx"."0.x" =
@@ -16115,153 +15645,129 @@
     self.by-version."ltx"."0.8.0";
   by-spec."ltx"."^0.5.2" =
     self.by-version."ltx"."0.5.2";
-  by-version."ltx"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ltx"."0.5.2" = self.buildNodePackage {
     name = "ltx-0.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ltx/-/ltx-0.5.2.tgz";
-        name = "ltx-0.5.2.tgz";
-        sha1 = "3a049fc30ab8982c227803a74b26c02fe225cef8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ltx" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ltx/-/ltx-0.5.2.tgz";
+      name = "ltx-0.5.2.tgz";
+      sha1 = "3a049fc30ab8982c227803a74b26c02fe225cef8";
+    };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ltx" ];
+    peerDependencies = [];
   };
   by-spec."ltx"."^0.7.2" =
     self.by-version."ltx"."0.7.2";
-  by-version."ltx"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ltx"."0.7.2" = self.buildNodePackage {
     name = "ltx-0.7.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz";
-        name = "ltx-0.7.2.tgz";
-        sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ltx" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz";
+      name = "ltx-0.7.2.tgz";
+      sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c";
+    };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ltx" ];
+    peerDependencies = [];
   };
   by-spec."ltx"."~0.3.2" =
     self.by-version."ltx"."0.3.4";
-  by-version."ltx"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."ltx"."0.3.4" = self.buildNodePackage {
     name = "ltx-0.3.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ltx/-/ltx-0.3.4.tgz";
-        name = "ltx-0.3.4.tgz";
-        sha1 = "3cc8d3af3cf08914383b19e8ab60b1f396e1e984";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ltx" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ltx/-/ltx-0.3.4.tgz";
+      name = "ltx-0.3.4.tgz";
+      sha1 = "3cc8d3af3cf08914383b19e8ab60b1f396e1e984";
+    };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.1.4" = self.by-version."node-expat"."2.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ltx" ];
+    peerDependencies = [];
   };
   by-spec."ltx"."~0.3.3" =
     self.by-version."ltx"."0.3.4";
   by-spec."ltx"."~0.6.0" =
     self.by-version."ltx"."0.6.0";
-  by-version."ltx"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ltx"."0.6.0" = self.buildNodePackage {
     name = "ltx-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ltx/-/ltx-0.6.0.tgz";
-        name = "ltx-0.6.0.tgz";
-        sha1 = "16470236570a2c436744a3c4adb8a4b15ea1acc7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ltx" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ltx/-/ltx-0.6.0.tgz";
+      name = "ltx-0.6.0.tgz";
+      sha1 = "16470236570a2c436744a3c4adb8a4b15ea1acc7";
+    };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ltx" ];
+    peerDependencies = [];
   };
   by-spec."ltx"."~0.x" =
     self.by-version."ltx"."0.8.0";
   by-spec."m8".">= 0.4.3" =
     self.by-version."m8"."0.4.4";
-  by-version."m8"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."m8"."0.4.4" = self.buildNodePackage {
     name = "m8-0.4.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/m8/-/m8-0.4.4.tgz";
-        name = "m8-0.4.4.tgz";
-        sha1 = "59df914d9bee2829ceac4346026abe945abed5b8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."m8" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/m8/-/m8-0.4.4.tgz";
+      name = "m8-0.4.4.tgz";
+      sha1 = "59df914d9bee2829ceac4346026abe945abed5b8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "m8" ];
+    peerDependencies = [];
   };
   by-spec."magnet-uri"."^2.0.1" =
     self.by-version."magnet-uri"."2.0.1";
-  by-version."magnet-uri"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."magnet-uri"."2.0.1" = self.buildNodePackage {
     name = "magnet-uri-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
-        name = "magnet-uri-2.0.1.tgz";
-        sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."magnet-uri" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
+      name = "magnet-uri-2.0.1.tgz";
+      sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209";
+    };
     deps = {
       "thirty-two-0.0.2" = self.by-version."thirty-two"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "magnet-uri" ];
+    peerDependencies = [];
   };
   by-spec."magnet-uri"."~2.0.0" =
     self.by-version."magnet-uri"."2.0.1";
+  by-spec."mailchimp".">=1.1.0" =
+    self.by-version."mailchimp"."1.1.0";
+  by-version."mailchimp"."1.1.0" = self.buildNodePackage {
+    name = "mailchimp-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mailchimp/-/mailchimp-1.1.0.tgz";
+      name = "mailchimp-1.1.0.tgz";
+      sha1 = "253220f0091724b1033fadcf9f8aaad68dcad309";
+    };
+    deps = {
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "qs-0.5.6" = self.by-version."qs"."0.5.6";
+    };
+    peerDependencies = [];
+  };
   by-spec."mailcomposer".">= 0.1.27" =
     self.by-version."mailcomposer"."0.2.12";
-  by-version."mailcomposer"."0.2.12" = lib.makeOverridable self.buildNodePackage {
+  by-version."mailcomposer"."0.2.12" = self.buildNodePackage {
     name = "mailcomposer-0.2.12";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.12.tgz";
-        name = "mailcomposer-0.2.12.tgz";
-        sha1 = "4d02a604616adcb45fb36d37513f4c1bd0b75681";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mailcomposer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.12.tgz";
+      name = "mailcomposer-0.2.12.tgz";
+      sha1 = "4d02a604616adcb45fb36d37513f4c1bd0b75681";
+    };
     deps = {
       "mimelib-0.2.18" = self.by-version."mimelib"."0.2.18";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
@@ -16269,156 +15775,156 @@
       "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
       "dkim-signer-0.1.2" = self.by-version."dkim-signer"."0.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mailcomposer" ];
+    peerDependencies = [];
+  };
+  by-spec."mailcomposer"."~0.2.10" =
+    self.by-version."mailcomposer"."0.2.12";
+  by-spec."mailgun-js"."^0.6.7" =
+    self.by-version."mailgun-js"."0.6.8";
+  by-version."mailgun-js"."0.6.8" = self.buildNodePackage {
+    name = "mailgun-js-0.6.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mailgun-js/-/mailgun-js-0.6.8.tgz";
+      name = "mailgun-js-0.6.8.tgz";
+      sha1 = "64a1aab7036b8161a7c619037d820d6c50fe83ab";
+    };
+    deps = {
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "inflection-1.5.3" = self.by-version."inflection"."1.5.3";
+      "path-proxy-1.0.0" = self.by-version."path-proxy"."1.0.0";
+      "proxy-agent-1.1.0" = self.by-version."proxy-agent"."1.1.0";
+      "q-1.1.2" = self.by-version."q"."1.1.2";
+      "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
+      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+    };
+    peerDependencies = [];
   };
   by-spec."map-obj"."^1.0.0" =
     self.by-version."map-obj"."1.0.0";
-  by-version."map-obj"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."map-obj"."1.0.0" = self.buildNodePackage {
     name = "map-obj-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz";
-        name = "map-obj-1.0.0.tgz";
-        sha1 = "bcbdf6756758763c182daf79e18094a2f1c85766";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."map-obj" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz";
+      name = "map-obj-1.0.0.tgz";
+      sha1 = "bcbdf6756758763c182daf79e18094a2f1c85766";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "map-obj" ];
+    peerDependencies = [];
   };
   by-spec."marked"."*" =
     self.by-version."marked"."0.3.2";
-  by-version."marked"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."marked"."0.3.2" = self.buildNodePackage {
     name = "marked-0.3.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz";
-        name = "marked-0.3.2.tgz";
-        sha1 = "015db158864438f24a64bdd61a0428b418706d09";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."marked" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz";
+      name = "marked-0.3.2.tgz";
+      sha1 = "015db158864438f24a64bdd61a0428b418706d09";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "marked" ];
+    peerDependencies = [];
   };
   "marked" = self.by-version."marked"."0.3.2";
+  by-spec."marked".">=0.2.9" =
+    self.by-version."marked"."0.3.2";
   by-spec."marked".">=0.3.1" =
     self.by-version."marked"."0.3.2";
+  by-spec."marked"."^0.3.2" =
+    self.by-version."marked"."0.3.2";
+  by-spec."mathjs"."~0.19.0" =
+    self.by-version."mathjs"."0.19.0";
+  by-version."mathjs"."0.19.0" = self.buildNodePackage {
+    name = "mathjs-0.19.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mathjs/-/mathjs-0.19.0.tgz";
+      name = "mathjs-0.19.0.tgz";
+      sha1 = "35f7bdfcca1431dac5438cbf095eefce4e1aae78";
+    };
+    deps = {
+      "bignumber.js-1.5.0" = self.by-version."bignumber.js"."1.5.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."maxmin"."^1.0.0" =
     self.by-version."maxmin"."1.0.0";
-  by-version."maxmin"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."maxmin"."1.0.0" = self.buildNodePackage {
     name = "maxmin-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/maxmin/-/maxmin-1.0.0.tgz";
-        name = "maxmin-1.0.0.tgz";
-        sha1 = "040b7a15ba5c6f3b08581cbf201df0bdd64e19f0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."maxmin" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/maxmin/-/maxmin-1.0.0.tgz";
+      name = "maxmin-1.0.0.tgz";
+      sha1 = "040b7a15ba5c6f3b08581cbf201df0bdd64e19f0";
+    };
     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-1.0.0" = self.by-version."gzip-size"."1.0.0";
       "pretty-bytes-1.0.2" = self.by-version."pretty-bytes"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "maxmin" ];
+    peerDependencies = [];
   };
   by-spec."mdns-js"."git+https://github.com/guerrerocarlos/node-mdns-js" =
-    self.by-version."mdns-js"."0.2.4";
-  by-version."mdns-js"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "mdns-js-0.2.4";
-    bin = false;
-    src = [
-      (fetchgit {
-        url = "https://github.com/guerrerocarlos/node-mdns-js";
-        rev = "36fc8ed207a6c7d571d1f98a186b8d3686c7f261";
-        sha256 = "b14121656f33817843d09452ff3d562bbedda28cda2cba3e8ba436c9541f75ee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mdns-js" or []);
+    self.by-version."mdns-js"."0.2.5";
+  by-version."mdns-js"."0.2.5" = self.buildNodePackage {
+    name = "mdns-js-0.2.5";
+    bin = false;
+    src = fetchgit {
+      url = "https://github.com/guerrerocarlos/node-mdns-js";
+      rev = "1d50693cc1f193eadea8c723ceafd6ed565ad8bb";
+      sha256 = "b5e989409eb45288271f11970ce6f9e7668c5ab20991f9326a679aaaff8685ae";
+    };
     deps = {
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
-      "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8";
+      "mdns-js-packet-0.1.9" = self.by-version."mdns-js-packet"."0.1.9";
+    };
+    peerDependencies = [];
+  };
+  by-spec."mdns-js-packet"."guerrerocarlos/node-mdns-js-packet" =
+    self.by-version."mdns-js-packet"."0.1.9";
+  by-version."mdns-js-packet"."0.1.9" = self.buildNodePackage {
+    name = "mdns-js-packet-0.1.9";
+    bin = false;
+    src = fetchgit {
+      url = "git://github.com/guerrerocarlos/node-mdns-js-packet";
+      rev = "7f26b7010e589462713d0c8a46b040e0adf424f9";
+      sha256 = "f5a40610eb321ea411a8fa9fe9af21edb1282c062fb63692ffee4d30590ae995";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mdns-js" ];
-  };
-  by-spec."mdns-js-packet"."0.1.x" =
-    self.by-version."mdns-js-packet"."0.1.8";
-  by-version."mdns-js-packet"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "mdns-js-packet-0.1.8";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.8.tgz";
-        name = "mdns-js-packet-0.1.8.tgz";
-        sha1 = "e5a205c6e26e22a1df58e5f38057e80a6f84ee26";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mdns-js-packet" or []);
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "qap-3.1.2" = self.by-version."qap"."3.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mdns-js-packet" ];
+    peerDependencies = [];
   };
   by-spec."mdns-js2"."0.0.5" =
     self.by-version."mdns-js2"."0.0.5";
-  by-version."mdns-js2"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."mdns-js2"."0.0.5" = self.buildNodePackage {
     name = "mdns-js2-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mdns-js2/-/mdns-js2-0.0.5.tgz";
-        name = "mdns-js2-0.0.5.tgz";
-        sha1 = "7df4f4fbdcb21bdd6f29d9c7d4cea43b0198c909";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mdns-js2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mdns-js2/-/mdns-js2-0.0.5.tgz";
+      name = "mdns-js2-0.0.5.tgz";
+      sha1 = "7df4f4fbdcb21bdd6f29d9c7d4cea43b0198c909";
+    };
     deps = {
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mdns-js2" ];
+    peerDependencies = [];
   };
   by-spec."meat"."*" =
     self.by-version."meat"."0.3.3";
-  by-version."meat"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."meat"."0.3.3" = self.buildNodePackage {
     name = "meat-0.3.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/meat/-/meat-0.3.3.tgz";
-        name = "meat-0.3.3.tgz";
-        sha1 = "45e670184553efe7dda25ce6446f1e6a0fca7571";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."meat" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/meat/-/meat-0.3.3.tgz";
+      name = "meat-0.3.3.tgz";
+      sha1 = "45e670184553efe7dda25ce6446f1e6a0fca7571";
+    };
     deps = {
       "express-2.5.11" = self.by-version."express"."2.5.11";
       "jade-0.27.0" = self.by-version."jade"."0.27.0";
@@ -16427,272 +15933,273 @@
       "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
       "node.extend-1.0.0" = self.by-version."node.extend"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "meat" ];
+    peerDependencies = [];
   };
   "meat" = self.by-version."meat"."0.3.3";
+  by-spec."media-typer"."0.2.0" =
+    self.by-version."media-typer"."0.2.0";
+  by-version."media-typer"."0.2.0" = self.buildNodePackage {
+    name = "media-typer-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
+      name = "media-typer-0.2.0.tgz";
+      sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."media-typer"."0.3.0" =
     self.by-version."media-typer"."0.3.0";
-  by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."media-typer"."0.3.0" = self.buildNodePackage {
     name = "media-typer-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."media-typer" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "media-typer" ];
+    peerDependencies = [];
   };
   by-spec."memoizee"."0.3.x" =
     self.by-version."memoizee"."0.3.8";
-  by-version."memoizee"."0.3.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."memoizee"."0.3.8" = self.buildNodePackage {
     name = "memoizee-0.3.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz";
-        name = "memoizee-0.3.8.tgz";
-        sha1 = "b5faf419f02fafe3c2cc1cf5d3907c210fc7efdc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."memoizee" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz";
+      name = "memoizee-0.3.8.tgz";
+      sha1 = "b5faf419f02fafe3c2cc1cf5d3907c210fc7efdc";
+    };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
       "es6-weak-map-0.1.2" = self.by-version."es6-weak-map"."0.1.2";
-      "event-emitter-0.3.1" = self.by-version."event-emitter"."0.3.1";
+      "event-emitter-0.3.2" = self.by-version."event-emitter"."0.3.2";
       "lru-queue-0.1.0" = self.by-version."lru-queue"."0.1.0";
       "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2";
       "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "memoizee" ];
+    peerDependencies = [];
+  };
+  by-spec."memwatch"."^0.2.2" =
+    self.by-version."memwatch"."0.2.2";
+  by-version."memwatch"."0.2.2" = self.buildNodePackage {
+    name = "memwatch-0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/memwatch/-/memwatch-0.2.2.tgz";
+      name = "memwatch-0.2.2.tgz";
+      sha1 = "779e8cd982532b6221b6ed1c1269098bee16f92c";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."meow"."*" =
+    self.by-version."meow"."3.0.0";
+  by-version."meow"."3.0.0" = self.buildNodePackage {
+    name = "meow-3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/meow/-/meow-3.0.0.tgz";
+      name = "meow-3.0.0.tgz";
+      sha1 = "07c0edaade76c77498618d119aebb18a28d91b6d";
+    };
+    deps = {
+      "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
+      "indent-string-1.2.0" = self.by-version."indent-string"."1.2.0";
+      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."meow"."^2.0.0" =
     self.by-version."meow"."2.1.0";
-  by-version."meow"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."meow"."2.1.0" = self.buildNodePackage {
     name = "meow-2.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/meow/-/meow-2.1.0.tgz";
-        name = "meow-2.1.0.tgz";
-        sha1 = "3a63f77977c150c16fd84484d0cef677c4182799";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."meow" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/meow/-/meow-2.1.0.tgz";
+      name = "meow-2.1.0.tgz";
+      sha1 = "3a63f77977c150c16fd84484d0cef677c4182799";
+    };
     deps = {
       "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
       "indent-string-1.2.0" = self.by-version."indent-string"."1.2.0";
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "meow" ];
+    peerDependencies = [];
   };
-  by-spec."meow"."^2.0.0" =
+  by-spec."meow"."^2.1.0" =
     self.by-version."meow"."2.1.0";
   by-spec."merge-descriptors"."0.0.2" =
     self.by-version."merge-descriptors"."0.0.2";
-  by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."merge-descriptors"."0.0.2" = self.buildNodePackage {
     name = "merge-descriptors-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
-        name = "merge-descriptors-0.0.2.tgz";
-        sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."merge-descriptors" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+      name = "merge-descriptors-0.0.2.tgz";
+      sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "merge-descriptors" ];
+    peerDependencies = [];
   };
   by-spec."method-override"."1.0.0" =
     self.by-version."method-override"."1.0.0";
-  by-version."method-override"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."method-override"."1.0.0" = self.buildNodePackage {
     name = "method-override-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
-        name = "method-override-1.0.0.tgz";
-        sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."method-override" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
+      name = "method-override-1.0.0.tgz";
+      sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61";
+    };
     deps = {
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "method-override" ];
+    peerDependencies = [];
+  };
+  by-spec."method-override"."^1.0.0" =
+    self.by-version."method-override"."1.0.2";
+  by-version."method-override"."1.0.2" = self.buildNodePackage {
+    name = "method-override-1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/method-override/-/method-override-1.0.2.tgz";
+      name = "method-override-1.0.2.tgz";
+      sha1 = "d6f80275db23a23380028c9215b97470be01d689";
+    };
+    deps = {
+      "methods-1.0.0" = self.by-version."methods"."1.0.0";
+    };
+    peerDependencies = [];
   };
   by-spec."method-override"."~2.2.0" =
     self.by-version."method-override"."2.2.0";
-  by-version."method-override"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."method-override"."2.2.0" = self.buildNodePackage {
     name = "method-override-2.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz";
-        name = "method-override-2.2.0.tgz";
-        sha1 = "177e852b6add3b4f9177033a9446b01e7801a0c0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."method-override" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz";
+      name = "method-override-2.2.0.tgz";
+      sha1 = "177e852b6add3b4f9177033a9446b01e7801a0c0";
+    };
     deps = {
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "methods-1.1.0" = self.by-version."methods"."1.1.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "method-override" ];
+    peerDependencies = [];
   };
   by-spec."method-override"."~2.3.1" =
     self.by-version."method-override"."2.3.1";
-  by-version."method-override"."2.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."method-override"."2.3.1" = self.buildNodePackage {
     name = "method-override-2.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/method-override/-/method-override-2.3.1.tgz";
-        name = "method-override-2.3.1.tgz";
-        sha1 = "59796b7ce565ae9f77f3b312447d2c0f938f93c6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."method-override" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/method-override/-/method-override-2.3.1.tgz";
+      name = "method-override-2.3.1.tgz";
+      sha1 = "59796b7ce565ae9f77f3b312447d2c0f938f93c6";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "method-override" ];
+    peerDependencies = [];
   };
   by-spec."methods"."*" =
     self.by-version."methods"."1.1.1";
-  by-version."methods"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."methods"."1.1.1" = self.buildNodePackage {
     name = "methods-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."methods" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
+      name = "methods-1.1.1.tgz";
+      sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "methods" ];
+    peerDependencies = [];
   };
   by-spec."methods"."0.0.1" =
     self.by-version."methods"."0.0.1";
-  by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."methods"."0.0.1" = self.buildNodePackage {
     name = "methods-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
-        name = "methods-0.0.1.tgz";
-        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."methods" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+      name = "methods-0.0.1.tgz";
+      sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "methods" ];
+    peerDependencies = [];
   };
   by-spec."methods"."0.1.0" =
     self.by-version."methods"."0.1.0";
-  by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."methods"."0.1.0" = self.buildNodePackage {
     name = "methods-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
-        name = "methods-0.1.0.tgz";
-        sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."methods" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
+      name = "methods-0.1.0.tgz";
+      sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."methods"."1.0.0" =
+    self.by-version."methods"."1.0.0";
+  by-version."methods"."1.0.0" = self.buildNodePackage {
+    name = "methods-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz";
+      name = "methods-1.0.0.tgz";
+      sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "methods" ];
+    peerDependencies = [];
   };
   by-spec."methods"."1.0.1" =
     self.by-version."methods"."1.0.1";
-  by-version."methods"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."methods"."1.0.1" = self.buildNodePackage {
     name = "methods-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
-        name = "methods-1.0.1.tgz";
-        sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."methods" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
+      name = "methods-1.0.1.tgz";
+      sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "methods" ];
+    peerDependencies = [];
   };
   by-spec."methods"."1.1.0" =
     self.by-version."methods"."1.1.0";
-  by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."methods"."1.1.0" = self.buildNodePackage {
     name = "methods-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
-        name = "methods-1.1.0.tgz";
-        sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."methods" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
+      name = "methods-1.1.0.tgz";
+      sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "methods" ];
+    peerDependencies = [];
   };
   by-spec."methods"."1.1.1" =
     self.by-version."methods"."1.1.1";
@@ -16702,130 +16209,110 @@
     self.by-version."methods"."1.1.1";
   by-spec."microee"."0.0.2" =
     self.by-version."microee"."0.0.2";
-  by-version."microee"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."microee"."0.0.2" = self.buildNodePackage {
     name = "microee-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/microee/-/microee-0.0.2.tgz";
-        name = "microee-0.0.2.tgz";
-        sha1 = "72e80d477075e5e799470f5defea96d1dd121587";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."microee" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/microee/-/microee-0.0.2.tgz";
+      name = "microee-0.0.2.tgz";
+      sha1 = "72e80d477075e5e799470f5defea96d1dd121587";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "microee" ];
+    peerDependencies = [];
   };
   by-spec."miller-rabin"."^1.1.2" =
     self.by-version."miller-rabin"."1.1.5";
-  by-version."miller-rabin"."1.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."miller-rabin"."1.1.5" = self.buildNodePackage {
     name = "miller-rabin-1.1.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz";
-        name = "miller-rabin-1.1.5.tgz";
-        sha1 = "41f506bed994b97e7c184a658ae107dad980526e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."miller-rabin" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz";
+      name = "miller-rabin-1.1.5.tgz";
+      sha1 = "41f506bed994b97e7c184a658ae107dad980526e";
+    };
     deps = {
       "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
       "brorand-1.0.5" = self.by-version."brorand"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "miller-rabin" ];
+    peerDependencies = [];
   };
   by-spec."mime"."*" =
     self.by-version."mime"."1.2.11";
-  by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."mime"."1.2.11" = self.buildNodePackage {
     name = "mime-1.2.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-        name = "mime-1.2.11.tgz";
-        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+      name = "mime-1.2.11.tgz";
+      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime" ];
+    peerDependencies = [];
   };
   by-spec."mime"."1.2.11" =
     self.by-version."mime"."1.2.11";
   by-spec."mime"."1.2.4" =
     self.by-version."mime"."1.2.4";
-  by-version."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."mime"."1.2.4" = self.buildNodePackage {
     name = "mime-1.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
-        name = "mime-1.2.4.tgz";
-        sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
+      name = "mime-1.2.4.tgz";
+      sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime" ];
+    peerDependencies = [];
+  };
+  by-spec."mime"."1.2.5" =
+    self.by-version."mime"."1.2.5";
+  by-version."mime"."1.2.5" = self.buildNodePackage {
+    name = "mime-1.2.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz";
+      name = "mime-1.2.5.tgz";
+      sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."mime"."1.2.6" =
     self.by-version."mime"."1.2.6";
-  by-version."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."mime"."1.2.6" = self.buildNodePackage {
     name = "mime-1.2.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
-        name = "mime-1.2.6.tgz";
-        sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+      name = "mime-1.2.6.tgz";
+      sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime" ];
+    peerDependencies = [];
   };
   by-spec."mime"."1.2.9" =
     self.by-version."mime"."1.2.9";
-  by-version."mime"."1.2.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."mime"."1.2.9" = self.buildNodePackage {
     name = "mime-1.2.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
-        name = "mime-1.2.9.tgz";
-        sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
+      name = "mime-1.2.9.tgz";
+      sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime" ];
+    peerDependencies = [];
   };
   by-spec."mime".">= 0.0.1" =
     self.by-version."mime"."1.2.11";
+  by-spec."mime".">=1.2.11" =
+    self.by-version."mime"."1.2.11";
   by-spec."mime"."^1.2.11" =
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.11" =
@@ -16838,243 +16325,195 @@
     self.by-version."mime"."1.2.11";
   by-spec."mime-db"."1.x" =
     self.by-version."mime-db"."1.5.0";
-  by-version."mime-db"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mime-db"."1.5.0" = self.buildNodePackage {
     name = "mime-db-1.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz";
-        name = "mime-db-1.5.0.tgz";
-        sha1 = "bd80b576157991c3b46c71be7041fc6d5402a6ee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime-db" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz";
+      name = "mime-db-1.5.0.tgz";
+      sha1 = "bd80b576157991c3b46c71be7041fc6d5402a6ee";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime-db" ];
+    peerDependencies = [];
   };
   by-spec."mime-db"."~1.5.0" =
     self.by-version."mime-db"."1.5.0";
-  by-spec."mime-types"."~1.0.1" =
-    self.by-version."mime-types"."1.0.2";
-  by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "mime-types-1.0.2";
+  by-spec."mime-types"."^2.0.3" =
+    self.by-version."mime-types"."2.0.7";
+  by-version."mime-types"."2.0.7" = self.buildNodePackage {
+    name = "mime-types-2.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
-        name = "mime-types-1.0.2.tgz";
-        sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime-types" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz";
+      name = "mime-types-2.0.7.tgz";
+      sha1 = "0cb58d0403aec977357db324eea67e40c32b44b2";
+    };
     deps = {
+      "mime-db-1.5.0" = self.by-version."mime-db"."1.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime-types" ];
+    peerDependencies = [];
   };
-  by-spec."mime-types"."~2.0.3" =
-    self.by-version."mime-types"."2.0.7";
-  by-version."mime-types"."2.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "mime-types-2.0.7";
+  by-spec."mime-types"."~1.0.0" =
+    self.by-version."mime-types"."1.0.2";
+  by-version."mime-types"."1.0.2" = self.buildNodePackage {
+    name = "mime-types-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz";
-        name = "mime-types-2.0.7.tgz";
-        sha1 = "0cb58d0403aec977357db324eea67e40c32b44b2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime-types" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+      name = "mime-types-1.0.2.tgz";
+      sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+    };
     deps = {
-      "mime-db-1.5.0" = self.by-version."mime-db"."1.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime-types" ];
+    peerDependencies = [];
   };
+  by-spec."mime-types"."~1.0.1" =
+    self.by-version."mime-types"."1.0.2";
+  by-spec."mime-types"."~2.0.3" =
+    self.by-version."mime-types"."2.0.7";
   by-spec."mime-types"."~2.0.4" =
     self.by-version."mime-types"."2.0.7";
   by-spec."mime-types"."~2.0.7" =
     self.by-version."mime-types"."2.0.7";
   by-spec."mimelib"."~0.2.15" =
     self.by-version."mimelib"."0.2.18";
-  by-version."mimelib"."0.2.18" = lib.makeOverridable self.buildNodePackage {
+  by-version."mimelib"."0.2.18" = self.buildNodePackage {
     name = "mimelib-0.2.18";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.18.tgz";
-        name = "mimelib-0.2.18.tgz";
-        sha1 = "2e631a3db449026fcb85099398b7bd750eac46a7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mimelib" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.18.tgz";
+      name = "mimelib-0.2.18.tgz";
+      sha1 = "2e631a3db449026fcb85099398b7bd750eac46a7";
+    };
     deps = {
       "encoding-0.1.11" = self.by-version."encoding"."0.1.11";
       "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mimelib" ];
+    peerDependencies = [];
   };
   by-spec."mine"."~0.0.1" =
     self.by-version."mine"."0.0.2";
-  by-version."mine"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."mine"."0.0.2" = self.buildNodePackage {
     name = "mine-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mine/-/mine-0.0.2.tgz";
-        name = "mine-0.0.2.tgz";
-        sha1 = "77c2d327f8357352e69fc3e618f7476539fa0c40";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mine" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mine/-/mine-0.0.2.tgz";
+      name = "mine-0.0.2.tgz";
+      sha1 = "77c2d327f8357352e69fc3e618f7476539fa0c40";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mine" ];
+    peerDependencies = [];
   };
   by-spec."minilog"."~2.0.2" =
     self.by-version."minilog"."2.0.6";
-  by-version."minilog"."2.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."minilog"."2.0.6" = self.buildNodePackage {
     name = "minilog-2.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minilog/-/minilog-2.0.6.tgz";
-        name = "minilog-2.0.6.tgz";
-        sha1 = "665601f32a08bda58406c0e933b08713b3a50ad4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minilog" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minilog/-/minilog-2.0.6.tgz";
+      name = "minilog-2.0.6.tgz";
+      sha1 = "665601f32a08bda58406c0e933b08713b3a50ad4";
+    };
     deps = {
       "microee-0.0.2" = self.by-version."microee"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minilog" ];
+    peerDependencies = [];
+  };
+  by-spec."minimalistic-assert"."^1.0.0" =
+    self.by-version."minimalistic-assert"."1.0.0";
+  by-version."minimalistic-assert"."1.0.0" = self.buildNodePackage {
+    name = "minimalistic-assert-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
+      name = "minimalistic-assert-1.0.0.tgz";
+      sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."minimatch"."0.0.x" =
     self.by-version."minimatch"."0.0.5";
-  by-version."minimatch"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimatch"."0.0.5" = self.buildNodePackage {
     name = "minimatch-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
-        name = "minimatch-0.0.5.tgz";
-        sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
+      name = "minimatch-0.0.5.tgz";
+      sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
+    };
     deps = {
       "lru-cache-1.0.6" = self.by-version."lru-cache"."1.0.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
+    peerDependencies = [];
   };
   by-spec."minimatch"."0.3" =
     self.by-version."minimatch"."0.3.0";
-  by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimatch"."0.3.0" = self.buildNodePackage {
     name = "minimatch-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
+    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.5.0" = self.by-version."lru-cache"."2.5.0";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
+    peerDependencies = [];
   };
   by-spec."minimatch"."0.x" =
     self.by-version."minimatch"."0.4.0";
-  by-version."minimatch"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimatch"."0.4.0" = self.buildNodePackage {
     name = "minimatch-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
-        name = "minimatch-0.4.0.tgz";
-        sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
+      name = "minimatch-0.4.0.tgz";
+      sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
+    };
     deps = {
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
+    peerDependencies = [];
   };
   by-spec."minimatch"."1" =
     self.by-version."minimatch"."1.0.0";
-  by-version."minimatch"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimatch"."1.0.0" = self.buildNodePackage {
     name = "minimatch-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
-        name = "minimatch-1.0.0.tgz";
-        sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
+      name = "minimatch-1.0.0.tgz";
+      sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d";
+    };
     deps = {
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
+    peerDependencies = [];
   };
   by-spec."minimatch"."1.0.x" =
     self.by-version."minimatch"."1.0.0";
   by-spec."minimatch".">=0.2.4" =
     self.by-version."minimatch"."2.0.1";
-  by-version."minimatch"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimatch"."2.0.1" = self.buildNodePackage {
     name = "minimatch-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz";
-        name = "minimatch-2.0.1.tgz";
-        sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz";
+      name = "minimatch-2.0.1.tgz";
+      sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37";
+    };
     deps = {
       "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
+    peerDependencies = [];
   };
   by-spec."minimatch"."^1.0.0" =
     self.by-version."minimatch"."1.0.0";
@@ -17082,25 +16521,19 @@
     self.by-version."minimatch"."2.0.1";
   by-spec."minimatch"."~0.2" =
     self.by-version."minimatch"."0.2.14";
-  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimatch"."0.2.14" = self.buildNodePackage {
     name = "minimatch-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
+    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.5.0" = self.by-version."lru-cache"."2.5.0";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
+    peerDependencies = [];
   };
   by-spec."minimatch"."~0.2.0" =
     self.by-version."minimatch"."0.2.14";
@@ -17118,63 +16551,45 @@
     self.by-version."minimatch"."2.0.1";
   by-spec."minimist"."0.0.8" =
     self.by-version."minimist"."0.0.8";
-  by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimist"."0.0.8" = self.buildNodePackage {
     name = "minimist-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+      name = "minimist-0.0.8.tgz";
+      sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimist" ];
+    peerDependencies = [];
   };
   by-spec."minimist"."^1.1.0" =
     self.by-version."minimist"."1.1.0";
-  by-version."minimist"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimist"."1.1.0" = self.buildNodePackage {
     name = "minimist-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz";
-        name = "minimist-1.1.0.tgz";
-        sha1 = "cdf225e8898f840a258ded44fc91776770afdc93";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz";
+      name = "minimist-1.1.0.tgz";
+      sha1 = "cdf225e8898f840a258ded44fc91776770afdc93";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimist" ];
+    peerDependencies = [];
   };
   by-spec."minimist"."~0.0.1" =
     self.by-version."minimist"."0.0.10";
-  by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimist"."0.0.10" = self.buildNodePackage {
     name = "minimist-0.0.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
-        name = "minimist-0.0.10.tgz";
-        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+      name = "minimist-0.0.10.tgz";
+      sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimist" ];
+    peerDependencies = [];
   };
   by-spec."minimist"."~0.0.5" =
     self.by-version."minimist"."0.0.10";
@@ -17182,170 +16597,122 @@
     self.by-version."minimist"."0.0.10";
   by-spec."minimist"."~0.2.0" =
     self.by-version."minimist"."0.2.0";
-  by-version."minimist"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimist"."0.2.0" = self.buildNodePackage {
     name = "minimist-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
-        name = "minimist-0.2.0.tgz";
-        sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
+      name = "minimist-0.2.0.tgz";
+      sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimist" ];
+    peerDependencies = [];
   };
   by-spec."minimist"."~1.1.0" =
     self.by-version."minimist"."1.1.0";
   by-spec."ministyle"."~0.1.3" =
     self.by-version."ministyle"."0.1.4";
-  by-version."ministyle"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."ministyle"."0.1.4" = self.buildNodePackage {
     name = "ministyle-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
-        name = "ministyle-0.1.4.tgz";
-        sha1 = "b10481eb16aa8f7b6cd983817393a44da0e5a0cd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ministyle" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
+      name = "ministyle-0.1.4.tgz";
+      sha1 = "b10481eb16aa8f7b6cd983817393a44da0e5a0cd";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ministyle" ];
+    peerDependencies = [];
   };
   by-spec."miniwrite"."~0.1.3" =
     self.by-version."miniwrite"."0.1.4";
-  by-version."miniwrite"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."miniwrite"."0.1.4" = self.buildNodePackage {
     name = "miniwrite-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz";
-        name = "miniwrite-0.1.4.tgz";
-        sha1 = "72f02385c0ac37d542efe27dc6764b31908725ce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."miniwrite" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz";
+      name = "miniwrite-0.1.4.tgz";
+      sha1 = "72f02385c0ac37d542efe27dc6764b31908725ce";
+    };
     deps = {
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "miniwrite" ];
+    peerDependencies = [];
   };
   by-spec."mkdirp"."*" =
     self.by-version."mkdirp"."0.5.0";
-  by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkdirp"."0.5.0" = self.buildNodePackage {
     name = "mkdirp-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
+    peerDependencies = [];
   };
   "mkdirp" = self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."0.0.x" =
     self.by-version."mkdirp"."0.0.7";
-  by-version."mkdirp"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkdirp"."0.0.7" = self.buildNodePackage {
     name = "mkdirp-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz";
-        name = "mkdirp-0.0.7.tgz";
-        sha1 = "d89b4f0e4c3e5e5ca54235931675e094fe1a5072";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz";
+      name = "mkdirp-0.0.7.tgz";
+      sha1 = "d89b4f0e4c3e5e5ca54235931675e094fe1a5072";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
+    peerDependencies = [];
   };
   by-spec."mkdirp"."0.3.0" =
     self.by-version."mkdirp"."0.3.0";
-  by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkdirp"."0.3.0" = self.buildNodePackage {
     name = "mkdirp-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+      name = "mkdirp-0.3.0.tgz";
+      sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
+    peerDependencies = [];
   };
   by-spec."mkdirp"."0.3.5" =
     self.by-version."mkdirp"."0.3.5";
-  by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkdirp"."0.3.5" = self.buildNodePackage {
     name = "mkdirp-0.3.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-        name = "mkdirp-0.3.5.tgz";
-        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+      name = "mkdirp-0.3.5.tgz";
+      sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
+    peerDependencies = [];
   };
   by-spec."mkdirp"."0.3.x" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."0.4.0" =
     self.by-version."mkdirp"."0.4.0";
-  by-version."mkdirp"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkdirp"."0.4.0" = self.buildNodePackage {
     name = "mkdirp-0.4.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz";
-        name = "mkdirp-0.4.0.tgz";
-        sha1 = "291ac2a2d43a19c478662577b5be846fe83b5923";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz";
+      name = "mkdirp-0.4.0.tgz";
+      sha1 = "291ac2a2d43a19c478662577b5be846fe83b5923";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
+    peerDependencies = [];
   };
   by-spec."mkdirp"."0.5" =
     self.by-version."mkdirp"."0.5.0";
@@ -17355,12 +16722,16 @@
     self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."0.x.x" =
     self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp".">=0.3.5" =
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp".">=0.5 0" =
     self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."^0.3.5" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."^0.5.0" =
     self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."~0.3" =
+    self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.3" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.4" =
@@ -17371,38 +16742,28 @@
     self.by-version."mkdirp"."0.5.0";
   by-spec."mkpath"."~0.1.0" =
     self.by-version."mkpath"."0.1.0";
-  by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkpath"."0.1.0" = self.buildNodePackage {
     name = "mkpath-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz";
-        name = "mkpath-0.1.0.tgz";
-        sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkpath" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz";
+      name = "mkpath-0.1.0.tgz";
+      sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkpath" ];
+    peerDependencies = [];
   };
   by-spec."mocha"."*" =
     self.by-version."mocha"."2.1.0";
-  by-version."mocha"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mocha"."2.1.0" = self.buildNodePackage {
     name = "mocha-2.1.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-2.1.0.tgz";
-        name = "mocha-2.1.0.tgz";
-        sha1 = "77752fe592fb9092756827af46cd3eae1b83671c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mocha" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mocha/-/mocha-2.1.0.tgz";
+      name = "mocha-2.1.0.tgz";
+      sha1 = "77752fe592fb9092756827af46cd3eae1b83671c";
+    };
     deps = {
       "commander-2.3.0" = self.by-version."commander"."2.3.0";
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
@@ -17413,25 +16774,19 @@
       "jade-0.26.3" = self.by-version."jade"."0.26.3";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mocha" ];
+    peerDependencies = [];
   };
   "mocha" = self.by-version."mocha"."2.1.0";
   by-spec."mocha"."~1.20.1" =
     self.by-version."mocha"."1.20.1";
-  by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."mocha"."1.20.1" = self.buildNodePackage {
     name = "mocha-1.20.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz";
-        name = "mocha-1.20.1.tgz";
-        sha1 = "f343832d9fe0c7d97c64fc70448f5136df9fed5b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mocha" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz";
+      name = "mocha-1.20.1.tgz";
+      sha1 = "f343832d9fe0c7d97c64fc70448f5136df9fed5b";
+    };
     deps = {
       "commander-2.0.0" = self.by-version."commander"."2.0.0";
       "growl-1.7.0" = self.by-version."growl"."1.7.0";
@@ -17441,82 +16796,64 @@
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "glob-3.2.3" = self.by-version."glob"."3.2.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mocha" ];
+    peerDependencies = [];
   };
   by-spec."mocha-phantomjs"."*" =
-    self.by-version."mocha-phantomjs"."3.5.2";
-  by-version."mocha-phantomjs"."3.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-phantomjs-3.5.2";
+    self.by-version."mocha-phantomjs"."3.5.3";
+  by-version."mocha-phantomjs"."3.5.3" = self.buildNodePackage {
+    name = "mocha-phantomjs-3.5.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.2.tgz";
-        name = "mocha-phantomjs-3.5.2.tgz";
-        sha1 = "4d7474d373acc9f828c90d868035be527cdf367b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mocha-phantomjs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.3.tgz";
+      name = "mocha-phantomjs-3.5.3.tgz";
+      sha1 = "bc0e654972d883ce11367f3f011f9e88f0a8de14";
+    };
     deps = {
       "mocha-1.20.1" = self.by-version."mocha"."1.20.1";
       "commander-2.0.0" = self.by-version."commander"."2.0.0";
     };
     peerDependencies = [
-      self.by-version."phantomjs"."1.9.13"
-    ];
-    passthru.names = [ "mocha-phantomjs" ];
+      self.by-version."phantomjs"."1.9.13"];
   };
-  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.2";
+  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.3";
   by-spec."mocha-unfunk-reporter"."*" =
     self.by-version."mocha-unfunk-reporter"."0.4.0";
-  by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mocha-unfunk-reporter"."0.4.0" = self.buildNodePackage {
     name = "mocha-unfunk-reporter-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz";
-        name = "mocha-unfunk-reporter-0.4.0.tgz";
-        sha1 = "59eda97aec6ae6e26d7af4173490a65b7b082d20";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mocha-unfunk-reporter" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz";
+      name = "mocha-unfunk-reporter-0.4.0.tgz";
+      sha1 = "59eda97aec6ae6e26d7af4173490a65b7b082d20";
+    };
     deps = {
       "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3";
       "unfunk-diff-0.0.2" = self.by-version."unfunk-diff"."0.0.2";
       "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4";
       "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mocha-unfunk-reporter" ];
+    peerDependencies = [];
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
   by-spec."module-deps"."^3.6.3" =
     self.by-version."module-deps"."3.6.4";
-  by-version."module-deps"."3.6.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."module-deps"."3.6.4" = self.buildNodePackage {
     name = "module-deps-3.6.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-3.6.4.tgz";
-        name = "module-deps-3.6.4.tgz";
-        sha1 = "6997857056165e9abade256de6f97dc7effe753f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."module-deps" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/module-deps/-/module-deps-3.6.4.tgz";
+      name = "module-deps-3.6.4.tgz";
+      sha1 = "6997857056165e9abade256de6f97dc7effe753f";
+    };
     deps = {
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0";
+      "browser-resolve-1.6.0" = self.by-version."browser-resolve"."1.6.0";
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
       "detective-4.0.0" = self.by-version."detective"."4.0.0";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
-      "parents-1.0.0" = self.by-version."parents"."1.0.0";
+      "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
@@ -17524,24 +16861,18 @@
       "subarg-0.0.1" = self.by-version."subarg"."0.0.1";
       "through2-0.4.2" = self.by-version."through2"."0.4.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "module-deps" ];
+    peerDependencies = [];
   };
   by-spec."module-deps"."~1.2.2" =
     self.by-version."module-deps"."1.2.2";
-  by-version."module-deps"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."module-deps"."1.2.2" = self.buildNodePackage {
     name = "module-deps-1.2.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.2.2.tgz";
-        name = "module-deps-1.2.2.tgz";
-        sha1 = "6e73959b7973af964de33a02437b76a8edfb2fc5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."module-deps" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/module-deps/-/module-deps-1.2.2.tgz";
+      name = "module-deps-1.2.2.tgz";
+      sha1 = "6e73959b7973af964de33a02437b76a8edfb2fc5";
+    };
     deps = {
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
@@ -17552,24 +16883,18 @@
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
       "parents-0.0.2" = self.by-version."parents"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "module-deps" ];
+    peerDependencies = [];
   };
   by-spec."module-deps"."~1.4.0" =
     self.by-version."module-deps"."1.4.2";
-  by-version."module-deps"."1.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."module-deps"."1.4.2" = self.buildNodePackage {
     name = "module-deps-1.4.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.4.2.tgz";
-        name = "module-deps-1.4.2.tgz";
-        sha1 = "cc48c5f88a087c6d9ec1973167c2c9fee2f80314";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."module-deps" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/module-deps/-/module-deps-1.4.2.tgz";
+      name = "module-deps-1.4.2.tgz";
+      sha1 = "cc48c5f88a087c6d9ec1973167c2c9fee2f80314";
+    };
     deps = {
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
@@ -17580,196 +16905,227 @@
       "parents-0.0.2" = self.by-version."parents"."0.0.2";
       "mine-0.0.2" = self.by-version."mine"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "module-deps" ];
+    peerDependencies = [];
   };
   by-spec."moment"."2.1.0" =
     self.by-version."moment"."2.1.0";
-  by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."moment"."2.1.0" = self.buildNodePackage {
     name = "moment-2.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
-        name = "moment-2.1.0.tgz";
-        sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."moment" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
+      name = "moment-2.1.0.tgz";
+      sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "moment" ];
+    peerDependencies = [];
   };
+  by-spec."moment".">= 2.1.0" =
+    self.by-version."moment"."2.9.0";
+  by-version."moment"."2.9.0" = self.buildNodePackage {
+    name = "moment-2.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment/-/moment-2.9.0.tgz";
+      name = "moment-2.9.0.tgz";
+      sha1 = "77ec1175fa294f42627f10c8e6de6302c036f6d5";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."moment".">= 2.6.0" =
+    self.by-version."moment"."2.9.0";
+  by-spec."moment".">=2.4.0" =
+    self.by-version."moment"."2.9.0";
+  by-spec."moment".">=2.5.0" =
+    self.by-version."moment"."2.9.0";
+  by-spec."moment"."^2.8.4" =
+    self.by-version."moment"."2.9.0";
   by-spec."moment"."~2.4.0" =
     self.by-version."moment"."2.4.0";
-  by-version."moment"."2.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."moment"."2.4.0" = self.buildNodePackage {
     name = "moment-2.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz";
-        name = "moment-2.4.0.tgz";
-        sha1 = "06dd8dfbbfdb53a03510080ac788163c9490e75d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."moment" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz";
+      name = "moment-2.4.0.tgz";
+      sha1 = "06dd8dfbbfdb53a03510080ac788163c9490e75d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "moment" ];
+    peerDependencies = [];
+  };
+  by-spec."moment"."~2.5.1" =
+    self.by-version."moment"."2.5.1";
+  by-version."moment"."2.5.1" = self.buildNodePackage {
+    name = "moment-2.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment/-/moment-2.5.1.tgz";
+      name = "moment-2.5.1.tgz";
+      sha1 = "7146a3900533064ca799d5e792f4e480ee0e82bc";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."moment"."~2.8.4" =
     self.by-version."moment"."2.8.4";
-  by-version."moment"."2.8.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."moment"."2.8.4" = self.buildNodePackage {
     name = "moment-2.8.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/moment/-/moment-2.8.4.tgz";
-        name = "moment-2.8.4.tgz";
-        sha1 = "cc174aabb19223efff5699a9467805a2789838bf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."moment" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment/-/moment-2.8.4.tgz";
+      name = "moment-2.8.4.tgz";
+      sha1 = "cc174aabb19223efff5699a9467805a2789838bf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "moment" ];
+    peerDependencies = [];
+  };
+  by-spec."moment-timezone"."0.0.3" =
+    self.by-version."moment-timezone"."0.0.3";
+  by-version."moment-timezone"."0.0.3" = self.buildNodePackage {
+    name = "moment-timezone-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.0.3.tgz";
+      name = "moment-timezone-0.0.3.tgz";
+      sha1 = "ebbd95f9220eba1c1b5e562d078db6c7d971e7ac";
+    };
+    deps = {
+      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."moment-timezone"."0.2.4" =
+    self.by-version."moment-timezone"."0.2.4";
+  by-version."moment-timezone"."0.2.4" = self.buildNodePackage {
+    name = "moment-timezone-0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.2.4.tgz";
+      name = "moment-timezone-0.2.4.tgz";
+      sha1 = "331a9dbecf965a8fb185ee30a6ed3fe32ee93012";
+    };
+    deps = {
+      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+    };
+    peerDependencies = [];
   };
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
-  by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
+  by-version."mongodb"."1.2.14" = self.buildNodePackage {
     name = "mongodb-1.2.14";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
-        name = "mongodb-1.2.14.tgz";
-        sha1 = "269665552066437308d0942036646e6795c3a9a3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongodb" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
+      name = "mongodb-1.2.14.tgz";
+      sha1 = "269665552066437308d0942036646e6795c3a9a3";
+    };
     deps = {
       "bson-0.1.8" = self.by-version."bson"."0.1.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongodb" ];
+    peerDependencies = [];
   };
   by-spec."mongodb"."1.3.19" =
     self.by-version."mongodb"."1.3.19";
-  by-version."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage {
+  by-version."mongodb"."1.3.19" = self.buildNodePackage {
     name = "mongodb-1.3.19";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
-        name = "mongodb-1.3.19.tgz";
-        sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongodb" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
+      name = "mongodb-1.3.19.tgz";
+      sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4";
+    };
     deps = {
       "bson-0.2.2" = self.by-version."bson"."0.2.2";
       "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongodb" ];
+    peerDependencies = [];
   };
   by-spec."mongodb"."1.4.12" =
     self.by-version."mongodb"."1.4.12";
-  by-version."mongodb"."1.4.12" = lib.makeOverridable self.buildNodePackage {
+  by-version."mongodb"."1.4.12" = self.buildNodePackage {
     name = "mongodb-1.4.12";
     bin = false;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.12.tgz";
-        name = "mongodb-1.4.12.tgz";
-        sha1 = "65cdd46ec127861e941168fdccf82bf17ad71c4d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongodb" or []);
-    deps = {
-      "bson-0.2.16" = self.by-version."bson"."0.2.16";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.12.tgz";
+      name = "mongodb-1.4.12.tgz";
+      sha1 = "65cdd46ec127861e941168fdccf82bf17ad71c4d";
+    };
+    deps = {
+      "bson-0.2.18" = self.by-version."bson"."0.2.18";
       "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongodb" ];
+    peerDependencies = [];
+  };
+  by-spec."mongodb"."1.4.28" =
+    self.by-version."mongodb"."1.4.28";
+  by-version."mongodb"."1.4.28" = self.buildNodePackage {
+    name = "mongodb-1.4.28";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.28.tgz";
+      name = "mongodb-1.4.28.tgz";
+      sha1 = "4308333aa9b369cc8214a67602527d138bf74e1f";
+    };
+    deps = {
+      "bson-0.2.18" = self.by-version."bson"."0.2.18";
+      "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    peerDependencies = [];
   };
   by-spec."mongodb".">= 1.2.0 <2.1.0" =
-    self.by-version."mongodb"."2.0.13";
-  by-version."mongodb"."2.0.13" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-2.0.13";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.13.tgz";
-        name = "mongodb-2.0.13.tgz";
-        sha1 = "ed555639c502007d08927e7d7347c194e5750f27";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongodb" or []);
-    deps = {
-      "mongodb-core-1.1.8" = self.by-version."mongodb-core"."1.1.8";
+    self.by-version."mongodb"."2.0.14";
+  by-version."mongodb"."2.0.14" = self.buildNodePackage {
+    name = "mongodb-2.0.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.14.tgz";
+      name = "mongodb-2.0.14.tgz";
+      sha1 = "9834ba645d56d111a5947f610bd96280afddb5e7";
+    };
+    deps = {
+      "mongodb-core-1.1.9" = self.by-version."mongodb-core"."1.1.9";
       "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongodb" ];
-  };
-  by-spec."mongodb-core"."1.1.8" =
-    self.by-version."mongodb-core"."1.1.8";
-  by-version."mongodb-core"."1.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-core-1.1.8";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.8.tgz";
-        name = "mongodb-core-1.1.8.tgz";
-        sha1 = "123b2e3c5387767b9d8eac0164185c53fccb99b5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongodb-core" or []);
-    deps = {
-      "bson-0.2.16" = self.by-version."bson"."0.2.16";
+    peerDependencies = [];
+  };
+  by-spec."mongodb"."~2.0" =
+    self.by-version."mongodb"."2.0.14";
+  by-spec."mongodb-core"."1.1.9" =
+    self.by-version."mongodb-core"."1.1.9";
+  by-version."mongodb-core"."1.1.9" = self.buildNodePackage {
+    name = "mongodb-core-1.1.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.9.tgz";
+      name = "mongodb-core-1.1.9.tgz";
+      sha1 = "fc9ede45da21427c8e18f2ccf7cce4efc368eeef";
+    };
+    deps = {
+      "bson-0.2.18" = self.by-version."bson"."0.2.18";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "rimraf-2.2.6" = self.by-version."rimraf"."2.2.6";
-      "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7";
+      "kerberos-0.0.8" = self.by-version."kerberos"."0.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongodb-core" ];
+    peerDependencies = [];
   };
   by-spec."mongoose"."3.6.7" =
     self.by-version."mongoose"."3.6.7";
-  by-version."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."mongoose"."3.6.7" = self.buildNodePackage {
     name = "mongoose-3.6.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
-        name = "mongoose-3.6.7.tgz";
-        sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongoose" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
+      name = "mongoose-3.6.7.tgz";
+      sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
+    };
     deps = {
       "hooks-0.2.1" = self.by-version."hooks"."0.2.1";
       "mongodb-1.2.14" = self.by-version."mongodb"."1.2.14";
@@ -17779,24 +17135,18 @@
       "mpromise-0.2.1" = self.by-version."mpromise"."0.2.1";
       "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongoose" ];
+    peerDependencies = [];
   };
   by-spec."mongoose"."3.6.x" =
     self.by-version."mongoose"."3.6.20";
-  by-version."mongoose"."3.6.20" = lib.makeOverridable self.buildNodePackage {
+  by-version."mongoose"."3.6.20" = self.buildNodePackage {
     name = "mongoose-3.6.20";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz";
-        name = "mongoose-3.6.20.tgz";
-        sha1 = "47263843e6b812ea207eec104c40a36c8d215f53";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongoose" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz";
+      name = "mongoose-3.6.20.tgz";
+      sha1 = "47263843e6b812ea207eec104c40a36c8d215f53";
+    };
     deps = {
       "hooks-0.2.1" = self.by-version."hooks"."0.2.1";
       "mongodb-1.3.19" = self.by-version."mongodb"."1.3.19";
@@ -17807,27 +17157,21 @@
       "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongoose" ];
+    peerDependencies = [];
   };
   "mongoose" = self.by-version."mongoose"."3.6.20";
   by-spec."mongoose"."3.8.x" =
-    self.by-version."mongoose"."3.8.21";
-  by-version."mongoose"."3.8.21" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-3.8.21";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.21.tgz";
-        name = "mongoose-3.8.21.tgz";
-        sha1 = "ba96d6e73b7b73a5c133ca886de316994df2a2f0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongoose" or []);
+    self.by-version."mongoose"."3.8.22";
+  by-version."mongoose"."3.8.22" = self.buildNodePackage {
+    name = "mongoose-3.8.22";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.22.tgz";
+      name = "mongoose-3.8.22.tgz";
+      sha1 = "e5f21eb1dac5532cdee15241dea50553267eb2e4";
+    };
     deps = {
-      "mongodb-1.4.12" = self.by-version."mongodb"."1.4.12";
+      "mongodb-1.4.28" = self.by-version."mongodb"."1.4.28";
       "hooks-0.2.1" = self.by-version."hooks"."0.2.1";
       "ms-0.1.0" = self.by-version."ms"."0.1.0";
       "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
@@ -17837,1146 +17181,1084 @@
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
       "mquery-0.8.0" = self.by-version."mquery"."0.8.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongoose" ];
+    peerDependencies = [];
+  };
+  by-spec."mongoose".">=3.8.0" =
+    self.by-version."mongoose"."3.9.7";
+  by-version."mongoose"."3.9.7" = self.buildNodePackage {
+    name = "mongoose-3.9.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.9.7.tgz";
+      name = "mongoose-3.9.7.tgz";
+      sha1 = "b315e6ebe5cefcce3843504b791f038828048da6";
+    };
+    deps = {
+      "hooks-0.3.2" = self.by-version."hooks"."0.3.2";
+      "mongodb-1.4.12" = self.by-version."mongodb"."1.4.12";
+      "ms-0.1.0" = self.by-version."ms"."0.1.0";
+      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
+      "muri-0.3.1" = self.by-version."muri"."0.3.1";
+      "mpromise-0.5.4" = self.by-version."mpromise"."0.5.4";
+      "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
+      "kareem-0.0.4" = self.by-version."kareem"."0.0.4";
+      "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
+      "mquery-1.0.0" = self.by-version."mquery"."1.0.0";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+    };
+    peerDependencies = [];
   };
   by-spec."mongoose-lifecycle"."1.0.0" =
     self.by-version."mongoose-lifecycle"."1.0.0";
-  by-version."mongoose-lifecycle"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mongoose-lifecycle"."1.0.0" = self.buildNodePackage {
     name = "mongoose-lifecycle-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
-        name = "mongoose-lifecycle-1.0.0.tgz";
-        sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongoose-lifecycle" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
+      name = "mongoose-lifecycle-1.0.0.tgz";
+      sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongoose-lifecycle" ];
+    peerDependencies = [];
   };
   by-spec."mongoose-schema-extend"."*" =
     self.by-version."mongoose-schema-extend"."0.1.7";
-  by-version."mongoose-schema-extend"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."mongoose-schema-extend"."0.1.7" = self.buildNodePackage {
     name = "mongoose-schema-extend-0.1.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz";
-        name = "mongoose-schema-extend-0.1.7.tgz";
-        sha1 = "50dc366ba63227d00c4cd3db9bb8bf95e9629910";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mongoose-schema-extend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz";
+      name = "mongoose-schema-extend-0.1.7.tgz";
+      sha1 = "50dc366ba63227d00c4cd3db9bb8bf95e9629910";
+    };
     deps = {
       "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongoose-schema-extend" ];
+    peerDependencies = [];
   };
   "mongoose-schema-extend" = self.by-version."mongoose-schema-extend"."0.1.7";
   by-spec."monocle"."1.1.50" =
     self.by-version."monocle"."1.1.50";
-  by-version."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage {
+  by-version."monocle"."1.1.50" = self.buildNodePackage {
     name = "monocle-1.1.50";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz";
-        name = "monocle-1.1.50.tgz";
-        sha1 = "e21b059d99726d958371f36240c106b8a067fa7d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."monocle" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz";
+      name = "monocle-1.1.50.tgz";
+      sha1 = "e21b059d99726d958371f36240c106b8a067fa7d";
+    };
     deps = {
       "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "monocle" ];
+    peerDependencies = [];
   };
   by-spec."monocle"."1.1.51" =
     self.by-version."monocle"."1.1.51";
-  by-version."monocle"."1.1.51" = lib.makeOverridable self.buildNodePackage {
+  by-version."monocle"."1.1.51" = self.buildNodePackage {
     name = "monocle-1.1.51";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz";
-        name = "monocle-1.1.51.tgz";
-        sha1 = "22ed16e112e9b056769c5ccac920e375249d89c0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."monocle" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz";
+      name = "monocle-1.1.51.tgz";
+      sha1 = "22ed16e112e9b056769c5ccac920e375249d89c0";
+    };
     deps = {
       "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "monocle" ];
+    peerDependencies = [];
   };
   by-spec."morgan"."1.0.0" =
     self.by-version."morgan"."1.0.0";
-  by-version."morgan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."morgan"."1.0.0" = self.buildNodePackage {
     name = "morgan-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
-        name = "morgan-1.0.0.tgz";
-        sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."morgan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
+      name = "morgan-1.0.0.tgz";
+      sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d";
+    };
     deps = {
       "bytes-0.2.1" = self.by-version."bytes"."0.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "morgan" ];
+    peerDependencies = [];
+  };
+  by-spec."morgan"."1.2.0" =
+    self.by-version."morgan"."1.2.0";
+  by-version."morgan"."1.2.0" = self.buildNodePackage {
+    name = "morgan-1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/morgan/-/morgan-1.2.0.tgz";
+      name = "morgan-1.2.0.tgz";
+      sha1 = "8dc17a57599598f80cd7a7e1e3b54e72c689910d";
+    };
+    deps = {
+      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
+      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+      "depd-0.4.2" = self.by-version."depd"."0.4.2";
+      "finished-1.2.2" = self.by-version."finished"."1.2.2";
+    };
+    peerDependencies = [];
   };
   by-spec."morgan"."~1.3.2" =
     self.by-version."morgan"."1.3.2";
-  by-version."morgan"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."morgan"."1.3.2" = self.buildNodePackage {
     name = "morgan-1.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz";
-        name = "morgan-1.3.2.tgz";
-        sha1 = "ac41aa15221ee4e5f2ac843896b6918139a18efd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."morgan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz";
+      name = "morgan-1.3.2.tgz";
+      sha1 = "ac41aa15221ee4e5f2ac843896b6918139a18efd";
+    };
     deps = {
       "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
       "depd-0.4.5" = self.by-version."depd"."0.4.5";
       "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "morgan" ];
+    peerDependencies = [];
   };
   by-spec."morgan"."~1.5.1" =
     self.by-version."morgan"."1.5.1";
-  by-version."morgan"."1.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."morgan"."1.5.1" = self.buildNodePackage {
     name = "morgan-1.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/morgan/-/morgan-1.5.1.tgz";
-        name = "morgan-1.5.1.tgz";
-        sha1 = "a9688eed9187ab648d816fc09c696fae882e16f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."morgan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/morgan/-/morgan-1.5.1.tgz";
+      name = "morgan-1.5.1.tgz";
+      sha1 = "a9688eed9187ab648d816fc09c696fae882e16f6";
+    };
     deps = {
       "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "morgan" ];
+    peerDependencies = [];
   };
   by-spec."mount-point"."^1.0.0" =
     self.by-version."mount-point"."1.0.3";
-  by-version."mount-point"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."mount-point"."1.0.3" = self.buildNodePackage {
     name = "mount-point-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mount-point/-/mount-point-1.0.3.tgz";
-        name = "mount-point-1.0.3.tgz";
-        sha1 = "43adac2467a9dc8abf4b784a0d7b7453ab58df4d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mount-point" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mount-point/-/mount-point-1.0.3.tgz";
+      name = "mount-point-1.0.3.tgz";
+      sha1 = "43adac2467a9dc8abf4b784a0d7b7453ab58df4d";
+    };
     deps = {
       "node-df-0.1.1" = self.by-version."node-df"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mount-point" ];
+    peerDependencies = [];
   };
   by-spec."mout"."~0.9.0" =
     self.by-version."mout"."0.9.1";
-  by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."mout"."0.9.1" = self.buildNodePackage {
     name = "mout-0.9.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz";
-        name = "mout-0.9.1.tgz";
-        sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mout" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz";
+      name = "mout-0.9.1.tgz";
+      sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mout" ];
+    peerDependencies = [];
   };
   by-spec."mpath"."0.1.1" =
     self.by-version."mpath"."0.1.1";
-  by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."mpath"."0.1.1" = self.buildNodePackage {
     name = "mpath-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
-        name = "mpath-0.1.1.tgz";
-        sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mpath" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
+      name = "mpath-0.1.1.tgz";
+      sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mpath" ];
+    peerDependencies = [];
   };
   by-spec."mpromise"."0.2.1" =
     self.by-version."mpromise"."0.2.1";
-  by-version."mpromise"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."mpromise"."0.2.1" = self.buildNodePackage {
     name = "mpromise-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
-        name = "mpromise-0.2.1.tgz";
-        sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mpromise" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
+      name = "mpromise-0.2.1.tgz";
+      sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
+    };
     deps = {
       "sliced-0.0.4" = self.by-version."sliced"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mpromise" ];
+    peerDependencies = [];
   };
   by-spec."mpromise"."0.4.3" =
     self.by-version."mpromise"."0.4.3";
-  by-version."mpromise"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."mpromise"."0.4.3" = self.buildNodePackage {
     name = "mpromise-0.4.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz";
-        name = "mpromise-0.4.3.tgz";
-        sha1 = "edc47a75a2a177b0e9382735db52dbec3808cc33";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mpromise" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz";
+      name = "mpromise-0.4.3.tgz";
+      sha1 = "edc47a75a2a177b0e9382735db52dbec3808cc33";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mpromise" ];
+    peerDependencies = [];
+  };
+  by-spec."mpromise"."0.5.4" =
+    self.by-version."mpromise"."0.5.4";
+  by-version."mpromise"."0.5.4" = self.buildNodePackage {
+    name = "mpromise-0.5.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz";
+      name = "mpromise-0.5.4.tgz";
+      sha1 = "b610613ec6de37419f944b35f0783b4de9f5dc75";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."mquery"."0.8.0" =
     self.by-version."mquery"."0.8.0";
-  by-version."mquery"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mquery"."0.8.0" = self.buildNodePackage {
     name = "mquery-0.8.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mquery/-/mquery-0.8.0.tgz";
-        name = "mquery-0.8.0.tgz";
-        sha1 = "1e5b8c2a5a52f5583bd08932700b85440ee25f60";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mquery" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mquery/-/mquery-0.8.0.tgz";
+      name = "mquery-0.8.0.tgz";
+      sha1 = "1e5b8c2a5a52f5583bd08932700b85440ee25f60";
+    };
     deps = {
       "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mquery" ];
+    peerDependencies = [];
+  };
+  by-spec."mquery"."1.0.0" =
+    self.by-version."mquery"."1.0.0";
+  by-version."mquery"."1.0.0" = self.buildNodePackage {
+    name = "mquery-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mquery/-/mquery-1.0.0.tgz";
+      name = "mquery-1.0.0.tgz";
+      sha1 = "6940a46d643368fe8e5abddeb94bd8dd32013f5b";
+    };
+    deps = {
+      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
+    };
+    peerDependencies = [];
   };
   by-spec."ms"."0.1.0" =
     self.by-version."ms"."0.1.0";
-  by-version."ms"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ms"."0.1.0" = self.buildNodePackage {
     name = "ms-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
-        name = "ms-0.1.0.tgz";
-        sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ms" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
+      name = "ms-0.1.0.tgz";
+      sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ms" ];
+    peerDependencies = [];
   };
   by-spec."ms"."0.6.2" =
     self.by-version."ms"."0.6.2";
-  by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ms"."0.6.2" = self.buildNodePackage {
     name = "ms-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ms" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+      name = "ms-0.6.2.tgz";
+      sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ms" ];
+    peerDependencies = [];
   };
   by-spec."ms"."0.7.0" =
     self.by-version."ms"."0.7.0";
-  by-version."ms"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ms"."0.7.0" = self.buildNodePackage {
     name = "ms-0.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
-        name = "ms-0.7.0.tgz";
-        sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ms" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
+      name = "ms-0.7.0.tgz";
+      sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ms" ];
+    peerDependencies = [];
   };
   by-spec."msgpack".">= 0.0.1" =
     self.by-version."msgpack"."0.2.4";
-  by-version."msgpack"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."msgpack"."0.2.4" = self.buildNodePackage {
     name = "msgpack-0.2.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.4.tgz";
-        name = "msgpack-0.2.4.tgz";
-        sha1 = "17ac333ea5320b45059f80c992d7465fed4fe706";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."msgpack" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.4.tgz";
+      name = "msgpack-0.2.4.tgz";
+      sha1 = "17ac333ea5320b45059f80c992d7465fed4fe706";
+    };
     deps = {
       "nan-1.0.0" = self.by-version."nan"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "msgpack" ];
+    peerDependencies = [];
+  };
+  by-spec."multer".">=0.0.6" =
+    self.by-version."multer"."0.1.7";
+  by-version."multer"."0.1.7" = self.buildNodePackage {
+    name = "multer-0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/multer/-/multer-0.1.7.tgz";
+      name = "multer-0.1.7.tgz";
+      sha1 = "bc2b7f72a32ad08496e209881ee348f38c495b22";
+    };
+    deps = {
+      "busboy-0.2.9" = self.by-version."busboy"."0.2.9";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "qs-1.2.2" = self.by-version."qs"."1.2.2";
+      "type-is-1.5.5" = self.by-version."type-is"."1.5.5";
+    };
+    peerDependencies = [];
   };
   by-spec."multiparty"."2.2.0" =
     self.by-version."multiparty"."2.2.0";
-  by-version."multiparty"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."multiparty"."2.2.0" = self.buildNodePackage {
     name = "multiparty-2.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
-        name = "multiparty-2.2.0.tgz";
-        sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."multiparty" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
+      name = "multiparty-2.2.0.tgz";
+      sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4";
+    };
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "multiparty" ];
+    peerDependencies = [];
   };
   by-spec."multiparty"."3.3.2" =
     self.by-version."multiparty"."3.3.2";
-  by-version."multiparty"."3.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."multiparty"."3.3.2" = self.buildNodePackage {
     name = "multiparty-3.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
-        name = "multiparty-3.3.2.tgz";
-        sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."multiparty" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
+      name = "multiparty-3.3.2.tgz";
+      sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
+    };
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "multiparty" ];
+    peerDependencies = [];
   };
+  by-spec."multiparty"."~3.3.2" =
+    self.by-version."multiparty"."3.3.2";
   by-spec."multipipe"."^0.1.2" =
     self.by-version."multipipe"."0.1.2";
-  by-version."multipipe"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."multipipe"."0.1.2" = self.buildNodePackage {
     name = "multipipe-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
-        name = "multipipe-0.1.2.tgz";
-        sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."multipipe" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
+      name = "multipipe-0.1.2.tgz";
+      sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
+    };
     deps = {
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "multipipe" ];
+    peerDependencies = [];
   };
   by-spec."muri"."0.3.1" =
     self.by-version."muri"."0.3.1";
-  by-version."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."muri"."0.3.1" = self.buildNodePackage {
     name = "muri-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
-        name = "muri-0.3.1.tgz";
-        sha1 = "861889c5c857f1a43700bee85d50731f61727c9a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."muri" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
+      name = "muri-0.3.1.tgz";
+      sha1 = "861889c5c857f1a43700bee85d50731f61727c9a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "muri" ];
+    peerDependencies = [];
   };
   by-spec."mutate.js"."^0.2.0" =
     self.by-version."mutate.js"."0.2.0";
-  by-version."mutate.js"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mutate.js"."0.2.0" = self.buildNodePackage {
     name = "mutate.js-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz";
-        name = "mutate.js-0.2.0.tgz";
-        sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mutate.js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz";
+      name = "mutate.js-0.2.0.tgz";
+      sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mutate.js" ];
+    peerDependencies = [];
   };
   by-spec."mute-stream"."0.0.4" =
     self.by-version."mute-stream"."0.0.4";
-  by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."mute-stream"."0.0.4" = self.buildNodePackage {
     name = "mute-stream-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
-        name = "mute-stream-0.0.4.tgz";
-        sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mute-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
+      name = "mute-stream-0.0.4.tgz";
+      sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mute-stream" ];
+    peerDependencies = [];
   };
   by-spec."mute-stream"."~0.0.4" =
     self.by-version."mute-stream"."0.0.4";
   by-spec."mv"."0.0.5" =
     self.by-version."mv"."0.0.5";
-  by-version."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."mv"."0.0.5" = self.buildNodePackage {
     name = "mv-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
-        name = "mv-0.0.5.tgz";
-        sha1 = "15eac759479884df1131d6de56bce20b654f5391";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mv" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
+      name = "mv-0.0.5.tgz";
+      sha1 = "15eac759479884df1131d6de56bce20b654f5391";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mv" ];
+    peerDependencies = [];
+  };
+  by-spec."mv"."~2" =
+    self.by-version."mv"."2.0.3";
+  by-version."mv"."2.0.3" = self.buildNodePackage {
+    name = "mv-2.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz";
+      name = "mv-2.0.3.tgz";
+      sha1 = "e9ab707d71dc38de24edcc637a8e2f5f480c7f32";
+    };
+    deps = {
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+    };
+    peerDependencies = [];
   };
   by-spec."mz"."1" =
     self.by-version."mz"."1.2.1";
-  by-version."mz"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."mz"."1.2.1" = self.buildNodePackage {
     name = "mz-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mz/-/mz-1.2.1.tgz";
-        name = "mz-1.2.1.tgz";
-        sha1 = "a758a8012cb43b59e209596a0e124cfff87c6923";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mz" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mz/-/mz-1.2.1.tgz";
+      name = "mz-1.2.1.tgz";
+      sha1 = "a758a8012cb43b59e209596a0e124cfff87c6923";
+    };
     deps = {
       "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2";
       "thenify-3.1.0" = self.by-version."thenify"."3.1.0";
-      "thenify-all-1.5.1" = self.by-version."thenify-all"."1.5.1";
+      "thenify-all-1.6.0" = self.by-version."thenify-all"."1.6.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mz" ];
+    peerDependencies = [];
   };
   by-spec."nan"."1.1.2" =
     self.by-version."nan"."1.1.2";
-  by-version."nan"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."nan"."1.1.2" = self.buildNodePackage {
     name = "nan-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz";
-        name = "nan-1.1.2.tgz";
-        sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz";
+      name = "nan-1.1.2.tgz";
+      sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nan" ];
+    peerDependencies = [];
   };
   by-spec."nan"."1.3.0" =
     self.by-version."nan"."1.3.0";
-  by-version."nan"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."nan"."1.3.0" = self.buildNodePackage {
     name = "nan-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
-        name = "nan-1.3.0.tgz";
-        sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
+      name = "nan-1.3.0.tgz";
+      sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nan" ];
+    peerDependencies = [];
+  };
+  by-spec."nan"."1.5.0" =
+    self.by-version."nan"."1.5.0";
+  by-version."nan"."1.5.0" = self.buildNodePackage {
+    name = "nan-1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.5.0.tgz";
+      name = "nan-1.5.0.tgz";
+      sha1 = "2b3c05bc361f52e50aea2c49077783aa67c5b7fb";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."nan"."1.5.1" =
+    self.by-version."nan"."1.5.1";
+  by-version."nan"."1.5.1" = self.buildNodePackage {
+    name = "nan-1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.5.1.tgz";
+      name = "nan-1.5.1.tgz";
+      sha1 = "a565e4d4143cb49afdd3fe07e4c8aeaa1e7e0603";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."nan".">=1.3.0" =
-    self.by-version."nan"."1.4.1";
-  by-version."nan"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "nan-1.4.1";
+    self.by-version."nan"."1.6.1";
+  by-version."nan"."1.6.1" = self.buildNodePackage {
+    name = "nan-1.6.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-1.4.1.tgz";
-        name = "nan-1.4.1.tgz";
-        sha1 = "0a2bb562c558b440005b1f7eb8b31ccbdb565d5f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.6.1.tgz";
+      name = "nan-1.6.1.tgz";
+      sha1 = "69bc50b2d727f3df01145a963f7d2e4da5ff9184";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nan" ];
+    peerDependencies = [];
   };
   by-spec."nan"."^1.3.0" =
-    self.by-version."nan"."1.4.1";
+    self.by-version."nan"."1.6.1";
+  by-spec."nan"."^1.5.1" =
+    self.by-version."nan"."1.6.1";
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
+      name = "nan-0.3.2.tgz";
+      sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."nan"."~0.6.0" =
     self.by-version."nan"."0.6.0";
-  by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."nan"."0.6.0" = self.buildNodePackage {
     name = "nan-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz";
-        name = "nan-0.6.0.tgz";
-        sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz";
+      name = "nan-0.6.0.tgz";
+      sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nan" ];
+    peerDependencies = [];
   };
   by-spec."nan"."~0.7.0" =
     self.by-version."nan"."0.7.1";
-  by-version."nan"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."nan"."0.7.1" = self.buildNodePackage {
     name = "nan-0.7.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-0.7.1.tgz";
-        name = "nan-0.7.1.tgz";
-        sha1 = "fc576184a1037b3e5675f2ba3740dee2044ff8f4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-0.7.1.tgz";
+      name = "nan-0.7.1.tgz";
+      sha1 = "fc576184a1037b3e5675f2ba3740dee2044ff8f4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nan" ];
+    peerDependencies = [];
   };
   by-spec."nan"."~1.0.0" =
     self.by-version."nan"."1.0.0";
-  by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."nan"."1.0.0" = self.buildNodePackage {
     name = "nan-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
-        name = "nan-1.0.0.tgz";
-        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+      name = "nan-1.0.0.tgz";
+      sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nan" ];
+    peerDependencies = [];
   };
   by-spec."nan"."~1.1.0" =
     self.by-version."nan"."1.1.2";
   by-spec."nan"."~1.2.0" =
     self.by-version."nan"."1.2.0";
-  by-version."nan"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."nan"."1.2.0" = self.buildNodePackage {
     name = "nan-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz";
-        name = "nan-1.2.0.tgz";
-        sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz";
+      name = "nan-1.2.0.tgz";
+      sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nan" ];
+    peerDependencies = [];
   };
   by-spec."nan"."~1.3.0" =
     self.by-version."nan"."1.3.0";
   by-spec."nan"."~1.4.1" =
-    self.by-version."nan"."1.4.1";
+    self.by-version."nan"."1.4.3";
+  by-version."nan"."1.4.3" = self.buildNodePackage {
+    name = "nan-1.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.4.3.tgz";
+      name = "nan-1.4.3.tgz";
+      sha1 = "c56b5404698063696f597435f9163c312aea5009";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."nan"."~1.5.0" =
+    self.by-version."nan"."1.5.3";
+  by-version."nan"."1.5.3" = self.buildNodePackage {
+    name = "nan-1.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.5.3.tgz";
+      name = "nan-1.5.3.tgz";
+      sha1 = "4cd0ecc133b7b0700a492a646add427ae8a318eb";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."native-buffer-browserify"."~2.0.0" =
     self.by-version."native-buffer-browserify"."2.0.17";
-  by-version."native-buffer-browserify"."2.0.17" = lib.makeOverridable self.buildNodePackage {
+  by-version."native-buffer-browserify"."2.0.17" = self.buildNodePackage {
     name = "native-buffer-browserify-2.0.17";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/native-buffer-browserify/-/native-buffer-browserify-2.0.17.tgz";
-        name = "native-buffer-browserify-2.0.17.tgz";
-        sha1 = "980577018c4884d169da40b47958ffac6c327d15";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."native-buffer-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/native-buffer-browserify/-/native-buffer-browserify-2.0.17.tgz";
+      name = "native-buffer-browserify-2.0.17.tgz";
+      sha1 = "980577018c4884d169da40b47958ffac6c327d15";
+    };
     deps = {
       "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
       "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "native-buffer-browserify" ];
+    peerDependencies = [];
   };
   by-spec."native-buffer-browserify"."~2.0.15" =
     self.by-version."native-buffer-browserify"."2.0.17";
+  by-spec."native-dns"."0.6.1" =
+    self.by-version."native-dns"."0.6.1";
+  by-version."native-dns"."0.6.1" = self.buildNodePackage {
+    name = "native-dns-0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/native-dns/-/native-dns-0.6.1.tgz";
+      name = "native-dns-0.6.1.tgz";
+      sha1 = "f7d2a3c5464bb6f09d9167e35a7350bd7ffe9b82";
+    };
+    deps = {
+      "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6";
+      "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2";
+      "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."native-dns-cache".">= 0.0.1" =
+    self.by-version."native-dns-cache"."0.0.2";
+  by-version."native-dns-cache"."0.0.2" = self.buildNodePackage {
+    name = "native-dns-cache-0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/native-dns-cache/-/native-dns-cache-0.0.2.tgz";
+      name = "native-dns-cache-0.0.2.tgz";
+      sha1 = "ce0998f7fdf6c7990970a33190624b0e98ee959b";
+    };
+    deps = {
+      "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3";
+      "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."native-dns-packet".">= 0.0.1" =
+    self.by-version."native-dns-packet"."0.1.1";
+  by-version."native-dns-packet"."0.1.1" = self.buildNodePackage {
+    name = "native-dns-packet-0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz";
+      name = "native-dns-packet-0.1.1.tgz";
+      sha1 = "97da90570b8438a00194701ce24d011fd3cc109a";
+    };
+    deps = {
+      "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
+      "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6";
+    };
+    peerDependencies = [];
+  };
+  by-spec."native-dns-packet".">= 0.0.4" =
+    self.by-version."native-dns-packet"."0.1.1";
   by-spec."native-or-bluebird"."1" =
     self.by-version."native-or-bluebird"."1.1.2";
-  by-version."native-or-bluebird"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage {
     name = "native-or-bluebird-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz";
-        name = "native-or-bluebird-1.1.2.tgz";
-        sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."native-or-bluebird" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz";
+      name = "native-or-bluebird-1.1.2.tgz";
+      sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "native-or-bluebird" ];
+    peerDependencies = [];
   };
   by-spec."native-or-bluebird"."~1.1.2" =
     self.by-version."native-or-bluebird"."1.1.2";
-  by-spec."natural"."0.1.17" =
-    self.by-version."natural"."0.1.17";
-  by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage {
-    name = "natural-0.1.17";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/natural/-/natural-0.1.17.tgz";
-        name = "natural-0.1.17.tgz";
-        sha1 = "0ff654cd30aeb2aa298ab0580e6f7ea9f40954e0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."natural" or []);
+  by-spec."natural"."^0.2.0" =
+    self.by-version."natural"."0.2.0";
+  by-version."natural"."0.2.0" = self.buildNodePackage {
+    name = "natural-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/natural/-/natural-0.2.0.tgz";
+      name = "natural-0.2.0.tgz";
+      sha1 = "42f4ff5f17ae54c439e7c61b45ff3a6bce9a0a8a";
+    };
     deps = {
       "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21";
       "apparatus-0.0.8" = self.by-version."apparatus"."0.0.8";
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "natural" ];
+    peerDependencies = [];
   };
   by-spec."nconf"."*" =
     self.by-version."nconf"."0.7.1";
-  by-version."nconf"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."nconf"."0.7.1" = self.buildNodePackage {
     name = "nconf-0.7.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz";
-        name = "nconf-0.7.1.tgz";
-        sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nconf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz";
+      name = "nconf-0.7.1.tgz";
+      sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b";
+    };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "ini-1.3.2" = self.by-version."ini"."1.3.2";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nconf" ];
+    peerDependencies = [];
   };
   "nconf" = self.by-version."nconf"."0.7.1";
   by-spec."nconf"."0.6.9" =
     self.by-version."nconf"."0.6.9";
-  by-version."nconf"."0.6.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."nconf"."0.6.9" = self.buildNodePackage {
     name = "nconf-0.6.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
-        name = "nconf-0.6.9.tgz";
-        sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nconf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
+      name = "nconf-0.6.9.tgz";
+      sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661";
+    };
     deps = {
       "async-0.2.9" = self.by-version."async"."0.2.9";
       "ini-1.3.2" = self.by-version."ini"."1.3.2";
       "optimist-0.6.0" = self.by-version."optimist"."0.6.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nconf" ];
+    peerDependencies = [];
   };
   by-spec."nconf"."~0.6.9" =
     self.by-version."nconf"."0.6.9";
   by-spec."ncp"."0.2.x" =
     self.by-version."ncp"."0.2.7";
-  by-version."ncp"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."ncp"."0.2.7" = self.buildNodePackage {
     name = "ncp-0.2.7";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
-        name = "ncp-0.2.7.tgz";
-        sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ncp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
+      name = "ncp-0.2.7.tgz";
+      sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ncp" ];
+    peerDependencies = [];
   };
   by-spec."ncp"."0.4.x" =
     self.by-version."ncp"."0.4.2";
-  by-version."ncp"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ncp"."0.4.2" = self.buildNodePackage {
     name = "ncp-0.4.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
-        name = "ncp-0.4.2.tgz";
-        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ncp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+      name = "ncp-0.4.2.tgz";
+      sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ncp" ];
+    peerDependencies = [];
   };
   by-spec."ncp"."^0.6.0" =
     self.by-version."ncp"."0.6.0";
-  by-version."ncp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ncp"."0.6.0" = self.buildNodePackage {
     name = "ncp-0.6.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
-        name = "ncp-0.6.0.tgz";
-        sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ncp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
+      name = "ncp-0.6.0.tgz";
+      sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ncp" ];
+    peerDependencies = [];
   };
   by-spec."ncp"."~0.4.2" =
     self.by-version."ncp"."0.4.2";
+  by-spec."ncp"."~0.6.0" =
+    self.by-version."ncp"."0.6.0";
   by-spec."ncp"."~1.0.1" =
     self.by-version."ncp"."1.0.1";
-  by-version."ncp"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."ncp"."1.0.1" = self.buildNodePackage {
     name = "ncp-1.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz";
-        name = "ncp-1.0.1.tgz";
-        sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ncp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz";
+      name = "ncp-1.0.1.tgz";
+      sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ncp" ];
+    peerDependencies = [];
   };
   by-spec."negotiator"."0.2.5" =
     self.by-version."negotiator"."0.2.5";
-  by-version."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."negotiator"."0.2.5" = self.buildNodePackage {
     name = "negotiator-0.2.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
-        name = "negotiator-0.2.5.tgz";
-        sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."negotiator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
+      name = "negotiator-0.2.5.tgz";
+      sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "negotiator" ];
+    peerDependencies = [];
   };
   by-spec."negotiator"."0.3.0" =
     self.by-version."negotiator"."0.3.0";
-  by-version."negotiator"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."negotiator"."0.3.0" = self.buildNodePackage {
     name = "negotiator-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
-        name = "negotiator-0.3.0.tgz";
-        sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."negotiator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
+      name = "negotiator-0.3.0.tgz";
+      sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "negotiator" ];
+    peerDependencies = [];
   };
   by-spec."negotiator"."0.4.2" =
     self.by-version."negotiator"."0.4.2";
-  by-version."negotiator"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."negotiator"."0.4.2" = self.buildNodePackage {
     name = "negotiator-0.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
-        name = "negotiator-0.4.2.tgz";
-        sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."negotiator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
+      name = "negotiator-0.4.2.tgz";
+      sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "negotiator" ];
+    peerDependencies = [];
+  };
+  by-spec."negotiator"."0.4.7" =
+    self.by-version."negotiator"."0.4.7";
+  by-version."negotiator"."0.4.7" = self.buildNodePackage {
+    name = "negotiator-0.4.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
+      name = "negotiator-0.4.7.tgz";
+      sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."negotiator"."0.4.9" =
     self.by-version."negotiator"."0.4.9";
-  by-version."negotiator"."0.4.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."negotiator"."0.4.9" = self.buildNodePackage {
     name = "negotiator-0.4.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
-        name = "negotiator-0.4.9.tgz";
-        sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."negotiator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
+      name = "negotiator-0.4.9.tgz";
+      sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "negotiator" ];
+    peerDependencies = [];
   };
   by-spec."negotiator"."0.5.0" =
     self.by-version."negotiator"."0.5.0";
-  by-version."negotiator"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."negotiator"."0.5.0" = self.buildNodePackage {
     name = "negotiator-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.0.tgz";
-        name = "negotiator-0.5.0.tgz";
-        sha1 = "bb77b3139d80d9b1ee8c913520a18b0d475b1b90";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."negotiator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.0.tgz";
+      name = "negotiator-0.5.0.tgz";
+      sha1 = "bb77b3139d80d9b1ee8c913520a18b0d475b1b90";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "negotiator" ];
+    peerDependencies = [];
   };
   by-spec."net-ping"."1.1.7" =
     self.by-version."net-ping"."1.1.7";
-  by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."net-ping"."1.1.7" = self.buildNodePackage {
     name = "net-ping-1.1.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
-        name = "net-ping-1.1.7.tgz";
-        sha1 = "49f5bca55a30a3726d69253557f231135a637075";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."net-ping" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
+      name = "net-ping-1.1.7.tgz";
+      sha1 = "49f5bca55a30a3726d69253557f231135a637075";
+    };
     deps = {
       "raw-socket-1.2.2" = self.by-version."raw-socket"."1.2.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "net-ping" ];
+    peerDependencies = [];
+  };
+  by-spec."netmask"."~1.0.4" =
+    self.by-version."netmask"."1.0.5";
+  by-version."netmask"."1.0.5" = self.buildNodePackage {
+    name = "netmask-1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/netmask/-/netmask-1.0.5.tgz";
+      name = "netmask-1.0.5.tgz";
+      sha1 = "84851218294b88e0ac5a008ec46401e2a5c767d2";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."network-address"."0.0.4" =
     self.by-version."network-address"."0.0.4";
-  by-version."network-address"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."network-address"."0.0.4" = self.buildNodePackage {
     name = "network-address-0.0.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/network-address/-/network-address-0.0.4.tgz";
-        name = "network-address-0.0.4.tgz";
-        sha1 = "4dc7a8400a9fbac6b845a2c7bf3f06bcf9b2eedf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."network-address" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/network-address/-/network-address-0.0.4.tgz";
+      name = "network-address-0.0.4.tgz";
+      sha1 = "4dc7a8400a9fbac6b845a2c7bf3f06bcf9b2eedf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "network-address" ];
+    peerDependencies = [];
   };
   by-spec."network-address"."0.0.5" =
     self.by-version."network-address"."0.0.5";
-  by-version."network-address"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."network-address"."0.0.5" = self.buildNodePackage {
     name = "network-address-0.0.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz";
-        name = "network-address-0.0.5.tgz";
-        sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."network-address" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz";
+      name = "network-address-0.0.5.tgz";
+      sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "network-address" ];
+    peerDependencies = [];
   };
   by-spec."next-tick"."~0.2.2" =
     self.by-version."next-tick"."0.2.2";
-  by-version."next-tick"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."next-tick"."0.2.2" = self.buildNodePackage {
     name = "next-tick-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz";
-        name = "next-tick-0.2.2.tgz";
-        sha1 = "75da4a927ee5887e39065880065b7336413b310d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."next-tick" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz";
+      name = "next-tick-0.2.2.tgz";
+      sha1 = "75da4a927ee5887e39065880065b7336413b310d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "next-tick" ];
+    peerDependencies = [];
   };
   by-spec."nib"."*" =
-    self.by-version."nib"."1.0.4";
-  by-version."nib"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "nib-1.0.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nib/-/nib-1.0.4.tgz";
-        name = "nib-1.0.4.tgz";
-        sha1 = "03d397c27a231f3c9a5a190eaa68e5d79e2f0345";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nib" or []);
-    deps = {
-      "stylus-0.45.1" = self.by-version."stylus"."0.45.1";
+    self.by-version."nib"."1.1.0";
+  by-version."nib"."1.1.0" = self.buildNodePackage {
+    name = "nib-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nib/-/nib-1.1.0.tgz";
+      name = "nib-1.1.0.tgz";
+      sha1 = "527c19662a10a2b565fe85e9b309d622aa7557d3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nib" ];
+    deps = {
+      "stylus-0.49.3" = self.by-version."stylus"."0.49.3";
+    };
+    peerDependencies = [];
   };
-  "nib" = self.by-version."nib"."1.0.4";
+  "nib" = self.by-version."nib"."1.1.0";
   by-spec."nib"."0.5.0" =
     self.by-version."nib"."0.5.0";
-  by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."nib"."0.5.0" = self.buildNodePackage {
     name = "nib-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz";
-        name = "nib-0.5.0.tgz";
-        sha1 = "ad0a7dfa2bca8680c8cb8adaa6ab68c80e5221e5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nib" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz";
+      name = "nib-0.5.0.tgz";
+      sha1 = "ad0a7dfa2bca8680c8cb8adaa6ab68c80e5221e5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nib" ];
+    peerDependencies = [];
   };
   by-spec."nijs"."*" =
     self.by-version."nijs"."0.0.22";
-  by-version."nijs"."0.0.22" = lib.makeOverridable self.buildNodePackage {
+  by-version."nijs"."0.0.22" = self.buildNodePackage {
     name = "nijs-0.0.22";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nijs/-/nijs-0.0.22.tgz";
-        name = "nijs-0.0.22.tgz";
-        sha1 = "41f162cfd4b8e99b56da26b3170307381916718a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nijs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nijs/-/nijs-0.0.22.tgz";
+      name = "nijs-0.0.22.tgz";
+      sha1 = "41f162cfd4b8e99b56da26b3170307381916718a";
+    };
     deps = {
       "optparse-1.0.5" = self.by-version."optparse"."1.0.5";
       "slasp-0.0.4" = self.by-version."slasp"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nijs" ];
+    peerDependencies = [];
   };
   "nijs" = self.by-version."nijs"."0.0.22";
   by-spec."node-appc"."0.2.14" =
     self.by-version."node-appc"."0.2.14";
-  by-version."node-appc"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-appc"."0.2.14" = self.buildNodePackage {
     name = "node-appc-0.2.14";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.14.tgz";
-        name = "node-appc-0.2.14.tgz";
-        sha1 = "74f20eca49ebf940799fac44bcb224321582cf98";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-appc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.14.tgz";
+      name = "node-appc-0.2.14.tgz";
+      sha1 = "74f20eca49ebf940799fac44bcb224321582cf98";
+    };
     deps = {
       "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
       "async-0.2.10" = self.by-version."async"."0.2.10";
@@ -18994,99 +18276,106 @@
       "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-appc" ];
+    peerDependencies = [];
+  };
+  by-spec."node-craigslist"."^0.1.7" =
+    self.by-version."node-craigslist"."0.1.7";
+  by-version."node-craigslist"."0.1.7" = self.buildNodePackage {
+    name = "node-craigslist-0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-craigslist/-/node-craigslist-0.1.7.tgz";
+      name = "node-craigslist-0.1.7.tgz";
+      sha1 = "f0cf7dbed75dcd67aa068fa5750bdb082a212777";
+    };
+    deps = {
+      "cheerio-0.17.0" = self.by-version."cheerio"."0.17.0";
+    };
+    peerDependencies = [];
   };
   by-spec."node-df"."^0.1.1" =
     self.by-version."node-df"."0.1.1";
-  by-version."node-df"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-df"."0.1.1" = self.buildNodePackage {
     name = "node-df-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-df/-/node-df-0.1.1.tgz";
-        name = "node-df-0.1.1.tgz";
-        sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-df" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-df/-/node-df-0.1.1.tgz";
+      name = "node-df-0.1.1.tgz";
+      sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea";
+    };
     deps = {
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-df" ];
+    peerDependencies = [];
   };
   by-spec."node-expat"."*" =
     self.by-version."node-expat"."2.3.4";
-  by-version."node-expat"."2.3.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-expat"."2.3.4" = self.buildNodePackage {
     name = "node-expat-2.3.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.4.tgz";
-        name = "node-expat-2.3.4.tgz";
-        sha1 = "f2659ee57ca6226d0d0a3957eeae71c1b3f67f61";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-expat" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.4.tgz";
+      name = "node-expat-2.3.4.tgz";
+      sha1 = "f2659ee57ca6226d0d0a3957eeae71c1b3f67f61";
+    };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "nan-1.4.1" = self.by-version."nan"."1.4.1";
+      "nan-1.4.3" = self.by-version."nan"."1.4.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-expat" ];
+    peerDependencies = [];
   };
   "node-expat" = self.by-version."node-expat"."2.3.4";
   by-spec."node-expat".">=1.4.1" =
     self.by-version."node-expat"."2.3.4";
+  by-spec."node-expat"."^2.3.0" =
+    self.by-version."node-expat"."2.3.4";
   by-spec."node-expat"."~2.1.4" =
     self.by-version."node-expat"."2.1.4";
-  by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-expat"."2.1.4" = self.buildNodePackage {
     name = "node-expat-2.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz";
-        name = "node-expat-2.1.4.tgz";
-        sha1 = "e55a82249b71afbce09ffa880705ec37553c5121";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-expat" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz";
+      name = "node-expat-2.1.4.tgz";
+      sha1 = "e55a82249b71afbce09ffa880705ec37553c5121";
+    };
     deps = {
       "nan-0.6.0" = self.by-version."nan"."0.6.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-expat" ];
+    peerDependencies = [];
   };
   by-spec."node-expat"."~2.3.0" =
     self.by-version."node-expat"."2.3.4";
   by-spec."node-expat"."~2.3.1" =
     self.by-version."node-expat"."2.3.4";
+  by-spec."node-fs"."^0.1.7" =
+    self.by-version."node-fs"."0.1.7";
+  by-version."node-fs"."0.1.7" = self.buildNodePackage {
+    name = "node-fs-0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz";
+      name = "node-fs-0.1.7.tgz";
+      sha1 = "32323cccb46c9fbf0fc11812d45021cc31d325bb";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."node-gyp"."*" =
     self.by-version."node-gyp"."1.0.2";
-  by-version."node-gyp"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-gyp"."1.0.2" = self.buildNodePackage {
     name = "node-gyp-1.0.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz";
-        name = "node-gyp-1.0.2.tgz";
-        sha1 = "b0bb6d2d762271408dd904853e7aa3000ed2eb57";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-gyp" or []);
-    deps = {
-      "fstream-1.0.3" = self.by-version."fstream"."1.0.3";
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz";
+      name = "node-gyp-1.0.2.tgz";
+      sha1 = "b0bb6d2d762271408dd904853e7aa3000ed2eb57";
+    };
+    deps = {
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
@@ -19099,9 +18388,7 @@
       "tar-1.0.3" = self.by-version."tar"."1.0.3";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-gyp" ];
+    peerDependencies = [];
   };
   "node-gyp" = self.by-version."node-gyp"."1.0.2";
   by-spec."node-gyp"."~1.0.1" =
@@ -19109,21 +18396,17 @@
   by-spec."node-gyp"."~1.0.2" =
     self.by-version."node-gyp"."1.0.2";
   by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.8.1";
-  by-version."node-inspector"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inspector-0.8.1";
+    self.by-version."node-inspector"."0.8.3";
+  by-version."node-inspector"."0.8.3" = self.buildNodePackage {
+    name = "node-inspector-0.8.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.8.1.tgz";
-        name = "node-inspector-0.8.1.tgz";
-        sha1 = "2e7e88d47c4dc0761497f2fba520ca2310985950";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-inspector" or []);
-    deps = {
-      "express-4.10.7" = self.by-version."express"."4.10.7";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.8.3.tgz";
+      name = "node-inspector-0.8.3.tgz";
+      sha1 = "2eac57771973c6eb49100ef4c9caa6ae0bcd8911";
+    };
+    deps = {
+      "express-4.11.1" = self.by-version."express"."4.11.1";
       "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
@@ -19138,25 +18421,33 @@
       "v8-profiler-5.2.2" = self.by-version."v8-profiler"."5.2.2";
       "semver-3.0.1" = self.by-version."semver"."3.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-inspector" ];
+    peerDependencies = [];
+  };
+  "node-inspector" = self.by-version."node-inspector"."0.8.3";
+  by-spec."node-options"."0.0.6" =
+    self.by-version."node-options"."0.0.6";
+  by-version."node-options"."0.0.6" = self.buildNodePackage {
+    name = "node-options-0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-options/-/node-options-0.0.6.tgz";
+      name = "node-options-0.0.6.tgz";
+      sha1 = "98721bd14fc4969a619e4d87666449f1f92477ed";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.8.1";
   by-spec."node-pre-gyp"."^0.5.0" =
     self.by-version."node-pre-gyp"."0.5.31";
-  by-version."node-pre-gyp"."0.5.31" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-pre-gyp"."0.5.31" = self.buildNodePackage {
     name = "node-pre-gyp-0.5.31";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz";
-        name = "node-pre-gyp-0.5.31.tgz";
-        sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-pre-gyp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz";
+      name = "node-pre-gyp-0.5.31.tgz";
+      sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba";
+    };
     deps = {
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
@@ -19168,160 +18459,133 @@
       "rc-0.5.5" = self.by-version."rc"."0.5.5";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-pre-gyp" ];
+    peerDependencies = [];
   };
   by-spec."node-protobuf"."*" =
     self.by-version."node-protobuf"."1.2.2";
-  by-version."node-protobuf"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-protobuf"."1.2.2" = self.buildNodePackage {
     name = "node-protobuf-1.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.2.tgz";
-        name = "node-protobuf-1.2.2.tgz";
-        sha1 = "8d512499fe012358c1fd89d6b4d84ad80317acb3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-protobuf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.2.tgz";
+      name = "node-protobuf-1.2.2.tgz";
+      sha1 = "8d512499fe012358c1fd89d6b4d84ad80317acb3";
+    };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.4.1" = self.by-version."nan"."1.4.1";
+      "nan-1.6.1" = self.by-version."nan"."1.6.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-protobuf" ];
+    peerDependencies = [];
   };
   "node-protobuf" = self.by-version."node-protobuf"."1.2.2";
   by-spec."node-stringprep"."*" =
-    self.by-version."node-stringprep"."0.6.2";
-  by-version."node-stringprep"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stringprep-0.6.2";
+    self.by-version."node-stringprep"."0.7.0";
+  by-version."node-stringprep"."0.7.0" = self.buildNodePackage {
+    name = "node-stringprep-0.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.6.2.tgz";
-        name = "node-stringprep-0.6.2.tgz";
-        sha1 = "c266853e5c22dfb53d99bcc68b02218c889ccdc7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-stringprep" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.7.0.tgz";
+      name = "node-stringprep-0.7.0.tgz";
+      sha1 = "c8a8deac9217db97ef3eb20dfa817d7e716f56b5";
+    };
     deps = {
-      "nan-1.2.0" = self.by-version."nan"."1.2.0";
-      "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "nan-1.6.1" = self.by-version."nan"."1.6.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-stringprep" ];
+    peerDependencies = [];
   };
-  "node-stringprep" = self.by-version."node-stringprep"."0.6.2";
+  "node-stringprep" = self.by-version."node-stringprep"."0.7.0";
   by-spec."node-stringprep"."^0.5.2" =
     self.by-version."node-stringprep"."0.5.4";
-  by-version."node-stringprep"."0.5.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-stringprep"."0.5.4" = self.buildNodePackage {
     name = "node-stringprep-0.5.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.5.4.tgz";
-        name = "node-stringprep-0.5.4.tgz";
-        sha1 = "dd03b3d8f6f83137754cc1ea1a55675447b0ab92";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-stringprep" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.5.4.tgz";
+      name = "node-stringprep-0.5.4.tgz";
+      sha1 = "dd03b3d8f6f83137754cc1ea1a55675447b0ab92";
+    };
     deps = {
       "nan-1.2.0" = self.by-version."nan"."1.2.0";
       "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-stringprep" ];
+    peerDependencies = [];
   };
   by-spec."node-stringprep"."~0.2.0" =
     self.by-version."node-stringprep"."0.2.3";
-  by-version."node-stringprep"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-stringprep"."0.2.3" = self.buildNodePackage {
     name = "node-stringprep-0.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.2.3.tgz";
-        name = "node-stringprep-0.2.3.tgz";
-        sha1 = "deab53eacbb2744eb65a3ab76f49a53a6d7f6b1c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-stringprep" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.2.3.tgz";
+      name = "node-stringprep-0.2.3.tgz";
+      sha1 = "deab53eacbb2744eb65a3ab76f49a53a6d7f6b1c";
+    };
     deps = {
       "nan-0.7.1" = self.by-version."nan"."0.7.1";
       "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-stringprep" ];
+    peerDependencies = [];
   };
   by-spec."node-stringprep"."~0.6.0" =
     self.by-version."node-stringprep"."0.6.2";
+  by-version."node-stringprep"."0.6.2" = self.buildNodePackage {
+    name = "node-stringprep-0.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.6.2.tgz";
+      name = "node-stringprep-0.6.2.tgz";
+      sha1 = "c266853e5c22dfb53d99bcc68b02218c889ccdc7";
+    };
+    deps = {
+      "nan-1.2.0" = self.by-version."nan"."1.2.0";
+      "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
+      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."node-stringprep"."~0.x" =
-    self.by-version."node-stringprep"."0.6.2";
+    self.by-version."node-stringprep"."0.7.0";
   by-spec."node-swt".">=0.1.1" =
     self.by-version."node-swt"."0.1.1";
-  by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-swt"."0.1.1" = self.buildNodePackage {
     name = "node-swt-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
-        name = "node-swt-0.1.1.tgz";
-        sha1 = "af0903825784be553b93dbae57d99d59060585dd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-swt" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
+      name = "node-swt-0.1.1.tgz";
+      sha1 = "af0903825784be553b93dbae57d99d59060585dd";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-swt" ];
+    peerDependencies = [];
   };
   by-spec."node-syslog"."1.1.7" =
     self.by-version."node-syslog"."1.1.7";
-  by-version."node-syslog"."1.1.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-syslog"."1.1.7" = self.buildNodePackage {
     name = "node-syslog-1.1.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
-        name = "node-syslog-1.1.7.tgz";
-        sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-syslog" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
+      name = "node-syslog-1.1.7.tgz";
+      sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-syslog" ];
+    peerDependencies = [];
   };
   by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" =
     self.by-version."node-uptime"."3.2.0";
-  by-version."node-uptime"."3.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-uptime"."3.2.0" = self.buildNodePackage {
     name = "node-uptime-3.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
-        name = "node-uptime-3.2.0.tgz";
-        sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-uptime" or []);
+    src = fetchurl {
+      url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7";
+      name = "node-uptime-3.2.0.tgz";
+      sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746";
+    };
     deps = {
       "mongoose-3.6.7" = self.by-version."mongoose"."3.6.7";
       "mongoose-lifecycle-1.0.0" = self.by-version."mongoose-lifecycle"."1.0.0";
@@ -19338,92 +18602,68 @@
       "net-ping-1.1.7" = self.by-version."net-ping"."1.1.7";
       "js-yaml-2.1.0" = self.by-version."js-yaml"."2.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-uptime" ];
+    peerDependencies = [];
   };
   "node-uptime" = self.by-version."node-uptime"."3.2.0";
   by-spec."node-uuid"."*" =
     self.by-version."node-uuid"."1.4.2";
-  by-version."node-uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-uuid"."1.4.2" = self.buildNodePackage {
     name = "node-uuid-1.4.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz";
-        name = "node-uuid-1.4.2.tgz";
-        sha1 = "907db3d11b7b6a2cf4f905fb7199f14ae7379ba0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-uuid" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz";
+      name = "node-uuid-1.4.2.tgz";
+      sha1 = "907db3d11b7b6a2cf4f905fb7199f14ae7379ba0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-uuid" ];
+    peerDependencies = [];
   };
   "node-uuid" = self.by-version."node-uuid"."1.4.2";
   by-spec."node-uuid"."1.3.3" =
     self.by-version."node-uuid"."1.3.3";
-  by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-uuid"."1.3.3" = self.buildNodePackage {
     name = "node-uuid-1.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
-        name = "node-uuid-1.3.3.tgz";
-        sha1 = "d3db4d7b56810d9e4032342766282af07391729b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-uuid" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
+      name = "node-uuid-1.3.3.tgz";
+      sha1 = "d3db4d7b56810d9e4032342766282af07391729b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-uuid" ];
+    peerDependencies = [];
   };
   by-spec."node-uuid"."1.4.0" =
     self.by-version."node-uuid"."1.4.0";
-  by-version."node-uuid"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-uuid"."1.4.0" = self.buildNodePackage {
     name = "node-uuid-1.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
-        name = "node-uuid-1.4.0.tgz";
-        sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-uuid" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
+      name = "node-uuid-1.4.0.tgz";
+      sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-uuid" ];
+    peerDependencies = [];
   };
   by-spec."node-uuid"."1.4.1" =
     self.by-version."node-uuid"."1.4.1";
-  by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-uuid"."1.4.1" = self.buildNodePackage {
     name = "node-uuid-1.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
-        name = "node-uuid-1.4.1.tgz";
-        sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-uuid" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
+      name = "node-uuid-1.4.1.tgz";
+      sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-uuid" ];
+    peerDependencies = [];
   };
+  by-spec."node-uuid"."^1.3.3" =
+    self.by-version."node-uuid"."1.4.2";
   by-spec."node-uuid"."^1.4.1" =
     self.by-version."node-uuid"."1.4.2";
   by-spec."node-uuid"."~1.4.0" =
@@ -19434,39 +18674,29 @@
     self.by-version."node-uuid"."1.4.2";
   by-spec."node-wsfederation".">=0.1.1" =
     self.by-version."node-wsfederation"."0.1.1";
-  by-version."node-wsfederation"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-wsfederation"."0.1.1" = self.buildNodePackage {
     name = "node-wsfederation-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
-        name = "node-wsfederation-0.1.1.tgz";
-        sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-wsfederation" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
+      name = "node-wsfederation-0.1.1.tgz";
+      sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b";
+    };
     deps = {
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-wsfederation" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp"."*" =
     self.by-version."node-xmpp"."1.0.0-alpha2";
-  by-version."node-xmpp"."1.0.0-alpha2" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp"."1.0.0-alpha2" = self.buildNodePackage {
     name = "node-xmpp-1.0.0-alpha2";
     bin = false;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-1.0.0-alpha2.tgz";
-        name = "node-xmpp-1.0.0-alpha2.tgz";
-        sha1 = "349041a9041d3bcc608cdbf57e60f5b301e7a8c0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-1.0.0-alpha2.tgz";
+      name = "node-xmpp-1.0.0-alpha2.tgz";
+      sha1 = "349041a9041d3bcc608cdbf57e60f5b301e7a8c0";
+    };
     deps = {
       "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4";
       "ltx-0.8.0" = self.by-version."ltx"."0.8.0";
@@ -19480,25 +18710,19 @@
       "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11";
       "node-xmpp-core-1.0.0-alpha13" = self.by-version."node-xmpp-core"."1.0.0-alpha13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp" ];
+    peerDependencies = [];
   };
   "node-xmpp" = self.by-version."node-xmpp"."1.0.0-alpha2";
   by-spec."node-xmpp"."~0.15.0" =
     self.by-version."node-xmpp"."0.15.0";
-  by-version."node-xmpp"."0.15.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp"."0.15.0" = self.buildNodePackage {
     name = "node-xmpp-0.15.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-0.15.0.tgz";
-        name = "node-xmpp-0.15.0.tgz";
-        sha1 = "b4e1adf6b4ea859f0d06e12daca9f850286cbb14";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-0.15.0.tgz";
+      name = "node-xmpp-0.15.0.tgz";
+      sha1 = "b4e1adf6b4ea859f0d06e12daca9f850286cbb14";
+    };
     deps = {
       "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4";
       "ltx-0.8.0" = self.by-version."ltx"."0.8.0";
@@ -19512,24 +18736,18 @@
       "node-xmpp-server-0.6.0" = self.by-version."node-xmpp-server"."0.6.0";
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-client"."*" =
     self.by-version."node-xmpp-client"."1.0.0-alpha9";
-  by-version."node-xmpp-client"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-client"."1.0.0-alpha9" = self.buildNodePackage {
     name = "node-xmpp-client-1.0.0-alpha9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-1.0.0-alpha9.tgz";
-        name = "node-xmpp-client-1.0.0-alpha9.tgz";
-        sha1 = "5e48ce59f9ea96ff7f80dc4fff2be252ace26f24";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-client" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-1.0.0-alpha9.tgz";
+      name = "node-xmpp-client-1.0.0-alpha9.tgz";
+      sha1 = "5e48ce59f9ea96ff7f80dc4fff2be252ace26f24";
+    };
     deps = {
       "request-2.27.0" = self.by-version."request"."2.27.0";
       "faye-websocket-0.7.3" = self.by-version."faye-websocket"."0.7.3";
@@ -19538,25 +18756,19 @@
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-client" ];
+    peerDependencies = [];
   };
   "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9";
   by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" =
     self.by-version."node-xmpp-client"."1.0.0-alpha19";
-  by-version."node-xmpp-client"."1.0.0-alpha19" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-client"."1.0.0-alpha19" = self.buildNodePackage {
     name = "node-xmpp-client-1.0.0-alpha19";
     bin = false;
-    src = [
-      (fetchgit {
-        url = "https://github.com/node-xmpp/node-xmpp-client.git";
-        rev = "74bf98a62700bee8e32ba7723abd35320917b8d7";
-        sha256 = "7dd69c6b8a4b8d7fef0109432c5b8add5560c9a108955b0adce7ee29507b5a26";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-client" or []);
+    src = fetchgit {
+      url = "https://github.com/node-xmpp/node-xmpp-client.git";
+      rev = "74bf98a62700bee8e32ba7723abd35320917b8d7";
+      sha256 = "7dd69c6b8a4b8d7fef0109432c5b8add5560c9a108955b0adce7ee29507b5a26";
+    };
     deps = {
       "request-2.48.0" = self.by-version."request"."2.48.0";
       "faye-websocket-0.7.3" = self.by-version."faye-websocket"."0.7.3";
@@ -19565,24 +18777,18 @@
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-client" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-client"."~0.4.0" =
     self.by-version."node-xmpp-client"."0.4.0";
-  by-version."node-xmpp-client"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-client"."0.4.0" = self.buildNodePackage {
     name = "node-xmpp-client-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-0.4.0.tgz";
-        name = "node-xmpp-client-0.4.0.tgz";
-        sha1 = "350def1797eaca28c592321cd16173f93167f90b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-client" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-0.4.0.tgz";
+      name = "node-xmpp-client-0.4.0.tgz";
+      sha1 = "350def1797eaca28c592321cd16173f93167f90b";
+    };
     deps = {
       "request-2.27.0" = self.by-version."request"."2.27.0";
       "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
@@ -19590,71 +18796,53 @@
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-client" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-component"."*" =
     self.by-version."node-xmpp-component"."1.0.0-alpha1";
-  by-version."node-xmpp-component"."1.0.0-alpha1" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-component"."1.0.0-alpha1" = self.buildNodePackage {
     name = "node-xmpp-component-1.0.0-alpha1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-1.0.0-alpha1.tgz";
-        name = "node-xmpp-component-1.0.0-alpha1.tgz";
-        sha1 = "3f85da00c05240bd48cc6c729d74875e6eb97877";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-component" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-1.0.0-alpha1.tgz";
+      name = "node-xmpp-component-1.0.0-alpha1.tgz";
+      sha1 = "3f85da00c05240bd48cc6c729d74875e6eb97877";
+    };
     deps = {
       "ltx-0.8.0" = self.by-version."ltx"."0.8.0";
       "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-component" ];
+    peerDependencies = [];
   };
   "node-xmpp-component" = self.by-version."node-xmpp-component"."1.0.0-alpha1";
   by-spec."node-xmpp-component"."git+https://github.com/node-xmpp/node-xmpp-component.git" =
     self.by-version."node-xmpp-component"."1.0.0-alpha1";
   by-spec."node-xmpp-component"."~0.3.0" =
     self.by-version."node-xmpp-component"."0.3.0";
-  by-version."node-xmpp-component"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-component"."0.3.0" = self.buildNodePackage {
     name = "node-xmpp-component-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-0.3.0.tgz";
-        name = "node-xmpp-component-0.3.0.tgz";
-        sha1 = "353fb4d8250beb7f55df17805d20c81d4ea0d3c7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-component" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-0.3.0.tgz";
+      name = "node-xmpp-component-0.3.0.tgz";
+      sha1 = "353fb4d8250beb7f55df17805d20c81d4ea0d3c7";
+    };
     deps = {
       "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-component" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-core"."*" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-version."node-xmpp-core"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-core"."1.0.0-alpha9" = self.buildNodePackage {
     name = "node-xmpp-core-1.0.0-alpha9";
     bin = false;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha9.tgz";
-        name = "node-xmpp-core-1.0.0-alpha9.tgz";
-        sha1 = "64b2b41e9f59fc910c71fe648c6be2bc4ecef7f1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-core" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha9.tgz";
+      name = "node-xmpp-core-1.0.0-alpha9.tgz";
+      sha1 = "64b2b41e9f59fc910c71fe648c6be2bc4ecef7f1";
+    };
     deps = {
       "node-stringprep-0.5.4" = self.by-version."node-stringprep"."0.5.4";
       "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
@@ -19662,35 +18850,27 @@
       "ltx-0.5.2" = self.by-version."ltx"."0.5.2";
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-core" ];
+    peerDependencies = [];
   };
   "node-xmpp-core" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-spec."node-xmpp-core"."1.0.0-alpha1" =
     self.by-version."node-xmpp-core"."1.0.0-alpha1";
-  by-version."node-xmpp-core"."1.0.0-alpha1" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-core"."1.0.0-alpha1" = self.buildNodePackage {
     name = "node-xmpp-core-1.0.0-alpha1";
     bin = false;
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha1.tgz";
-        name = "node-xmpp-core-1.0.0-alpha1.tgz";
-        sha1 = "94b1b33a0ccb84427d8b290af80e29b8dec5545f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-core" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha1.tgz";
+      name = "node-xmpp-core-1.0.0-alpha1.tgz";
+      sha1 = "94b1b33a0ccb84427d8b290af80e29b8dec5545f";
+    };
     deps = {
-      "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2";
+      "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0";
       "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
       "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
       "ltx-0.8.0" = self.by-version."ltx"."0.8.0";
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-core" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-core"."^1.0.0-alpha10" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
@@ -19700,18 +18880,14 @@
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-spec."node-xmpp-core"."git+https://github.com/node-xmpp/node-xmpp-core.git" =
     self.by-version."node-xmpp-core"."1.0.0-alpha13";
-  by-version."node-xmpp-core"."1.0.0-alpha13" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-core"."1.0.0-alpha13" = self.buildNodePackage {
     name = "node-xmpp-core-1.0.0-alpha13";
     bin = false;
-    src = [
-      (self.patchSource fetchgit {
-        url = "https://github.com/node-xmpp/node-xmpp-core.git";
-        rev = "18a2542664cae823fff404c5b6e79a31c58b52b2";
-        sha256 = "6278c890a76613e02676ce6df946f4415e441d279d3fd9af803489c51280a7f0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-core" or []);
+    src = fetchgit {
+      url = "https://github.com/node-xmpp/node-xmpp-core.git";
+      rev = "18a2542664cae823fff404c5b6e79a31c58b52b2";
+      sha256 = "6278c890a76613e02676ce6df946f4415e441d279d3fd9af803489c51280a7f0";
+    };
     deps = {
       "node-stringprep-0.5.4" = self.by-version."node-stringprep"."0.5.4";
       "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
@@ -19719,49 +18895,37 @@
       "ltx-0.7.2" = self.by-version."ltx"."0.7.2";
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-core" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-core"."~0.5.0" =
     self.by-version."node-xmpp-core"."0.5.0";
-  by-version."node-xmpp-core"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-core"."0.5.0" = self.buildNodePackage {
     name = "node-xmpp-core-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-0.5.0.tgz";
-        name = "node-xmpp-core-0.5.0.tgz";
-        sha1 = "d3a453bf7bc029b7b5f10b1941e8a9e2952cf3db";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-core" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-0.5.0.tgz";
+      name = "node-xmpp-core-0.5.0.tgz";
+      sha1 = "d3a453bf7bc029b7b5f10b1941e8a9e2952cf3db";
+    };
     deps = {
       "node-stringprep-0.2.3" = self.by-version."node-stringprep"."0.2.3";
       "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
       "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-core" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-core"."~1.0.0-alpha10" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-spec."node-xmpp-joap"."*" =
     self.by-version."node-xmpp-joap"."0.0.17";
-  by-version."node-xmpp-joap"."0.0.17" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-joap"."0.0.17" = self.buildNodePackage {
     name = "node-xmpp-joap-0.0.17";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.17.tgz";
-        name = "node-xmpp-joap-0.0.17.tgz";
-        sha1 = "d6d4fce1148f3fa158ed2a381787c51be3168fff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-joap" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.17.tgz";
+      name = "node-xmpp-joap-0.0.17.tgz";
+      sha1 = "d6d4fce1148f3fa158ed2a381787c51be3168fff";
+    };
     deps = {
       "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4";
       "node-xmpp-0.15.0" = self.by-version."node-xmpp"."0.15.0";
@@ -19771,254 +18935,223 @@
       "toobusy-0.2.4" = self.by-version."toobusy"."0.2.4";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-joap" ];
+    peerDependencies = [];
   };
   "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.17";
   by-spec."node-xmpp-server"."*" =
     self.by-version."node-xmpp-server"."1.0.0-alpha9";
-  by-version."node-xmpp-server"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-server"."1.0.0-alpha9" = self.buildNodePackage {
     name = "node-xmpp-server-1.0.0-alpha9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-1.0.0-alpha9.tgz";
-        name = "node-xmpp-server-1.0.0-alpha9.tgz";
-        sha1 = "1622aafddf9efde4dd9483c849d56b80e582a745";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-server" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-1.0.0-alpha9.tgz";
+      name = "node-xmpp-server-1.0.0-alpha9.tgz";
+      sha1 = "1622aafddf9efde4dd9483c849d56b80e582a745";
+    };
     deps = {
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-server" ];
+    peerDependencies = [];
   };
   "node-xmpp-server" = self.by-version."node-xmpp-server"."1.0.0-alpha9";
   by-spec."node-xmpp-server"."git+https://github.com/node-xmpp/node-xmpp-server.git" =
     self.by-version."node-xmpp-server"."1.0.0-alpha11";
-  by-version."node-xmpp-server"."1.0.0-alpha11" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-server"."1.0.0-alpha11" = self.buildNodePackage {
     name = "node-xmpp-server-1.0.0-alpha11";
     bin = false;
-    src = [
-      (fetchgit {
-        url = "https://github.com/node-xmpp/node-xmpp-server.git";
-        rev = "bc82930d1396c259610603742849bce165b74f58";
-        sha256 = "513927fee92aa81493e16686dedd49ea2946ee978dc23308a2b104bcef9f3b8d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-server" or []);
+    src = fetchgit {
+      url = "https://github.com/node-xmpp/node-xmpp-server.git";
+      rev = "bc82930d1396c259610603742849bce165b74f58";
+      sha256 = "513927fee92aa81493e16686dedd49ea2946ee978dc23308a2b104bcef9f3b8d";
+    };
     deps = {
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-server" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-server"."~0.6.0" =
     self.by-version."node-xmpp-server"."0.6.0";
-  by-version."node-xmpp-server"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-server"."0.6.0" = self.buildNodePackage {
     name = "node-xmpp-server-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-0.6.0.tgz";
-        name = "node-xmpp-server-0.6.0.tgz";
-        sha1 = "66f7102d9b0c9aa34e2d37aa2f78811964f1298e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-server" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-0.6.0.tgz";
+      name = "node-xmpp-server-0.6.0.tgz";
+      sha1 = "66f7102d9b0c9aa34e2d37aa2f78811964f1298e";
+    };
     deps = {
       "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
       "node-xmpp-client-0.4.0" = self.by-version."node-xmpp-client"."0.4.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-server" ];
+    peerDependencies = [];
   };
   by-spec."node-xmpp-serviceadmin"."*" =
     self.by-version."node-xmpp-serviceadmin"."0.1.6";
-  by-version."node-xmpp-serviceadmin"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."node-xmpp-serviceadmin"."0.1.6" = self.buildNodePackage {
     name = "node-xmpp-serviceadmin-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.1.6.tgz";
-        name = "node-xmpp-serviceadmin-0.1.6.tgz";
-        sha1 = "c67be0926b56b12c050d7caf8e2522b36ea84c00";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-xmpp-serviceadmin" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.1.6.tgz";
+      name = "node-xmpp-serviceadmin-0.1.6.tgz";
+      sha1 = "c67be0926b56b12c050d7caf8e2522b36ea84c00";
+    };
     deps = {
       "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-xmpp-serviceadmin" ];
+    peerDependencies = [];
   };
   "node-xmpp-serviceadmin" = self.by-version."node-xmpp-serviceadmin"."0.1.6";
   by-spec."node.extend"."1.0.0" =
     self.by-version."node.extend"."1.0.0";
-  by-version."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."node.extend"."1.0.0" = self.buildNodePackage {
     name = "node.extend-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
-        name = "node.extend-1.0.0.tgz";
-        sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node.extend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
+      name = "node.extend-1.0.0.tgz";
+      sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node.extend" ];
+    peerDependencies = [];
   };
   by-spec."nodemailer"."0.3.35" =
     self.by-version."nodemailer"."0.3.35";
-  by-version."nodemailer"."0.3.35" = lib.makeOverridable self.buildNodePackage {
+  by-version."nodemailer"."0.3.35" = self.buildNodePackage {
     name = "nodemailer-0.3.35";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
-        name = "nodemailer-0.3.35.tgz";
-        sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nodemailer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
+      name = "nodemailer-0.3.35.tgz";
+      sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
+    };
     deps = {
       "mailcomposer-0.2.12" = self.by-version."mailcomposer"."0.2.12";
-      "simplesmtp-0.3.33" = self.by-version."simplesmtp"."0.3.33";
+      "simplesmtp-0.3.34" = self.by-version."simplesmtp"."0.3.34";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nodemailer" ];
+    peerDependencies = [];
+  };
+  by-spec."nodemailer"."0.7.1" =
+    self.by-version."nodemailer"."0.7.1";
+  by-version."nodemailer"."0.7.1" = self.buildNodePackage {
+    name = "nodemailer-0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.7.1.tgz";
+      name = "nodemailer-0.7.1.tgz";
+      sha1 = "1ec819e243622300a00abe746cb5d3389c0f316c";
+    };
+    deps = {
+      "mailcomposer-0.2.12" = self.by-version."mailcomposer"."0.2.12";
+      "simplesmtp-0.3.34" = self.by-version."simplesmtp"."0.3.34";
+      "directmail-0.1.8" = self.by-version."directmail"."0.1.8";
+      "he-0.3.6" = self.by-version."he"."0.3.6";
+      "public-address-0.1.1" = self.by-version."public-address"."0.1.1";
+      "aws-sdk-2.0.5" = self.by-version."aws-sdk"."2.0.5";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    peerDependencies = [];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.3.0-7";
-  by-version."nodemon"."1.3.0-7" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-1.3.0-7";
+    self.by-version."nodemon"."1.3.2";
+  by-version."nodemon"."1.3.2" = self.buildNodePackage {
+    name = "nodemon-1.3.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.0-7.tgz";
-        name = "nodemon-1.3.0-7.tgz";
-        sha1 = "d52e76bfcc628f2282c45b53cdc0aa5a3645d68a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nodemon" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.2.tgz";
+      name = "nodemon-1.3.2.tgz";
+      sha1 = "9d54b0731bb2ce213169ebffd5bed9ea988ae9d8";
+    };
     deps = {
+      "touch-0.0.3" = self.by-version."touch"."0.0.3";
       "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
       "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
       "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nodemon" ];
+    peerDependencies = [];
   };
-  "nodemon" = self.by-version."nodemon"."1.3.0-7";
+  "nodemon" = self.by-version."nodemon"."1.3.2";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
-  by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."nomnom"."1.6.2" = self.buildNodePackage {
     name = "nomnom-1.6.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
-        name = "nomnom-1.6.2.tgz";
-        sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nomnom" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
+      name = "nomnom-1.6.2.tgz";
+      sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971";
+    };
     deps = {
       "colors-0.5.1" = self.by-version."colors"."0.5.1";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nomnom" ];
+    peerDependencies = [];
   };
   by-spec."nopt"."2" =
     self.by-version."nopt"."2.2.1";
-  by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."nopt"."2.2.1" = self.buildNodePackage {
     name = "nopt-2.2.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
-        name = "nopt-2.2.1.tgz";
-        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nopt" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
+      name = "nopt-2.2.1.tgz";
+      sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
+    };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nopt" ];
+    peerDependencies = [];
   };
   by-spec."nopt"."2 || 3" =
     self.by-version."nopt"."3.0.1";
-  by-version."nopt"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."nopt"."3.0.1" = self.buildNodePackage {
     name = "nopt-3.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
-        name = "nopt-3.0.1.tgz";
-        sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nopt" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
+      name = "nopt-3.0.1.tgz";
+      sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
+    };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nopt" ];
+    peerDependencies = [];
   };
   by-spec."nopt"."2.0.0" =
     self.by-version."nopt"."2.0.0";
-  by-version."nopt"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."nopt"."2.0.0" = self.buildNodePackage {
     name = "nopt-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nopt" or []);
+    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.5" = self.by-version."abbrev"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nopt" ];
+    peerDependencies = [];
+  };
+  by-spec."nopt"."2.1.1" =
+    self.by-version."nopt"."2.1.1";
+  by-version."nopt"."2.1.1" = self.buildNodePackage {
+    name = "nopt-2.1.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz";
+      name = "nopt-2.1.1.tgz";
+      sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1";
+    };
+    deps = {
+      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+    };
+    peerDependencies = [];
   };
   by-spec."nopt"."3.0.1" =
     self.by-version."nopt"."3.0.1";
@@ -20026,25 +19159,21 @@
     self.by-version."nopt"."3.0.1";
   by-spec."nopt"."~1.0.10" =
     self.by-version."nopt"."1.0.10";
-  by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."nopt"."1.0.10" = self.buildNodePackage {
     name = "nopt-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nopt" or []);
+    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.5" = self.by-version."abbrev"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nopt" ];
+    peerDependencies = [];
   };
+  by-spec."nopt"."~2" =
+    self.by-version."nopt"."2.2.1";
   by-spec."nopt"."~2.2.0" =
     self.by-version."nopt"."2.2.1";
   by-spec."nopt"."~3.0.0" =
@@ -20053,65 +19182,49 @@
     self.by-version."nopt"."3.0.1";
   by-spec."normalize-git-url"."~1.0.0" =
     self.by-version."normalize-git-url"."1.0.0";
-  by-version."normalize-git-url"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."normalize-git-url"."1.0.0" = self.buildNodePackage {
     name = "normalize-git-url-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/normalize-git-url/-/normalize-git-url-1.0.0.tgz";
-        name = "normalize-git-url-1.0.0.tgz";
-        sha1 = "80e59471f0616b579893973e3f1b3684bedbad48";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."normalize-git-url" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/normalize-git-url/-/normalize-git-url-1.0.0.tgz";
+      name = "normalize-git-url-1.0.0.tgz";
+      sha1 = "80e59471f0616b579893973e3f1b3684bedbad48";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "normalize-git-url" ];
+    peerDependencies = [];
   };
   by-spec."normalize-package-data"."^1.0.0" =
     self.by-version."normalize-package-data"."1.0.3";
-  by-version."normalize-package-data"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."normalize-package-data"."1.0.3" = self.buildNodePackage {
     name = "normalize-package-data-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz";
-        name = "normalize-package-data-1.0.3.tgz";
-        sha1 = "8be955b8907af975f1a4584ea8bb9b41492312f5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."normalize-package-data" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz";
+      name = "normalize-package-data-1.0.3.tgz";
+      sha1 = "8be955b8907af975f1a4584ea8bb9b41492312f5";
+    };
     deps = {
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
       "semver-4.2.0" = self.by-version."semver"."4.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "normalize-package-data" ];
+    peerDependencies = [];
   };
   by-spec."normalize-package-data"."~1.0.1" =
     self.by-version."normalize-package-data"."1.0.3";
   by-spec."normalize-package-data"."~1.0.3" =
     self.by-version."normalize-package-data"."1.0.3";
   by-spec."npm"."*" =
-    self.by-version."npm"."2.2.0";
-  by-version."npm"."2.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-2.2.0";
+    self.by-version."npm"."2.4.1";
+  by-version."npm"."2.4.1" = self.buildNodePackage {
+    name = "npm-2.4.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-2.2.0.tgz";
-        name = "npm-2.2.0.tgz";
-        sha1 = "e9a1c4971558019f3d14f7a33aa7a7492bc195ed";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm/-/npm-2.4.1.tgz";
+      name = "npm-2.4.1.tgz";
+      sha1 = "0212e03b8ade89bec6a59fc75bc2aa03f94f0f53";
+    };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
@@ -20131,16 +19244,16 @@
       "editor-0.1.0" = self.by-version."editor"."0.1.0";
       "fs-vacuum-1.2.5" = self.by-version."fs-vacuum"."1.2.5";
       "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2";
-      "fstream-1.0.3" = self.by-version."fstream"."1.0.3";
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1";
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "ini-1.3.2" = self.by-version."ini"."1.3.2";
-      "init-package-json-1.1.3" = self.by-version."init-package-json"."1.1.3";
+      "init-package-json-1.2.0" = self.by-version."init-package-json"."1.2.0";
       "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0";
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
@@ -20152,7 +19265,7 @@
       "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1";
       "npm-install-checks-1.0.5" = self.by-version."npm-install-checks"."1.0.5";
       "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3";
-      "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5";
+      "npm-registry-client-6.0.3" = self.by-version."npm-registry-client"."6.0.3";
       "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1";
       "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
       "once-1.3.1" = self.by-version."once"."1.3.1";
@@ -20174,29 +19287,24 @@
       "tar-1.0.3" = self.by-version."tar"."1.0.3";
       "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
       "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6";
+      "umask-1.1.0" = self.by-version."umask"."1.1.0";
       "which-1.0.8" = self.by-version."which"."1.0.8";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
       "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm" ];
+    peerDependencies = [];
   };
-  "npm" = self.by-version."npm"."2.2.0";
+  "npm" = self.by-version."npm"."2.4.1";
   by-spec."npm"."1.4.28" =
     self.by-version."npm"."1.4.28";
-  by-version."npm"."1.4.28" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm"."1.4.28" = self.buildNodePackage {
     name = "npm-1.4.28";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.4.28.tgz";
-        name = "npm-1.4.28.tgz";
-        sha1 = "da2a18f871c0cf7edae706b72b2f2b44cf74d7d3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm/-/npm-1.4.28.tgz";
+      name = "npm-1.4.28.tgz";
+      sha1 = "da2a18f871c0cf7edae706b72b2f2b44cf74d7d3";
+    };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
@@ -20211,7 +19319,7 @@
       "cmd-shim-2.0.0" = self.by-version."cmd-shim"."2.0.0";
       "columnify-1.2.1" = self.by-version."columnify"."1.2.1";
       "editor-0.1.0" = self.by-version."editor"."0.1.0";
-      "fstream-1.0.3" = self.by-version."fstream"."1.0.3";
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1";
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
@@ -20251,24 +19359,18 @@
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm" ];
+    peerDependencies = [];
   };
   by-spec."npm"."2.1.x" =
     self.by-version."npm"."2.1.18";
-  by-version."npm"."2.1.18" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm"."2.1.18" = self.buildNodePackage {
     name = "npm-2.1.18";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-2.1.18.tgz";
-        name = "npm-2.1.18.tgz";
-        sha1 = "e2af4c5f848fb023851cd2ec129005d33090bd57";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm/-/npm-2.1.18.tgz";
+      name = "npm-2.1.18.tgz";
+      sha1 = "e2af4c5f848fb023851cd2ec129005d33090bd57";
+    };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
@@ -20288,11 +19390,11 @@
       "editor-0.1.0" = self.by-version."editor"."0.1.0";
       "fs-vacuum-1.2.5" = self.by-version."fs-vacuum"."1.2.5";
       "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2";
-      "fstream-1.0.3" = self.by-version."fstream"."1.0.3";
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1";
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -20335,46 +19437,34 @@
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
       "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm" ];
+    peerDependencies = [];
   };
   by-spec."npm-cache-filename"."^1.0.0" =
     self.by-version."npm-cache-filename"."1.0.1";
-  by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm-cache-filename"."1.0.1" = self.buildNodePackage {
     name = "npm-cache-filename-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz";
-        name = "npm-cache-filename-1.0.1.tgz";
-        sha1 = "9b640f0c1a5ba1145659685372a9ff71f70c4323";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-cache-filename" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz";
+      name = "npm-cache-filename-1.0.1.tgz";
+      sha1 = "9b640f0c1a5ba1145659685372a9ff71f70c4323";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-cache-filename" ];
+    peerDependencies = [];
   };
   by-spec."npm-cache-filename"."~1.0.1" =
     self.by-version."npm-cache-filename"."1.0.1";
   by-spec."npm-check-updates"."*" =
     self.by-version."npm-check-updates"."1.5.0";
-  by-version."npm-check-updates"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm-check-updates"."1.5.0" = self.buildNodePackage {
     name = "npm-check-updates-1.5.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.5.0.tgz";
-        name = "npm-check-updates-1.5.0.tgz";
-        sha1 = "99cecb1f9e8321047a90b418dfdb8828a8c0ad9c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-check-updates" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.5.0.tgz";
+      name = "npm-check-updates-1.5.0.tgz";
+      sha1 = "99cecb1f9e8321047a90b418dfdb8828a8c0ad9c";
+    };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "cint-8.1.0" = self.by-version."cint"."8.1.0";
@@ -20384,72 +19474,70 @@
       "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
       "semver-4.1.1" = self.by-version."semver"."4.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-check-updates" ];
+    peerDependencies = [];
   };
   "npm-check-updates" = self.by-version."npm-check-updates"."1.5.0";
   by-spec."npm-install-checks"."~1.0.2" =
     self.by-version."npm-install-checks"."1.0.5";
-  by-version."npm-install-checks"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm-install-checks"."1.0.5" = self.buildNodePackage {
     name = "npm-install-checks-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.5.tgz";
-        name = "npm-install-checks-1.0.5.tgz";
-        sha1 = "a1b5beabfd60e0535b14f763157c410cb6bdae56";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-install-checks" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.5.tgz";
+      name = "npm-install-checks-1.0.5.tgz";
+      sha1 = "a1b5beabfd60e0535b14f763157c410cb6bdae56";
+    };
     deps = {
       "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0";
       "semver-4.2.0" = self.by-version."semver"."4.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-install-checks" ];
+    peerDependencies = [];
   };
   by-spec."npm-install-checks"."~1.0.5" =
     self.by-version."npm-install-checks"."1.0.5";
   by-spec."npm-package-arg"."^2.1.3" =
     self.by-version."npm-package-arg"."2.1.3";
-  by-version."npm-package-arg"."2.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm-package-arg"."2.1.3" = self.buildNodePackage {
     name = "npm-package-arg-2.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.1.3.tgz";
-        name = "npm-package-arg-2.1.3.tgz";
-        sha1 = "dfba34bd82dd327c10cb43a65c8db6ef0b812bf7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-package-arg" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.1.3.tgz";
+      name = "npm-package-arg-2.1.3.tgz";
+      sha1 = "dfba34bd82dd327c10cb43a65c8db6ef0b812bf7";
+    };
     deps = {
       "semver-4.2.0" = self.by-version."semver"."4.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-package-arg" ];
+    peerDependencies = [];
+  };
+  by-spec."npm-package-arg"."^3.0.0" =
+    self.by-version."npm-package-arg"."3.0.0";
+  by-version."npm-package-arg"."3.0.0" = self.buildNodePackage {
+    name = "npm-package-arg-3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-3.0.0.tgz";
+      name = "npm-package-arg-3.0.0.tgz";
+      sha1 = "84e91836fa2e4e35ae26dc984440b1e5b5aee1ee";
+    };
+    deps = {
+      "hosted-git-info-1.5.3" = self.by-version."hosted-git-info"."1.5.3";
+      "semver-4.2.0" = self.by-version."semver"."4.2.0";
+    };
+    peerDependencies = [];
   };
   by-spec."npm-package-arg"."~2.1.3" =
     self.by-version."npm-package-arg"."2.1.3";
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
-  by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm-registry-client"."0.2.27" = self.buildNodePackage {
     name = "npm-registry-client-0.2.27";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
-        name = "npm-registry-client-0.2.27.tgz";
-        sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-registry-client" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
+      name = "npm-registry-client-0.2.27.tgz";
+      sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
+    };
     deps = {
       "request-2.51.0" = self.by-version."request"."2.51.0";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
@@ -20462,24 +19550,18 @@
       "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20";
       "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-registry-client" ];
+    peerDependencies = [];
   };
   by-spec."npm-registry-client"."~2.0.7" =
     self.by-version."npm-registry-client"."2.0.7";
-  by-version."npm-registry-client"."2.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm-registry-client"."2.0.7" = self.buildNodePackage {
     name = "npm-registry-client-2.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-2.0.7.tgz";
-        name = "npm-registry-client-2.0.7.tgz";
-        sha1 = "97a2cdca5aba753b4b5b334b4ae65669c6641085";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-registry-client" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-2.0.7.tgz";
+      name = "npm-registry-client-2.0.7.tgz";
+      sha1 = "97a2cdca5aba753b4b5b334b4ae65669c6641085";
+    };
     deps = {
       "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
@@ -20492,24 +19574,18 @@
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-registry-client" ];
+    peerDependencies = [];
   };
   by-spec."npm-registry-client"."~4.0.4" =
     self.by-version."npm-registry-client"."4.0.5";
-  by-version."npm-registry-client"."4.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm-registry-client"."4.0.5" = self.buildNodePackage {
     name = "npm-registry-client-4.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.5.tgz";
-        name = "npm-registry-client-4.0.5.tgz";
-        sha1 = "27d37ca0c7bbd5df14f4ae35223a4d588dd4fea6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-registry-client" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.5.tgz";
+      name = "npm-registry-client-4.0.5.tgz";
+      sha1 = "27d37ca0c7bbd5df14f4ae35223a4d588dd4fea6";
+    };
     deps = {
       "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
       "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
@@ -20524,48 +19600,63 @@
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-registry-client" ];
+    peerDependencies = [];
   };
   by-spec."npm-registry-client"."~4.0.5" =
     self.by-version."npm-registry-client"."4.0.5";
+  by-spec."npm-registry-client"."~6.0.3" =
+    self.by-version."npm-registry-client"."6.0.3";
+  by-version."npm-registry-client"."6.0.3" = self.buildNodePackage {
+    name = "npm-registry-client-6.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.0.3.tgz";
+      name = "npm-registry-client-6.0.3.tgz";
+      sha1 = "ae19f33b1cd6b4f5e81b7614bde7b97393c57cdc";
+    };
+    deps = {
+      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
+      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+      "npm-package-arg-3.0.0" = self.by-version."npm-package-arg"."3.0.0";
+      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "retry-0.6.1" = self.by-version."retry"."0.6.1";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "semver-4.2.0" = self.by-version."semver"."4.2.0";
+      "slide-1.1.6" = self.by-version."slide"."1.1.6";
+      "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."npm-user-validate"."~0.1.0" =
     self.by-version."npm-user-validate"."0.1.1";
-  by-version."npm-user-validate"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."npm-user-validate"."0.1.1" = self.buildNodePackage {
     name = "npm-user-validate-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.1.tgz";
-        name = "npm-user-validate-0.1.1.tgz";
-        sha1 = "ea7774636c3c8fe6d01e174bd9f2ee0e22eeed57";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-user-validate" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.1.tgz";
+      name = "npm-user-validate-0.1.1.tgz";
+      sha1 = "ea7774636c3c8fe6d01e174bd9f2ee0e22eeed57";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-user-validate" ];
+    peerDependencies = [];
   };
   by-spec."npm-user-validate"."~0.1.1" =
     self.by-version."npm-user-validate"."0.1.1";
-  by-spec."npm2nix"."*" =
-    self.by-version."npm2nix"."5.8.1";
-  by-version."npm2nix"."5.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "npm2nix-5.8.1";
+  by-spec."npm2nix"."git://github.com/NixOS/npm2nix.git#5.10.3" =
+    self.by-version."npm2nix"."5.10.3";
+  by-version."npm2nix"."5.10.3" = self.buildNodePackage {
+    name = "npm2nix-5.10.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.8.1.tgz";
-        name = "npm2nix-5.8.1.tgz";
-        sha1 = "0d8356b458caaa677b4a1225fea4900f2995982f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm2nix" or []);
+    src = fetchgit {
+      url = "git://github.com/NixOS/npm2nix.git";
+      rev = "d7c63c4edf4d6df4ff829c47f487b5903307b053";
+      sha256 = "8c2ef1a6b1637440d181282f90d46f55dcf92c4eecf8093663a53041225754cd";
+    };
     deps = {
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
@@ -20573,28 +19664,23 @@
       "npmconf-0.1.1" = self.by-version."npmconf"."0.1.1";
       "tar-0.1.17" = self.by-version."tar"."0.1.17";
       "temp-0.6.0" = self.by-version."temp"."0.6.0";
-      "fs.extra-1.3.0" = self.by-version."fs.extra"."1.3.0";
+      "fs.extra-1.3.2" = self.by-version."fs.extra"."1.3.2";
       "findit-1.2.0" = self.by-version."findit"."1.2.0";
+      "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm2nix" ];
+    peerDependencies = [];
   };
-  "npm2nix" = self.by-version."npm2nix"."5.8.1";
+  "npm2nix" = self.by-version."npm2nix"."5.10.3";
   by-spec."npmconf"."0.1.1" =
     self.by-version."npmconf"."0.1.1";
-  by-version."npmconf"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."npmconf"."0.1.1" = self.buildNodePackage {
     name = "npmconf-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
-        name = "npmconf-0.1.1.tgz";
-        sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npmconf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
+      name = "npmconf-0.1.1.tgz";
+      sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
+    };
     deps = {
       "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
       "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
@@ -20605,24 +19691,18 @@
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "ini-1.1.0" = self.by-version."ini"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npmconf" ];
+    peerDependencies = [];
   };
   by-spec."npmconf"."0.1.16" =
     self.by-version."npmconf"."0.1.16";
-  by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage {
+  by-version."npmconf"."0.1.16" = self.buildNodePackage {
     name = "npmconf-0.1.16";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
-        name = "npmconf-0.1.16.tgz";
-        sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npmconf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
+      name = "npmconf-0.1.16.tgz";
+      sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
+    };
     deps = {
       "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -20633,24 +19713,18 @@
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "ini-1.1.0" = self.by-version."ini"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npmconf" ];
+    peerDependencies = [];
   };
   by-spec."npmconf"."2.0.9" =
     self.by-version."npmconf"."2.0.9";
-  by-version."npmconf"."2.0.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."npmconf"."2.0.9" = self.buildNodePackage {
     name = "npmconf-2.0.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz";
-        name = "npmconf-2.0.9.tgz";
-        sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npmconf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz";
+      name = "npmconf-2.0.9.tgz";
+      sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2";
+    };
     deps = {
       "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -20662,24 +19736,18 @@
       "semver-4.2.0" = self.by-version."semver"."4.2.0";
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npmconf" ];
+    peerDependencies = [];
   };
   by-spec."npmconf"."^2.0.1" =
     self.by-version."npmconf"."2.1.1";
-  by-version."npmconf"."2.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."npmconf"."2.1.1" = self.buildNodePackage {
     name = "npmconf-2.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz";
-        name = "npmconf-2.1.1.tgz";
-        sha1 = "a266c7e5c56695eb7f55caf3a5a7328f24510dae";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npmconf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz";
+      name = "npmconf-2.1.1.tgz";
+      sha1 = "a266c7e5c56695eb7f55caf3a5a7328f24510dae";
+    };
     deps = {
       "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -20691,26 +19759,20 @@
       "semver-4.2.0" = self.by-version."semver"."4.2.0";
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npmconf" ];
+    peerDependencies = [];
   };
   by-spec."npmconf"."~0.1.2" =
     self.by-version."npmconf"."0.1.16";
   by-spec."npmconf"."~1.1.8" =
     self.by-version."npmconf"."1.1.9";
-  by-version."npmconf"."1.1.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."npmconf"."1.1.9" = self.buildNodePackage {
     name = "npmconf-1.1.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-1.1.9.tgz";
-        name = "npmconf-1.1.9.tgz";
-        sha1 = "0ec71e3c5e604c84facc313cd175636ec11c8a6a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npmconf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmconf/-/npmconf-1.1.9.tgz";
+      name = "npmconf-1.1.9.tgz";
+      sha1 = "0ec71e3c5e604c84facc313cd175636ec11c8a6a";
+    };
     deps = {
       "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -20722,55 +19784,41 @@
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npmconf" ];
+    peerDependencies = [];
   };
   by-spec."npmconf"."~2.1.1" =
     self.by-version."npmconf"."2.1.1";
   by-spec."npmlog"."*" =
     self.by-version."npmlog"."1.0.0";
-  by-version."npmlog"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."npmlog"."1.0.0" = self.buildNodePackage {
     name = "npmlog-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npmlog/-/npmlog-1.0.0.tgz";
-        name = "npmlog-1.0.0.tgz";
-        sha1 = "ed2f290b60316887c39e0da9f09f8d13847cef0f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npmlog" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmlog/-/npmlog-1.0.0.tgz";
+      name = "npmlog-1.0.0.tgz";
+      sha1 = "ed2f290b60316887c39e0da9f09f8d13847cef0f";
+    };
     deps = {
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
       "are-we-there-yet-1.0.2" = self.by-version."are-we-there-yet"."1.0.2";
       "gauge-1.0.2" = self.by-version."gauge"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npmlog" ];
+    peerDependencies = [];
   };
   by-spec."npmlog"."0" =
     self.by-version."npmlog"."0.1.1";
-  by-version."npmlog"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."npmlog"."0.1.1" = self.buildNodePackage {
     name = "npmlog-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz";
-        name = "npmlog-0.1.1.tgz";
-        sha1 = "8b9b9e4405d7ec48c31c2346965aadc7abaecaa5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npmlog" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz";
+      name = "npmlog-0.1.1.tgz";
+      sha1 = "8b9b9e4405d7ec48c31c2346965aadc7abaecaa5";
+    };
     deps = {
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "npmlog" ];
+    peerDependencies = [];
   };
   by-spec."npmlog"."0.1 || 1" =
     self.by-version."npmlog"."1.0.0";
@@ -20778,369 +19826,330 @@
     self.by-version."npmlog"."0.1.1";
   by-spec."nssocket"."~0.5.1" =
     self.by-version."nssocket"."0.5.3";
-  by-version."nssocket"."0.5.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."nssocket"."0.5.3" = self.buildNodePackage {
     name = "nssocket-0.5.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz";
-        name = "nssocket-0.5.3.tgz";
-        sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nssocket" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz";
+      name = "nssocket-0.5.3.tgz";
+      sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
+    };
     deps = {
       "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
       "lazy-1.0.11" = self.by-version."lazy"."1.0.11";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nssocket" ];
+    peerDependencies = [];
+  };
+  by-spec."ntwitter".">=0.5.0" =
+    self.by-version."ntwitter"."0.5.0";
+  by-version."ntwitter"."0.5.0" = self.buildNodePackage {
+    name = "ntwitter-0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ntwitter/-/ntwitter-0.5.0.tgz";
+      name = "ntwitter-0.5.0.tgz";
+      sha1 = "30c40105f82432fa8956a4f7655de932af631534";
+    };
+    deps = {
+      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "cookies-0.1.6" = self.by-version."cookies"."0.1.6";
+      "keygrip-0.2.4" = self.by-version."keygrip"."0.2.4";
+    };
+    peerDependencies = [];
   };
   by-spec."numeral"."^1.5.3" =
     self.by-version."numeral"."1.5.3";
-  by-version."numeral"."1.5.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."numeral"."1.5.3" = self.buildNodePackage {
     name = "numeral-1.5.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz";
-        name = "numeral-1.5.3.tgz";
-        sha1 = "a4c3eba68239580509f818267c77243bce43ff62";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."numeral" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz";
+      name = "numeral-1.5.3.tgz";
+      sha1 = "a4c3eba68239580509f818267c77243bce43ff62";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "numeral" ];
+    peerDependencies = [];
   };
-  by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
+  by-spec."nwmatcher"."~1.3.1" =
+    self.by-version."nwmatcher"."1.3.4";
+  by-version."nwmatcher"."1.3.4" = self.buildNodePackage {
+    name = "nwmatcher-1.3.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.4.tgz";
+      name = "nwmatcher-1.3.4.tgz";
+      sha1 = "965aa05fc3bc9de0a6438c8c07169866092fdaed";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."nwmatcher"."~1.3.2" =
+    self.by-version."nwmatcher"."1.3.4";
+  by-spec."oauth"."*" =
     self.by-version."oauth"."0.9.12";
-  by-version."oauth"."0.9.12" = lib.makeOverridable self.buildNodePackage {
+  by-version."oauth"."0.9.12" = self.buildNodePackage {
     name = "oauth-0.9.12";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "https://github.com/ciaranj/node-oauth/tarball/master";
-        name = "oauth-0.9.12.tgz";
-        sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."oauth" or []);
+    src = fetchurl {
+      url = "https://github.com/ciaranj/node-oauth/tarball/master";
+      name = "oauth-0.9.12.tgz";
+      sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "oauth" ];
+    peerDependencies = [];
   };
+  by-spec."oauth"."0.9.x" =
+    self.by-version."oauth"."0.9.12";
+  by-spec."oauth".">=0.8.4" =
+    self.by-version."oauth"."0.9.12";
+  by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
+    self.by-version."oauth"."0.9.12";
   by-spec."oauth-sign"."~0.2.0" =
     self.by-version."oauth-sign"."0.2.0";
-  by-version."oauth-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."oauth-sign"."0.2.0" = self.buildNodePackage {
     name = "oauth-sign-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
-        name = "oauth-sign-0.2.0.tgz";
-        sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."oauth-sign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
+      name = "oauth-sign-0.2.0.tgz";
+      sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "oauth-sign" ];
+    peerDependencies = [];
   };
   by-spec."oauth-sign"."~0.3.0" =
     self.by-version."oauth-sign"."0.3.0";
-  by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."oauth-sign"."0.3.0" = self.buildNodePackage {
     name = "oauth-sign-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
-        name = "oauth-sign-0.3.0.tgz";
-        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."oauth-sign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+      name = "oauth-sign-0.3.0.tgz";
+      sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "oauth-sign" ];
+    peerDependencies = [];
   };
   by-spec."oauth-sign"."~0.4.0" =
     self.by-version."oauth-sign"."0.4.0";
-  by-version."oauth-sign"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."oauth-sign"."0.4.0" = self.buildNodePackage {
     name = "oauth-sign-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
-        name = "oauth-sign-0.4.0.tgz";
-        sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."oauth-sign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
+      name = "oauth-sign-0.4.0.tgz";
+      sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "oauth-sign" ];
+    peerDependencies = [];
   };
   by-spec."oauth-sign"."~0.5.0" =
     self.by-version."oauth-sign"."0.5.0";
-  by-version."oauth-sign"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."oauth-sign"."0.5.0" = self.buildNodePackage {
     name = "oauth-sign-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
-        name = "oauth-sign-0.5.0.tgz";
-        sha1 = "d767f5169325620eab2e087ef0c472e773db6461";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."oauth-sign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
+      name = "oauth-sign-0.5.0.tgz";
+      sha1 = "d767f5169325620eab2e087ef0c472e773db6461";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "oauth-sign" ];
+    peerDependencies = [];
   };
   by-spec."object-additions"."^0.5.1" =
     self.by-version."object-additions"."0.5.1";
-  by-version."object-additions"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."object-additions"."0.5.1" = self.buildNodePackage {
     name = "object-additions-0.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
-        name = "object-additions-0.5.1.tgz";
-        sha1 = "ac624e0995e696c94cc69b41f316462b16a3bda4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."object-additions" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
+      name = "object-additions-0.5.1.tgz";
+      sha1 = "ac624e0995e696c94cc69b41f316462b16a3bda4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "object-additions" ];
+    peerDependencies = [];
   };
   by-spec."object-assign"."^0.3.0" =
     self.by-version."object-assign"."0.3.1";
-  by-version."object-assign"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."object-assign"."0.3.1" = self.buildNodePackage {
     name = "object-assign-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz";
-        name = "object-assign-0.3.1.tgz";
-        sha1 = "060e2a2a27d7c0d77ec77b78f11aa47fd88008d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."object-assign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz";
+      name = "object-assign-0.3.1.tgz";
+      sha1 = "060e2a2a27d7c0d77ec77b78f11aa47fd88008d2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "object-assign" ];
+    peerDependencies = [];
   };
   by-spec."object-assign"."^1.0.0" =
     self.by-version."object-assign"."1.0.0";
-  by-version."object-assign"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."object-assign"."1.0.0" = self.buildNodePackage {
     name = "object-assign-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
-        name = "object-assign-1.0.0.tgz";
-        sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."object-assign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
+      name = "object-assign-1.0.0.tgz";
+      sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "object-assign" ];
+    peerDependencies = [];
   };
   by-spec."object-assign"."^2.0.0" =
     self.by-version."object-assign"."2.0.0";
-  by-version."object-assign"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."object-assign"."2.0.0" = self.buildNodePackage {
     name = "object-assign-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz";
-        name = "object-assign-2.0.0.tgz";
-        sha1 = "f8309b09083b01261ece3ef7373f2b57b8dd7042";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."object-assign" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz";
+      name = "object-assign-2.0.0.tgz";
+      sha1 = "f8309b09083b01261ece3ef7373f2b57b8dd7042";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "object-assign" ];
+    peerDependencies = [];
+  };
+  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";
+    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 = {
+    };
+    peerDependencies = [];
   };
   by-spec."object-keys"."~0.4.0" =
     self.by-version."object-keys"."0.4.0";
-  by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."object-keys"."0.4.0" = self.buildNodePackage {
     name = "object-keys-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz";
-        name = "object-keys-0.4.0.tgz";
-        sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."object-keys" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz";
+      name = "object-keys-0.4.0.tgz";
+      sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "object-keys" ];
+    peerDependencies = [];
   };
   by-spec."on-finished"."2.1.0" =
     self.by-version."on-finished"."2.1.0";
-  by-version."on-finished"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."on-finished"."2.1.0" = self.buildNodePackage {
     name = "on-finished-2.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
-        name = "on-finished-2.1.0.tgz";
-        sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."on-finished" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
+      name = "on-finished-2.1.0.tgz";
+      sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
+    };
     deps = {
       "ee-first-1.0.5" = self.by-version."ee-first"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "on-finished" ];
+    peerDependencies = [];
   };
-  by-spec."on-finished"."~2.1.1" =
+  by-spec."on-finished"."~2.1.0" =
     self.by-version."on-finished"."2.1.1";
-  by-version."on-finished"."2.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."on-finished"."2.1.1" = self.buildNodePackage {
     name = "on-finished-2.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz";
-        name = "on-finished-2.1.1.tgz";
-        sha1 = "f82ca1c9e3a4f3286b1b9938610e5b8636bd3cb2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."on-finished" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz";
+      name = "on-finished-2.1.1.tgz";
+      sha1 = "f82ca1c9e3a4f3286b1b9938610e5b8636bd3cb2";
+    };
     deps = {
       "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "on-finished" ];
+    peerDependencies = [];
   };
+  by-spec."on-finished"."~2.1.1" =
+    self.by-version."on-finished"."2.1.1";
   by-spec."on-finished"."~2.2.0" =
     self.by-version."on-finished"."2.2.0";
-  by-version."on-finished"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."on-finished"."2.2.0" = self.buildNodePackage {
     name = "on-finished-2.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz";
-        name = "on-finished-2.2.0.tgz";
-        sha1 = "e6ba6a09a3482d6b7969bc3da92c86f0a967605e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."on-finished" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz";
+      name = "on-finished-2.2.0.tgz";
+      sha1 = "e6ba6a09a3482d6b7969bc3da92c86f0a967605e";
+    };
     deps = {
       "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "on-finished" ];
+    peerDependencies = [];
   };
   by-spec."on-headers"."~1.0.0" =
     self.by-version."on-headers"."1.0.0";
-  by-version."on-headers"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."on-headers"."1.0.0" = self.buildNodePackage {
     name = "on-headers-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz";
-        name = "on-headers-1.0.0.tgz";
-        sha1 = "2c75b5da4375513d0161c6052e7fcbe4953fca5d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."on-headers" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz";
+      name = "on-headers-1.0.0.tgz";
+      sha1 = "2c75b5da4375513d0161c6052e7fcbe4953fca5d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "on-headers" ];
+    peerDependencies = [];
   };
   by-spec."once"."1.1.1" =
     self.by-version."once"."1.1.1";
-  by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."once"."1.1.1" = self.buildNodePackage {
     name = "once-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
-        name = "once-1.1.1.tgz";
-        sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."once" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
+      name = "once-1.1.1.tgz";
+      sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "once" ];
+    peerDependencies = [];
+  };
+  by-spec."once"."1.3.0" =
+    self.by-version."once"."1.3.0";
+  by-version."once"."1.3.0" = self.buildNodePackage {
+    name = "once-1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz";
+      name = "once-1.3.0.tgz";
+      sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."once"."1.x" =
     self.by-version."once"."1.3.1";
-  by-version."once"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."once"."1.3.1" = self.buildNodePackage {
     name = "once-1.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz";
-        name = "once-1.3.1.tgz";
-        sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."once" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz";
+      name = "once-1.3.1.tgz";
+      sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f";
+    };
     deps = {
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "once" ];
+    peerDependencies = [];
   };
   by-spec."once"."^1.1.1" =
     self.by-version."once"."1.3.1";
@@ -21152,23 +20161,17 @@
     self.by-version."once"."1.1.1";
   by-spec."once"."~1.2.0" =
     self.by-version."once"."1.2.0";
-  by-version."once"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."once"."1.2.0" = self.buildNodePackage {
     name = "once-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/once/-/once-1.2.0.tgz";
-        name = "once-1.2.0.tgz";
-        sha1 = "de1905c636af874a8fba862d9aabddd1f920461c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."once" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/once/-/once-1.2.0.tgz";
+      name = "once-1.2.0.tgz";
+      sha1 = "de1905c636af874a8fba862d9aabddd1f920461c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "once" ];
+    peerDependencies = [];
   };
   by-spec."once"."~1.3.0" =
     self.by-version."once"."1.3.1";
@@ -21176,213 +20179,157 @@
     self.by-version."once"."1.3.1";
   by-spec."onetime"."^1.0.0" =
     self.by-version."onetime"."1.0.0";
-  by-version."onetime"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."onetime"."1.0.0" = self.buildNodePackage {
     name = "onetime-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz";
-        name = "onetime-1.0.0.tgz";
-        sha1 = "3a08a8e39d7816df52d34886374fb8ed8b651f62";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."onetime" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz";
+      name = "onetime-1.0.0.tgz";
+      sha1 = "3a08a8e39d7816df52d34886374fb8ed8b651f62";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "onetime" ];
+    peerDependencies = [];
   };
   by-spec."open"."0.0.2" =
     self.by-version."open"."0.0.2";
-  by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."open"."0.0.2" = self.buildNodePackage {
     name = "open-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz";
-        name = "open-0.0.2.tgz";
-        sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."open" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz";
+      name = "open-0.0.2.tgz";
+      sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "open" ];
+    peerDependencies = [];
   };
   by-spec."open"."0.0.5" =
     self.by-version."open"."0.0.5";
-  by-version."open"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."open"."0.0.5" = self.buildNodePackage {
     name = "open-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/open/-/open-0.0.5.tgz";
-        name = "open-0.0.5.tgz";
-        sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."open" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/open/-/open-0.0.5.tgz";
+      name = "open-0.0.5.tgz";
+      sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "open" ];
+    peerDependencies = [];
   };
+  by-spec."open"."0.0.x" =
+    self.by-version."open"."0.0.5";
+  by-spec."open".">= 0.0.3" =
+    self.by-version."open"."0.0.5";
   by-spec."open"."~0.0.5" =
     self.by-version."open"."0.0.5";
   by-spec."opener"."^1.3.0" =
     self.by-version."opener"."1.4.0";
-  by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."opener"."1.4.0" = self.buildNodePackage {
     name = "opener-1.4.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz";
-        name = "opener-1.4.0.tgz";
-        sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."opener" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz";
+      name = "opener-1.4.0.tgz";
+      sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "opener" ];
+    peerDependencies = [];
   };
   by-spec."opener"."~1.3.0" =
     self.by-version."opener"."1.3.0";
-  by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."opener"."1.3.0" = self.buildNodePackage {
     name = "opener-1.3.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz";
-        name = "opener-1.3.0.tgz";
-        sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."opener" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz";
+      name = "opener-1.3.0.tgz";
+      sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "opener" ];
+    peerDependencies = [];
   };
   by-spec."opener"."~1.4.0" =
     self.by-version."opener"."1.4.0";
   by-spec."openid".">=0.2.0" =
     self.by-version."openid"."0.5.9";
-  by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."openid"."0.5.9" = self.buildNodePackage {
     name = "openid-0.5.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz";
-        name = "openid-0.5.9.tgz";
-        sha1 = "f44dd2609764c458c65fb22c03db068579e4bfa8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."openid" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz";
+      name = "openid-0.5.9.tgz";
+      sha1 = "f44dd2609764c458c65fb22c03db068579e4bfa8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "openid" ];
+    peerDependencies = [];
   };
   by-spec."opn"."~1.0.0" =
     self.by-version."opn"."1.0.1";
-  by-version."opn"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."opn"."1.0.1" = self.buildNodePackage {
     name = "opn-1.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/opn/-/opn-1.0.1.tgz";
-        name = "opn-1.0.1.tgz";
-        sha1 = "c2dce2a5c41ab9589a7486aaff4d8de002d041ca";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."opn" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/opn/-/opn-1.0.1.tgz";
+      name = "opn-1.0.1.tgz";
+      sha1 = "c2dce2a5c41ab9589a7486aaff4d8de002d041ca";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "opn" ];
+    peerDependencies = [];
   };
   by-spec."optimist"."*" =
     self.by-version."optimist"."0.6.1";
-  by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."optimist"."0.6.1" = self.buildNodePackage {
     name = "optimist-0.6.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
-        name = "optimist-0.6.1.tgz";
-        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optimist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+      name = "optimist-0.6.1.tgz";
+      sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+    };
     deps = {
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "optimist" ];
+    peerDependencies = [];
   };
   "optimist" = self.by-version."optimist"."0.6.1";
   by-spec."optimist"."0.2" =
     self.by-version."optimist"."0.2.8";
-  by-version."optimist"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."optimist"."0.2.8" = self.buildNodePackage {
     name = "optimist-0.2.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
-        name = "optimist-0.2.8.tgz";
-        sha1 = "e981ab7e268b457948593b55674c099a815cac31";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optimist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
+      name = "optimist-0.2.8.tgz";
+      sha1 = "e981ab7e268b457948593b55674c099a815cac31";
+    };
     deps = {
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "optimist" ];
+    peerDependencies = [];
   };
   by-spec."optimist"."0.6.0" =
     self.by-version."optimist"."0.6.0";
-  by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."optimist"."0.6.0" = self.buildNodePackage {
     name = "optimist-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
-        name = "optimist-0.6.0.tgz";
-        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optimist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+      name = "optimist-0.6.0.tgz";
+      sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+    };
     deps = {
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "optimist" ];
+    peerDependencies = [];
   };
   by-spec."optimist"."0.6.x" =
     self.by-version."optimist"."0.6.1";
@@ -21390,25 +20337,21 @@
     self.by-version."optimist"."0.6.1";
   by-spec."optimist"."~0.3" =
     self.by-version."optimist"."0.3.7";
-  by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."optimist"."0.3.7" = self.buildNodePackage {
     name = "optimist-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optimist" or []);
+    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.2" = self.by-version."wordwrap"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "optimist" ];
+    peerDependencies = [];
   };
+  by-spec."optimist"."~0.3.4" =
+    self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.3.5" =
     self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.6.0" =
@@ -21417,18 +20360,14 @@
     self.by-version."optimist"."0.6.1";
   by-spec."optionator"."^0.5.0" =
     self.by-version."optionator"."0.5.0";
-  by-version."optionator"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."optionator"."0.5.0" = self.buildNodePackage {
     name = "optionator-0.5.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz";
-        name = "optionator-0.5.0.tgz";
-        sha1 = "b75a8995a2d417df25b6e4e3862f50aa88651368";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optionator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz";
+      name = "optionator-0.5.0.tgz";
+      sha1 = "b75a8995a2d417df25b6e4e3862f50aa88651368";
+    };
     deps = {
       "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1";
       "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
@@ -21437,197 +20376,156 @@
       "levn-0.2.5" = self.by-version."levn"."0.2.5";
       "fast-levenshtein-1.0.6" = self.by-version."fast-levenshtein"."1.0.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "optionator" ];
+    peerDependencies = [];
   };
   by-spec."options".">=0.0.5" =
     self.by-version."options"."0.0.6";
-  by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."options"."0.0.6" = self.buildNodePackage {
     name = "options-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."options" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
+      name = "options-0.0.6.tgz";
+      sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "options" ];
+    peerDependencies = [];
   };
   by-spec."optjs"."*" =
     self.by-version."optjs"."3.2.1-boom";
-  by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage {
+  by-version."optjs"."3.2.1-boom" = self.buildNodePackage {
     name = "optjs-3.2.1-boom";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
-        name = "optjs-3.2.1-boom.tgz";
-        sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optjs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
+      name = "optjs-3.2.1-boom.tgz";
+      sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "optjs" ];
+    peerDependencies = [];
   };
   by-spec."optparse"."*" =
     self.by-version."optparse"."1.0.5";
-  by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."optparse"."1.0.5" = self.buildNodePackage {
     name = "optparse-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
-        name = "optparse-1.0.5.tgz";
-        sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optparse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
+      name = "optparse-1.0.5.tgz";
+      sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "optparse" ];
+    peerDependencies = [];
   };
   "optparse" = self.by-version."optparse"."1.0.5";
   by-spec."optparse".">= 1.0.3" =
     self.by-version."optparse"."1.0.5";
+  by-spec."opts"."^1.2.1" =
+    self.by-version."opts"."1.2.2";
+  by-version."opts"."1.2.2" = self.buildNodePackage {
+    name = "opts-1.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/opts/-/opts-1.2.2.tgz";
+      name = "opts-1.2.2.tgz";
+      sha1 = "81782b93014a1cd88d56c226643fd4282473853d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."orchestrator"."^0.3.0" =
     self.by-version."orchestrator"."0.3.7";
-  by-version."orchestrator"."0.3.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."orchestrator"."0.3.7" = self.buildNodePackage {
     name = "orchestrator-0.3.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
-        name = "orchestrator-0.3.7.tgz";
-        sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."orchestrator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
+      name = "orchestrator-0.3.7.tgz";
+      sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df";
+    };
     deps = {
       "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
       "sequencify-0.0.7" = self.by-version."sequencify"."0.0.7";
       "stream-consume-0.1.0" = self.by-version."stream-consume"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "orchestrator" ];
+    peerDependencies = [];
   };
   by-spec."ordered-read-streams"."^0.1.0" =
     self.by-version."ordered-read-streams"."0.1.0";
-  by-version."ordered-read-streams"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ordered-read-streams"."0.1.0" = self.buildNodePackage {
     name = "ordered-read-streams-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz";
-        name = "ordered-read-streams-0.1.0.tgz";
-        sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ordered-read-streams" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz";
+      name = "ordered-read-streams-0.1.0.tgz";
+      sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ordered-read-streams" ];
+    peerDependencies = [];
   };
   by-spec."os-browserify"."~0.1.1" =
     self.by-version."os-browserify"."0.1.2";
-  by-version."os-browserify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."os-browserify"."0.1.2" = self.buildNodePackage {
     name = "os-browserify-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
-        name = "os-browserify-0.1.2.tgz";
-        sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."os-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
+      name = "os-browserify-0.1.2.tgz";
+      sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "os-browserify" ];
+    peerDependencies = [];
   };
   by-spec."os-name"."^1.0.0" =
-    self.by-version."os-name"."1.0.1";
-  by-version."os-name"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "os-name-1.0.1";
+    self.by-version."os-name"."1.0.2";
+  by-version."os-name"."1.0.2" = self.buildNodePackage {
+    name = "os-name-1.0.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/os-name/-/os-name-1.0.1.tgz";
-        name = "os-name-1.0.1.tgz";
-        sha1 = "5d78a4a0d6bc96f7fce8e060fef19525422dcc8f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."os-name" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/os-name/-/os-name-1.0.2.tgz";
+      name = "os-name-1.0.2.tgz";
+      sha1 = "cd17bf43e927d0f889ae93dbc5e9930baf918277";
+    };
     deps = {
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
       "osx-release-1.0.0" = self.by-version."osx-release"."1.0.0";
+      "win-release-1.0.0" = self.by-version."win-release"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "os-name" ];
+    peerDependencies = [];
   };
   by-spec."osenv"."0" =
     self.by-version."osenv"."0.1.0";
-  by-version."osenv"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."osenv"."0.1.0" = self.buildNodePackage {
     name = "osenv-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz";
-        name = "osenv-0.1.0.tgz";
-        sha1 = "61668121eec584955030b9f470b1d2309504bfcb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."osenv" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz";
+      name = "osenv-0.1.0.tgz";
+      sha1 = "61668121eec584955030b9f470b1d2309504bfcb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "osenv" ];
+    peerDependencies = [];
   };
   by-spec."osenv"."0.0.3" =
     self.by-version."osenv"."0.0.3";
-  by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."osenv"."0.0.3" = self.buildNodePackage {
     name = "osenv-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
-        name = "osenv-0.0.3.tgz";
-        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."osenv" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+      name = "osenv-0.0.3.tgz";
+      sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "osenv" ];
+    peerDependencies = [];
   };
   by-spec."osenv"."0.1.0" =
     self.by-version."osenv"."0.1.0";
@@ -21637,623 +20535,931 @@
     self.by-version."osenv"."0.1.0";
   by-spec."osx-release"."^1.0.0" =
     self.by-version."osx-release"."1.0.0";
-  by-version."osx-release"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."osx-release"."1.0.0" = self.buildNodePackage {
     name = "osx-release-1.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/osx-release/-/osx-release-1.0.0.tgz";
-        name = "osx-release-1.0.0.tgz";
-        sha1 = "02bee80f3b898aaa88922d2f86e178605974beac";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."osx-release" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/osx-release/-/osx-release-1.0.0.tgz";
+      name = "osx-release-1.0.0.tgz";
+      sha1 = "02bee80f3b898aaa88922d2f86e178605974beac";
+    };
     deps = {
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "osx-release" ];
+    peerDependencies = [];
   };
   by-spec."owl-deepcopy"."*" =
     self.by-version."owl-deepcopy"."0.0.4";
-  by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."owl-deepcopy"."0.0.4" = self.buildNodePackage {
     name = "owl-deepcopy-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz";
-        name = "owl-deepcopy-0.0.4.tgz";
-        sha1 = "665f3aeafab74302d98ecaeeb7b3e764ae21f369";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."owl-deepcopy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz";
+      name = "owl-deepcopy-0.0.4.tgz";
+      sha1 = "665f3aeafab74302d98ecaeeb7b3e764ae21f369";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "owl-deepcopy" ];
+    peerDependencies = [];
   };
   "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4";
   by-spec."owl-deepcopy"."~0.0.1" =
     self.by-version."owl-deepcopy"."0.0.4";
   by-spec."p-throttler"."0.1.0" =
     self.by-version."p-throttler"."0.1.0";
-  by-version."p-throttler"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."p-throttler"."0.1.0" = self.buildNodePackage {
     name = "p-throttler-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz";
-        name = "p-throttler-0.1.0.tgz";
-        sha1 = "1b16907942c333e6f1ddeabcb3479204b8c417c4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."p-throttler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz";
+      name = "p-throttler-0.1.0.tgz";
+      sha1 = "1b16907942c333e6f1ddeabcb3479204b8c417c4";
+    };
     deps = {
       "q-0.9.7" = self.by-version."q"."0.9.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "p-throttler" ];
+    peerDependencies = [];
+  };
+  by-spec."pac-proxy-agent"."0" =
+    self.by-version."pac-proxy-agent"."0.2.0";
+  by-version."pac-proxy-agent"."0.2.0" = self.buildNodePackage {
+    name = "pac-proxy-agent-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-0.2.0.tgz";
+      name = "pac-proxy-agent-0.2.0.tgz";
+      sha1 = "ad902909d92f4fe7cc2e5f59f5bf5061bcfa71b2";
+    };
+    deps = {
+      "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
+      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "pac-resolver-1.2.4" = self.by-version."pac-resolver"."1.2.4";
+      "proxy-agent-1.1.0" = self.by-version."proxy-agent"."1.1.0";
+      "get-uri-0.1.3" = self.by-version."get-uri"."0.1.3";
+      "stream-to-array-1.0.0" = self.by-version."stream-to-array"."1.0.0";
+      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."pac-resolver"."~1.2.1" =
+    self.by-version."pac-resolver"."1.2.4";
+  by-version."pac-resolver"."1.2.4" = self.buildNodePackage {
+    name = "pac-resolver-1.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pac-resolver/-/pac-resolver-1.2.4.tgz";
+      name = "pac-resolver-1.2.4.tgz";
+      sha1 = "c6948acc57a1e78c8104ccdc8a4c89de90189008";
+    };
+    deps = {
+      "co-3.0.6" = self.by-version."co"."3.0.6";
+      "netmask-1.0.5" = self.by-version."netmask"."1.0.5";
+      "degenerator-1.0.0" = self.by-version."degenerator"."1.0.0";
+      "regenerator-0.4.12" = self.by-version."regenerator"."0.4.12";
+      "thunkify-2.1.2" = self.by-version."thunkify"."2.1.2";
+    };
+    peerDependencies = [];
   };
   by-spec."package-json"."^0.2.0" =
     self.by-version."package-json"."0.2.0";
-  by-version."package-json"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."package-json"."0.2.0" = self.buildNodePackage {
     name = "package-json-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz";
-        name = "package-json-0.2.0.tgz";
-        sha1 = "0316e177b8eb149985d34f706b4a5543b274bec5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."package-json" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz";
+      name = "package-json-0.2.0.tgz";
+      sha1 = "0316e177b8eb149985d34f706b4a5543b274bec5";
+    };
     deps = {
       "got-0.3.0" = self.by-version."got"."0.3.0";
       "registry-url-0.1.1" = self.by-version."registry-url"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "package-json" ];
+    peerDependencies = [];
   };
   by-spec."package-json"."^1.0.0" =
     self.by-version."package-json"."1.0.1";
-  by-version."package-json"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."package-json"."1.0.1" = self.buildNodePackage {
     name = "package-json-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/package-json/-/package-json-1.0.1.tgz";
-        name = "package-json-1.0.1.tgz";
-        sha1 = "89cc831317c4d17922413d5318b23c904e5cf43e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."package-json" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/package-json/-/package-json-1.0.1.tgz";
+      name = "package-json-1.0.1.tgz";
+      sha1 = "89cc831317c4d17922413d5318b23c904e5cf43e";
+    };
     deps = {
       "got-1.2.2" = self.by-version."got"."1.2.2";
-      "registry-url-2.0.0" = self.by-version."registry-url"."2.0.0";
+      "registry-url-2.1.0" = self.by-version."registry-url"."2.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "package-json" ];
+    peerDependencies = [];
   };
   by-spec."pad"."0.0.5" =
     self.by-version."pad"."0.0.5";
-  by-version."pad"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."pad"."0.0.5" = self.buildNodePackage {
     name = "pad-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pad/-/pad-0.0.5.tgz";
-        name = "pad-0.0.5.tgz";
-        sha1 = "2219ab4db2ac74549a676164bc475d68cb87de05";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pad" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pad/-/pad-0.0.5.tgz";
+      name = "pad-0.0.5.tgz";
+      sha1 = "2219ab4db2ac74549a676164bc475d68cb87de05";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pad" ];
+    peerDependencies = [];
   };
   by-spec."pako"."~0.2.0" =
     self.by-version."pako"."0.2.5";
-  by-version."pako"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."pako"."0.2.5" = self.buildNodePackage {
     name = "pako-0.2.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pako/-/pako-0.2.5.tgz";
-        name = "pako-0.2.5.tgz";
-        sha1 = "36df19467a3879152e9adcc44784f07d0a80c525";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pako" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pako/-/pako-0.2.5.tgz";
+      name = "pako-0.2.5.tgz";
+      sha1 = "36df19467a3879152e9adcc44784f07d0a80c525";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pako" ];
+    peerDependencies = [];
   };
   by-spec."parents"."0.0.2" =
     self.by-version."parents"."0.0.2";
-  by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."parents"."0.0.2" = self.buildNodePackage {
     name = "parents-0.0.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz";
-        name = "parents-0.0.2.tgz";
-        sha1 = "67147826e497d40759aaf5ba4c99659b6034d302";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."parents" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz";
+      name = "parents-0.0.2.tgz";
+      sha1 = "67147826e497d40759aaf5ba4c99659b6034d302";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "parents" ];
+    peerDependencies = [];
   };
   by-spec."parents"."^1.0.0" =
-    self.by-version."parents"."1.0.0";
-  by-version."parents"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "parents-1.0.0";
+    self.by-version."parents"."1.0.1";
+  by-version."parents"."1.0.1" = self.buildNodePackage {
+    name = "parents-1.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/parents/-/parents-1.0.0.tgz";
-        name = "parents-1.0.0.tgz";
-        sha1 = "05726fdb61b60d8c9e3d5d9c595aa78c881c8479";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."parents" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parents/-/parents-1.0.1.tgz";
+      name = "parents-1.0.1.tgz";
+      sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
+    };
     deps = {
-      "path-platform-0.0.1" = self.by-version."path-platform"."0.0.1";
+      "path-platform-0.11.15" = self.by-version."path-platform"."0.11.15";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "parents" ];
+    peerDependencies = [];
   };
+  by-spec."parents"."^1.0.1" =
+    self.by-version."parents"."1.0.1";
   by-spec."parents"."~0.0.1" =
     self.by-version."parents"."0.0.3";
-  by-version."parents"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."parents"."0.0.3" = self.buildNodePackage {
     name = "parents-0.0.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/parents/-/parents-0.0.3.tgz";
-        name = "parents-0.0.3.tgz";
-        sha1 = "fa212f024d9fa6318dbb6b4ce676c8be493b9c43";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."parents" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parents/-/parents-0.0.3.tgz";
+      name = "parents-0.0.3.tgz";
+      sha1 = "fa212f024d9fa6318dbb6b4ce676c8be493b9c43";
+    };
     deps = {
       "path-platform-0.0.1" = self.by-version."path-platform"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "parents" ];
+    peerDependencies = [];
   };
   by-spec."parse-asn1"."^2.0.0" =
     self.by-version."parse-asn1"."2.0.0";
-  by-version."parse-asn1"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."parse-asn1"."2.0.0" = self.buildNodePackage {
     name = "parse-asn1-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-2.0.0.tgz";
-        name = "parse-asn1-2.0.0.tgz";
-        sha1 = "c8cbc588abc91ade087c02ecbdfd7b66d9a8405f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."parse-asn1" or []);
-    deps = {
-      "asn1.js-1.0.0" = self.by-version."asn1.js"."1.0.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-2.0.0.tgz";
+      name = "parse-asn1-2.0.0.tgz";
+      sha1 = "c8cbc588abc91ade087c02ecbdfd7b66d9a8405f";
+    };
+    deps = {
+      "asn1.js-1.0.2" = self.by-version."asn1.js"."1.0.2";
       "asn1.js-rfc3280-1.0.0" = self.by-version."asn1.js-rfc3280"."1.0.0";
       "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "parse-asn1" ];
+    peerDependencies = [];
   };
   by-spec."parse-torrent"."^1.4.0" =
     self.by-version."parse-torrent"."1.7.0";
-  by-version."parse-torrent"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."parse-torrent"."1.7.0" = self.buildNodePackage {
     name = "parse-torrent-1.7.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.7.0.tgz";
-        name = "parse-torrent-1.7.0.tgz";
-        sha1 = "f64d09d2efa05f7a9e89378d041a63d9ca1e47d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."parse-torrent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.7.0.tgz";
+      name = "parse-torrent-1.7.0.tgz";
+      sha1 = "f64d09d2efa05f7a9e89378d041a63d9ca1e47d2";
+    };
     deps = {
       "bencode-0.6.0" = self.by-version."bencode"."0.6.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "parse-torrent" ];
+    peerDependencies = [];
   };
   by-spec."parse-torrent"."~1.0.0" =
     self.by-version."parse-torrent"."1.0.0";
-  by-version."parse-torrent"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."parse-torrent"."1.0.0" = self.buildNodePackage {
     name = "parse-torrent-1.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.0.0.tgz";
-        name = "parse-torrent-1.0.0.tgz";
-        sha1 = "5a47a038c5db161b7b67b0534636194e1c8907a2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."parse-torrent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.0.0.tgz";
+      name = "parse-torrent-1.0.0.tgz";
+      sha1 = "5a47a038c5db161b7b67b0534636194e1c8907a2";
+    };
     deps = {
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
       "rusha-browserify-0.7.3" = self.by-version."rusha-browserify"."0.7.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "parse-torrent" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
   };
   by-spec."parseurl"."1.0.1" =
     self.by-version."parseurl"."1.0.1";
-  by-version."parseurl"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."parseurl"."1.0.1" = self.buildNodePackage {
     name = "parseurl-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz";
-        name = "parseurl-1.0.1.tgz";
-        sha1 = "2e57dce6efdd37c3518701030944c22bf388b7b4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."parseurl" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz";
+      name = "parseurl-1.0.1.tgz";
+      sha1 = "2e57dce6efdd37c3518701030944c22bf388b7b4";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."parseurl"."~1.1.3" =
+    self.by-version."parseurl"."1.1.3";
+  by-version."parseurl"."1.1.3" = self.buildNodePackage {
+    name = "parseurl-1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.1.3.tgz";
+      name = "parseurl-1.1.3.tgz";
+      sha1 = "1f005738ac71b417bc2d0845cbdfa2a8b63ea639";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "parseurl" ];
+    peerDependencies = [];
   };
   by-spec."parseurl"."~1.3.0" =
     self.by-version."parseurl"."1.3.0";
-  by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."parseurl"."1.3.0" = self.buildNodePackage {
     name = "parseurl-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."parseurl" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
+      name = "parseurl-1.3.0.tgz";
+      sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "parseurl" ];
+    peerDependencies = [];
+  };
+  by-spec."parsoid"."*" =
+    self.by-version."parsoid"."0.2.0";
+  by-version."parsoid"."0.2.0" = self.buildNodePackage {
+    name = "parsoid-0.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parsoid/-/parsoid-0.2.0.tgz";
+      name = "parsoid-0.2.0.tgz";
+      sha1 = "6b32e8246d1e477d00fcf3b25b79fbd9b1223069";
+    };
+    deps = {
+      "alea-0.0.9" = self.by-version."alea"."0.0.9";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "bunyan-1.0.1" = self.by-version."bunyan"."1.0.1";
+      "diff-1.0.8" = self.by-version."diff"."1.0.8";
+      "domino-1.0.18" = self.by-version."domino"."1.0.18";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+      "es6-shim-0.16.0" = self.by-version."es6-shim"."0.16.0";
+      "express-2.5.11" = self.by-version."express"."2.5.11";
+      "gelf-stream-0.2.4" = self.by-version."gelf-stream"."0.2.4";
+      "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
+      "html5-1.0.5" = self.by-version."html5"."1.0.5";
+      "html5-entities-1.0.0" = self.by-version."html5-entities"."1.0.0";
+      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "pegjs-0.8.0" = self.by-version."pegjs"."0.8.0";
+      "prfun-1.0.2" = self.by-version."prfun"."1.0.2";
+      "request-2.40.0" = self.by-version."request"."2.40.0";
+      "simplediff-0.1.1" = self.by-version."simplediff"."0.1.1";
+      "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
+    };
+    peerDependencies = [];
   };
+  "parsoid" = self.by-version."parsoid"."0.2.0";
   by-spec."passport"."*" =
     self.by-version."passport"."0.2.1";
-  by-version."passport"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."passport"."0.2.1" = self.buildNodePackage {
     name = "passport-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/passport/-/passport-0.2.1.tgz";
-        name = "passport-0.2.1.tgz";
-        sha1 = "a7d34c07b30fb605be885edbc8c93e5142e38574";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."passport" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport/-/passport-0.2.1.tgz";
+      name = "passport-0.2.1.tgz";
+      sha1 = "a7d34c07b30fb605be885edbc8c93e5142e38574";
+    };
     deps = {
       "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "passport" ];
+    peerDependencies = [];
   };
   "passport" = self.by-version."passport"."0.2.1";
-  by-spec."passport"."~0.1.3" =
+  by-spec."passport".">=0.1.15" =
+    self.by-version."passport"."0.2.1";
+  by-spec."passport"."~0.1.1" =
     self.by-version."passport"."0.1.18";
-  by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage {
+  by-version."passport"."0.1.18" = self.buildNodePackage {
     name = "passport-0.1.18";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
-        name = "passport-0.1.18.tgz";
-        sha1 = "c8264479dcb6414cadbb66752d12b37e0b6525a1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."passport" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
+      name = "passport-0.1.18.tgz";
+      sha1 = "c8264479dcb6414cadbb66752d12b37e0b6525a1";
+    };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "passport" ];
+    peerDependencies = [];
   };
+  by-spec."passport"."~0.1.3" =
+    self.by-version."passport"."0.1.18";
   by-spec."passport"."~0.2.1" =
     self.by-version."passport"."0.2.1";
+  by-spec."passport-bitly"."git://github.com/simov/passport-bitly.git" =
+    self.by-version."passport-bitly"."0.1.0";
+  by-version."passport-bitly"."0.1.0" = self.buildNodePackage {
+    name = "passport-bitly-0.1.0";
+    bin = false;
+    src = fetchgit {
+      url = "git://github.com/simov/passport-bitly.git";
+      rev = "838ce018873eb4b8bb23331216c78e2822c6493f";
+      sha256 = "7cb69e2ca9ef5cf47fecf0d669f15c0366174183ec0c7623ad5a619365c36e8a";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-dropbox".">=0.1.2" =
+    self.by-version."passport-dropbox"."0.1.2";
+  by-version."passport-dropbox"."0.1.2" = self.buildNodePackage {
+    name = "passport-dropbox-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-dropbox/-/passport-dropbox-0.1.2.tgz";
+      name = "passport-dropbox-0.1.2.tgz";
+      sha1 = "19149539d88895ce4627e166ddc8009239f58010";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-evernote"."^0.1.1" =
+    self.by-version."passport-evernote"."0.1.1";
+  by-version."passport-evernote"."0.1.1" = self.buildNodePackage {
+    name = "passport-evernote-0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-evernote/-/passport-evernote-0.1.1.tgz";
+      name = "passport-evernote-0.1.1.tgz";
+      sha1 = "10e097affa7e7520358d9ea26f34f1cce176adc2";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-facebook".">=0.1.5" =
+    self.by-version."passport-facebook"."1.0.3";
+  by-version."passport-facebook"."1.0.3" = self.buildNodePackage {
+    name = "passport-facebook-1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-facebook/-/passport-facebook-1.0.3.tgz";
+      name = "passport-facebook-1.0.3.tgz";
+      sha1 = "82a95aab0017ab190b815ab1e64ab75482eacdc7";
+    };
+    deps = {
+      "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-flickr".">=0.1.1" =
+    self.by-version."passport-flickr"."0.2.0";
+  by-version."passport-flickr"."0.2.0" = self.buildNodePackage {
+    name = "passport-flickr-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-flickr/-/passport-flickr-0.2.0.tgz";
+      name = "passport-flickr-0.2.0.tgz";
+      sha1 = "9f3a77eac4b48a9e2109df12e544114b42960c5c";
+    };
+    deps = {
+      "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-github".">=0.1.5" =
+    self.by-version."passport-github"."0.1.5";
+  by-version."passport-github"."0.1.5" = self.buildNodePackage {
+    name = "passport-github-0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-github/-/passport-github-0.1.5.tgz";
+      name = "passport-github-0.1.5.tgz";
+      sha1 = "258ebb75af40cdc4e3af11be3a138b75c1f865c1";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-google-oauth"."*" =
+    self.by-version."passport-google-oauth"."0.1.5";
+  by-version."passport-google-oauth"."0.1.5" = self.buildNodePackage {
+    name = "passport-google-oauth-0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-0.1.5.tgz";
+      name = "passport-google-oauth-0.1.5.tgz";
+      sha1 = "fd6b48cf9b20283721c7636e91d094c16a8671d7";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-google-oauth".">=0.1.5" =
+    self.by-version."passport-google-oauth"."0.1.5";
   by-spec."passport-http"."*" =
     self.by-version."passport-http"."0.2.2";
-  by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."passport-http"."0.2.2" = self.buildNodePackage {
     name = "passport-http-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz";
-        name = "passport-http-0.2.2.tgz";
-        sha1 = "2501314c0ff4a831e8a51ccfdb1b68f5c7cbc9f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."passport-http" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz";
+      name = "passport-http-0.2.2.tgz";
+      sha1 = "2501314c0ff4a831e8a51ccfdb1b68f5c7cbc9f6";
+    };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-0.1.18" = self.by-version."passport"."0.1.18";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "passport-http" ];
+    peerDependencies = [];
   };
   "passport-http" = self.by-version."passport-http"."0.2.2";
+  by-spec."passport-imgur".">=0.0.1" =
+    self.by-version."passport-imgur"."0.0.2";
+  by-version."passport-imgur"."0.0.2" = self.buildNodePackage {
+    name = "passport-imgur-0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-imgur/-/passport-imgur-0.0.2.tgz";
+      name = "passport-imgur-0.0.2.tgz";
+      sha1 = "81d1d7049f3f83b71d04f4eb08627659b07e58b0";
+    };
+    deps = {
+      "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-instagram".">=0.1.2" =
+    self.by-version."passport-instagram"."0.1.2";
+  by-version."passport-instagram"."0.1.2" = self.buildNodePackage {
+    name = "passport-instagram-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-instagram/-/passport-instagram-0.1.2.tgz";
+      name = "passport-instagram-0.1.2.tgz";
+      sha1 = "a1c84525330eed8a05d3ecfec3bf56caa895cfd6";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+    };
+    peerDependencies = [];
+  };
   by-spec."passport-local"."*" =
     self.by-version."passport-local"."1.0.0";
-  by-version."passport-local"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."passport-local"."1.0.0" = self.buildNodePackage {
     name = "passport-local-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
-        name = "passport-local-1.0.0.tgz";
-        sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."passport-local" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
+      name = "passport-local-1.0.0.tgz";
+      sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
+    };
     deps = {
       "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "passport-local" ];
+    peerDependencies = [];
   };
   "passport-local" = self.by-version."passport-local"."1.0.0";
   by-spec."passport-local"."~1.0.0" =
     self.by-version."passport-local"."1.0.0";
+  by-spec."passport-mailchimp".">=0.0.1" =
+    self.by-version."passport-mailchimp"."0.0.1";
+  by-version."passport-mailchimp"."0.0.1" = self.buildNodePackage {
+    name = "passport-mailchimp-0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-mailchimp/-/passport-mailchimp-0.0.1.tgz";
+      name = "passport-mailchimp-0.0.1.tgz";
+      sha1 = "24f78c6926d2fa684ee7aa51cfb1b2b11f3fe4ac";
+    };
+    deps = {
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-mixcloud".">=0.0.1" =
+    self.by-version."passport-mixcloud"."0.0.2";
+  by-version."passport-mixcloud"."0.0.2" = self.buildNodePackage {
+    name = "passport-mixcloud-0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-mixcloud/-/passport-mixcloud-0.0.2.tgz";
+      name = "passport-mixcloud-0.0.2.tgz";
+      sha1 = "b216bcb0cbc605ec5dac87e65387d456768346c1";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+      "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-oauth"."0.1.x" =
+    self.by-version."passport-oauth"."0.1.15";
+  by-version."passport-oauth"."0.1.15" = self.buildNodePackage {
+    name = "passport-oauth-0.1.15";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-oauth/-/passport-oauth-0.1.15.tgz";
+      name = "passport-oauth-0.1.15.tgz";
+      sha1 = "fb74e0afe84614bfa256c5fc716cc56bbfc8cec0";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-0.1.18" = self.by-version."passport"."0.1.18";
+      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-oauth".">= 0.1.0" =
+    self.by-version."passport-oauth"."1.0.0";
+  by-version."passport-oauth"."1.0.0" = self.buildNodePackage {
+    name = "passport-oauth-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-oauth/-/passport-oauth-1.0.0.tgz";
+      name = "passport-oauth-1.0.0.tgz";
+      sha1 = "90aff63387540f02089af28cdad39ea7f80d77df";
+    };
+    deps = {
+      "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1";
+      "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-oauth"."~0.1.1" =
+    self.by-version."passport-oauth"."0.1.15";
+  by-spec."passport-oauth"."~0.1.15" =
+    self.by-version."passport-oauth"."0.1.15";
+  by-spec."passport-oauth"."~0.1.4" =
+    self.by-version."passport-oauth"."0.1.15";
+  by-spec."passport-oauth1"."1.x.x" =
+    self.by-version."passport-oauth1"."1.0.1";
+  by-version."passport-oauth1"."1.0.1" = self.buildNodePackage {
+    name = "passport-oauth1-1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.0.1.tgz";
+      name = "passport-oauth1-1.0.1.tgz";
+      sha1 = "41ade140b881392b144cbdd426095c035a91ad9c";
+    };
+    deps = {
+      "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
+      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-oauth2"."1.x.x" =
+    self.by-version."passport-oauth2"."1.1.2";
+  by-version."passport-oauth2"."1.1.2" = self.buildNodePackage {
+    name = "passport-oauth2-1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.1.2.tgz";
+      name = "passport-oauth2-1.1.2.tgz";
+      sha1 = "bd7163b1b6090371868dc4ef6f9f2e1e4cc4b948";
+    };
+    deps = {
+      "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
+      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-soundcloud".">=0.1.2" =
+    self.by-version."passport-soundcloud"."0.1.2";
+  by-version."passport-soundcloud"."0.1.2" = self.buildNodePackage {
+    name = "passport-soundcloud-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-soundcloud/-/passport-soundcloud-0.1.2.tgz";
+      name = "passport-soundcloud-0.1.2.tgz";
+      sha1 = "4ecf4b42b3e7d9641b78b9181aae6b75127beb21";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+    };
+    peerDependencies = [];
+  };
   by-spec."passport-strategy"."1.x.x" =
     self.by-version."passport-strategy"."1.0.0";
-  by-version."passport-strategy"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."passport-strategy"."1.0.0" = self.buildNodePackage {
     name = "passport-strategy-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
-        name = "passport-strategy-1.0.0.tgz";
-        sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."passport-strategy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
+      name = "passport-strategy-1.0.0.tgz";
+      sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-trello"."~0.1.4" =
+    self.by-version."passport-trello"."0.1.4";
+  by-version."passport-trello"."0.1.4" = self.buildNodePackage {
+    name = "passport-trello-0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-trello/-/passport-trello-0.1.4.tgz";
+      name = "passport-trello-0.1.4.tgz";
+      sha1 = "c0aeeaa4dd598f99e129cb83b97950f672519442";
+    };
     deps = {
+      "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "passport-strategy" ];
+    peerDependencies = [];
+  };
+  by-spec."passport-twitter".">=0.1.4" =
+    self.by-version."passport-twitter"."1.0.2";
+  by-version."passport-twitter"."1.0.2" = self.buildNodePackage {
+    name = "passport-twitter-1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.2.tgz";
+      name = "passport-twitter-1.0.2.tgz";
+      sha1 = "6bfe5f9ec259dc363991b0be3cee94bfe4853d2b";
+    };
+    deps = {
+      "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1";
+      "xtraverse-0.1.0" = self.by-version."xtraverse"."0.1.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."passport-wordpress".">=0.0.1" =
+    self.by-version."passport-wordpress"."0.0.3";
+  by-version."passport-wordpress"."0.0.3" = self.buildNodePackage {
+    name = "passport-wordpress-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/passport-wordpress/-/passport-wordpress-0.0.3.tgz";
+      name = "passport-wordpress-0.0.3.tgz";
+      sha1 = "fa3b144c7c5a4c967a5f5f383139d515a95a7988";
+    };
+    deps = {
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+    };
+    peerDependencies = [];
   };
   by-spec."path-browserify"."~0.0.0" =
     self.by-version."path-browserify"."0.0.0";
-  by-version."path-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."path-browserify"."0.0.0" = self.buildNodePackage {
     name = "path-browserify-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
-        name = "path-browserify-0.0.0.tgz";
-        sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."path-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
+      name = "path-browserify-0.0.0.tgz";
+      sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "path-browserify" ];
+    peerDependencies = [];
   };
   by-spec."path-is-inside"."^1.0.1" =
     self.by-version."path-is-inside"."1.0.1";
-  by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."path-is-inside"."1.0.1" = self.buildNodePackage {
     name = "path-is-inside-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz";
-        name = "path-is-inside-1.0.1.tgz";
-        sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."path-is-inside" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz";
+      name = "path-is-inside-1.0.1.tgz";
+      sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "path-is-inside" ];
+    peerDependencies = [];
   };
   by-spec."path-is-inside"."~1.0.0" =
     self.by-version."path-is-inside"."1.0.1";
   by-spec."path-platform"."^0.0.1" =
     self.by-version."path-platform"."0.0.1";
-  by-version."path-platform"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."path-platform"."0.0.1" = self.buildNodePackage {
     name = "path-platform-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz";
-        name = "path-platform-0.0.1.tgz";
-        sha1 = "b5585d7c3c463d89aa0060d86611cf1afd617e2a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."path-platform" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz";
+      name = "path-platform-0.0.1.tgz";
+      sha1 = "b5585d7c3c463d89aa0060d86611cf1afd617e2a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."path-platform"."~0.11.15" =
+    self.by-version."path-platform"."0.11.15";
+  by-version."path-platform"."0.11.15" = self.buildNodePackage {
+    name = "path-platform-0.11.15";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz";
+      name = "path-platform-0.11.15.tgz";
+      sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "path-platform" ];
+    peerDependencies = [];
+  };
+  by-spec."path-proxy"."~1.0" =
+    self.by-version."path-proxy"."1.0.0";
+  by-version."path-proxy"."1.0.0" = self.buildNodePackage {
+    name = "path-proxy-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz";
+      name = "path-proxy-1.0.0.tgz";
+      sha1 = "18e8a36859fc9d2f1a53b48dee138543c020de5e";
+    };
+    deps = {
+      "inflection-1.3.8" = self.by-version."inflection"."1.3.8";
+    };
+    peerDependencies = [];
   };
   by-spec."path-to-regexp"."0.1.3" =
     self.by-version."path-to-regexp"."0.1.3";
-  by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."path-to-regexp"."0.1.3" = self.buildNodePackage {
     name = "path-to-regexp-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
-        name = "path-to-regexp-0.1.3.tgz";
-        sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."path-to-regexp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+      name = "path-to-regexp-0.1.3.tgz";
+      sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "path-to-regexp" ];
+    peerDependencies = [];
   };
   by-spec."pause"."0.0.1" =
     self.by-version."pause"."0.0.1";
-  by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."pause"."0.0.1" = self.buildNodePackage {
     name = "pause-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
-        name = "pause-0.0.1.tgz";
-        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pause" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+      name = "pause-0.0.1.tgz";
+      sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pause" ];
+    peerDependencies = [];
   };
   by-spec."pbkdf2-compat"."2.0.1" =
     self.by-version."pbkdf2-compat"."2.0.1";
-  by-version."pbkdf2-compat"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."pbkdf2-compat"."2.0.1" = self.buildNodePackage {
     name = "pbkdf2-compat-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
-        name = "pbkdf2-compat-2.0.1.tgz";
-        sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pbkdf2-compat" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
+      name = "pbkdf2-compat-2.0.1.tgz";
+      sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pbkdf2-compat" ];
+    peerDependencies = [];
   };
   by-spec."peer-wire-protocol"."^0.7.0" =
     self.by-version."peer-wire-protocol"."0.7.0";
-  by-version."peer-wire-protocol"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."peer-wire-protocol"."0.7.0" = self.buildNodePackage {
     name = "peer-wire-protocol-0.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz";
-        name = "peer-wire-protocol-0.7.0.tgz";
-        sha1 = "6c015abf24b4877ed9eca3822b22d996078011da";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."peer-wire-protocol" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz";
+      name = "peer-wire-protocol-0.7.0.tgz";
+      sha1 = "6c015abf24b4877ed9eca3822b22d996078011da";
+    };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "bncode-0.2.3" = self.by-version."bncode"."0.2.3";
       "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "peer-wire-protocol" ];
+    peerDependencies = [];
   };
   by-spec."peer-wire-swarm"."^0.9.0" =
     self.by-version."peer-wire-swarm"."0.9.2";
-  by-version."peer-wire-swarm"."0.9.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."peer-wire-swarm"."0.9.2" = self.buildNodePackage {
     name = "peer-wire-swarm-0.9.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz";
-        name = "peer-wire-swarm-0.9.2.tgz";
-        sha1 = "092848005607d8ca94e69f9bc9ebe52956ec3048";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."peer-wire-swarm" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz";
+      name = "peer-wire-swarm-0.9.2.tgz";
+      sha1 = "092848005607d8ca94e69f9bc9ebe52956ec3048";
+    };
     deps = {
       "peer-wire-protocol-0.7.0" = self.by-version."peer-wire-protocol"."0.7.0";
       "fifo-0.1.4" = self.by-version."fifo"."0.1.4";
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "peer-wire-swarm" ];
+    peerDependencies = [];
   };
   by-spec."peer-wire-swarm"."^0.9.2" =
     self.by-version."peer-wire-swarm"."0.9.2";
   by-spec."peerflix"."*" =
-    self.by-version."peerflix"."0.24.0";
-  by-version."peerflix"."0.24.0" = lib.makeOverridable self.buildNodePackage {
-    name = "peerflix-0.24.0";
+    self.by-version."peerflix"."0.25.0";
+  by-version."peerflix"."0.25.0" = self.buildNodePackage {
+    name = "peerflix-0.25.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/peerflix/-/peerflix-0.24.0.tgz";
-        name = "peerflix-0.24.0.tgz";
-        sha1 = "340a06d3b0fff0a51a1839213456f70366529a5b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."peerflix" or []);
-    deps = {
-      "airplay-js-0.2.6" = self.by-version."airplay-js"."0.2.6";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/peerflix/-/peerflix-0.25.0.tgz";
+      name = "peerflix-0.25.0.tgz";
+      sha1 = "9371bb353603101503551fdbdcdbe28a1556a96d";
+    };
+    deps = {
+      "airplay-js-0.2.11" = self.by-version."airplay-js"."0.2.11";
       "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
@@ -22269,27 +21475,21 @@
       "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "peerflix" ];
+    peerDependencies = [];
   };
-  "peerflix" = self.by-version."peerflix"."0.24.0";
+  "peerflix" = self.by-version."peerflix"."0.25.0";
   by-spec."peerflix"."^0.19.1" =
     self.by-version."peerflix"."0.19.3";
-  by-version."peerflix"."0.19.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."peerflix"."0.19.3" = self.buildNodePackage {
     name = "peerflix-0.19.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/peerflix/-/peerflix-0.19.3.tgz";
-        name = "peerflix-0.19.3.tgz";
-        sha1 = "2376097d7563f37db1d6e93c8b1f9cf800592a54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."peerflix" or []);
-    deps = {
-      "airplay-js-0.2.6" = self.by-version."airplay-js"."0.2.6";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/peerflix/-/peerflix-0.19.3.tgz";
+      name = "peerflix-0.19.3.tgz";
+      sha1 = "2376097d7563f37db1d6e93c8b1f9cf800592a54";
+    };
+    deps = {
+      "airplay-js-0.2.11" = self.by-version."airplay-js"."0.2.11";
       "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "network-address-0.0.4" = self.by-version."network-address"."0.0.4";
@@ -22302,94 +21502,85 @@
       "torrent-stream-0.15.1" = self.by-version."torrent-stream"."0.15.1";
       "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "peerflix" ];
+    peerDependencies = [];
   };
   by-spec."peerflix-server"."*" =
-    self.by-version."peerflix-server"."0.0.14";
-  by-version."peerflix-server"."0.0.14" = lib.makeOverridable self.buildNodePackage {
-    name = "peerflix-server-0.0.14";
+    self.by-version."peerflix-server"."0.0.20";
+  by-version."peerflix-server"."0.0.20" = self.buildNodePackage {
+    name = "peerflix-server-0.0.20";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.14.tgz";
-        name = "peerflix-server-0.0.14.tgz";
-        sha1 = "4f6c29886b6cead1faf8117a3e9c5346ca75b764";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."peerflix-server" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.20.tgz";
+      name = "peerflix-server-0.0.20.tgz";
+      sha1 = "b5545f7f0abf3f13b65bae00eecd344d9973d342";
+    };
     deps = {
-      "torrent-stream-0.13.5" = self.by-version."torrent-stream"."0.13.5";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "pump-0.3.5" = self.by-version."pump"."0.3.5";
+      "connect-multiparty-1.2.5" = self.by-version."connect-multiparty"."1.2.5";
       "express-3.5.3" = self.by-version."express"."3.5.3";
+      "fluent-ffmpeg-2.0.0-rc3" = self.by-version."fluent-ffmpeg"."2.0.0-rc3";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
-      "read-torrent-1.0.0" = self.by-version."read-torrent"."1.0.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "pump-0.3.5" = self.by-version."pump"."0.3.5";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "read-torrent-1.0.0" = self.by-version."read-torrent"."1.0.0";
+      "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
+      "torrent-stream-0.13.5" = self.by-version."torrent-stream"."0.13.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "peerflix-server" ];
+    peerDependencies = [];
   };
-  "peerflix-server" = self.by-version."peerflix-server"."0.0.14";
+  "peerflix-server" = self.by-version."peerflix-server"."0.0.20";
   by-spec."pegjs"."0.6.2" =
     self.by-version."pegjs"."0.6.2";
-  by-version."pegjs"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."pegjs"."0.6.2" = self.buildNodePackage {
     name = "pegjs-0.6.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz";
-        name = "pegjs-0.6.2.tgz";
-        sha1 = "74651f8a800e444db688e4eeae8edb65637a17a5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pegjs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz";
+      name = "pegjs-0.6.2.tgz";
+      sha1 = "74651f8a800e444db688e4eeae8edb65637a17a5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pegjs" ];
+    peerDependencies = [];
+  };
+  by-spec."pegjs"."git+https://github.com/arlolra/pegjs#startOffset" =
+    self.by-version."pegjs"."0.8.0";
+  by-version."pegjs"."0.8.0" = self.buildNodePackage {
+    name = "pegjs-0.8.0";
+    bin = true;
+    src = fetchgit {
+      url = "https://github.com/arlolra/pegjs";
+      rev = "7ff7464d082dd96def08e8c14aadc6bc5e5a84ba";
+      sha256 = "36706b776a50ca1320cd5f7d4db2668d1567cccd43ee6a746e4d2c70552570e9";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."pemstrip"."0.0.1" =
     self.by-version."pemstrip"."0.0.1";
-  by-version."pemstrip"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."pemstrip"."0.0.1" = self.buildNodePackage {
     name = "pemstrip-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pemstrip/-/pemstrip-0.0.1.tgz";
-        name = "pemstrip-0.0.1.tgz";
-        sha1 = "39f7071720cfa13d542c9bde75f1fa5bf9d08806";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pemstrip" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pemstrip/-/pemstrip-0.0.1.tgz";
+      name = "pemstrip-0.0.1.tgz";
+      sha1 = "39f7071720cfa13d542c9bde75f1fa5bf9d08806";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pemstrip" ];
+    peerDependencies = [];
   };
   by-spec."phantomjs"."*" =
     self.by-version."phantomjs"."1.9.13";
-  by-version."phantomjs"."1.9.13" = lib.makeOverridable self.buildNodePackage {
+  by-version."phantomjs"."1.9.13" = self.buildNodePackage {
     name = "phantomjs-1.9.13";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.13.tgz";
-        name = "phantomjs-1.9.13.tgz";
-        sha1 = "2f9afca241eaf17cad5a137bf9eade948a4d7ef5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."phantomjs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.13.tgz";
+      name = "phantomjs-1.9.13.tgz";
+      sha1 = "2f9afca241eaf17cad5a137bf9eade948a4d7ef5";
+    };
     deps = {
       "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
       "kew-0.4.0" = self.by-version."kew"."0.4.0";
@@ -22402,9 +21593,7 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "which-1.0.8" = self.by-version."which"."1.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "phantomjs" ];
+    peerDependencies = [];
   };
   "phantomjs" = self.by-version."phantomjs"."1.9.13";
   by-spec."phantomjs"."~1.9.1" =
@@ -22413,504 +21602,444 @@
     self.by-version."phantomjs"."1.9.13";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
-  by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."pkginfo"."0.2.3" = self.buildNodePackage {
     name = "pkginfo-0.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
-        name = "pkginfo-0.2.3.tgz";
-        sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pkginfo" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
+      name = "pkginfo-0.2.3.tgz";
+      sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pkginfo" ];
+    peerDependencies = [];
   };
   by-spec."pkginfo"."0.3.x" =
     self.by-version."pkginfo"."0.3.0";
-  by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."pkginfo"."0.3.0" = self.buildNodePackage {
     name = "pkginfo-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
-        name = "pkginfo-0.3.0.tgz";
-        sha1 = "726411401039fe9b009eea86614295d5f3a54276";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pkginfo" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
+      name = "pkginfo-0.3.0.tgz";
+      sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pkginfo" ];
+    peerDependencies = [];
   };
   by-spec."pkginfo"."0.x.x" =
     self.by-version."pkginfo"."0.3.0";
+  by-spec."pkginfo"."~0.3.0" =
+    self.by-version."pkginfo"."0.3.0";
   by-spec."playerui"."^1.2.0" =
     self.by-version."playerui"."1.2.0";
-  by-version."playerui"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."playerui"."1.2.0" = self.buildNodePackage {
     name = "playerui-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz";
-        name = "playerui-1.2.0.tgz";
-        sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."playerui" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz";
+      name = "playerui-1.2.0.tgz";
+      sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812";
+    };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "pad-0.0.5" = self.by-version."pad"."0.0.5";
       "single-line-log-0.4.1" = self.by-version."single-line-log"."0.4.1";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "playerui" ];
+    peerDependencies = [];
   };
   by-spec."plc"."*" =
-    self.by-version."plc"."0.1.2";
-  by-version."plc"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "plc-0.1.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/plc/-/plc-0.1.2.tgz";
-        name = "plc-0.1.2.tgz";
-        sha1 = "a25c5e677261f7912d5d35cedfb2527315b7d329";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."plc" or []);
+    self.by-version."plc"."0.2.0";
+  by-version."plc"."0.2.0" = self.buildNodePackage {
+    name = "plc-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/plc/-/plc-0.2.0.tgz";
+      name = "plc-0.2.0.tgz";
+      sha1 = "2218f9217c82ea0d3266bb601a8180abb230675a";
+    };
     deps = {
       "bits-0.1.1" = self.by-version."bits"."0.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "plc" ];
+    peerDependencies = [];
   };
-  "plc" = self.by-version."plc"."0.1.2";
+  "plc" = self.by-version."plc"."0.2.0";
   by-spec."plist"."1.1.0" =
     self.by-version."plist"."1.1.0";
-  by-version."plist"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."plist"."1.1.0" = self.buildNodePackage {
     name = "plist-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/plist/-/plist-1.1.0.tgz";
-        name = "plist-1.1.0.tgz";
-        sha1 = "ff6708590c97cc438e7bc45de5251bd725f3f89d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."plist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/plist/-/plist-1.1.0.tgz";
+      name = "plist-1.1.0.tgz";
+      sha1 = "ff6708590c97cc438e7bc45de5251bd725f3f89d";
+    };
     deps = {
       "base64-js-0.0.6" = self.by-version."base64-js"."0.0.6";
       "xmlbuilder-2.2.1" = self.by-version."xmlbuilder"."2.2.1";
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
       "util-deprecate-1.0.0" = self.by-version."util-deprecate"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "plist" ];
+    peerDependencies = [];
   };
   by-spec."plist-native"."*" =
     self.by-version."plist-native"."0.3.1";
-  by-version."plist-native"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."plist-native"."0.3.1" = self.buildNodePackage {
     name = "plist-native-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz";
-        name = "plist-native-0.3.1.tgz";
-        sha1 = "c9cd71ae2ac6aa16c315dde213c65d6cc53dee1a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."plist-native" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz";
+      name = "plist-native-0.3.1.tgz";
+      sha1 = "c9cd71ae2ac6aa16c315dde213c65d6cc53dee1a";
+    };
     deps = {
       "libxmljs-0.10.0" = self.by-version."libxmljs"."0.10.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "plist-native" ];
+    peerDependencies = [];
   };
   "plist-native" = self.by-version."plist-native"."0.3.1";
   by-spec."plist-with-patches"."0.5.1" =
     self.by-version."plist-with-patches"."0.5.1";
-  by-version."plist-with-patches"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."plist-with-patches"."0.5.1" = self.buildNodePackage {
     name = "plist-with-patches-0.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz";
-        name = "plist-with-patches-0.5.1.tgz";
-        sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."plist-with-patches" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz";
+      name = "plist-with-patches-0.5.1.tgz";
+      sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d";
+    };
     deps = {
       "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "plist-with-patches" ];
+    peerDependencies = [];
   };
   by-spec."policyfile"."0.0.4" =
     self.by-version."policyfile"."0.0.4";
-  by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."policyfile"."0.0.4" = self.buildNodePackage {
     name = "policyfile-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
-        name = "policyfile-0.0.4.tgz";
-        sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."policyfile" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
+      name = "policyfile-0.0.4.tgz";
+      sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "policyfile" ];
+    peerDependencies = [];
+  };
+  by-spec."pooling"."0.4.6" =
+    self.by-version."pooling"."0.4.6";
+  by-version."pooling"."0.4.6" = self.buildNodePackage {
+    name = "pooling-0.4.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pooling/-/pooling-0.4.6.tgz";
+      name = "pooling-0.4.6.tgz";
+      sha1 = "76a317371ea8a363b4858fa4799e60245f30e664";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "bunyan-0.22.1" = self.by-version."bunyan"."0.22.1";
+      "once-1.3.0" = self.by-version."once"."1.3.0";
+      "vasync-1.4.0" = self.by-version."vasync"."1.4.0";
+      "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
+    };
+    peerDependencies = [];
   };
   by-spec."portfinder"."^0.2.1" =
     self.by-version."portfinder"."0.2.1";
-  by-version."portfinder"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."portfinder"."0.2.1" = self.buildNodePackage {
     name = "portfinder-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz";
-        name = "portfinder-0.2.1.tgz";
-        sha1 = "b2b9b0164f9e17fa3a9c7db2304d0a75140c71ad";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."portfinder" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz";
+      name = "portfinder-0.2.1.tgz";
+      sha1 = "b2b9b0164f9e17fa3a9c7db2304d0a75140c71ad";
+    };
     deps = {
       "mkdirp-0.0.7" = self.by-version."mkdirp"."0.0.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "portfinder" ];
+    peerDependencies = [];
   };
   by-spec."portfinder"."^0.3.0" =
     self.by-version."portfinder"."0.3.0";
-  by-version."portfinder"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."portfinder"."0.3.0" = self.buildNodePackage {
     name = "portfinder-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz";
-        name = "portfinder-0.3.0.tgz";
-        sha1 = "f9f2c96894440c5b5113b84e0ad1013042b7c2a0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."portfinder" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz";
+      name = "portfinder-0.3.0.tgz";
+      sha1 = "f9f2c96894440c5b5113b84e0ad1013042b7c2a0";
+    };
     deps = {
       "mkdirp-0.0.7" = self.by-version."mkdirp"."0.0.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "portfinder" ];
+    peerDependencies = [];
   };
   by-spec."posix"."*" =
     self.by-version."posix"."1.0.4";
-  by-version."posix"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."posix"."1.0.4" = self.buildNodePackage {
     name = "posix-1.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/posix/-/posix-1.0.4.tgz";
-        name = "posix-1.0.4.tgz";
-        sha1 = "628eb17c9c3299a296cf2f9fdc7cbad4fd554a56";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."posix" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/posix/-/posix-1.0.4.tgz";
+      name = "posix-1.0.4.tgz";
+      sha1 = "628eb17c9c3299a296cf2f9fdc7cbad4fd554a56";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "posix" ];
+    peerDependencies = [];
   };
   "posix" = self.by-version."posix"."1.0.4";
   by-spec."posix-getopt"."1.0.0" =
     self.by-version."posix-getopt"."1.0.0";
-  by-version."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."posix-getopt"."1.0.0" = self.buildNodePackage {
     name = "posix-getopt-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz";
-        name = "posix-getopt-1.0.0.tgz";
-        sha1 = "42a90eca6119014c78bc4b9b70463d294db1aa87";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."posix-getopt" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz";
+      name = "posix-getopt-1.0.0.tgz";
+      sha1 = "42a90eca6119014c78bc4b9b70463d294db1aa87";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "posix-getopt" ];
+    peerDependencies = [];
+  };
+  by-spec."posix-getopt"."1.1.0" =
+    self.by-version."posix-getopt"."1.1.0";
+  by-version."posix-getopt"."1.1.0" = self.buildNodePackage {
+    name = "posix-getopt-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.1.0.tgz";
+      name = "posix-getopt-1.1.0.tgz";
+      sha1 = "8e258aca8f34d6906c159a32b0388360197e5698";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."prelude-ls"."~1.1.0" =
     self.by-version."prelude-ls"."1.1.1";
-  by-version."prelude-ls"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."prelude-ls"."1.1.1" = self.buildNodePackage {
     name = "prelude-ls-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz";
-        name = "prelude-ls-1.1.1.tgz";
-        sha1 = "c0b86c1ffd151ad3cc75e7e3fe38d7a1bf33728a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."prelude-ls" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz";
+      name = "prelude-ls-1.1.1.tgz";
+      sha1 = "c0b86c1ffd151ad3cc75e7e3fe38d7a1bf33728a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "prelude-ls" ];
+    peerDependencies = [];
   };
   by-spec."prelude-ls"."~1.1.1" =
     self.by-version."prelude-ls"."1.1.1";
   by-spec."pretty-bytes"."^1.0.0" =
     self.by-version."pretty-bytes"."1.0.2";
-  by-version."pretty-bytes"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."pretty-bytes"."1.0.2" = self.buildNodePackage {
     name = "pretty-bytes-1.0.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.2.tgz";
-        name = "pretty-bytes-1.0.2.tgz";
-        sha1 = "b38f90c0b93d9942a4c4bec6cb5f367d51d80120";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pretty-bytes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.2.tgz";
+      name = "pretty-bytes-1.0.2.tgz";
+      sha1 = "b38f90c0b93d9942a4c4bec6cb5f367d51d80120";
+    };
     deps = {
       "get-stdin-1.0.0" = self.by-version."get-stdin"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pretty-bytes" ];
+    peerDependencies = [];
   };
   by-spec."pretty-hrtime"."^0.2.0" =
     self.by-version."pretty-hrtime"."0.2.2";
-  by-version."pretty-hrtime"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."pretty-hrtime"."0.2.2" = self.buildNodePackage {
     name = "pretty-hrtime-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz";
-        name = "pretty-hrtime-0.2.2.tgz";
-        sha1 = "d4fd88351e3a4741f8173af7d6a4b846f9895c00";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pretty-hrtime" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz";
+      name = "pretty-hrtime-0.2.2.tgz";
+      sha1 = "d4fd88351e3a4741f8173af7d6a4b846f9895c00";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pretty-hrtime" ];
+    peerDependencies = [];
+  };
+  by-spec."prfun"."~1.0.2" =
+    self.by-version."prfun"."1.0.2";
+  by-version."prfun"."1.0.2" = self.buildNodePackage {
+    name = "prfun-1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/prfun/-/prfun-1.0.2.tgz";
+      name = "prfun-1.0.2.tgz";
+      sha1 = "ac8799843d8194ea478ee4442e455fd5e054db3e";
+    };
+    deps = {
+      "es6-shim-0.22.2" = self.by-version."es6-shim"."0.22.2";
+    };
+    peerDependencies = [];
+  };
+  by-spec."private"."~0.1.2" =
+    self.by-version."private"."0.1.6";
+  by-version."private"."0.1.6" = self.buildNodePackage {
+    name = "private-0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/private/-/private-0.1.6.tgz";
+      name = "private-0.1.6.tgz";
+      sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
+  by-spec."private"."~0.1.5" =
+    self.by-version."private"."0.1.6";
+  by-spec."private"."~0.1.6" =
+    self.by-version."private"."0.1.6";
   by-spec."process"."^0.10.0" =
     self.by-version."process"."0.10.0";
-  by-version."process"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."process"."0.10.0" = self.buildNodePackage {
     name = "process-0.10.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/process/-/process-0.10.0.tgz";
-        name = "process-0.10.0.tgz";
-        sha1 = "99b375aaab5c0d3bbb59f774edc69df574da8dd4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."process" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/process/-/process-0.10.0.tgz";
+      name = "process-0.10.0.tgz";
+      sha1 = "99b375aaab5c0d3bbb59f774edc69df574da8dd4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "process" ];
+    peerDependencies = [];
   };
   by-spec."process"."^0.8.0" =
     self.by-version."process"."0.8.0";
-  by-version."process"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."process"."0.8.0" = self.buildNodePackage {
     name = "process-0.8.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/process/-/process-0.8.0.tgz";
-        name = "process-0.8.0.tgz";
-        sha1 = "7bbaf7187fe6ded3fd5be0cb6103fba9cacb9798";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."process" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/process/-/process-0.8.0.tgz";
+      name = "process-0.8.0.tgz";
+      sha1 = "7bbaf7187fe6ded3fd5be0cb6103fba9cacb9798";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "process" ];
+    peerDependencies = [];
   };
   by-spec."process"."~0.10.0" =
     self.by-version."process"."0.10.0";
   by-spec."process"."~0.5.1" =
     self.by-version."process"."0.5.2";
-  by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."process"."0.5.2" = self.buildNodePackage {
     name = "process-0.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz";
-        name = "process-0.5.2.tgz";
-        sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."process" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz";
+      name = "process-0.5.2.tgz";
+      sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "process" ];
+    peerDependencies = [];
   };
   by-spec."process"."~0.6.0" =
     self.by-version."process"."0.6.0";
-  by-version."process"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."process"."0.6.0" = self.buildNodePackage {
     name = "process-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/process/-/process-0.6.0.tgz";
-        name = "process-0.6.0.tgz";
-        sha1 = "7dd9be80ffaaedd4cb628f1827f1cbab6dc0918f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."process" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/process/-/process-0.6.0.tgz";
+      name = "process-0.6.0.tgz";
+      sha1 = "7dd9be80ffaaedd4cb628f1827f1cbab6dc0918f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "process" ];
+    peerDependencies = [];
+  };
+  by-spec."progress"."1.1.4" =
+    self.by-version."progress"."1.1.4";
+  by-version."progress"."1.1.4" = self.buildNodePackage {
+    name = "progress-1.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/progress/-/progress-1.1.4.tgz";
+      name = "progress-1.1.4.tgz";
+      sha1 = "789f57691b88b826a439bc52dc9620245d60255b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."progress"."1.1.8" =
     self.by-version."progress"."1.1.8";
-  by-version."progress"."1.1.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."progress"."1.1.8" = self.buildNodePackage {
     name = "progress-1.1.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
-        name = "progress-1.1.8.tgz";
-        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."progress" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+      name = "progress-1.1.8.tgz";
+      sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "progress" ];
+    peerDependencies = [];
   };
   by-spec."promiscuous"."^0.6.0" =
     self.by-version."promiscuous"."0.6.0";
-  by-version."promiscuous"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."promiscuous"."0.6.0" = self.buildNodePackage {
     name = "promiscuous-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz";
-        name = "promiscuous-0.6.0.tgz";
-        sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."promiscuous" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz";
+      name = "promiscuous-0.6.0.tgz";
+      sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "promiscuous" ];
+    peerDependencies = [];
   };
   by-spec."promise"."^6.0.1" =
-    self.by-version."promise"."6.0.1";
-  by-version."promise"."6.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "promise-6.0.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/promise/-/promise-6.0.1.tgz";
-        name = "promise-6.0.1.tgz";
-        sha1 = "d475cff81c083a27fe87ae19952b72c1a6936237";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."promise" or []);
+    self.by-version."promise"."6.1.0";
+  by-version."promise"."6.1.0" = self.buildNodePackage {
+    name = "promise-6.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
+      name = "promise-6.1.0.tgz";
+      sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6";
+    };
     deps = {
       "asap-1.0.0" = self.by-version."asap"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "promise" ];
+    peerDependencies = [];
   };
   by-spec."promise"."~2.0" =
     self.by-version."promise"."2.0.0";
-  by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."promise"."2.0.0" = self.buildNodePackage {
     name = "promise-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
-        name = "promise-2.0.0.tgz";
-        sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."promise" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
+      name = "promise-2.0.0.tgz";
+      sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
+    };
     deps = {
       "is-promise-1.0.1" = self.by-version."is-promise"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "promise" ];
+    peerDependencies = [];
   };
   by-spec."prompt"."0.2.14" =
     self.by-version."prompt"."0.2.14";
-  by-version."prompt"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+  by-version."prompt"."0.2.14" = self.buildNodePackage {
     name = "prompt-0.2.14";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
-        name = "prompt-0.2.14.tgz";
-        sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."prompt" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
+      name = "prompt-0.2.14.tgz";
+      sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
+    };
     deps = {
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "read-1.0.5" = self.by-version."read"."1.0.5";
@@ -22918,207 +22047,201 @@
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "prompt" ];
+    peerDependencies = [];
   };
+  by-spec."prompt"."0.2.x" =
+    self.by-version."prompt"."0.2.14";
   by-spec."promptly"."0.2.0" =
     self.by-version."promptly"."0.2.0";
-  by-version."promptly"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."promptly"."0.2.0" = self.buildNodePackage {
     name = "promptly-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz";
-        name = "promptly-0.2.0.tgz";
-        sha1 = "73ef200fa8329d5d3a8df41798950b8646ca46d9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."promptly" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz";
+      name = "promptly-0.2.0.tgz";
+      sha1 = "73ef200fa8329d5d3a8df41798950b8646ca46d9";
+    };
     deps = {
       "read-1.0.5" = self.by-version."read"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "promptly" ];
+    peerDependencies = [];
   };
   by-spec."promzard"."~0.2.0" =
     self.by-version."promzard"."0.2.2";
-  by-version."promzard"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."promzard"."0.2.2" = self.buildNodePackage {
     name = "promzard-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz";
-        name = "promzard-0.2.2.tgz";
-        sha1 = "918b9f2b29458cb001781a8856502e4a79b016e0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."promzard" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz";
+      name = "promzard-0.2.2.tgz";
+      sha1 = "918b9f2b29458cb001781a8856502e4a79b016e0";
+    };
     deps = {
       "read-1.0.5" = self.by-version."read"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "promzard" ];
+    peerDependencies = [];
   };
   by-spec."properties-parser"."0.2.3" =
     self.by-version."properties-parser"."0.2.3";
-  by-version."properties-parser"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."properties-parser"."0.2.3" = self.buildNodePackage {
     name = "properties-parser-0.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz";
-        name = "properties-parser-0.2.3.tgz";
-        sha1 = "f7591255f707abbff227c7b56b637dbb0373a10f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."properties-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz";
+      name = "properties-parser-0.2.3.tgz";
+      sha1 = "f7591255f707abbff227c7b56b637dbb0373a10f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "properties-parser" ];
+    peerDependencies = [];
   };
   by-spec."proto-list"."~1.2.1" =
     self.by-version."proto-list"."1.2.3";
-  by-version."proto-list"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."proto-list"."1.2.3" = self.buildNodePackage {
     name = "proto-list-1.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz";
-        name = "proto-list-1.2.3.tgz";
-        sha1 = "6235554a1bca1f0d15e3ca12ca7329d5def42bd9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."proto-list" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz";
+      name = "proto-list-1.2.3.tgz";
+      sha1 = "6235554a1bca1f0d15e3ca12ca7329d5def42bd9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "proto-list" ];
+    peerDependencies = [];
   };
   by-spec."protobufjs"."^3.2.2" =
     self.by-version."protobufjs"."3.8.2";
-  by-version."protobufjs"."3.8.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."protobufjs"."3.8.2" = self.buildNodePackage {
     name = "protobufjs-3.8.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz";
-        name = "protobufjs-3.8.2.tgz";
-        sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."protobufjs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz";
+      name = "protobufjs-3.8.2.tgz";
+      sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17";
+    };
     deps = {
       "bytebuffer-3.5.4" = self.by-version."bytebuffer"."3.5.4";
       "ascli-0.3.0" = self.by-version."ascli"."0.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "protobufjs" ];
+    peerDependencies = [];
+  };
+  by-spec."proxy-addr"."1.0.1" =
+    self.by-version."proxy-addr"."1.0.1";
+  by-version."proxy-addr"."1.0.1" = self.buildNodePackage {
+    name = "proxy-addr-1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
+      name = "proxy-addr-1.0.1.tgz";
+      sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
+    };
+    deps = {
+      "ipaddr.js-0.1.2" = self.by-version."ipaddr.js"."0.1.2";
+    };
+    peerDependencies = [];
   };
   by-spec."proxy-addr"."~1.0.3" =
     self.by-version."proxy-addr"."1.0.5";
-  by-version."proxy-addr"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."proxy-addr"."1.0.5" = self.buildNodePackage {
     name = "proxy-addr-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.5.tgz";
-        name = "proxy-addr-1.0.5.tgz";
-        sha1 = "17ad518b637a21a64746319f39fbc72c8628f63b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."proxy-addr" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.5.tgz";
+      name = "proxy-addr-1.0.5.tgz";
+      sha1 = "17ad518b637a21a64746319f39fbc72c8628f63b";
+    };
     deps = {
       "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
       "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "proxy-addr" ];
+    peerDependencies = [];
   };
-  by-spec."proxy-addr"."~1.0.4" =
-    self.by-version."proxy-addr"."1.0.5";
   by-spec."proxy-addr"."~1.0.5" =
     self.by-version."proxy-addr"."1.0.5";
+  by-spec."proxy-agent"."1" =
+    self.by-version."proxy-agent"."1.1.0";
+  by-version."proxy-agent"."1.1.0" = self.buildNodePackage {
+    name = "proxy-agent-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/proxy-agent/-/proxy-agent-1.1.0.tgz";
+      name = "proxy-agent-1.1.0.tgz";
+      sha1 = "e23fd209bcbaa3e6743206f4e5fef0b765c380a6";
+    };
+    deps = {
+      "http-proxy-agent-0.2.6" = self.by-version."http-proxy-agent"."0.2.6";
+      "https-proxy-agent-0.3.5" = self.by-version."https-proxy-agent"."0.3.5";
+      "pac-proxy-agent-0.2.0" = self.by-version."pac-proxy-agent"."0.2.0";
+      "socks-proxy-agent-0.1.2" = self.by-version."socks-proxy-agent"."0.1.2";
+      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."proxy-agent"."~1.1.0" =
+    self.by-version."proxy-agent"."1.1.0";
   by-spec."ps-tree"."0.0.x" =
     self.by-version."ps-tree"."0.0.3";
-  by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."ps-tree"."0.0.3" = self.buildNodePackage {
     name = "ps-tree-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
-        name = "ps-tree-0.0.3.tgz";
-        sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ps-tree" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
+      name = "ps-tree-0.0.3.tgz";
+      sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc";
+    };
     deps = {
       "event-stream-0.5.3" = self.by-version."event-stream"."0.5.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ps-tree" ];
+    peerDependencies = [];
   };
   by-spec."ps-tree"."~0.0.3" =
     self.by-version."ps-tree"."0.0.3";
+  by-spec."public-address"."~0.1.1" =
+    self.by-version."public-address"."0.1.1";
+  by-version."public-address"."0.1.1" = self.buildNodePackage {
+    name = "public-address-0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/public-address/-/public-address-0.1.1.tgz";
+      name = "public-address-0.1.1.tgz";
+      sha1 = "58bdea323c88287b6914159312454b804ca9eeaf";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."public-encrypt"."1.1.2" =
     self.by-version."public-encrypt"."1.1.2";
-  by-version."public-encrypt"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."public-encrypt"."1.1.2" = self.buildNodePackage {
     name = "public-encrypt-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-1.1.2.tgz";
-        name = "public-encrypt-1.1.2.tgz";
-        sha1 = "90711147083bc5bfbe2b51964f9a6b038adb0d4b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."public-encrypt" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-1.1.2.tgz";
+      name = "public-encrypt-1.1.2.tgz";
+      sha1 = "90711147083bc5bfbe2b51964f9a6b038adb0d4b";
+    };
     deps = {
       "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0";
       "browserify-rsa-1.1.1" = self.by-version."browserify-rsa"."1.1.1";
       "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "public-encrypt" ];
+    peerDependencies = [];
   };
   by-spec."pump"."^0.3.1" =
     self.by-version."pump"."0.3.5";
-  by-version."pump"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."pump"."0.3.5" = self.buildNodePackage {
     name = "pump-0.3.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/pump/-/pump-0.3.5.tgz";
-        name = "pump-0.3.5.tgz";
-        sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pump" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pump/-/pump-0.3.5.tgz";
+      name = "pump-0.3.5.tgz";
+      sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b";
+    };
     deps = {
       "once-1.2.0" = self.by-version."once"."1.2.0";
       "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pump" ];
+    peerDependencies = [];
   };
   by-spec."pump"."^0.3.5" =
     self.by-version."pump"."0.3.5";
@@ -23126,151 +22249,142 @@
     self.by-version."pump"."0.3.5";
   by-spec."punycode"."1.3.2" =
     self.by-version."punycode"."1.3.2";
-  by-version."punycode"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."punycode"."1.3.2" = self.buildNodePackage {
     name = "punycode-1.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
-        name = "punycode-1.3.2.tgz";
-        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."punycode" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
+      name = "punycode-1.3.2.tgz";
+      sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "punycode" ];
+    peerDependencies = [];
   };
   by-spec."punycode".">=0.2.0" =
     self.by-version."punycode"."1.3.2";
   by-spec."punycode".">=1.0.0 <1.1.0" =
     self.by-version."punycode"."1.0.0";
-  by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."punycode"."1.0.0" = self.buildNodePackage {
     name = "punycode-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz";
-        name = "punycode-1.0.0.tgz";
-        sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."punycode" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz";
+      name = "punycode-1.0.0.tgz";
+      sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "punycode" ];
+    peerDependencies = [];
   };
   by-spec."punycode"."~1.2.3" =
     self.by-version."punycode"."1.2.4";
-  by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."punycode"."1.2.4" = self.buildNodePackage {
     name = "punycode-1.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz";
-        name = "punycode-1.2.4.tgz";
-        sha1 = "54008ac972aec74175def9cba6df7fa9d3918740";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."punycode" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz";
+      name = "punycode-1.2.4.tgz";
+      sha1 = "54008ac972aec74175def9cba6df7fa9d3918740";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "punycode" ];
+    peerDependencies = [];
   };
   by-spec."punycode"."~1.2.4" =
     self.by-version."punycode"."1.2.4";
   by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" =
     self.by-version."pure-css"."0.5.0-rc-1";
-  by-version."pure-css"."0.5.0-rc-1" = lib.makeOverridable self.buildNodePackage {
+  by-version."pure"."0.5.0-rc-1" = self.buildNodePackage {
     name = "pure-0.5.0-rc-1";
     bin = false;
-    src = [
-      (fetchgit {
-        url = "git://github.com/yui/pure.git";
-        rev = "f5ce3ae4b48ce252adac7b6ddac50c9518729a2d";
-        sha256 = "049ac2ef812771852978d11cd5aecac2dd561e97bb16ad89c79eb1e10aa57672";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."pure" or []);
+    src = fetchgit {
+      url = "git://github.com/yui/pure.git";
+      rev = "f5ce3ae4b48ce252adac7b6ddac50c9518729a2d";
+      sha256 = "049ac2ef812771852978d11cd5aecac2dd561e97bb16ad89c79eb1e10aa57672";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "pure" ];
+    peerDependencies = [];
+  };
+  "pure-css" = self.by-version."pure"."0.5.0-rc-1";
+  by-spec."pusher"."^1.0.0" =
+    self.by-version."pusher"."1.0.2";
+  by-version."pusher"."1.0.2" = self.buildNodePackage {
+    name = "pusher-1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pusher/-/pusher-1.0.2.tgz";
+      name = "pusher-1.0.2.tgz";
+      sha1 = "9276f7b884bc967bf66f5c3d407fc43c66315969";
+    };
+    deps = {
+      "request-2.45.0" = self.by-version."request"."2.45.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."q"."0.9.7" =
+    self.by-version."q"."0.9.7";
+  by-version."q"."0.9.7" = self.buildNodePackage {
+    name = "q-0.9.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz";
+      name = "q-0.9.7.tgz";
+      sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
-  "pure-css" = self.by-version."pure-css"."0.5.0-rc-1";
   by-spec."q"."1.0.1" =
     self.by-version."q"."1.0.1";
-  by-version."q"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."q"."1.0.1" = self.buildNodePackage {
     name = "q-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz";
-        name = "q-1.0.1.tgz";
-        sha1 = "11872aeedee89268110b10a718448ffb10112a14";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."q" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz";
+      name = "q-1.0.1.tgz";
+      sha1 = "11872aeedee89268110b10a718448ffb10112a14";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "q" ];
+    peerDependencies = [];
   };
   by-spec."q".">= 0.0.1" =
     self.by-version."q"."2.0.2";
-  by-version."q"."2.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."q"."2.0.2" = self.buildNodePackage {
     name = "q-2.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz";
-        name = "q-2.0.2.tgz";
-        sha1 = "4629e6cc668ff8554cfa775dab5aba50bad8f56d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."q" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz";
+      name = "q-2.0.2.tgz";
+      sha1 = "4629e6cc668ff8554cfa775dab5aba50bad8f56d";
+    };
     deps = {
       "asap-1.0.0" = self.by-version."asap"."1.0.0";
       "collections-2.0.1" = self.by-version."collections"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "q" ];
+    peerDependencies = [];
   };
-  by-spec."q"."~0.9.2" =
-    self.by-version."q"."0.9.7";
-  by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage {
-    name = "q-0.9.7";
+  by-spec."q"."^1.0.1" =
+    self.by-version."q"."1.1.2";
+  by-version."q"."1.1.2" = self.buildNodePackage {
+    name = "q-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz";
-        name = "q-0.9.7.tgz";
-        sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."q" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/q/-/q-1.1.2.tgz";
+      name = "q-1.1.2.tgz";
+      sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "q" ];
+    peerDependencies = [];
   };
+  by-spec."q"."^1.1.2" =
+    self.by-version."q"."1.1.2";
+  by-spec."q"."~0.9.2" =
+    self.by-version."q"."0.9.7";
   by-spec."q"."~0.9.6" =
     self.by-version."q"."0.9.7";
   by-spec."q"."~0.9.7" =
@@ -23279,454 +22393,385 @@
     self.by-version."q"."1.0.1";
   by-spec."q"."~1.0.1" =
     self.by-version."q"."1.0.1";
+  by-spec."q"."~1.1.2" =
+    self.by-version."q"."1.1.2";
   by-spec."qap"."^3.1.2" =
     self.by-version."qap"."3.1.2";
-  by-version."qap"."3.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."qap"."3.1.2" = self.buildNodePackage {
     name = "qap-3.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qap/-/qap-3.1.2.tgz";
-        name = "qap-3.1.2.tgz";
-        sha1 = "3672b8707d0b9b983b18f91fb14237de241bdba8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qap" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qap/-/qap-3.1.2.tgz";
+      name = "qap-3.1.2.tgz";
+      sha1 = "3672b8707d0b9b983b18f91fb14237de241bdba8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qap" ];
+    peerDependencies = [];
   };
   by-spec."qs"."0.4.2" =
     self.by-version."qs"."0.4.2";
-  by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."0.4.2" = self.buildNodePackage {
     name = "qs-0.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
-        name = "qs-0.4.2.tgz";
-        sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
+      name = "qs-0.4.2.tgz";
+      sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
   };
   by-spec."qs"."0.4.x" =
     self.by-version."qs"."0.4.2";
   by-spec."qs"."0.5.1" =
     self.by-version."qs"."0.5.1";
-  by-version."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."0.5.1" = self.buildNodePackage {
     name = "qs-0.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
-        name = "qs-0.5.1.tgz";
-        sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
+      name = "qs-0.5.1.tgz";
+      sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
+  };
+  by-spec."qs"."0.5.2" =
+    self.by-version."qs"."0.5.2";
+  by-version."qs"."0.5.2" = self.buildNodePackage {
+    name = "qs-0.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-0.5.2.tgz";
+      name = "qs-0.5.2.tgz";
+      sha1 = "e5734acb7009fb918e800fd5c60c2f5b94a7ff43";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."qs"."0.5.5" =
     self.by-version."qs"."0.5.5";
-  by-version."qs"."0.5.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."0.5.5" = self.buildNodePackage {
     name = "qs-0.5.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz";
-        name = "qs-0.5.5.tgz";
-        sha1 = "b07f0d7ffe3efc6fc2fcde6c66a20775641423f3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz";
+      name = "qs-0.5.5.tgz";
+      sha1 = "b07f0d7ffe3efc6fc2fcde6c66a20775641423f3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
+  };
+  by-spec."qs"."0.5.x" =
+    self.by-version."qs"."0.5.6";
+  by-version."qs"."0.5.6" = self.buildNodePackage {
+    name = "qs-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 = {
+    };
+    peerDependencies = [];
   };
   by-spec."qs"."0.6.5" =
     self.by-version."qs"."0.6.5";
-  by-version."qs"."0.6.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."0.6.5" = self.buildNodePackage {
     name = "qs-0.6.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
-        name = "qs-0.6.5.tgz";
-        sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
+      name = "qs-0.6.5.tgz";
+      sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
   };
   by-spec."qs"."0.6.6" =
     self.by-version."qs"."0.6.6";
-  by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."0.6.6" = self.buildNodePackage {
     name = "qs-0.6.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
-        name = "qs-0.6.6.tgz";
-        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
+      name = "qs-0.6.6.tgz";
+      sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
   };
   by-spec."qs"."1.2.0" =
     self.by-version."qs"."1.2.0";
-  by-version."qs"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."1.2.0" = self.buildNodePackage {
     name = "qs-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
-        name = "qs-1.2.0.tgz";
-        sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
+      name = "qs-1.2.0.tgz";
+      sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
   };
   by-spec."qs"."2.2.4" =
     self.by-version."qs"."2.2.4";
-  by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."2.2.4" = self.buildNodePackage {
     name = "qs-2.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz";
-        name = "qs-2.2.4.tgz";
-        sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz";
+      name = "qs-2.2.4.tgz";
+      sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
   };
   by-spec."qs"."2.3.2" =
     self.by-version."qs"."2.3.2";
-  by-version."qs"."2.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."2.3.2" = self.buildNodePackage {
     name = "qs-2.3.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-2.3.2.tgz";
-        name = "qs-2.3.2.tgz";
-        sha1 = "d45ec249e4b9b029af008829a101d5ff7e972790";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.3.2.tgz";
+      name = "qs-2.3.2.tgz";
+      sha1 = "d45ec249e4b9b029af008829a101d5ff7e972790";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
   };
   by-spec."qs"."2.3.3" =
     self.by-version."qs"."2.3.3";
-  by-version."qs"."2.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."2.3.3" = self.buildNodePackage {
     name = "qs-2.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
-        name = "qs-2.3.3.tgz";
-        sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+      name = "qs-2.3.3.tgz";
+      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
   };
   by-spec."qs".">= 0.4.0" =
     self.by-version."qs"."2.3.3";
   by-spec."qs"."~0.5.4" =
     self.by-version."qs"."0.5.6";
-  by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
-  };
   by-spec."qs"."~0.6.0" =
     self.by-version."qs"."0.6.6";
   by-spec."qs"."~1.0.0" =
     self.by-version."qs"."1.0.2";
-  by-version."qs"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."1.0.2" = self.buildNodePackage {
     name = "qs-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
-        name = "qs-1.0.2.tgz";
-        sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
+      name = "qs-1.0.2.tgz";
+      sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
   };
   by-spec."qs"."~1.2.0" =
     self.by-version."qs"."1.2.2";
-  by-version."qs"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."qs"."1.2.2" = self.buildNodePackage {
     name = "qs-1.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
-        name = "qs-1.2.2.tgz";
-        sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
+      name = "qs-1.2.2.tgz";
+      sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
+    peerDependencies = [];
+  };
+  by-spec."qs"."~1.2.2" =
+    self.by-version."qs"."1.2.2";
+  by-spec."qs"."~2.2.4" =
+    self.by-version."qs"."2.2.5";
+  by-version."qs"."2.2.5" = self.buildNodePackage {
+    name = "qs-2.2.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.2.5.tgz";
+      name = "qs-2.2.5.tgz";
+      sha1 = "1088abaf9dcc0ae5ae45b709e6c6b5888b23923c";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."qs"."~2.3.1" =
     self.by-version."qs"."2.3.3";
   by-spec."query-string"."^1.0.0" =
     self.by-version."query-string"."1.0.0";
-  by-version."query-string"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."query-string"."1.0.0" = self.buildNodePackage {
     name = "query-string-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/query-string/-/query-string-1.0.0.tgz";
-        name = "query-string-1.0.0.tgz";
-        sha1 = "c1bc6af99fa698a5395922ae5b3de3efe978c59b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."query-string" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/query-string/-/query-string-1.0.0.tgz";
+      name = "query-string-1.0.0.tgz";
+      sha1 = "c1bc6af99fa698a5395922ae5b3de3efe978c59b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "query-string" ];
+    peerDependencies = [];
   };
   by-spec."querystring".">=0.1.0 <0.2.0" =
     self.by-version."querystring"."0.1.0";
-  by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."querystring"."0.1.0" = self.buildNodePackage {
     name = "querystring-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
-        name = "querystring-0.1.0.tgz";
-        sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."querystring" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
+      name = "querystring-0.1.0.tgz";
+      sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "querystring" ];
+    peerDependencies = [];
   };
   by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" =
     self.by-version."querystring"."0.2.0";
-  by-version."querystring"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."querystring"."0.2.0" = self.buildNodePackage {
     name = "querystring-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz";
-        name = "querystring-0.2.0.tgz";
-        sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."querystring" or []);
+    src = fetchurl {
+      url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz";
+      name = "querystring-0.2.0.tgz";
+      sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "querystring" ];
+    peerDependencies = [];
   };
   by-spec."querystring-es3"."~0.2.0" =
     self.by-version."querystring-es3"."0.2.1";
-  by-version."querystring-es3"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."querystring-es3"."0.2.1" = self.buildNodePackage {
     name = "querystring-es3-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
-        name = "querystring-es3-0.2.1.tgz";
-        sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."querystring-es3" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
+      name = "querystring-es3-0.2.1.tgz";
+      sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "querystring-es3" ];
+    peerDependencies = [];
   };
   by-spec."rai"."~0.1.11" =
     self.by-version."rai"."0.1.11";
-  by-version."rai"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."rai"."0.1.11" = self.buildNodePackage {
     name = "rai-0.1.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz";
-        name = "rai-0.1.11.tgz";
-        sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rai" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz";
+      name = "rai-0.1.11.tgz";
+      sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rai" ];
+    peerDependencies = [];
+  };
+  by-spec."rainbowsocks"."~0.1.2" =
+    self.by-version."rainbowsocks"."0.1.2";
+  by-version."rainbowsocks"."0.1.2" = self.buildNodePackage {
+    name = "rainbowsocks-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rainbowsocks/-/rainbowsocks-0.1.2.tgz";
+      name = "rainbowsocks-0.1.2.tgz";
+      sha1 = "eebddb330eac4f178d79eadb12ff851c84ab97e1";
+    };
+    deps = {
+      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+    };
+    peerDependencies = [];
   };
   by-spec."random-access-file"."^0.3.1" =
     self.by-version."random-access-file"."0.3.1";
-  by-version."random-access-file"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."random-access-file"."0.3.1" = self.buildNodePackage {
     name = "random-access-file-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/random-access-file/-/random-access-file-0.3.1.tgz";
-        name = "random-access-file-0.3.1.tgz";
-        sha1 = "8afffaac665de38feba00f371429648f057d5c16";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."random-access-file" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/random-access-file/-/random-access-file-0.3.1.tgz";
+      name = "random-access-file-0.3.1.tgz";
+      sha1 = "8afffaac665de38feba00f371429648f057d5c16";
+    };
     deps = {
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "random-access-file" ];
+    peerDependencies = [];
+  };
+  by-spec."randombytes"."^2.0.0" =
+    self.by-version."randombytes"."2.0.1";
+  by-version."randombytes"."2.0.1" = self.buildNodePackage {
+    name = "randombytes-2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz";
+      name = "randombytes-2.0.1.tgz";
+      sha1 = "18f4a9ba0dd07bdb1580bc9156091fcf90eabc6f";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."range-parser"."0.0.4" =
     self.by-version."range-parser"."0.0.4";
-  by-version."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."range-parser"."0.0.4" = self.buildNodePackage {
     name = "range-parser-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
-        name = "range-parser-0.0.4.tgz";
-        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."range-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
+      name = "range-parser-0.0.4.tgz";
+      sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "range-parser" ];
+    peerDependencies = [];
   };
   by-spec."range-parser"."1.0.0" =
     self.by-version."range-parser"."1.0.0";
-  by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."range-parser"."1.0.0" = self.buildNodePackage {
     name = "range-parser-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
-        name = "range-parser-1.0.0.tgz";
-        sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."range-parser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
+      name = "range-parser-1.0.0.tgz";
+      sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "range-parser" ];
+    peerDependencies = [];
   };
   by-spec."range-parser"."^1.0.0" =
     self.by-version."range-parser"."1.0.2";
-  by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."range-parser"."1.0.2" = self.buildNodePackage {
     name = "range-parser-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."range-parser" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "range-parser" ];
+    peerDependencies = [];
   };
   by-spec."range-parser"."^1.0.2" =
     self.by-version."range-parser"."1.0.2";
@@ -23736,225 +22781,181 @@
     self.by-version."range-parser"."1.0.2";
   by-spec."raven"."~0.7.2" =
     self.by-version."raven"."0.7.2";
-  by-version."raven"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."raven"."0.7.2" = self.buildNodePackage {
     name = "raven-0.7.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/raven/-/raven-0.7.2.tgz";
-        name = "raven-0.7.2.tgz";
-        sha1 = "51c1268e5d947e45c53fdb2e0a88b829c24a02a7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."raven" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/raven/-/raven-0.7.2.tgz";
+      name = "raven-0.7.2.tgz";
+      sha1 = "51c1268e5d947e45c53fdb2e0a88b829c24a02a7";
+    };
     deps = {
       "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
       "lsmod-0.0.3" = self.by-version."lsmod"."0.0.3";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "raven" ];
+    peerDependencies = [];
   };
   by-spec."raw-body"."0.0.3" =
     self.by-version."raw-body"."0.0.3";
-  by-version."raw-body"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."raw-body"."0.0.3" = self.buildNodePackage {
     name = "raw-body-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
-        name = "raw-body-0.0.3.tgz";
-        sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."raw-body" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
+      name = "raw-body-0.0.3.tgz";
+      sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "raw-body" ];
+    peerDependencies = [];
   };
   by-spec."raw-body"."1.1.4" =
     self.by-version."raw-body"."1.1.4";
-  by-version."raw-body"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."raw-body"."1.1.4" = self.buildNodePackage {
     name = "raw-body-1.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
-        name = "raw-body-1.1.4.tgz";
-        sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."raw-body" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
+      name = "raw-body-1.1.4.tgz";
+      sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d";
+    };
     deps = {
       "bytes-0.3.0" = self.by-version."bytes"."0.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "raw-body" ];
+    peerDependencies = [];
   };
   by-spec."raw-body"."1.3.0" =
     self.by-version."raw-body"."1.3.0";
-  by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."raw-body"."1.3.0" = self.buildNodePackage {
     name = "raw-body-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
-        name = "raw-body-1.3.0.tgz";
-        sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."raw-body" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
+      name = "raw-body-1.3.0.tgz";
+      sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
+    };
     deps = {
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "raw-body" ];
+    peerDependencies = [];
   };
   by-spec."raw-body"."1.3.1" =
     self.by-version."raw-body"."1.3.1";
-  by-version."raw-body"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."raw-body"."1.3.1" = self.buildNodePackage {
     name = "raw-body-1.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.1.tgz";
-        name = "raw-body-1.3.1.tgz";
-        sha1 = "26a1491059086fd121942232d16758cd2817f815";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."raw-body" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.1.tgz";
+      name = "raw-body-1.3.1.tgz";
+      sha1 = "26a1491059086fd121942232d16758cd2817f815";
+    };
     deps = {
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "raw-body" ];
+    peerDependencies = [];
+  };
+  by-spec."raw-body"."1.3.2" =
+    self.by-version."raw-body"."1.3.2";
+  by-version."raw-body"."1.3.2" = self.buildNodePackage {
+    name = "raw-body-1.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.2.tgz";
+      name = "raw-body-1.3.2.tgz";
+      sha1 = "0e186f27c5fbfe326d8b3062774804564a0ecf93";
+    };
+    deps = {
+      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+      "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6";
+    };
+    peerDependencies = [];
   };
   by-spec."raw-socket"."*" =
     self.by-version."raw-socket"."1.2.2";
-  by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."raw-socket"."1.2.2" = self.buildNodePackage {
     name = "raw-socket-1.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz";
-        name = "raw-socket-1.2.2.tgz";
-        sha1 = "c9be873878a1ef70497a27e40b6e55b563d8f886";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."raw-socket" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz";
+      name = "raw-socket-1.2.2.tgz";
+      sha1 = "c9be873878a1ef70497a27e40b6e55b563d8f886";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "raw-socket" ];
+    peerDependencies = [];
   };
   by-spec."rbytes"."*" =
     self.by-version."rbytes"."1.1.0";
-  by-version."rbytes"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."rbytes"."1.1.0" = self.buildNodePackage {
     name = "rbytes-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rbytes/-/rbytes-1.1.0.tgz";
-        name = "rbytes-1.1.0.tgz";
-        sha1 = "50234097e70c079bcdf5227494311b1038f3d619";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rbytes" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rbytes/-/rbytes-1.1.0.tgz";
+      name = "rbytes-1.1.0.tgz";
+      sha1 = "50234097e70c079bcdf5227494311b1038f3d619";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rbytes" ];
+    peerDependencies = [];
   };
   "rbytes" = self.by-version."rbytes"."1.1.0";
   by-spec."rc"."0.5.2" =
     self.by-version."rc"."0.5.2";
-  by-version."rc"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."rc"."0.5.2" = self.buildNodePackage {
     name = "rc-0.5.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rc/-/rc-0.5.2.tgz";
-        name = "rc-0.5.2.tgz";
-        sha1 = "6b8e05894a158e3d4a15e7daddb970f4d15a024f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rc/-/rc-0.5.2.tgz";
+      name = "rc-0.5.2.tgz";
+      sha1 = "6b8e05894a158e3d4a15e7daddb970f4d15a024f";
+    };
     deps = {
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
       "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
       "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
       "ini-1.1.0" = self.by-version."ini"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rc" ];
+    peerDependencies = [];
   };
   by-spec."rc"."^0.4.0" =
     self.by-version."rc"."0.4.0";
-  by-version."rc"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."rc"."0.4.0" = self.buildNodePackage {
     name = "rc-0.4.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
-        name = "rc-0.4.0.tgz";
-        sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
+      name = "rc-0.4.0.tgz";
+      sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
+    };
     deps = {
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
       "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
       "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
       "ini-1.1.0" = self.by-version."ini"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rc" ];
+    peerDependencies = [];
   };
   by-spec."rc"."^0.5.1" =
     self.by-version."rc"."0.5.5";
-  by-version."rc"."0.5.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."rc"."0.5.5" = self.buildNodePackage {
     name = "rc-0.5.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rc/-/rc-0.5.5.tgz";
-        name = "rc-0.5.5.tgz";
-        sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rc/-/rc-0.5.5.tgz";
+      name = "rc-0.5.5.tgz";
+      sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199";
+    };
     deps = {
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
       "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
       "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
       "ini-1.3.2" = self.by-version."ini"."1.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rc" ];
+    peerDependencies = [];
   };
   by-spec."rc"."~0.5.0" =
     self.by-version."rc"."0.5.5";
@@ -23963,47 +22964,52 @@
   by-spec."rc"."~0.5.4" =
     self.by-version."rc"."0.5.5";
   by-spec."react"."*" =
-    self.by-version."react"."0.13.0-alpha.1";
-  by-version."react"."0.13.0-alpha.1" = lib.makeOverridable self.buildNodePackage {
-    name = "react-0.13.0-alpha.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/react/-/react-0.13.0-alpha.1.tgz";
-        name = "react-0.13.0-alpha.1.tgz";
-        sha1 = "3f456c28218911536bb331f95f293ac4983ebcd3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."react" or []);
+    self.by-version."react"."0.13.0-alpha.2";
+  by-version."react"."0.13.0-alpha.2" = self.buildNodePackage {
+    name = "react-0.13.0-alpha.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/react/-/react-0.13.0-alpha.2.tgz";
+      name = "react-0.13.0-alpha.2.tgz";
+      sha1 = "ef16c2018564cf12560543abdde2425f995761f8";
+    };
     deps = {
       "envify-3.2.0" = self.by-version."envify"."3.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "react" ];
+    peerDependencies = [];
+  };
+  "react" = self.by-version."react"."0.13.0-alpha.2";
+  by-spec."react-tools"."*" =
+    self.by-version."react-tools"."0.13.0-alpha.2";
+  by-version."react-tools"."0.13.0-alpha.2" = self.buildNodePackage {
+    name = "react-tools-0.13.0-alpha.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.0-alpha.2.tgz";
+      name = "react-tools-0.13.0-alpha.2.tgz";
+      sha1 = "ef9a43938e203175d97012859217e7a0c08750a6";
+    };
+    deps = {
+      "commoner-0.10.1" = self.by-version."commoner"."0.10.1";
+      "jstransform-8.2.0" = self.by-version."jstransform"."8.2.0";
+    };
+    peerDependencies = [];
   };
-  "react" = self.by-version."react"."0.13.0-alpha.1";
+  "react-tools" = self.by-version."react-tools"."0.13.0-alpha.2";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
-  by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."read"."1.0.5" = self.buildNodePackage {
     name = "read-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
-        name = "read-1.0.5.tgz";
-        sha1 = "007a3d169478aa710a491727e453effb92e76203";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."read" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
+      name = "read-1.0.5.tgz";
+      sha1 = "007a3d169478aa710a491727e453effb92e76203";
+    };
     deps = {
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "read" ];
+    peerDependencies = [];
   };
   by-spec."read"."1.0.x" =
     self.by-version."read"."1.0.5";
@@ -24013,18 +23019,14 @@
     self.by-version."read"."1.0.5";
   by-spec."read-installed"."~2.0.5" =
     self.by-version."read-installed"."2.0.7";
-  by-version."read-installed"."2.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."read-installed"."2.0.7" = self.buildNodePackage {
     name = "read-installed-2.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.7.tgz";
-        name = "read-installed-2.0.7.tgz";
-        sha1 = "a82157a5e273576c57f230ecec3702ab215a6d6c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."read-installed" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.7.tgz";
+      name = "read-installed-2.0.7.tgz";
+      sha1 = "a82157a5e273576c57f230ecec3702ab215a6d6c";
+    };
     deps = {
       "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
       "semver-3.0.1" = self.by-version."semver"."3.0.1";
@@ -24032,24 +23034,18 @@
       "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "read-installed" ];
+    peerDependencies = [];
   };
   by-spec."read-installed"."~3.1.5" =
     self.by-version."read-installed"."3.1.5";
-  by-version."read-installed"."3.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."read-installed"."3.1.5" = self.buildNodePackage {
     name = "read-installed-3.1.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz";
-        name = "read-installed-3.1.5.tgz";
-        sha1 = "4ae36081afd3e2204dc2e279807aaa52c30c8c0c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."read-installed" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz";
+      name = "read-installed-3.1.5.tgz";
+      sha1 = "4ae36081afd3e2204dc2e279807aaa52c30c8c0c";
+    };
     deps = {
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
       "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
@@ -24059,35 +23055,27 @@
       "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "read-installed" ];
+    peerDependencies = [];
   };
   by-spec."read-package-json"."1" =
     self.by-version."read-package-json"."1.2.7";
-  by-version."read-package-json"."1.2.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."read-package-json"."1.2.7" = self.buildNodePackage {
     name = "read-package-json-1.2.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz";
-        name = "read-package-json-1.2.7.tgz";
-        sha1 = "f0b440c461a218f4dbf48b094e80fc65c5248502";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."read-package-json" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz";
+      name = "read-package-json-1.2.7.tgz";
+      sha1 = "f0b440c461a218f4dbf48b094e80fc65c5248502";
+    };
     deps = {
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
       "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "read-package-json" ];
+    peerDependencies = [];
   };
   by-spec."read-package-json"."1.2.x" =
     self.by-version."read-package-json"."1.2.7";
@@ -24095,151 +23083,117 @@
     self.by-version."read-package-json"."1.2.7";
   by-spec."read-torrent"."^1.0.0" =
     self.by-version."read-torrent"."1.2.0";
-  by-version."read-torrent"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."read-torrent"."1.2.0" = self.buildNodePackage {
     name = "read-torrent-1.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.2.0.tgz";
-        name = "read-torrent-1.2.0.tgz";
-        sha1 = "2b5fa465ab1e3a9a2e478403b425910ae66c58a9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."read-torrent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.2.0.tgz";
+      name = "read-torrent-1.2.0.tgz";
+      sha1 = "2b5fa465ab1e3a9a2e478403b425910ae66c58a9";
+    };
     deps = {
       "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
       "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0";
       "request-2.16.6" = self.by-version."request"."2.16.6";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "read-torrent" ];
+    peerDependencies = [];
   };
   by-spec."read-torrent"."^1.1.0" =
     self.by-version."read-torrent"."1.2.0";
   by-spec."read-torrent"."~1.0.0" =
     self.by-version."read-torrent"."1.0.0";
-  by-version."read-torrent"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."read-torrent"."1.0.0" = self.buildNodePackage {
     name = "read-torrent-1.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.0.0.tgz";
-        name = "read-torrent-1.0.0.tgz";
-        sha1 = "d45427a10dbbf21479fdf7e1ce8ce4ad39770966";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."read-torrent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.0.0.tgz";
+      name = "read-torrent-1.0.0.tgz";
+      sha1 = "d45427a10dbbf21479fdf7e1ce8ce4ad39770966";
+    };
     deps = {
       "request-2.16.6" = self.by-version."request"."2.16.6";
       "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0";
       "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "read-torrent" ];
+    peerDependencies = [];
   };
   by-spec."readable-stream"."*" =
     self.by-version."readable-stream"."1.1.13";
-  by-version."readable-stream"."1.1.13" = lib.makeOverridable self.buildNodePackage {
+  by-version."readable-stream"."1.1.13" = self.buildNodePackage {
     name = "readable-stream-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readable-stream" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readable-stream" ];
+    peerDependencies = [];
   };
   by-spec."readable-stream"."1.0" =
     self.by-version."readable-stream"."1.0.33";
-  by-version."readable-stream"."1.0.33" = lib.makeOverridable self.buildNodePackage {
+  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
     name = "readable-stream-1.0.33";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
-        name = "readable-stream-1.0.33.tgz";
-        sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readable-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
+      name = "readable-stream-1.0.33.tgz";
+      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
+    };
     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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readable-stream" ];
+    peerDependencies = [];
   };
   by-spec."readable-stream"."1.0.27-1" =
     self.by-version."readable-stream"."1.0.27-1";
-  by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage {
+  by-version."readable-stream"."1.0.27-1" = self.buildNodePackage {
     name = "readable-stream-1.0.27-1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
-        name = "readable-stream-1.0.27-1.tgz";
-        sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readable-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+      name = "readable-stream-1.0.27-1.tgz";
+      sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
+    };
     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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readable-stream" ];
+    peerDependencies = [];
   };
   by-spec."readable-stream"."1.0.31" =
     self.by-version."readable-stream"."1.0.31";
-  by-version."readable-stream"."1.0.31" = lib.makeOverridable self.buildNodePackage {
+  by-version."readable-stream"."1.0.31" = self.buildNodePackage {
     name = "readable-stream-1.0.31";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
-        name = "readable-stream-1.0.31.tgz";
-        sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readable-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
+      name = "readable-stream-1.0.31.tgz";
+      sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae";
+    };
     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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readable-stream" ];
+    peerDependencies = [];
   };
   by-spec."readable-stream"."1.1" =
     self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."1.1.x" =
+    self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" =
     self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" =
@@ -24262,6 +23216,8 @@
     self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream"."~1.0.26-2" =
     self.by-version."readable-stream"."1.0.33";
+  by-spec."readable-stream"."~1.0.26-4" =
+    self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream"."~1.0.33" =
     self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream"."~1.1" =
@@ -24272,451 +23228,369 @@
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-wrap"."^1.0.0" =
     self.by-version."readable-wrap"."1.0.0";
-  by-version."readable-wrap"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."readable-wrap"."1.0.0" = self.buildNodePackage {
     name = "readable-wrap-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
-        name = "readable-wrap-1.0.0.tgz";
-        sha1 = "3b5a211c631e12303a54991c806c17e7ae206bff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readable-wrap" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
+      name = "readable-wrap-1.0.0.tgz";
+      sha1 = "3b5a211c631e12303a54991c806c17e7ae206bff";
+    };
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readable-wrap" ];
+    peerDependencies = [];
   };
   by-spec."readdir-scoped-modules"."^1.0.0" =
     self.by-version."readdir-scoped-modules"."1.0.1";
-  by-version."readdir-scoped-modules"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."readdir-scoped-modules"."1.0.1" = self.buildNodePackage {
     name = "readdir-scoped-modules-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.1.tgz";
-        name = "readdir-scoped-modules-1.0.1.tgz";
-        sha1 = "5c2a77f3e08250a8fddf53fa58cdc17900b808b9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readdir-scoped-modules" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.1.tgz";
+      name = "readdir-scoped-modules-1.0.1.tgz";
+      sha1 = "5c2a77f3e08250a8fddf53fa58cdc17900b808b9";
+    };
     deps = {
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
       "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readdir-scoped-modules" ];
+    peerDependencies = [];
   };
   by-spec."readdirp"."^1.2.0" =
     self.by-version."readdirp"."1.3.0";
-  by-version."readdirp"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."readdirp"."1.3.0" = self.buildNodePackage {
     name = "readdirp-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz";
-        name = "readdirp-1.3.0.tgz";
-        sha1 = "eaf1a9b463be9a8190fc9ae163aa1ac934aa340b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz";
+      name = "readdirp-1.3.0.tgz";
+      sha1 = "eaf1a9b463be9a8190fc9ae163aa1ac934aa340b";
+    };
     deps = {
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readdirp" ];
+    peerDependencies = [];
   };
   by-spec."readdirp"."~0.2.3" =
     self.by-version."readdirp"."0.2.5";
-  by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."readdirp"."0.2.5" = self.buildNodePackage {
     name = "readdirp-0.2.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz";
-        name = "readdirp-0.2.5.tgz";
-        sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz";
+      name = "readdirp-0.2.5.tgz";
+      sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb";
+    };
     deps = {
       "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readdirp" ];
+    peerDependencies = [];
   };
   by-spec."readdirp"."~1.3.0" =
     self.by-version."readdirp"."1.3.0";
   by-spec."readline2"."~0.1.0" =
-    self.by-version."readline2"."0.1.0";
-  by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "readline2-0.1.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readline2/-/readline2-0.1.0.tgz";
-        name = "readline2-0.1.0.tgz";
-        sha1 = "6a272ef89731225b448e4c6799b6e50d5be12b98";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readline2" or []);
+    self.by-version."readline2"."0.1.1";
+  by-version."readline2"."0.1.1" = self.buildNodePackage {
+    name = "readline2-0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz";
+      name = "readline2-0.1.1.tgz";
+      sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568";
+    };
     deps = {
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "chalk-0.4.0" = self.by-version."chalk"."0.4.0";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "readline2" ];
+    peerDependencies = [];
   };
   by-spec."realize-package-specifier"."~1.3.0" =
     self.by-version."realize-package-specifier"."1.3.0";
-  by-version."realize-package-specifier"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."realize-package-specifier"."1.3.0" = self.buildNodePackage {
     name = "realize-package-specifier-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.3.0.tgz";
-        name = "realize-package-specifier-1.3.0.tgz";
-        sha1 = "23374a84e6a9188483f346cc939eb58eec85efa5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."realize-package-specifier" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.3.0.tgz";
+      name = "realize-package-specifier-1.3.0.tgz";
+      sha1 = "23374a84e6a9188483f346cc939eb58eec85efa5";
+    };
     deps = {
       "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
       "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "realize-package-specifier" ];
+    peerDependencies = [];
+  };
+  by-spec."recast"."~0.6.5" =
+    self.by-version."recast"."0.6.10";
+  by-version."recast"."0.6.10" = self.buildNodePackage {
+    name = "recast-0.6.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/recast/-/recast-0.6.10.tgz";
+      name = "recast-0.6.10.tgz";
+      sha1 = "3dd75f6e114503cb34f25459a7848c17f0dd2e95";
+    };
+    deps = {
+      "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony";
+      "source-map-0.1.32" = self.by-version."source-map"."0.1.32";
+      "private-0.1.6" = self.by-version."private"."0.1.6";
+      "cls-0.1.5" = self.by-version."cls"."0.1.5";
+      "ast-types-0.4.13" = self.by-version."ast-types"."0.4.13";
+    };
+    peerDependencies = [];
+  };
+  by-spec."recast"."~0.9.5" =
+    self.by-version."recast"."0.9.15";
+  by-version."recast"."0.9.15" = self.buildNodePackage {
+    name = "recast-0.9.15";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/recast/-/recast-0.9.15.tgz";
+      name = "recast-0.9.15.tgz";
+      sha1 = "33f82d42c8f69f4c84e666c8cc9b2864c4d42133";
+    };
+    deps = {
+      "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "private-0.1.6" = self.by-version."private"."0.1.6";
+      "ast-types-0.6.10" = self.by-version."ast-types"."0.6.10";
+    };
+    peerDependencies = [];
   };
   by-spec."reconnect-core"."https://github.com/dodo/reconnect-core/tarball/merged" =
     self.by-version."reconnect-core"."0.0.1";
-  by-version."reconnect-core"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."reconnect-core"."0.0.1" = self.buildNodePackage {
     name = "reconnect-core-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "https://github.com/dodo/reconnect-core/tarball/merged";
-        name = "reconnect-core-0.0.1.tgz";
-        sha256 = "431dd7a1578061815270e4ad59c6e8b40dff6b308244973e1c11049ccbf1629b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."reconnect-core" or []);
+    src = fetchurl {
+      url = "https://github.com/dodo/reconnect-core/tarball/merged";
+      name = "reconnect-core-0.0.1.tgz";
+      sha256 = "431dd7a1578061815270e4ad59c6e8b40dff6b308244973e1c11049ccbf1629b";
+    };
     deps = {
       "backoff-2.3.0" = self.by-version."backoff"."2.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "reconnect-core" ];
+    peerDependencies = [];
   };
   by-spec."redeyed"."~0.4.0" =
     self.by-version."redeyed"."0.4.4";
-  by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."redeyed"."0.4.4" = self.buildNodePackage {
     name = "redeyed-0.4.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz";
-        name = "redeyed-0.4.4.tgz";
-        sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."redeyed" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz";
+      name = "redeyed-0.4.4.tgz";
+      sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f";
+    };
     deps = {
       "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "redeyed" ];
+    peerDependencies = [];
   };
   by-spec."redis"."*" =
     self.by-version."redis"."0.12.1";
-  by-version."redis"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."redis"."0.12.1" = self.buildNodePackage {
     name = "redis-0.12.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
-        name = "redis-0.12.1.tgz";
-        sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."redis" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
+      name = "redis-0.12.1.tgz";
+      sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "redis" ];
+    peerDependencies = [];
   };
   "redis" = self.by-version."redis"."0.12.1";
   by-spec."redis"."0.10.x" =
     self.by-version."redis"."0.10.3";
-  by-version."redis"."0.10.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."redis"."0.10.3" = self.buildNodePackage {
     name = "redis-0.10.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
-        name = "redis-0.10.3.tgz";
-        sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."redis" or []);
-    deps = {
+    src = fetchurl {
+      url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
+      name = "redis-0.10.3.tgz";
+      sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "redis" ];
-  };
-  by-spec."redis"."0.7.2" =
-    self.by-version."redis"."0.7.2";
-  by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.7.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz";
-        name = "redis-0.7.2.tgz";
-        sha1 = "fa557fef4985ab3e3384fdc5be6e2541a0bb49af";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."redis" or []);
     deps = {
-      "hiredis-0.1.17" = self.by-version."hiredis"."0.1.17";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "redis" ];
+    peerDependencies = [];
   };
   by-spec."redis"."0.7.3" =
     self.by-version."redis"."0.7.3";
-  by-version."redis"."0.7.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."redis"."0.7.3" = self.buildNodePackage {
     name = "redis-0.7.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
-        name = "redis-0.7.3.tgz";
-        sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."redis" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
+      name = "redis-0.7.3.tgz";
+      sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "redis" ];
+    peerDependencies = [];
   };
+  by-spec."redis"."^0.12.1" =
+    self.by-version."redis"."0.12.1";
   by-spec."redis"."~0.10.0" =
     self.by-version."redis"."0.10.3";
   by-spec."reds"."~0.2.4" =
-    self.by-version."reds"."0.2.4";
-  by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "reds-0.2.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/reds/-/reds-0.2.4.tgz";
-        name = "reds-0.2.4.tgz";
-        sha1 = "a82dcaaa52319635bc6eee3ef9c1ac074411de3c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."reds" or []);
-    deps = {
-      "natural-0.1.17" = self.by-version."natural"."0.1.17";
-      "redis-0.7.2" = self.by-version."redis"."0.7.2";
+    self.by-version."reds"."0.2.5";
+  by-version."reds"."0.2.5" = self.buildNodePackage {
+    name = "reds-0.2.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/reds/-/reds-0.2.5.tgz";
+      name = "reds-0.2.5.tgz";
+      sha1 = "38a767f7663cd749036848697d82c74fd29bc01f";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "reds" ];
+    deps = {
+      "natural-0.2.0" = self.by-version."natural"."0.2.0";
+      "redis-0.12.1" = self.by-version."redis"."0.12.1";
+    };
+    peerDependencies = [];
   };
   by-spec."reduce-component"."1.0.1" =
     self.by-version."reduce-component"."1.0.1";
-  by-version."reduce-component"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."reduce-component"."1.0.1" = self.buildNodePackage {
     name = "reduce-component-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
-        name = "reduce-component-1.0.1.tgz";
-        sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."reduce-component" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
+      name = "reduce-component-1.0.1.tgz";
+      sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "reduce-component" ];
+    peerDependencies = [];
+  };
+  by-spec."regenerator"."~0.4.7" =
+    self.by-version."regenerator"."0.4.12";
+  by-version."regenerator"."0.4.12" = self.buildNodePackage {
+    name = "regenerator-0.4.12";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/regenerator/-/regenerator-0.4.12.tgz";
+      name = "regenerator-0.4.12.tgz";
+      sha1 = "1b056b8c24583c5d9c71abb42bbb61b682dbb867";
+    };
+    deps = {
+      "commander-2.1.0" = self.by-version."commander"."2.1.0";
+      "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony";
+      "recast-0.6.10" = self.by-version."recast"."0.6.10";
+      "private-0.1.6" = self.by-version."private"."0.1.6";
+      "defs-0.6.2" = self.by-version."defs"."0.6.2";
+    };
+    peerDependencies = [];
   };
   by-spec."regexp-clone"."0.0.1" =
     self.by-version."regexp-clone"."0.0.1";
-  by-version."regexp-clone"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."regexp-clone"."0.0.1" = self.buildNodePackage {
     name = "regexp-clone-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
-        name = "regexp-clone-0.0.1.tgz";
-        sha1 = "a7c2e09891fdbf38fbb10d376fb73003e68ac589";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."regexp-clone" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
+      name = "regexp-clone-0.0.1.tgz";
+      sha1 = "a7c2e09891fdbf38fbb10d376fb73003e68ac589";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "regexp-clone" ];
+    peerDependencies = [];
   };
   by-spec."registry-url"."^0.1.0" =
     self.by-version."registry-url"."0.1.1";
-  by-version."registry-url"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."registry-url"."0.1.1" = self.buildNodePackage {
     name = "registry-url-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz";
-        name = "registry-url-0.1.1.tgz";
-        sha1 = "1739427b81b110b302482a1c7cd727ffcc82d5be";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."registry-url" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz";
+      name = "registry-url-0.1.1.tgz";
+      sha1 = "1739427b81b110b302482a1c7cd727ffcc82d5be";
+    };
     deps = {
       "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "registry-url" ];
+    peerDependencies = [];
   };
   by-spec."registry-url"."^2.0.0" =
-    self.by-version."registry-url"."2.0.0";
-  by-version."registry-url"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "registry-url-2.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/registry-url/-/registry-url-2.0.0.tgz";
-        name = "registry-url-2.0.0.tgz";
-        sha1 = "f42feb744865eef37a33d38edec4cff9ea92f643";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."registry-url" or []);
+    self.by-version."registry-url"."2.1.0";
+  by-version."registry-url"."2.1.0" = self.buildNodePackage {
+    name = "registry-url-2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/registry-url/-/registry-url-2.1.0.tgz";
+      name = "registry-url-2.1.0.tgz";
+      sha1 = "f9624c877b43946af540849ba772ed704d606f7a";
+    };
     deps = {
       "rc-0.5.5" = self.by-version."rc"."0.5.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "registry-url" ];
+    peerDependencies = [];
   };
   by-spec."repeating"."^1.1.0" =
     self.by-version."repeating"."1.1.1";
-  by-version."repeating"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."repeating"."1.1.1" = self.buildNodePackage {
     name = "repeating-1.1.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz";
-        name = "repeating-1.1.1.tgz";
-        sha1 = "2dfe71fb0baf78249e8ec6a537ec3dd63f48bb22";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."repeating" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz";
+      name = "repeating-1.1.1.tgz";
+      sha1 = "2dfe71fb0baf78249e8ec6a537ec3dd63f48bb22";
+    };
     deps = {
       "is-finite-1.0.0" = self.by-version."is-finite"."1.0.0";
       "meow-2.1.0" = self.by-version."meow"."2.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "repeating" ];
+    peerDependencies = [];
   };
   by-spec."replace"."~0.2.4" =
     self.by-version."replace"."0.2.10";
-  by-version."replace"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."replace"."0.2.10" = self.buildNodePackage {
     name = "replace-0.2.10";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/replace/-/replace-0.2.10.tgz";
-        name = "replace-0.2.10.tgz";
-        sha1 = "1123397e995b3bfef9985fc63cddcf79a014fd64";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."replace" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/replace/-/replace-0.2.10.tgz";
+      name = "replace-0.2.10.tgz";
+      sha1 = "1123397e995b3bfef9985fc63cddcf79a014fd64";
+    };
     deps = {
       "nomnom-1.6.2" = self.by-version."nomnom"."1.6.2";
       "colors-0.5.1" = self.by-version."colors"."0.5.1";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "replace" ];
+    peerDependencies = [];
   };
   by-spec."replace-ext"."0.0.1" =
     self.by-version."replace-ext"."0.0.1";
-  by-version."replace-ext"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."replace-ext"."0.0.1" = self.buildNodePackage {
     name = "replace-ext-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
-        name = "replace-ext-0.0.1.tgz";
-        sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."replace-ext" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
+      name = "replace-ext-0.0.1.tgz";
+      sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "replace-ext" ];
+    peerDependencies = [];
   };
   by-spec."request"."2" =
     self.by-version."request"."2.51.0";
-  by-version."request"."2.51.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."request"."2.51.0" = self.buildNodePackage {
     name = "request-2.51.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz";
-        name = "request-2.51.0.tgz";
-        sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = {
-      "bl-0.9.3" = self.by-version."bl"."0.9.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz";
+      name = "request-2.51.0.tgz";
+      sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "caseless-0.8.0" = self.by-version."caseless"."0.8.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
@@ -24733,9 +23607,7 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
   };
   by-spec."request"."2 >=2.20.0" =
     self.by-version."request"."2.51.0";
@@ -24743,18 +23615,14 @@
     self.by-version."request"."2.51.0";
   by-spec."request"."2.16.x" =
     self.by-version."request"."2.16.6";
-  by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."request"."2.16.6" = self.buildNodePackage {
     name = "request-2.16.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
-        name = "request-2.16.6.tgz";
-        sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
+      name = "request-2.16.6.tgz";
+      sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
+    };
     deps = {
       "form-data-0.0.10" = self.by-version."form-data"."0.0.10";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
@@ -24768,24 +23636,122 @@
       "json-stringify-safe-3.0.0" = self.by-version."json-stringify-safe"."3.0.0";
       "qs-0.5.6" = self.by-version."qs"."0.5.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
+  };
+  by-spec."request"."2.26.x" =
+    self.by-version."request"."2.26.0";
+  by-version."request"."2.26.0" = self.buildNodePackage {
+    name = "request-2.26.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
+      name = "request-2.26.0.tgz";
+      sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    };
+    deps = {
+      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+      "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
+      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+      "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
+      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+    };
+    peerDependencies = [];
+  };
+  by-spec."request"."2.27.x" =
+    self.by-version."request"."2.27.0";
+  by-version."request"."2.27.0" = self.buildNodePackage {
+    name = "request-2.27.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
+      name = "request-2.27.0.tgz";
+      sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+    };
+    deps = {
+      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+      "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
+      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+      "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
+      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+    };
+    peerDependencies = [];
+  };
+  by-spec."request"."2.29.0" =
+    self.by-version."request"."2.29.0";
+  by-version."request"."2.29.0" = self.buildNodePackage {
+    name = "request-2.29.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz";
+      name = "request-2.29.0.tgz";
+      sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3";
+    };
+    deps = {
+      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15";
+      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."request"."2.36.0" =
+    self.by-version."request"."2.36.0";
+  by-version."request"."2.36.0" = self.buildNodePackage {
+    name = "request-2.36.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz";
+      name = "request-2.36.0.tgz";
+      sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
+    };
+    deps = {
+      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+    };
+    peerDependencies = [];
   };
   by-spec."request"."2.40.0" =
     self.by-version."request"."2.40.0";
-  by-version."request"."2.40.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."request"."2.40.0" = self.buildNodePackage {
     name = "request-2.40.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz";
-        name = "request-2.40.0.tgz";
-        sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz";
+      name = "request-2.40.0.tgz";
+      sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67";
+    };
     deps = {
       "qs-1.0.2" = self.by-version."qs"."1.0.2";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
@@ -24801,26 +23767,20 @@
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
   };
   by-spec."request"."2.42.0" =
     self.by-version."request"."2.42.0";
-  by-version."request"."2.42.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."request"."2.42.0" = self.buildNodePackage {
     name = "request-2.42.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz";
-        name = "request-2.42.0.tgz";
-        sha1 = "572bd0148938564040ac7ab148b96423a063304a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = {
-      "bl-0.9.3" = self.by-version."bl"."0.9.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz";
+      name = "request-2.42.0.tgz";
+      sha1 = "572bd0148938564040ac7ab148b96423a063304a";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
@@ -24836,26 +23796,20 @@
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
   };
   by-spec."request"."2.47.0" =
     self.by-version."request"."2.47.0";
-  by-version."request"."2.47.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."request"."2.47.0" = self.buildNodePackage {
     name = "request-2.47.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.47.0.tgz";
-        name = "request-2.47.0.tgz";
-        sha1 = "09e9fd1a4fed6593a805ef8202b20f0c5ecb485f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = {
-      "bl-0.9.3" = self.by-version."bl"."0.9.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.47.0.tgz";
+      name = "request-2.47.0.tgz";
+      sha1 = "09e9fd1a4fed6593a805ef8202b20f0c5ecb485f";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
@@ -24872,34 +23826,67 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
   };
   by-spec."request"."2.9.x" =
     self.by-version."request"."2.9.203";
-  by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage {
+  by-version."request"."2.9.203" = self.buildNodePackage {
     name = "request-2.9.203";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
-        name = "request-2.9.203.tgz";
-        sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
+      name = "request-2.9.203.tgz";
+      sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
   };
   by-spec."request"."2.x" =
     self.by-version."request"."2.51.0";
+  by-spec."request"."2.x.x" =
+    self.by-version."request"."2.51.0";
+  by-spec."request"."=2.45.0" =
+    self.by-version."request"."2.45.0";
+  by-version."request"."2.45.0" = self.buildNodePackage {
+    name = "request-2.45.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.45.0.tgz";
+      name = "request-2.45.0.tgz";
+      sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "qs-1.2.2" = self.by-version."qs"."1.2.2";
+      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
+      "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+    };
+    peerDependencies = [];
+  };
+  by-spec."request".">= 2.2.9" =
+    self.by-version."request"."2.51.0";
   by-spec."request".">= 2.9.153" =
     self.by-version."request"."2.51.0";
+  by-spec."request".">=2.27.0" =
+    self.by-version."request"."2.51.0";
+  by-spec."request".">=2.29.1" =
+    self.by-version."request"."2.51.0";
+  by-spec."request".">=2.30.1" =
+    self.by-version."request"."2.51.0";
+  by-spec."request"."^2.34.0" =
+    self.by-version."request"."2.51.0";
   by-spec."request"."^2.36.0" =
     self.by-version."request"."2.51.0";
   by-spec."request"."^2.40.0" =
@@ -24908,60 +23895,56 @@
     self.by-version."request"."2.51.0";
   by-spec."request"."^2.48.0" =
     self.by-version."request"."2.51.0";
+  by-spec."request"."^2.51.0" =
+    self.by-version."request"."2.51.0";
   by-spec."request"."~2" =
     self.by-version."request"."2.51.0";
   by-spec."request"."~2.16.2" =
     self.by-version."request"."2.16.6";
   by-spec."request"."~2.27.0" =
     self.by-version."request"."2.27.0";
-  by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.27.0";
+  by-spec."request"."~2.34.0" =
+    self.by-version."request"."2.34.0";
+  by-version."request"."2.34.0" = self.buildNodePackage {
+    name = "request-2.34.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
-        name = "request-2.27.0.tgz";
-        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
+      name = "request-2.34.0.tgz";
+      sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
+    };
     deps = {
       "qs-0.6.6" = self.by-version."qs"."0.6.6";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
-      "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
-      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
-      "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
   };
+  by-spec."request"."~2.40.0" =
+    self.by-version."request"."2.40.0";
   by-spec."request"."~2.42.0" =
     self.by-version."request"."2.42.0";
   by-spec."request"."~2.46.0" =
     self.by-version."request"."2.46.0";
-  by-version."request"."2.46.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."request"."2.46.0" = self.buildNodePackage {
     name = "request-2.46.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.46.0.tgz";
-        name = "request-2.46.0.tgz";
-        sha1 = "359195d52eaf720bc69742579d04ad6d265a8274";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = {
-      "bl-0.9.3" = self.by-version."bl"."0.9.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.46.0.tgz";
+      name = "request-2.46.0.tgz";
+      sha1 = "359195d52eaf720bc69742579d04ad6d265a8274";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
@@ -24977,26 +23960,20 @@
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
   };
   by-spec."request"."~2.48.0" =
     self.by-version."request"."2.48.0";
-  by-version."request"."2.48.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."request"."2.48.0" = self.buildNodePackage {
     name = "request-2.48.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.48.0.tgz";
-        name = "request-2.48.0.tgz";
-        sha1 = "3ae2e091c9698282d58a0e6989ece2638f0f1f28";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = {
-      "bl-0.9.3" = self.by-version."bl"."0.9.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.48.0.tgz";
+      name = "request-2.48.0.tgz";
+      sha1 = "3ae2e091c9698282d58a0e6989ece2638f0f1f28";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "caseless-0.7.0" = self.by-version."caseless"."0.7.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
@@ -25013,176 +23990,141 @@
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
+    peerDependencies = [];
   };
   by-spec."request"."~2.51.0" =
     self.by-version."request"."2.51.0";
   by-spec."request-progress"."0.3.0" =
     self.by-version."request-progress"."0.3.0";
-  by-version."request-progress"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."request-progress"."0.3.0" = self.buildNodePackage {
     name = "request-progress-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz";
-        name = "request-progress-0.3.0.tgz";
-        sha1 = "bdf2062bfc197c5d492500d44cb3aff7865b492e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request-progress" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz";
+      name = "request-progress-0.3.0.tgz";
+      sha1 = "bdf2062bfc197c5d492500d44cb3aff7865b492e";
+    };
     deps = {
       "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request-progress" ];
+    peerDependencies = [];
   };
   by-spec."request-progress"."0.3.1" =
     self.by-version."request-progress"."0.3.1";
-  by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."request-progress"."0.3.1" = self.buildNodePackage {
     name = "request-progress-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
-        name = "request-progress-0.3.1.tgz";
-        sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request-progress" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
+      name = "request-progress-0.3.1.tgz";
+      sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a";
+    };
     deps = {
       "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request-progress" ];
+    peerDependencies = [];
   };
   by-spec."request-replay"."~0.2.0" =
     self.by-version."request-replay"."0.2.0";
-  by-version."request-replay"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."request-replay"."0.2.0" = self.buildNodePackage {
     name = "request-replay-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz";
-        name = "request-replay-0.2.0.tgz";
-        sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request-replay" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz";
+      name = "request-replay-0.2.0.tgz";
+      sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60";
+    };
     deps = {
       "retry-0.6.1" = self.by-version."retry"."0.6.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request-replay" ];
+    peerDependencies = [];
   };
   by-spec."requirejs"."~2.1" =
     self.by-version."requirejs"."2.1.15";
-  by-version."requirejs"."2.1.15" = lib.makeOverridable self.buildNodePackage {
+  by-version."requirejs"."2.1.15" = self.buildNodePackage {
     name = "requirejs-2.1.15";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.15.tgz";
-        name = "requirejs-2.1.15.tgz";
-        sha1 = "cbcfce55d584ae5983c00a20daa8eade37d18892";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."requirejs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.15.tgz";
+      name = "requirejs-2.1.15.tgz";
+      sha1 = "cbcfce55d584ae5983c00a20daa8eade37d18892";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "requirejs" ];
+    peerDependencies = [];
   };
   by-spec."requirejs"."~2.1.0" =
     self.by-version."requirejs"."2.1.15";
+  by-spec."resanitize"."~0.3.0" =
+    self.by-version."resanitize"."0.3.0";
+  by-version."resanitize"."0.3.0" = self.buildNodePackage {
+    name = "resanitize-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/resanitize/-/resanitize-0.3.0.tgz";
+      name = "resanitize-0.3.0.tgz";
+      sha1 = "dfcb2bf2ae1df2838439ed6cd04c78845c532353";
+    };
+    deps = {
+      "validator-1.5.1" = self.by-version."validator"."1.5.1";
+    };
+    peerDependencies = [];
+  };
   by-spec."resolve"."0.6.3" =
     self.by-version."resolve"."0.6.3";
-  by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."resolve"."0.6.3" = self.buildNodePackage {
     name = "resolve-0.6.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz";
-        name = "resolve-0.6.3.tgz";
-        sha1 = "dd957982e7e736debdf53b58a4dd91754575dd46";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."resolve" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz";
+      name = "resolve-0.6.3.tgz";
+      sha1 = "dd957982e7e736debdf53b58a4dd91754575dd46";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "resolve" ];
+    peerDependencies = [];
   };
   by-spec."resolve"."0.7.x" =
     self.by-version."resolve"."0.7.4";
-  by-version."resolve"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."resolve"."0.7.4" = self.buildNodePackage {
     name = "resolve-0.7.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
-        name = "resolve-0.7.4.tgz";
-        sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."resolve" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
+      name = "resolve-0.7.4.tgz";
+      sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "resolve" ];
+    peerDependencies = [];
   };
   by-spec."resolve"."1.0.0" =
     self.by-version."resolve"."1.0.0";
-  by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."resolve"."1.0.0" = self.buildNodePackage {
     name = "resolve-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz";
-        name = "resolve-1.0.0.tgz";
-        sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."resolve" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz";
+      name = "resolve-1.0.0.tgz";
+      sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "resolve" ];
+    peerDependencies = [];
   };
   by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
-  by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."resolve"."0.3.1" = self.buildNodePackage {
     name = "resolve-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz";
-        name = "resolve-0.3.1.tgz";
-        sha1 = "34c63447c664c70598d1c9b126fc43b2a24310a4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."resolve" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz";
+      name = "resolve-0.3.1.tgz";
+      sha1 = "34c63447c664c70598d1c9b126fc43b2a24310a4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "resolve" ];
+    peerDependencies = [];
   };
   by-spec."resolve"."~0.3.1" =
     self.by-version."resolve"."0.3.1";
@@ -25196,81 +24138,59 @@
     self.by-version."resolve"."1.0.0";
   by-spec."response-time"."1.0.0" =
     self.by-version."response-time"."1.0.0";
-  by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."response-time"."1.0.0" = self.buildNodePackage {
     name = "response-time-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
-        name = "response-time-1.0.0.tgz";
-        sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."response-time" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
+      name = "response-time-1.0.0.tgz";
+      sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "response-time" ];
+    peerDependencies = [];
   };
   by-spec."response-time"."~2.0.1" =
     self.by-version."response-time"."2.0.1";
-  by-version."response-time"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."response-time"."2.0.1" = self.buildNodePackage {
     name = "response-time-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz";
-        name = "response-time-2.0.1.tgz";
-        sha1 = "c6d2cbadeac4cb251b21016fe182640c02aff343";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."response-time" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz";
+      name = "response-time-2.0.1.tgz";
+      sha1 = "c6d2cbadeac4cb251b21016fe182640c02aff343";
+    };
     deps = {
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "response-time" ];
+    peerDependencies = [];
   };
   by-spec."response-time"."~2.2.0" =
     self.by-version."response-time"."2.2.0";
-  by-version."response-time"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."response-time"."2.2.0" = self.buildNodePackage {
     name = "response-time-2.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/response-time/-/response-time-2.2.0.tgz";
-        name = "response-time-2.2.0.tgz";
-        sha1 = "77ab4688cbf030e9c5f82dc1eac7fe5226d3c8eb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."response-time" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/response-time/-/response-time-2.2.0.tgz";
+      name = "response-time-2.2.0.tgz";
+      sha1 = "77ab4688cbf030e9c5f82dc1eac7fe5226d3c8eb";
+    };
     deps = {
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "response-time" ];
+    peerDependencies = [];
   };
   by-spec."restify"."2.4.1" =
     self.by-version."restify"."2.4.1";
-  by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."restify"."2.4.1" = self.buildNodePackage {
     name = "restify-2.4.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz";
-        name = "restify-2.4.1.tgz";
-        sha1 = "35790a052bd0927e7f6a06cc3d079e56fabc9371";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."restify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz";
+      name = "restify-2.4.1.tgz";
+      sha1 = "35790a052bd0927e7f6a06cc3d079e56fabc9371";
+    };
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
       "backoff-2.1.0" = self.by-version."backoff"."2.1.0";
@@ -25290,71 +24210,65 @@
       "verror-1.3.6" = self.by-version."verror"."1.3.6";
       "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "restify" ];
+    peerDependencies = [];
+  };
+  by-spec."ret"."~0.1.6" =
+    self.by-version."ret"."0.1.10";
+  by-version."ret"."0.1.10" = self.buildNodePackage {
+    name = "ret-0.1.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ret/-/ret-0.1.10.tgz";
+      name = "ret-0.1.10.tgz";
+      sha1 = "7bda7048cb6b0566617d3b15a3345f712060a1a4";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."rethinkdb"."*" =
     self.by-version."rethinkdb"."1.15.0";
-  by-version."rethinkdb"."1.15.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."rethinkdb"."1.15.0" = self.buildNodePackage {
     name = "rethinkdb-1.15.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.15.0.tgz";
-        name = "rethinkdb-1.15.0.tgz";
-        sha1 = "b9005cd79e3800c26739938473dbb4dd769cd022";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rethinkdb" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.15.0.tgz";
+      name = "rethinkdb-1.15.0.tgz";
+      sha1 = "b9005cd79e3800c26739938473dbb4dd769cd022";
+    };
     deps = {
-      "bluebird-2.6.2" = self.by-version."bluebird"."2.6.2";
+      "bluebird-2.9.1" = self.by-version."bluebird"."2.9.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rethinkdb" ];
+    peerDependencies = [];
   };
   "rethinkdb" = self.by-version."rethinkdb"."1.15.0";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
-  by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."retry"."0.6.0" = self.buildNodePackage {
     name = "retry-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
-        name = "retry-0.6.0.tgz";
-        sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."retry" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
+      name = "retry-0.6.0.tgz";
+      sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "retry" ];
+    peerDependencies = [];
   };
   by-spec."retry"."^0.6.1" =
     self.by-version."retry"."0.6.1";
-  by-version."retry"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."retry"."0.6.1" = self.buildNodePackage {
     name = "retry-0.6.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
-        name = "retry-0.6.1.tgz";
-        sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."retry" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
+      name = "retry-0.6.1.tgz";
+      sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "retry" ];
+    peerDependencies = [];
   };
   by-spec."retry"."~0.6.0" =
     self.by-version."retry"."0.6.1";
@@ -25362,110 +24276,82 @@
     self.by-version."retry"."0.6.1";
   by-spec."revalidator"."0.1.x" =
     self.by-version."revalidator"."0.1.8";
-  by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."revalidator"."0.1.8" = self.buildNodePackage {
     name = "revalidator-0.1.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
-        name = "revalidator-0.1.8.tgz";
-        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."revalidator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
+      name = "revalidator-0.1.8.tgz";
+      sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "revalidator" ];
+    peerDependencies = [];
   };
   by-spec."rfile"."~1.0" =
     self.by-version."rfile"."1.0.0";
-  by-version."rfile"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."rfile"."1.0.0" = self.buildNodePackage {
     name = "rfile-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz";
-        name = "rfile-1.0.0.tgz";
-        sha1 = "59708cf90ca1e74c54c3cfc5c36fdb9810435261";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rfile" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz";
+      name = "rfile-1.0.0.tgz";
+      sha1 = "59708cf90ca1e74c54c3cfc5c36fdb9810435261";
+    };
     deps = {
       "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
       "resolve-0.3.1" = self.by-version."resolve"."0.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rfile" ];
+    peerDependencies = [];
   };
   by-spec."rfile"."~1.0.0" =
     self.by-version."rfile"."1.0.0";
   by-spec."rimraf"."1.x.x" =
     self.by-version."rimraf"."1.0.9";
-  by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."rimraf"."1.0.9" = self.buildNodePackage {
     name = "rimraf-1.0.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
-        name = "rimraf-1.0.9.tgz";
-        sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rimraf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
+      name = "rimraf-1.0.9.tgz";
+      sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rimraf" ];
+    peerDependencies = [];
   };
   by-spec."rimraf"."2" =
     self.by-version."rimraf"."2.2.8";
-  by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."rimraf"."2.2.8" = self.buildNodePackage {
     name = "rimraf-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rimraf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+      name = "rimraf-2.2.8.tgz";
+      sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rimraf" ];
+    peerDependencies = [];
   };
   by-spec."rimraf"."2.2.6" =
     self.by-version."rimraf"."2.2.6";
-  by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."rimraf"."2.2.6" = self.buildNodePackage {
     name = "rimraf-2.2.6";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
-        name = "rimraf-2.2.6.tgz";
-        sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rimraf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
+      name = "rimraf-2.2.6.tgz";
+      sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rimraf" ];
+    peerDependencies = [];
   };
   by-spec."rimraf"."2.x.x" =
     self.by-version."rimraf"."2.2.8";
+  by-spec."rimraf".">=2.2.6" =
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."^2.2.5" =
     self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."^2.2.8" =
@@ -25474,24 +24360,18 @@
     self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.1.4" =
     self.by-version."rimraf"."2.1.4";
-  by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."rimraf"."2.1.4" = self.buildNodePackage {
     name = "rimraf-2.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
-        name = "rimraf-2.1.4.tgz";
-        sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rimraf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+      name = "rimraf-2.1.4.tgz";
+      sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
+    };
     deps = {
       "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rimraf" ];
+    peerDependencies = [];
   };
   by-spec."rimraf"."~2.2.0" =
     self.by-version."rimraf"."2.2.8";
@@ -25501,202 +24381,175 @@
     self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.8" =
     self.by-version."rimraf"."2.2.8";
-  by-spec."ripemd160"."0.2.0" =
-    self.by-version."ripemd160"."0.2.0";
-  by-version."ripemd160"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ripemd160-0.2.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
-        name = "ripemd160-0.2.0.tgz";
-        sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ripemd160" or []);
+  by-spec."ripemd160"."^1.0.0" =
+    self.by-version."ripemd160"."1.0.0";
+  by-version."ripemd160"."1.0.0" = self.buildNodePackage {
+    name = "ripemd160-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ripemd160/-/ripemd160-1.0.0.tgz";
+      name = "ripemd160-1.0.0.tgz";
+      sha1 = "15fd251d56e58848840f3d5864a5cfbb259114c7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ripemd160" ];
+    peerDependencies = [];
   };
   by-spec."rndm"."~1.1.0" =
     self.by-version."rndm"."1.1.0";
-  by-version."rndm"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."rndm"."1.1.0" = self.buildNodePackage {
     name = "rndm-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz";
-        name = "rndm-1.1.0.tgz";
-        sha1 = "01d1a8f1fb9b471181925b627b9049bf33074574";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rndm" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz";
+      name = "rndm-1.1.0.tgz";
+      sha1 = "01d1a8f1fb9b471181925b627b9049bf33074574";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rndm" ];
+    peerDependencies = [];
   };
   by-spec."router"."^0.6.2" =
     self.by-version."router"."0.6.2";
-  by-version."router"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."router"."0.6.2" = self.buildNodePackage {
     name = "router-0.6.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/router/-/router-0.6.2.tgz";
-        name = "router-0.6.2.tgz";
-        sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."router" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/router/-/router-0.6.2.tgz";
+      name = "router-0.6.2.tgz";
+      sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "router" ];
+    peerDependencies = [];
+  };
+  by-spec."rss".">=0.2.1" =
+    self.by-version."rss"."1.1.1";
+  by-version."rss"."1.1.1" = self.buildNodePackage {
+    name = "rss-1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rss/-/rss-1.1.1.tgz";
+      name = "rss-1.1.1.tgz";
+      sha1 = "eb240f55e48bda42b9f546be5fc659221a95c72c";
+    };
+    deps = {
+      "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7";
+      "xml-1.0.0" = self.by-version."xml"."1.0.0";
+    };
+    peerDependencies = [];
   };
   by-spec."ruglify"."~1.0.0" =
     self.by-version."ruglify"."1.0.0";
-  by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ruglify"."1.0.0" = self.buildNodePackage {
     name = "ruglify-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz";
-        name = "ruglify-1.0.0.tgz";
-        sha1 = "dc8930e2a9544a274301cc9972574c0d0986b675";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ruglify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz";
+      name = "ruglify-1.0.0.tgz";
+      sha1 = "dc8930e2a9544a274301cc9972574c0d0986b675";
+    };
     deps = {
       "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
       "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ruglify" ];
+    peerDependencies = [];
   };
   by-spec."run-applescript"."^1.0.0" =
     self.by-version."run-applescript"."1.0.1";
-  by-version."run-applescript"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."run-applescript"."1.0.1" = self.buildNodePackage {
     name = "run-applescript-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/run-applescript/-/run-applescript-1.0.1.tgz";
-        name = "run-applescript-1.0.1.tgz";
-        sha1 = "9f0be74a910dcea702caba65f747563706e86fe2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."run-applescript" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/run-applescript/-/run-applescript-1.0.1.tgz";
+      name = "run-applescript-1.0.1.tgz";
+      sha1 = "9f0be74a910dcea702caba65f747563706e86fe2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "run-applescript" ];
+    peerDependencies = [];
   };
   by-spec."run-parallel"."^1.0.0" =
     self.by-version."run-parallel"."1.0.0";
-  by-version."run-parallel"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."run-parallel"."1.0.0" = self.buildNodePackage {
     name = "run-parallel-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/run-parallel/-/run-parallel-1.0.0.tgz";
-        name = "run-parallel-1.0.0.tgz";
-        sha1 = "1dd0787f994d17f8d1bbe7e910e0cc3036800cbc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."run-parallel" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/run-parallel/-/run-parallel-1.0.0.tgz";
+      name = "run-parallel-1.0.0.tgz";
+      sha1 = "1dd0787f994d17f8d1bbe7e910e0cc3036800cbc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "run-parallel" ];
+    peerDependencies = [];
   };
   by-spec."run-series"."^1.0.2" =
     self.by-version."run-series"."1.0.2";
-  by-version."run-series"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."run-series"."1.0.2" = self.buildNodePackage {
     name = "run-series-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/run-series/-/run-series-1.0.2.tgz";
-        name = "run-series-1.0.2.tgz";
-        sha1 = "63d0d361b9aa2509c85bd790810a8bd9d302bc8e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."run-series" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/run-series/-/run-series-1.0.2.tgz";
+      name = "run-series-1.0.2.tgz";
+      sha1 = "63d0d361b9aa2509c85bd790810a8bd9d302bc8e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "run-series" ];
+    peerDependencies = [];
+  };
+  by-spec."runforcover"."~0.0.2" =
+    self.by-version."runforcover"."0.0.2";
+  by-version."runforcover"."0.0.2" = self.buildNodePackage {
+    name = "runforcover-0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
+      name = "runforcover-0.0.2.tgz";
+      sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
+    };
+    deps = {
+      "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
+    };
+    peerDependencies = [];
   };
   by-spec."rusha-browserify"."^0.7.3" =
     self.by-version."rusha-browserify"."0.7.3";
-  by-version."rusha-browserify"."0.7.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."rusha-browserify"."0.7.3" = self.buildNodePackage {
     name = "rusha-browserify-0.7.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rusha-browserify/-/rusha-browserify-0.7.3.tgz";
-        name = "rusha-browserify-0.7.3.tgz";
-        sha1 = "03b313892e287021cc2fc391e2c154fd7d79aef2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rusha-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rusha-browserify/-/rusha-browserify-0.7.3.tgz";
+      name = "rusha-browserify-0.7.3.tgz";
+      sha1 = "03b313892e287021cc2fc391e2c154fd7d79aef2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rusha-browserify" ];
+    peerDependencies = [];
   };
   by-spec."rx"."^2.2.27" =
-    self.by-version."rx"."2.3.22";
-  by-version."rx"."2.3.22" = lib.makeOverridable self.buildNodePackage {
-    name = "rx-2.3.22";
+    self.by-version."rx"."2.3.24";
+  by-version."rx"."2.3.24" = self.buildNodePackage {
+    name = "rx-2.3.24";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rx/-/rx-2.3.22.tgz";
-        name = "rx-2.3.22.tgz";
-        sha1 = "031fba769eaba0b74dbad2f0e7aeaed9b1b8199d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rx" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rx/-/rx-2.3.24.tgz";
+      name = "rx-2.3.24.tgz";
+      sha1 = "14f950a4217d7e35daa71bbcbe58eff68ea4b2b7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rx" ];
+    peerDependencies = [];
   };
   by-spec."s3http"."*" =
     self.by-version."s3http"."0.0.5";
-  by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."s3http"."0.0.5" = self.buildNodePackage {
     name = "s3http-0.0.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz";
-        name = "s3http-0.0.5.tgz";
-        sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."s3http" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz";
+      name = "s3http-0.0.5.tgz";
+      sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198";
+    };
     deps = {
       "aws-sdk-1.18.0" = self.by-version."aws-sdk"."1.18.0";
       "commander-2.0.0" = self.by-version."commander"."2.0.0";
@@ -25707,303 +24560,236 @@
       "util-0.4.9" = self.by-version."util"."0.4.9";
       "crypto-0.0.3" = self.by-version."crypto"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "s3http" ];
+    peerDependencies = [];
   };
   "s3http" = self.by-version."s3http"."0.0.5";
+  by-spec."safe-regex"."0.0.1" =
+    self.by-version."safe-regex"."0.0.1";
+  by-version."safe-regex"."0.0.1" = self.buildNodePackage {
+    name = "safe-regex-0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/safe-regex/-/safe-regex-0.0.1.tgz";
+      name = "safe-regex-0.0.1.tgz";
+      sha1 = "350ae32b49b7dc75d1cac3a18cb8b375a94ef15c";
+    };
+    deps = {
+      "ret-0.1.10" = self.by-version."ret"."0.1.10";
+    };
+    peerDependencies = [];
+  };
   by-spec."samsam"."~1.1" =
     self.by-version."samsam"."1.1.2";
-  by-version."samsam"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."samsam"."1.1.2" = self.buildNodePackage {
     name = "samsam-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
-        name = "samsam-1.1.2.tgz";
-        sha1 = "bec11fdc83a9fda063401210e40176c3024d1567";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."samsam" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
+      name = "samsam-1.1.2.tgz";
+      sha1 = "bec11fdc83a9fda063401210e40176c3024d1567";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "samsam" ];
+    peerDependencies = [];
   };
   by-spec."sauce-connect-launcher"."~0.6.0" =
     self.by-version."sauce-connect-launcher"."0.6.1";
-  by-version."sauce-connect-launcher"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."sauce-connect-launcher"."0.6.1" = self.buildNodePackage {
     name = "sauce-connect-launcher-0.6.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz";
-        name = "sauce-connect-launcher-0.6.1.tgz";
-        sha1 = "a770184d8d9860cbb1e76c344af28cdf5d0e247a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sauce-connect-launcher" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz";
+      name = "sauce-connect-launcher-0.6.1.tgz";
+      sha1 = "a770184d8d9860cbb1e76c344af28cdf5d0e247a";
+    };
     deps = {
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sauce-connect-launcher" ];
+    peerDependencies = [];
   };
   by-spec."saucelabs"."~0.1.0" =
     self.by-version."saucelabs"."0.1.1";
-  by-version."saucelabs"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."saucelabs"."0.1.1" = self.buildNodePackage {
     name = "saucelabs-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz";
-        name = "saucelabs-0.1.1.tgz";
-        sha1 = "5e0ea1cf3d735d6ea15fde94b5bda6bc15d2c06d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."saucelabs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz";
+      name = "saucelabs-0.1.1.tgz";
+      sha1 = "5e0ea1cf3d735d6ea15fde94b5bda6bc15d2c06d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "saucelabs" ];
+    peerDependencies = [];
   };
   by-spec."sax"."0.3.5" =
     self.by-version."sax"."0.3.5";
-  by-version."sax"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."sax"."0.3.5" = self.buildNodePackage {
     name = "sax-0.3.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
-        name = "sax-0.3.5.tgz";
-        sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sax" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
+      name = "sax-0.3.5.tgz";
+      sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sax" ];
+    peerDependencies = [];
   };
   by-spec."sax"."0.4.2" =
     self.by-version."sax"."0.4.2";
-  by-version."sax"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."sax"."0.4.2" = self.buildNodePackage {
     name = "sax-0.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
-        name = "sax-0.4.2.tgz";
-        sha1 = "39f3b601733d6bec97105b242a2a40fd6978ac3c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sax" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
+      name = "sax-0.4.2.tgz";
+      sha1 = "39f3b601733d6bec97105b242a2a40fd6978ac3c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sax" ];
+    peerDependencies = [];
   };
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.8";
-  by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."sax"."0.5.8" = self.buildNodePackage {
     name = "sax-0.5.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
-        name = "sax-0.5.8.tgz";
-        sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sax" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
+      name = "sax-0.5.8.tgz";
+      sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sax" ];
+    peerDependencies = [];
   };
   by-spec."sax"."0.6.x" =
     self.by-version."sax"."0.6.1";
-  by-version."sax"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."sax"."0.6.1" = self.buildNodePackage {
     name = "sax-0.6.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz";
-        name = "sax-0.6.1.tgz";
-        sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sax" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz";
+      name = "sax-0.6.1.tgz";
+      sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sax" ];
+    peerDependencies = [];
   };
   by-spec."sax".">=0.4.2" =
     self.by-version."sax"."0.6.1";
   by-spec."sax"."~0.6.0" =
     self.by-version."sax"."0.6.1";
+  by-spec."scmp"."0.0.3" =
+    self.by-version."scmp"."0.0.3";
+  by-version."scmp"."0.0.3" = self.buildNodePackage {
+    name = "scmp-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz";
+      name = "scmp-0.0.3.tgz";
+      sha1 = "3648df2d7294641e7f78673ffc29681d9bad9073";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."scmp"."1.0.0" =
     self.by-version."scmp"."1.0.0";
-  by-version."scmp"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."scmp"."1.0.0" = self.buildNodePackage {
     name = "scmp-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz";
-        name = "scmp-1.0.0.tgz";
-        sha1 = "a0b272c3fc7292f77115646f00618b0262514e04";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."scmp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz";
+      name = "scmp-1.0.0.tgz";
+      sha1 = "a0b272c3fc7292f77115646f00618b0262514e04";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "scmp" ];
+    peerDependencies = [];
   };
   by-spec."scmp"."~0.0.3" =
     self.by-version."scmp"."0.0.3";
-  by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "scmp-0.0.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz";
-        name = "scmp-0.0.3.tgz";
-        sha1 = "3648df2d7294641e7f78673ffc29681d9bad9073";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."scmp" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "scmp" ];
-  };
+  by-spec."scmp"."~1.0.0" =
+    self.by-version."scmp"."1.0.0";
   by-spec."selenium-webdriver"."*" =
     self.by-version."selenium-webdriver"."2.44.0";
-  by-version."selenium-webdriver"."2.44.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."selenium-webdriver"."2.44.0" = self.buildNodePackage {
     name = "selenium-webdriver-2.44.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.44.0.tgz";
-        name = "selenium-webdriver-2.44.0.tgz";
-        sha1 = "6cc6257731cd27c6db6471092857755f99d77b57";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."selenium-webdriver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.44.0.tgz";
+      name = "selenium-webdriver-2.44.0.tgz";
+      sha1 = "6cc6257731cd27c6db6471092857755f99d77b57";
+    };
     deps = {
       "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
       "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "selenium-webdriver" ];
+    peerDependencies = [];
   };
   "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0";
   by-spec."semver"."*" =
     self.by-version."semver"."4.2.0";
-  by-version."semver"."4.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."4.2.0" = self.buildNodePackage {
     name = "semver-4.2.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-4.2.0.tgz";
-        name = "semver-4.2.0.tgz";
-        sha1 = "a571fd4adbe974fe32bd9cb4c5e249606f498423";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-4.2.0.tgz";
+      name = "semver-4.2.0.tgz";
+      sha1 = "a571fd4adbe974fe32bd9cb4c5e249606f498423";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   "semver" = self.by-version."semver"."4.2.0";
   by-spec."semver"."1.1.0" =
     self.by-version."semver"."1.1.0";
-  by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."1.1.0" = self.buildNodePackage {
     name = "semver-1.1.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
-        name = "semver-1.1.0.tgz";
-        sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
+      name = "semver-1.1.0.tgz";
+      sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   by-spec."semver"."1.1.4" =
     self.by-version."semver"."1.1.4";
-  by-version."semver"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."1.1.4" = self.buildNodePackage {
     name = "semver-1.1.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
-        name = "semver-1.1.4.tgz";
-        sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
+      name = "semver-1.1.4.tgz";
+      sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   by-spec."semver"."2" =
     self.by-version."semver"."2.3.2";
-  by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."2.3.2" = self.buildNodePackage {
     name = "semver-2.3.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
-        name = "semver-2.3.2.tgz";
-        sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
+      name = "semver-2.3.2.tgz";
+      sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   by-spec."semver"."2 >=2.2.1" =
     self.by-version."semver"."2.3.2";
@@ -26011,45 +24797,33 @@
     self.by-version."semver"."4.2.0";
   by-spec."semver"."2 || 3" =
     self.by-version."semver"."3.0.1";
-  by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."3.0.1" = self.buildNodePackage {
     name = "semver-3.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz";
-        name = "semver-3.0.1.tgz";
-        sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz";
+      name = "semver-3.0.1.tgz";
+      sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   by-spec."semver"."2 || 3 || 4" =
     self.by-version."semver"."4.2.0";
   by-spec."semver"."2.0.11" =
     self.by-version."semver"."2.0.11";
-  by-version."semver"."2.0.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."2.0.11" = self.buildNodePackage {
     name = "semver-2.0.11";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
-        name = "semver-2.0.11.tgz";
-        sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+      name = "semver-2.0.11.tgz";
+      sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   by-spec."semver"."2.x" =
     self.by-version."semver"."2.3.2";
@@ -26059,23 +24833,17 @@
     self.by-version."semver"."4.2.0";
   by-spec."semver"."4.1.x" =
     self.by-version."semver"."4.1.1";
-  by-version."semver"."4.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."4.1.1" = self.buildNodePackage {
     name = "semver-4.1.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz";
-        name = "semver-4.1.1.tgz";
-        sha1 = "8d63e2e90df847e626d48ae068cd65786b0ed3d3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz";
+      name = "semver-4.1.1.tgz";
+      sha1 = "8d63e2e90df847e626d48ae068cd65786b0ed3d3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   by-spec."semver".">=2.0.10 <3.0.0" =
     self.by-version."semver"."2.3.2";
@@ -26099,43 +24867,31 @@
     self.by-version."semver"."2.0.11";
   by-spec."semver"."~2.1.0" =
     self.by-version."semver"."2.1.0";
-  by-version."semver"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."2.1.0" = self.buildNodePackage {
     name = "semver-2.1.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
-        name = "semver-2.1.0.tgz";
-        sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
+      name = "semver-2.1.0.tgz";
+      sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   by-spec."semver"."~2.2.1" =
     self.by-version."semver"."2.2.1";
-  by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver"."2.2.1" = self.buildNodePackage {
     name = "semver-2.2.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
-        name = "semver-2.2.1.tgz";
-        sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
+      name = "semver-2.2.1.tgz";
+      sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
+    peerDependencies = [];
   };
   by-spec."semver"."~2.3.0" =
     self.by-version."semver"."2.3.2";
@@ -26145,60 +24901,44 @@
     self.by-version."semver"."4.2.0";
   by-spec."semver-diff"."^0.1.0" =
     self.by-version."semver-diff"."0.1.0";
-  by-version."semver-diff"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver-diff"."0.1.0" = self.buildNodePackage {
     name = "semver-diff-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz";
-        name = "semver-diff-0.1.0.tgz";
-        sha1 = "4f6057ca3eba23cc484b51f64aaf88b131a3855d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver-diff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz";
+      name = "semver-diff-0.1.0.tgz";
+      sha1 = "4f6057ca3eba23cc484b51f64aaf88b131a3855d";
+    };
     deps = {
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver-diff" ];
+    peerDependencies = [];
   };
   by-spec."semver-diff"."^2.0.0" =
     self.by-version."semver-diff"."2.0.0";
-  by-version."semver-diff"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."semver-diff"."2.0.0" = self.buildNodePackage {
     name = "semver-diff-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz";
-        name = "semver-diff-2.0.0.tgz";
-        sha1 = "d43024f91aa7843937dc1379002766809f7480d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver-diff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz";
+      name = "semver-diff-2.0.0.tgz";
+      sha1 = "d43024f91aa7843937dc1379002766809f7480d2";
+    };
     deps = {
       "semver-4.2.0" = self.by-version."semver"."4.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver-diff" ];
+    peerDependencies = [];
   };
   by-spec."send"."*" =
-    self.by-version."send"."0.11.0";
-  by-version."send"."0.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "send-0.11.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.11.0.tgz";
-        name = "send-0.11.0.tgz";
-        sha1 = "d66b83b44576061ebd49551943b3c5c1f61cb308";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."send" or []);
+    self.by-version."send"."0.11.1";
+  by-version."send"."0.11.1" = self.buildNodePackage {
+    name = "send-0.11.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz";
+      name = "send-0.11.1.tgz";
+      sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
@@ -26211,96 +24951,72 @@
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "send" ];
+    peerDependencies = [];
   };
   by-spec."send"."0.0.3" =
     self.by-version."send"."0.0.3";
-  by-version."send"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."send"."0.0.3" = self.buildNodePackage {
     name = "send-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz";
-        name = "send-0.0.3.tgz";
-        sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."send" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz";
+      name = "send-0.0.3.tgz";
+      sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "mime-1.2.6" = self.by-version."mime"."1.2.6";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "send" ];
+    peerDependencies = [];
   };
   by-spec."send"."0.1.0" =
     self.by-version."send"."0.1.0";
-  by-version."send"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."send"."0.1.0" = self.buildNodePackage {
     name = "send-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
-        name = "send-0.1.0.tgz";
-        sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."send" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
+      name = "send-0.1.0.tgz";
+      sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "mime-1.2.6" = self.by-version."mime"."1.2.6";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "send" ];
+    peerDependencies = [];
   };
   by-spec."send"."0.1.4" =
     self.by-version."send"."0.1.4";
-  by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."send"."0.1.4" = self.buildNodePackage {
     name = "send-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
-        name = "send-0.1.4.tgz";
-        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."send" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
+      name = "send-0.1.4.tgz";
+      sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "send" ];
+    peerDependencies = [];
   };
   by-spec."send"."0.10.1" =
     self.by-version."send"."0.10.1";
-  by-version."send"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."send"."0.10.1" = self.buildNodePackage {
     name = "send-0.10.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.10.1.tgz";
-        name = "send-0.10.1.tgz";
-        sha1 = "7745c50ec72f115115980e8fb179aec01900e08a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."send" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.10.1.tgz";
+      name = "send-0.10.1.tgz";
+      sha1 = "7745c50ec72f115115980e8fb179aec01900e08a";
+    };
     deps = {
       "debug-2.1.1" = self.by-version."debug"."2.1.1";
       "depd-1.0.0" = self.by-version."depd"."1.0.0";
@@ -26313,26 +25029,20 @@
       "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "send" ];
+    peerDependencies = [];
   };
-  by-spec."send"."0.11.0" =
-    self.by-version."send"."0.11.0";
+  by-spec."send"."0.11.1" =
+    self.by-version."send"."0.11.1";
   by-spec."send"."0.3.0" =
     self.by-version."send"."0.3.0";
-  by-version."send"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."send"."0.3.0" = self.buildNodePackage {
     name = "send-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz";
-        name = "send-0.3.0.tgz";
-        sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."send" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz";
+      name = "send-0.3.0.tgz";
+      sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7";
+    };
     deps = {
       "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1";
       "debug-0.8.0" = self.by-version."debug"."0.8.0";
@@ -26340,24 +25050,40 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "send" ];
+    peerDependencies = [];
+  };
+  by-spec."send"."0.6.0" =
+    self.by-version."send"."0.6.0";
+  by-version."send"."0.6.0" = self.buildNodePackage {
+    name = "send-0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.6.0.tgz";
+      name = "send-0.6.0.tgz";
+      sha1 = "a59da9265db7c35141e1079cf1f368ee0d59b3ab";
+    };
+    deps = {
+      "debug-1.0.3" = self.by-version."debug"."1.0.3";
+      "depd-0.3.0" = self.by-version."depd"."0.3.0";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "finished-1.2.2" = self.by-version."finished"."1.2.2";
+      "fresh-0.2.2" = self.by-version."fresh"."0.2.2";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+    };
+    peerDependencies = [];
   };
   by-spec."send"."0.9.3" =
     self.by-version."send"."0.9.3";
-  by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."send"."0.9.3" = self.buildNodePackage {
     name = "send-0.9.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz";
-        name = "send-0.9.3.tgz";
-        sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."send" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz";
+      name = "send-0.9.3.tgz";
+      sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0";
+    };
     deps = {
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "depd-0.4.5" = self.by-version."depd"."0.4.5";
@@ -26370,161 +25096,119 @@
       "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "send" ];
+    peerDependencies = [];
   };
+  by-spec."send"."^0.9.2" =
+    self.by-version."send"."0.9.3";
   by-spec."sequence"."2.2.1" =
     self.by-version."sequence"."2.2.1";
-  by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."sequence"."2.2.1" = self.buildNodePackage {
     name = "sequence-2.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
-        name = "sequence-2.2.1.tgz";
-        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sequence" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+      name = "sequence-2.2.1.tgz";
+      sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sequence" ];
+    peerDependencies = [];
   };
-  by-spec."sequence"."2.x" =
-    self.by-version."sequence"."2.2.1";
   by-spec."sequencify"."~0.0.7" =
     self.by-version."sequencify"."0.0.7";
-  by-version."sequencify"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."sequencify"."0.0.7" = self.buildNodePackage {
     name = "sequencify-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz";
-        name = "sequencify-0.0.7.tgz";
-        sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sequencify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz";
+      name = "sequencify-0.0.7.tgz";
+      sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sequencify" ];
+    peerDependencies = [];
   };
   by-spec."serve-favicon"."^2.1.1" =
     self.by-version."serve-favicon"."2.2.0";
-  by-version."serve-favicon"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."serve-favicon"."2.2.0" = self.buildNodePackage {
     name = "serve-favicon-2.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz";
-        name = "serve-favicon-2.2.0.tgz";
-        sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-favicon" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz";
+      name = "serve-favicon-2.2.0.tgz";
+      sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858";
+    };
     deps = {
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
       "ms-0.7.0" = self.by-version."ms"."0.7.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-favicon" ];
+    peerDependencies = [];
   };
   by-spec."serve-favicon"."~2.1.5" =
     self.by-version."serve-favicon"."2.1.7";
-  by-version."serve-favicon"."2.1.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."serve-favicon"."2.1.7" = self.buildNodePackage {
     name = "serve-favicon-2.1.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz";
-        name = "serve-favicon-2.1.7.tgz";
-        sha1 = "7b911c0ea4c0f9a2ad686daa5222766f7bc7db79";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-favicon" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz";
+      name = "serve-favicon-2.1.7.tgz";
+      sha1 = "7b911c0ea4c0f9a2ad686daa5222766f7bc7db79";
+    };
     deps = {
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-favicon" ];
+    peerDependencies = [];
   };
   by-spec."serve-favicon"."~2.2.0" =
     self.by-version."serve-favicon"."2.2.0";
   by-spec."serve-index"."1.0.1" =
     self.by-version."serve-index"."1.0.1";
-  by-version."serve-index"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."serve-index"."1.0.1" = self.buildNodePackage {
     name = "serve-index-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
-        name = "serve-index-1.0.1.tgz";
-        sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-index" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
+      name = "serve-index-1.0.1.tgz";
+      sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6";
+    };
     deps = {
       "batch-0.5.0" = self.by-version."batch"."0.5.0";
       "negotiator-0.4.2" = self.by-version."negotiator"."0.4.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-index" ];
+    peerDependencies = [];
   };
   by-spec."serve-index"."~1.2.1" =
     self.by-version."serve-index"."1.2.1";
-  by-version."serve-index"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."serve-index"."1.2.1" = self.buildNodePackage {
     name = "serve-index-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz";
-        name = "serve-index-1.2.1.tgz";
-        sha1 = "854daef00ac9ff2f5bfda1c019b78fb0ed6d2e6f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-index" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz";
+      name = "serve-index-1.2.1.tgz";
+      sha1 = "854daef00ac9ff2f5bfda1c019b78fb0ed6d2e6f";
+    };
     deps = {
       "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
       "batch-0.5.1" = self.by-version."batch"."0.5.1";
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-index" ];
+    peerDependencies = [];
   };
   by-spec."serve-index"."~1.6.0" =
     self.by-version."serve-index"."1.6.0";
-  by-version."serve-index"."1.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."serve-index"."1.6.0" = self.buildNodePackage {
     name = "serve-index-1.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.0.tgz";
-        name = "serve-index-1.6.0.tgz";
-        sha1 = "5a9216ee1fa50f5c49bba4842d041bb7970df0cd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-index" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.0.tgz";
+      name = "serve-index-1.6.0.tgz";
+      sha1 = "5a9216ee1fa50f5c49bba4842d041bb7970df0cd";
+    };
     deps = {
       "accepts-1.2.2" = self.by-version."accepts"."1.2.2";
       "batch-0.5.2" = self.by-version."batch"."0.5.2";
@@ -26533,314 +25217,249 @@
       "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-index" ];
+    peerDependencies = [];
   };
   by-spec."serve-static"."1.1.0" =
     self.by-version."serve-static"."1.1.0";
-  by-version."serve-static"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."serve-static"."1.1.0" = self.buildNodePackage {
     name = "serve-static-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz";
-        name = "serve-static-1.1.0.tgz";
-        sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-static" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz";
+      name = "serve-static-1.1.0.tgz";
+      sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643";
+    };
     deps = {
       "parseurl-1.0.1" = self.by-version."parseurl"."1.0.1";
       "send-0.3.0" = self.by-version."send"."0.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-static" ];
+    peerDependencies = [];
+  };
+  by-spec."serve-static"."~1.3.2" =
+    self.by-version."serve-static"."1.3.2";
+  by-version."serve-static"."1.3.2" = self.buildNodePackage {
+    name = "serve-static-1.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.3.2.tgz";
+      name = "serve-static-1.3.2.tgz";
+      sha1 = "d904a6cbf55f511c78138f6f45ee6e69d9d105ca";
+    };
+    deps = {
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3";
+      "send-0.6.0" = self.by-version."send"."0.6.0";
+    };
+    peerDependencies = [];
   };
   by-spec."serve-static"."~1.6.4" =
     self.by-version."serve-static"."1.6.4";
-  by-version."serve-static"."1.6.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."serve-static"."1.6.4" = self.buildNodePackage {
     name = "serve-static-1.6.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.4.tgz";
-        name = "serve-static-1.6.4.tgz";
-        sha1 = "c512e4188d7a9366672db24e40d294f0c6212367";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-static" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.4.tgz";
+      name = "serve-static-1.6.4.tgz";
+      sha1 = "c512e4188d7a9366672db24e40d294f0c6212367";
+    };
     deps = {
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "send-0.9.3" = self.by-version."send"."0.9.3";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-static" ];
+    peerDependencies = [];
   };
   by-spec."serve-static"."~1.7.1" =
     self.by-version."serve-static"."1.7.2";
-  by-version."serve-static"."1.7.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."serve-static"."1.7.2" = self.buildNodePackage {
     name = "serve-static-1.7.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.7.2.tgz";
-        name = "serve-static-1.7.2.tgz";
-        sha1 = "3164ce06d4e6c3459bdcc9d6018fb4fb35e84b39";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-static" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.7.2.tgz";
+      name = "serve-static-1.7.2.tgz";
+      sha1 = "3164ce06d4e6c3459bdcc9d6018fb4fb35e84b39";
+    };
     deps = {
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "send-0.10.1" = self.by-version."send"."0.10.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-static" ];
+    peerDependencies = [];
   };
   by-spec."serve-static"."~1.7.2" =
     self.by-version."serve-static"."1.7.2";
-  by-spec."serve-static"."~1.8.0" =
-    self.by-version."serve-static"."1.8.0";
-  by-version."serve-static"."1.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "serve-static-1.8.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.8.0.tgz";
-        name = "serve-static-1.8.0.tgz";
-        sha1 = "239e57bbfce030a8933d274e3fe7b55492ea267c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-static" or []);
+  by-spec."serve-static"."~1.8.1" =
+    self.by-version."serve-static"."1.8.1";
+  by-version."serve-static"."1.8.1" = self.buildNodePackage {
+    name = "serve-static-1.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz";
+      name = "serve-static-1.8.1.tgz";
+      sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c";
+    };
     deps = {
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "send-0.11.0" = self.by-version."send"."0.11.0";
+      "send-0.11.1" = self.by-version."send"."0.11.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-static" ];
+    peerDependencies = [];
   };
   by-spec."set-immediate-shim"."^1.0.0" =
     self.by-version."set-immediate-shim"."1.0.0";
-  by-version."set-immediate-shim"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."set-immediate-shim"."1.0.0" = self.buildNodePackage {
     name = "set-immediate-shim-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.0.tgz";
-        name = "set-immediate-shim-1.0.0.tgz";
-        sha1 = "e23b45a33244f6f2dcd90359bc38bdbf048de152";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."set-immediate-shim" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.0.tgz";
+      name = "set-immediate-shim-1.0.0.tgz";
+      sha1 = "e23b45a33244f6f2dcd90359bc38bdbf048de152";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "set-immediate-shim" ];
+    peerDependencies = [];
   };
   by-spec."setimmediate"."1.0.1" =
     self.by-version."setimmediate"."1.0.1";
-  by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."setimmediate"."1.0.1" = self.buildNodePackage {
     name = "setimmediate-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
-        name = "setimmediate-1.0.1.tgz";
-        sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."setimmediate" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
+      name = "setimmediate-1.0.1.tgz";
+      sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "setimmediate" ];
+    peerDependencies = [];
   };
   by-spec."sha"."~1.2.1" =
     self.by-version."sha"."1.2.4";
-  by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."sha"."1.2.4" = self.buildNodePackage {
     name = "sha-1.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz";
-        name = "sha-1.2.4.tgz";
-        sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sha" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz";
+      name = "sha-1.2.4.tgz";
+      sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sha" ];
+    peerDependencies = [];
   };
   by-spec."sha"."~1.3.0" =
     self.by-version."sha"."1.3.0";
-  by-version."sha"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."sha"."1.3.0" = self.buildNodePackage {
     name = "sha-1.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sha/-/sha-1.3.0.tgz";
-        name = "sha-1.3.0.tgz";
-        sha1 = "79f4787045d0ede7327d702c25c443460dbc6764";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sha" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sha/-/sha-1.3.0.tgz";
+      name = "sha-1.3.0.tgz";
+      sha1 = "79f4787045d0ede7327d702c25c443460dbc6764";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sha" ];
+    peerDependencies = [];
   };
-  by-spec."sha.js"."2.3.0" =
-    self.by-version."sha.js"."2.3.0";
-  by-version."sha.js"."2.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "sha.js-2.3.0";
+  by-spec."sha.js"."^2.3.6" =
+    self.by-version."sha.js"."2.3.6";
+  by-version."sha.js"."2.3.6" = self.buildNodePackage {
+    name = "sha.js-2.3.6";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sha.js/-/sha.js-2.3.0.tgz";
-        name = "sha.js-2.3.0.tgz";
-        sha1 = "9fbcbb99583712fd44dedeffebebe5e4617baf71";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sha.js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz";
+      name = "sha.js-2.3.6.tgz";
+      sha1 = "10585a3f7fd8f1da715adac6f9d54516da0670cc";
+    };
     deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sha.js" ];
+    peerDependencies = [];
   };
+  by-spec."sha.js"."~2.3.0" =
+    self.by-version."sha.js"."2.3.6";
   by-spec."shallow-copy"."0.0.1" =
     self.by-version."shallow-copy"."0.0.1";
-  by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."shallow-copy"."0.0.1" = self.buildNodePackage {
     name = "shallow-copy-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
-        name = "shallow-copy-0.0.1.tgz";
-        sha1 = "415f42702d73d810330292cc5ee86eae1a11a170";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shallow-copy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
+      name = "shallow-copy-0.0.1.tgz";
+      sha1 = "415f42702d73d810330292cc5ee86eae1a11a170";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "shallow-copy" ];
+    peerDependencies = [];
   };
   by-spec."shasum"."^1.0.0" =
-    self.by-version."shasum"."1.0.0";
-  by-version."shasum"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "shasum-1.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shasum/-/shasum-1.0.0.tgz";
-        name = "shasum-1.0.0.tgz";
-        sha1 = "26e3f2cef88577da2d976c7c160a5f297eb2ea36";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shasum" or []);
+    self.by-version."shasum"."1.0.1";
+  by-version."shasum"."1.0.1" = self.buildNodePackage {
+    name = "shasum-1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/shasum/-/shasum-1.0.1.tgz";
+      name = "shasum-1.0.1.tgz";
+      sha1 = "0e0e8506a3b9e6c371ad9173845d04ff9126587f";
+    };
     deps = {
       "json-stable-stringify-0.0.1" = self.by-version."json-stable-stringify"."0.0.1";
+      "sha.js-2.3.6" = self.by-version."sha.js"."2.3.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "shasum" ];
+    peerDependencies = [];
   };
   by-spec."shell-quote"."~0.0.1" =
     self.by-version."shell-quote"."0.0.1";
-  by-version."shell-quote"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."shell-quote"."0.0.1" = self.buildNodePackage {
     name = "shell-quote-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
-        name = "shell-quote-0.0.1.tgz";
-        sha1 = "1a41196f3c0333c482323593d6886ecf153dd986";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shell-quote" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
+      name = "shell-quote-0.0.1.tgz";
+      sha1 = "1a41196f3c0333c482323593d6886ecf153dd986";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "shell-quote" ];
+    peerDependencies = [];
   };
   by-spec."shell-quote"."~1.4.1" =
     self.by-version."shell-quote"."1.4.2";
-  by-version."shell-quote"."1.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."shell-quote"."1.4.2" = self.buildNodePackage {
     name = "shell-quote-1.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.2.tgz";
-        name = "shell-quote-1.4.2.tgz";
-        sha1 = "f132a54f2030d69280d370d4974155f85f62f67b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shell-quote" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.2.tgz";
+      name = "shell-quote-1.4.2.tgz";
+      sha1 = "f132a54f2030d69280d370d4974155f85f62f67b";
+    };
     deps = {
       "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
       "array-filter-0.0.1" = self.by-version."array-filter"."0.0.1";
       "array-reduce-0.0.0" = self.by-version."array-reduce"."0.0.0";
       "array-map-0.0.0" = self.by-version."array-map"."0.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "shell-quote" ];
+    peerDependencies = [];
   };
   by-spec."shelljs"."*" =
     self.by-version."shelljs"."0.3.0";
-  by-version."shelljs"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."shelljs"."0.3.0" = self.buildNodePackage {
     name = "shelljs-0.3.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
-        name = "shelljs-0.3.0.tgz";
-        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shelljs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
+      name = "shelljs-0.3.0.tgz";
+      sha1 = "3596e6307a781544f591f37da618360f31db57b1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "shelljs" ];
+    peerDependencies = [];
   };
   "shelljs" = self.by-version."shelljs"."0.3.0";
   by-spec."shelljs"."0.3.0" =
@@ -26848,323 +25467,297 @@
   by-spec."shelljs"."0.3.x" =
     self.by-version."shelljs"."0.3.0";
   by-spec."should"."*" =
-    self.by-version."should"."4.4.4";
-  by-version."should"."4.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "should-4.4.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-4.4.4.tgz";
-        name = "should-4.4.4.tgz";
-        sha1 = "829989d478c14ddcdf678119532f8c8e27ad48bd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."should" or []);
-    deps = {
-      "should-equal-0.2.8" = self.by-version."should-equal"."0.2.8";
-      "should-format-0.0.6" = self.by-version."should-format"."0.0.6";
+    self.by-version."should"."4.6.1";
+  by-version."should"."4.6.1" = self.buildNodePackage {
+    name = "should-4.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/should/-/should-4.6.1.tgz";
+      name = "should-4.6.1.tgz";
+      sha1 = "ce04cb2e8b526fd02ef36110a4f0bcfd614d408e";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "should" ];
-  };
-  "should" = self.by-version."should"."4.4.4";
-  by-spec."should-equal"."0.2.8" =
-    self.by-version."should-equal"."0.2.8";
-  by-version."should-equal"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "should-equal-0.2.8";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/should-equal/-/should-equal-0.2.8.tgz";
-        name = "should-equal-0.2.8.tgz";
-        sha1 = "d7618457646c724de8c72ee6e0e4b743b0f1bc8d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."should-equal" or []);
     deps = {
+      "should-equal-0.3.1" = self.by-version."should-equal"."0.3.1";
+      "should-format-0.0.7" = self.by-version."should-format"."0.0.7";
       "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "should-equal" ];
-  };
-  by-spec."should-format"."0.0.6" =
-    self.by-version."should-format"."0.0.6";
-  by-version."should-format"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "should-format-0.0.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/should-format/-/should-format-0.0.6.tgz";
-        name = "should-format-0.0.6.tgz";
-        sha1 = "4e700846add4ec12fb6257ad2371dc36044b0edd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."should-format" or []);
+    peerDependencies = [];
+  };
+  "should" = self.by-version."should"."4.6.1";
+  by-spec."should-equal"."0.3.1" =
+    self.by-version."should-equal"."0.3.1";
+  by-version."should-equal"."0.3.1" = self.buildNodePackage {
+    name = "should-equal-0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/should-equal/-/should-equal-0.3.1.tgz";
+      name = "should-equal-0.3.1.tgz";
+      sha1 = "bd8ea97a6748e39fad476a3be6fd72ebc2e72bf0";
+    };
     deps = {
       "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "should-format" ];
+    peerDependencies = [];
+  };
+  by-spec."should-format"."0.0.7" =
+    self.by-version."should-format"."0.0.7";
+  by-version."should-format"."0.0.7" = self.buildNodePackage {
+    name = "should-format-0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/should-format/-/should-format-0.0.7.tgz";
+      name = "should-format-0.0.7.tgz";
+      sha1 = "1e2ef86bd91da9c2e0412335b56ababd9a2fde12";
+    };
+    deps = {
+      "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
+    };
+    peerDependencies = [];
   };
   by-spec."should-type"."0.0.4" =
     self.by-version."should-type"."0.0.4";
-  by-version."should-type"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."should-type"."0.0.4" = self.buildNodePackage {
     name = "should-type-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/should-type/-/should-type-0.0.4.tgz";
-        name = "should-type-0.0.4.tgz";
-        sha1 = "0132a05417a6126866426acf116f1ed5623a5cd0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."should-type" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/should-type/-/should-type-0.0.4.tgz";
+      name = "should-type-0.0.4.tgz";
+      sha1 = "0132a05417a6126866426acf116f1ed5623a5cd0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "should-type" ];
+    peerDependencies = [];
   };
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
-  by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."sigmund"."1.0.0" = self.buildNodePackage {
     name = "sigmund-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
-        name = "sigmund-1.0.0.tgz";
-        sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sigmund" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
+      name = "sigmund-1.0.0.tgz";
+      sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sigmund" ];
+    peerDependencies = [];
   };
   by-spec."signals"."<2.0" =
     self.by-version."signals"."1.0.0";
-  by-version."signals"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."signals"."1.0.0" = self.buildNodePackage {
     name = "signals-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
-        name = "signals-1.0.0.tgz";
-        sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."signals" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
+      name = "signals-1.0.0.tgz";
+      sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "signals" ];
+    peerDependencies = [];
   };
   by-spec."signals".">0.7 <2.0" =
     self.by-version."signals"."1.0.0";
   by-spec."signals"."~1.0.0" =
     self.by-version."signals"."1.0.0";
+  by-spec."simple-fmt"."~0.1.0" =
+    self.by-version."simple-fmt"."0.1.0";
+  by-version."simple-fmt"."0.1.0" = self.buildNodePackage {
+    name = "simple-fmt-0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz";
+      name = "simple-fmt-0.1.0.tgz";
+      sha1 = "191bf566a59e6530482cb25ab53b4a8dc85c3a6b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."simple-get"."^1.3.0" =
+    self.by-version."simple-get"."1.3.0";
+  by-version."simple-get"."1.3.0" = self.buildNodePackage {
+    name = "simple-get-1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/simple-get/-/simple-get-1.3.0.tgz";
+      name = "simple-get-1.3.0.tgz";
+      sha1 = "b74582c8ac71cf6e0ece58b152a4eb74a55630ad";
+    };
+    deps = {
+      "once-1.3.1" = self.by-version."once"."1.3.1";
+    };
+    peerDependencies = [];
+  };
+  by-spec."simple-is"."~0.2.0" =
+    self.by-version."simple-is"."0.2.0";
+  by-version."simple-is"."0.2.0" = self.buildNodePackage {
+    name = "simple-is-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz";
+      name = "simple-is-0.2.0.tgz";
+      sha1 = "2abb75aade39deb5cc815ce10e6191164850baf0";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."simple-lru-cache"."0.0.x" =
     self.by-version."simple-lru-cache"."0.0.1";
-  by-version."simple-lru-cache"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."simple-lru-cache"."0.0.1" = self.buildNodePackage {
     name = "simple-lru-cache-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz";
-        name = "simple-lru-cache-0.0.1.tgz";
-        sha1 = "0334171e40ed4a4861ac29250eb1db23300be4f0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."simple-lru-cache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz";
+      name = "simple-lru-cache-0.0.1.tgz";
+      sha1 = "0334171e40ed4a4861ac29250eb1db23300be4f0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "simple-lru-cache" ];
+    peerDependencies = [];
+  };
+  by-spec."simplediff"."~0.1.1" =
+    self.by-version."simplediff"."0.1.1";
+  by-version."simplediff"."0.1.1" = self.buildNodePackage {
+    name = "simplediff-0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
+      name = "simplediff-0.1.1.tgz";
+      sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.33";
-  by-version."simplesmtp"."0.3.33" = lib.makeOverridable self.buildNodePackage {
-    name = "simplesmtp-0.3.33";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.33.tgz";
-        name = "simplesmtp-0.3.33.tgz";
-        sha1 = "f25e12431d8c6363755c106595b998f5f965aad9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."simplesmtp" or []);
+    self.by-version."simplesmtp"."0.3.34";
+  by-version."simplesmtp"."0.3.34" = self.buildNodePackage {
+    name = "simplesmtp-0.3.34";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.34.tgz";
+      name = "simplesmtp-0.3.34.tgz";
+      sha1 = "5d494ed18b832df304f197b7e4d97b81a6b8e0df";
+    };
     deps = {
       "rai-0.1.11" = self.by-version."rai"."0.1.11";
       "xoauth2-0.1.8" = self.by-version."xoauth2"."0.1.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "simplesmtp" ];
+    peerDependencies = [];
   };
+  by-spec."simplesmtp"."~0.2 || ~0.3.30" =
+    self.by-version."simplesmtp"."0.3.34";
+  by-spec."simplesmtp"."~0.3.30" =
+    self.by-version."simplesmtp"."0.3.34";
   by-spec."single-line-log"."^0.4.1" =
     self.by-version."single-line-log"."0.4.1";
-  by-version."single-line-log"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."single-line-log"."0.4.1" = self.buildNodePackage {
     name = "single-line-log-0.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz";
-        name = "single-line-log-0.4.1.tgz";
-        sha1 = "87a55649f749d783ec0dcd804e8140d9873c7cee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."single-line-log" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz";
+      name = "single-line-log-0.4.1.tgz";
+      sha1 = "87a55649f749d783ec0dcd804e8140d9873c7cee";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "single-line-log" ];
+    peerDependencies = [];
   };
   by-spec."sinon"."*" =
     self.by-version."sinon"."1.12.2";
-  by-version."sinon"."1.12.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."sinon"."1.12.2" = self.buildNodePackage {
     name = "sinon-1.12.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sinon/-/sinon-1.12.2.tgz";
-        name = "sinon-1.12.2.tgz";
-        sha1 = "dd893d1f93bfa652ae7c2a08c6eaa42898452c94";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sinon" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sinon/-/sinon-1.12.2.tgz";
+      name = "sinon-1.12.2.tgz";
+      sha1 = "dd893d1f93bfa652ae7c2a08c6eaa42898452c94";
+    };
     deps = {
       "formatio-1.1.1" = self.by-version."formatio"."1.1.1";
       "util-0.10.3" = self.by-version."util"."0.10.3";
       "lolex-1.1.0" = self.by-version."lolex"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sinon" ];
+    peerDependencies = [];
   };
   "sinon" = self.by-version."sinon"."1.12.2";
   by-spec."slasp"."*" =
     self.by-version."slasp"."0.0.4";
-  by-version."slasp"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."slasp"."0.0.4" = self.buildNodePackage {
     name = "slasp-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
-        name = "slasp-0.0.4.tgz";
-        sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."slasp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
+      name = "slasp-0.0.4.tgz";
+      sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "slasp" ];
+    peerDependencies = [];
   };
   "slasp" = self.by-version."slasp"."0.0.4";
   by-spec."slasp"."0.0.4" =
     self.by-version."slasp"."0.0.4";
   by-spec."sliced"."0.0.3" =
     self.by-version."sliced"."0.0.3";
-  by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."sliced"."0.0.3" = self.buildNodePackage {
     name = "sliced-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
-        name = "sliced-0.0.3.tgz";
-        sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sliced" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
+      name = "sliced-0.0.3.tgz";
+      sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sliced" ];
+    peerDependencies = [];
   };
   by-spec."sliced"."0.0.4" =
     self.by-version."sliced"."0.0.4";
-  by-version."sliced"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."sliced"."0.0.4" = self.buildNodePackage {
     name = "sliced-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
-        name = "sliced-0.0.4.tgz";
-        sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sliced" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
+      name = "sliced-0.0.4.tgz";
+      sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sliced" ];
+    peerDependencies = [];
   };
   by-spec."sliced"."0.0.5" =
     self.by-version."sliced"."0.0.5";
-  by-version."sliced"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."sliced"."0.0.5" = self.buildNodePackage {
     name = "sliced-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
-        name = "sliced-0.0.5.tgz";
-        sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sliced" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
+      name = "sliced-0.0.5.tgz";
+      sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sliced" ];
+    peerDependencies = [];
   };
-  by-spec."slide"."^1.1.3" =
+  by-spec."slide"."*" =
     self.by-version."slide"."1.1.6";
-  by-version."slide"."1.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."slide"."1.1.6" = self.buildNodePackage {
     name = "slide-1.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
-        name = "slide-1.1.6.tgz";
-        sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."slide" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
+      name = "slide-1.1.6.tgz";
+      sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "slide" ];
+    peerDependencies = [];
   };
+  by-spec."slide"."^1.1.3" =
+    self.by-version."slide"."1.1.6";
   by-spec."slide"."^1.1.5" =
     self.by-version."slide"."1.1.6";
   by-spec."slide"."~1.1.3" =
@@ -27173,43 +25766,33 @@
     self.by-version."slide"."1.1.6";
   by-spec."sloc"."*" =
     self.by-version."sloc"."0.1.9";
-  by-version."sloc"."0.1.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."sloc"."0.1.9" = self.buildNodePackage {
     name = "sloc-0.1.9";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sloc/-/sloc-0.1.9.tgz";
-        name = "sloc-0.1.9.tgz";
-        sha1 = "af12b4f713d079c65056435fe67ff11580770873";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sloc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sloc/-/sloc-0.1.9.tgz";
+      name = "sloc-0.1.9.tgz";
+      sha1 = "af12b4f713d079c65056435fe67ff11580770873";
+    };
     deps = {
       "commander-2.5.1" = self.by-version."commander"."2.5.1";
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1";
       "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sloc" ];
+    peerDependencies = [];
   };
   "sloc" = self.by-version."sloc"."0.1.9";
   by-spec."smartdc"."*" =
     self.by-version."smartdc"."7.3.0";
-  by-version."smartdc"."7.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."smartdc"."7.3.0" = self.buildNodePackage {
     name = "smartdc-7.3.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.0.tgz";
-        name = "smartdc-7.3.0.tgz";
-        sha1 = "d932196df2d75599fcb98a628803e83c8f9fbe45";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."smartdc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.0.tgz";
+      name = "smartdc-7.3.0.tgz";
+      sha1 = "d932196df2d75599fcb98a628803e83c8f9fbe45";
+    };
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
       "lru-cache-2.2.0" = self.by-version."lru-cache"."2.2.0";
@@ -27222,25 +25805,19 @@
       "dashdash-1.5.0" = self.by-version."dashdash"."1.5.0";
       "vasync-1.4.3" = self.by-version."vasync"."1.4.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "smartdc" ];
+    peerDependencies = [];
   };
   "smartdc" = self.by-version."smartdc"."7.3.0";
   by-spec."smartdc-auth"."1.0.1" =
     self.by-version."smartdc-auth"."1.0.1";
-  by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."smartdc-auth"."1.0.1" = self.buildNodePackage {
     name = "smartdc-auth-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz";
-        name = "smartdc-auth-1.0.1.tgz";
-        sha1 = "520bbf918313bdf2da372927d33756d46356b87b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."smartdc-auth" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz";
+      name = "smartdc-auth-1.0.1.tgz";
+      sha1 = "520bbf918313bdf2da372927d33756d46356b87b";
+    };
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
       "clone-0.1.5" = self.by-version."clone"."0.1.5";
@@ -27248,285 +25825,341 @@
       "once-1.1.1" = self.by-version."once"."1.1.1";
       "vasync-1.3.3" = self.by-version."vasync"."1.3.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "smartdc-auth" ];
+    peerDependencies = [];
   };
   by-spec."sntp"."0.1.x" =
     self.by-version."sntp"."0.1.4";
-  by-version."sntp"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."sntp"."0.1.4" = self.buildNodePackage {
     name = "sntp-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
-        name = "sntp-0.1.4.tgz";
-        sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sntp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
+      name = "sntp-0.1.4.tgz";
+      sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84";
+    };
     deps = {
       "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sntp" ];
+    peerDependencies = [];
   };
   by-spec."sntp"."0.2.x" =
     self.by-version."sntp"."0.2.4";
-  by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."sntp"."0.2.4" = self.buildNodePackage {
     name = "sntp-0.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
-        name = "sntp-0.2.4.tgz";
-        sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sntp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+      name = "sntp-0.2.4.tgz";
+      sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+    };
     deps = {
       "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sntp" ];
+    peerDependencies = [];
   };
   by-spec."socket.io"."0.9.14" =
     self.by-version."socket.io"."0.9.14";
-  by-version."socket.io"."0.9.14" = lib.makeOverridable self.buildNodePackage {
+  by-version."socket.io"."0.9.14" = self.buildNodePackage {
     name = "socket.io-0.9.14";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
-        name = "socket.io-0.9.14.tgz";
-        sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."socket.io" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
+      name = "socket.io-0.9.14.tgz";
+      sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667";
+    };
     deps = {
       "socket.io-client-0.9.11" = self.by-version."socket.io-client"."0.9.11";
       "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
       "redis-0.7.3" = self.by-version."redis"."0.7.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "socket.io" ];
+    peerDependencies = [];
   };
   by-spec."socket.io"."0.9.16" =
     self.by-version."socket.io"."0.9.16";
-  by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage {
+  by-version."socket.io"."0.9.16" = self.buildNodePackage {
     name = "socket.io-0.9.16";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
-        name = "socket.io-0.9.16.tgz";
-        sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."socket.io" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
+      name = "socket.io-0.9.16.tgz";
+      sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76";
+    };
     deps = {
       "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16";
       "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
       "redis-0.7.3" = self.by-version."redis"."0.7.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "socket.io" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
   };
   by-spec."socket.io"."~0.9.16" =
     self.by-version."socket.io"."0.9.17";
-  by-version."socket.io"."0.9.17" = lib.makeOverridable self.buildNodePackage {
+  by-version."socket.io"."0.9.17" = self.buildNodePackage {
     name = "socket.io-0.9.17";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
-        name = "socket.io-0.9.17.tgz";
-        sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."socket.io" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
+      name = "socket.io-0.9.17.tgz";
+      sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
+    };
     deps = {
       "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16";
       "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
       "redis-0.7.3" = self.by-version."redis"."0.7.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "socket.io" ];
+    peerDependencies = [];
   };
   by-spec."socket.io"."~0.9.17" =
     self.by-version."socket.io"."0.9.17";
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
   by-spec."socket.io-client"."0.9.11" =
     self.by-version."socket.io-client"."0.9.11";
-  by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."socket.io-client"."0.9.11" = self.buildNodePackage {
     name = "socket.io-client-0.9.11";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
-        name = "socket.io-client-0.9.11.tgz";
-        sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."socket.io-client" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
+      name = "socket.io-client-0.9.11.tgz";
+      sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7";
+    };
     deps = {
       "uglify-js-1.2.5" = self.by-version."uglify-js"."1.2.5";
       "ws-0.4.32" = self.by-version."ws"."0.4.32";
       "xmlhttprequest-1.4.2" = self.by-version."xmlhttprequest"."1.4.2";
       "active-x-obfuscator-0.0.1" = self.by-version."active-x-obfuscator"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "socket.io-client" ];
+    peerDependencies = [];
   };
   by-spec."socket.io-client"."0.9.16" =
     self.by-version."socket.io-client"."0.9.16";
-  by-version."socket.io-client"."0.9.16" = lib.makeOverridable self.buildNodePackage {
+  by-version."socket.io-client"."0.9.16" = self.buildNodePackage {
     name = "socket.io-client-0.9.16";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
-        name = "socket.io-client-0.9.16.tgz";
-        sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."socket.io-client" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
+      name = "socket.io-client-0.9.16.tgz";
+      sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6";
+    };
     deps = {
       "uglify-js-1.2.5" = self.by-version."uglify-js"."1.2.5";
       "ws-0.4.32" = self.by-version."ws"."0.4.32";
       "xmlhttprequest-1.4.2" = self.by-version."xmlhttprequest"."1.4.2";
       "active-x-obfuscator-0.0.1" = self.by-version."active-x-obfuscator"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "socket.io-client" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
   };
   by-spec."sockjs"."*" =
     self.by-version."sockjs"."0.3.12";
-  by-version."sockjs"."0.3.12" = lib.makeOverridable self.buildNodePackage {
+  by-version."sockjs"."0.3.12" = self.buildNodePackage {
     name = "sockjs-0.3.12";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.12.tgz";
-        name = "sockjs-0.3.12.tgz";
-        sha1 = "99f5686851cf8655706da977f56ccd266dded859";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sockjs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.12.tgz";
+      name = "sockjs-0.3.12.tgz";
+      sha1 = "99f5686851cf8655706da977f56ccd266dded859";
+    };
     deps = {
       "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2";
       "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sockjs" ];
+    peerDependencies = [];
   };
   "sockjs" = self.by-version."sockjs"."0.3.12";
+  by-spec."socks-proxy-agent"."0" =
+    self.by-version."socks-proxy-agent"."0.1.2";
+  by-version."socks-proxy-agent"."0.1.2" = self.buildNodePackage {
+    name = "socks-proxy-agent-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-0.1.2.tgz";
+      name = "socks-proxy-agent-0.1.2.tgz";
+      sha1 = "e8981486360896f692f600ba52a974c8b23dc121";
+    };
+    deps = {
+      "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
+      "rainbowsocks-0.1.2" = self.by-version."rainbowsocks"."0.1.2";
+      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+    };
+    peerDependencies = [];
+  };
   by-spec."sorted-object"."~1.0.0" =
     self.by-version."sorted-object"."1.0.0";
-  by-version."sorted-object"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."sorted-object"."1.0.0" = self.buildNodePackage {
     name = "sorted-object-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz";
-        name = "sorted-object-1.0.0.tgz";
-        sha1 = "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sorted-object" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz";
+      name = "sorted-object-1.0.0.tgz";
+      sha1 = "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sorted-object" ];
+    peerDependencies = [];
   };
   by-spec."source-map"."*" =
     self.by-version."source-map"."0.1.43";
-  by-version."source-map"."0.1.43" = lib.makeOverridable self.buildNodePackage {
+  by-version."source-map"."0.1.43" = self.buildNodePackage {
     name = "source-map-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."source-map" or []);
+    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-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "source-map" ];
+    peerDependencies = [];
   };
   "source-map" = self.by-version."source-map"."0.1.43";
   by-spec."source-map"."0.1.31" =
     self.by-version."source-map"."0.1.31";
-  by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage {
+  by-version."source-map"."0.1.31" = self.buildNodePackage {
     name = "source-map-0.1.31";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
-        name = "source-map-0.1.31.tgz";
-        sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."source-map" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
+      name = "source-map-0.1.31.tgz";
+      sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
+    };
     deps = {
       "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "source-map" ];
+    peerDependencies = [];
+  };
+  by-spec."source-map"."0.1.32" =
+    self.by-version."source-map"."0.1.32";
+  by-version."source-map"."0.1.32" = self.buildNodePackage {
+    name = "source-map-0.1.32";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
+      name = "source-map-0.1.32.tgz";
+      sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
+    };
+    deps = {
+      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+    };
+    peerDependencies = [];
   };
   by-spec."source-map"."0.1.34" =
     self.by-version."source-map"."0.1.34";
-  by-version."source-map"."0.1.34" = lib.makeOverridable self.buildNodePackage {
+  by-version."source-map"."0.1.34" = self.buildNodePackage {
     name = "source-map-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."source-map" or []);
+    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-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "source-map" ];
+    peerDependencies = [];
   };
   by-spec."source-map"."0.1.x" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map".">= 0.1.2" =
     self.by-version."source-map"."0.1.43";
+  by-spec."source-map".">=0.1.43 <0.2" =
+    self.by-version."source-map"."0.1.43";
   by-spec."source-map"."^0.1.x" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.1.31" =
@@ -27539,441 +26172,363 @@
     self.by-version."source-map"."0.1.43";
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
-  by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."spdy"."1.7.1" = self.buildNodePackage {
     name = "spdy-1.7.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz";
-        name = "spdy-1.7.1.tgz";
-        sha1 = "4fde77e602b20c4ecc39ee8619373dd9bf669152";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."spdy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz";
+      name = "spdy-1.7.1.tgz";
+      sha1 = "4fde77e602b20c4ecc39ee8619373dd9bf669152";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "spdy" ];
+    peerDependencies = [];
   };
   by-spec."speedometer"."^0.1.2" =
     self.by-version."speedometer"."0.1.4";
-  by-version."speedometer"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."speedometer"."0.1.4" = self.buildNodePackage {
     name = "speedometer-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz";
-        name = "speedometer-0.1.4.tgz";
-        sha1 = "9876dbd2a169d3115402d48e6ea6329c8816a50d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."speedometer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz";
+      name = "speedometer-0.1.4.tgz";
+      sha1 = "9876dbd2a169d3115402d48e6ea6329c8816a50d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."sprintf"."0.1.1" =
+    self.by-version."sprintf"."0.1.1";
+  by-version."sprintf"."0.1.1" = self.buildNodePackage {
+    name = "sprintf-0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.1.tgz";
+      name = "sprintf-0.1.1.tgz";
+      sha1 = "e8925fc9894e1aa6899e9091c7f2a12130b70de5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "speedometer" ];
+    peerDependencies = [];
   };
-  by-spec."sprintf"."~0.1.2" =
+  by-spec."sprintf".">=0.1.1" =
     self.by-version."sprintf"."0.1.5";
-  by-version."sprintf"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."sprintf"."0.1.5" = self.buildNodePackage {
     name = "sprintf-0.1.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
-        name = "sprintf-0.1.5.tgz";
-        sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sprintf" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
+      name = "sprintf-0.1.5.tgz";
+      sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sprintf" ];
+    peerDependencies = [];
   };
+  by-spec."sprintf"."~0.1.2" =
+    self.by-version."sprintf"."0.1.5";
   by-spec."sprintf"."~0.1.3" =
     self.by-version."sprintf"."0.1.5";
   by-spec."sprintf"."~0.1.4" =
     self.by-version."sprintf"."0.1.5";
   by-spec."srt2vtt"."^1.2.0" =
     self.by-version."srt2vtt"."1.2.0";
-  by-version."srt2vtt"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."srt2vtt"."1.2.0" = self.buildNodePackage {
     name = "srt2vtt-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/srt2vtt/-/srt2vtt-1.2.0.tgz";
-        name = "srt2vtt-1.2.0.tgz";
-        sha1 = "f17bbae66d3a0368b1e3d8e1e547e7aad794e70a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."srt2vtt" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/srt2vtt/-/srt2vtt-1.2.0.tgz";
+      name = "srt2vtt-1.2.0.tgz";
+      sha1 = "f17bbae66d3a0368b1e3d8e1e547e7aad794e70a";
+    };
     deps = {
       "codepage-1.3.8" = self.by-version."codepage"."1.3.8";
       "utfx-1.0.0" = self.by-version."utfx"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "srt2vtt" ];
+    peerDependencies = [];
   };
   by-spec."ssh-agent"."0.2.1" =
     self.by-version."ssh-agent"."0.2.1";
-  by-version."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."ssh-agent"."0.2.1" = self.buildNodePackage {
     name = "ssh-agent-0.2.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz";
-        name = "ssh-agent-0.2.1.tgz";
-        sha1 = "3044e9eaeca88a9e6971dd7deb19bdcc20012929";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ssh-agent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz";
+      name = "ssh-agent-0.2.1.tgz";
+      sha1 = "3044e9eaeca88a9e6971dd7deb19bdcc20012929";
+    };
     deps = {
       "ctype-0.5.0" = self.by-version."ctype"."0.5.0";
       "posix-getopt-1.0.0" = self.by-version."posix-getopt"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ssh-agent" ];
+    peerDependencies = [];
+  };
+  by-spec."ssl-root-cas"."^1.1.7" =
+    self.by-version."ssl-root-cas"."1.1.9-beta";
+  by-version."ssl-root-cas"."1.1.9-beta" = self.buildNodePackage {
+    name = "ssl-root-cas-1.1.9-beta";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.9-beta.tgz";
+      name = "ssl-root-cas-1.1.9-beta.tgz";
+      sha1 = "0a090a4b908e88ef6d1a429dcf08720732eb2d58";
+    };
+    deps = {
+      "es6-promise-2.0.1" = self.by-version."es6-promise"."2.0.1";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."stable"."~0.1.3" =
+    self.by-version."stable"."0.1.5";
+  by-version."stable"."0.1.5" = self.buildNodePackage {
+    name = "stable-0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stable/-/stable-0.1.5.tgz";
+      name = "stable-0.1.5.tgz";
+      sha1 = "08232f60c732e9890784b5bed0734f8b32a887b9";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."stack-trace"."0.0.7" =
     self.by-version."stack-trace"."0.0.7";
-  by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."stack-trace"."0.0.7" = self.buildNodePackage {
     name = "stack-trace-0.0.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
-        name = "stack-trace-0.0.7.tgz";
-        sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stack-trace" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
+      name = "stack-trace-0.0.7.tgz";
+      sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stack-trace" ];
+    peerDependencies = [];
   };
   by-spec."stack-trace"."0.0.x" =
     self.by-version."stack-trace"."0.0.9";
-  by-version."stack-trace"."0.0.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."stack-trace"."0.0.9" = self.buildNodePackage {
     name = "stack-trace-0.0.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
-        name = "stack-trace-0.0.9.tgz";
-        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stack-trace" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+      name = "stack-trace-0.0.9.tgz";
+      sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stack-trace" ];
+    peerDependencies = [];
   };
   by-spec."stackdriver-statsd-backend"."*" =
     self.by-version."stackdriver-statsd-backend"."0.2.3";
-  by-version."stackdriver-statsd-backend"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage {
     name = "stackdriver-statsd-backend-0.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
-        name = "stackdriver-statsd-backend-0.2.3.tgz";
-        sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stackdriver-statsd-backend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
+      name = "stackdriver-statsd-backend-0.2.3.tgz";
+      sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stackdriver-statsd-backend" ];
+    peerDependencies = [];
   };
   "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
   by-spec."static-favicon"."1.0.2" =
     self.by-version."static-favicon"."1.0.2";
-  by-version."static-favicon"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."static-favicon"."1.0.2" = self.buildNodePackage {
     name = "static-favicon-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
-        name = "static-favicon-1.0.2.tgz";
-        sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."static-favicon" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
+      name = "static-favicon-1.0.2.tgz";
+      sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "static-favicon" ];
+    peerDependencies = [];
   };
   by-spec."statsd"."*" =
     self.by-version."statsd"."0.7.2";
-  by-version."statsd"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."statsd"."0.7.2" = self.buildNodePackage {
     name = "statsd-0.7.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
-        name = "statsd-0.7.2.tgz";
-        sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."statsd" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
+      name = "statsd-0.7.2.tgz";
+      sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
+    };
     deps = {
       "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
       "hashring-1.0.1" = self.by-version."hashring"."1.0.1";
       "winser-0.1.6" = self.by-version."winser"."0.1.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "statsd" ];
+    peerDependencies = [];
   };
   "statsd" = self.by-version."statsd"."0.7.2";
   by-spec."statsd-influxdb-backend"."*" =
     self.by-version."statsd-influxdb-backend"."0.3.0";
-  by-version."statsd-influxdb-backend"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."statsd-influxdb-backend"."0.3.0" = self.buildNodePackage {
     name = "statsd-influxdb-backend-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.3.0.tgz";
-        name = "statsd-influxdb-backend-0.3.0.tgz";
-        sha1 = "f66197570545c04743c8637af1fbbc914096ec44";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."statsd-influxdb-backend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.3.0.tgz";
+      name = "statsd-influxdb-backend-0.3.0.tgz";
+      sha1 = "f66197570545c04743c8637af1fbbc914096ec44";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "statsd-influxdb-backend" ];
+    peerDependencies = [];
   };
   "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.3.0";
   by-spec."statsd-librato-backend"."*" =
-    self.by-version."statsd-librato-backend"."0.1.4";
-  by-version."statsd-librato-backend"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "statsd-librato-backend-0.1.4";
+    self.by-version."statsd-librato-backend"."0.1.6";
+  by-version."statsd-librato-backend"."0.1.6" = self.buildNodePackage {
+    name = "statsd-librato-backend-0.1.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.4.tgz";
-        name = "statsd-librato-backend-0.1.4.tgz";
-        sha1 = "b331a9d0253c055d77b6c66fc14e3ec3793379bf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."statsd-librato-backend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.6.tgz";
+      name = "statsd-librato-backend-0.1.6.tgz";
+      sha1 = "04467674959cf61986fe16896f9a62f38d0e12f3";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "statsd-librato-backend" ];
+    peerDependencies = [];
   };
-  "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.4";
+  "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.6";
   by-spec."statuses"."1" =
     self.by-version."statuses"."1.2.0";
-  by-version."statuses"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."statuses"."1.2.0" = self.buildNodePackage {
     name = "statuses-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/statuses/-/statuses-1.2.0.tgz";
-        name = "statuses-1.2.0.tgz";
-        sha1 = "4445790d65bec29184f50d54810f67e290c1679e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."statuses" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/statuses/-/statuses-1.2.0.tgz";
+      name = "statuses-1.2.0.tgz";
+      sha1 = "4445790d65bec29184f50d54810f67e290c1679e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "statuses" ];
+    peerDependencies = [];
   };
   by-spec."stream-browserify"."^1.0.0" =
     self.by-version."stream-browserify"."1.0.0";
-  by-version."stream-browserify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-browserify"."1.0.0" = self.buildNodePackage {
     name = "stream-browserify-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
-        name = "stream-browserify-1.0.0.tgz";
-        sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
+      name = "stream-browserify-1.0.0.tgz";
+      sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-browserify" ];
+    peerDependencies = [];
   };
   by-spec."stream-browserify"."~0.1.0" =
     self.by-version."stream-browserify"."0.1.3";
-  by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-browserify"."0.1.3" = self.buildNodePackage {
     name = "stream-browserify-0.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz";
-        name = "stream-browserify-0.1.3.tgz";
-        sha1 = "95cf1b369772e27adaf46352265152689c6c4be9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz";
+      name = "stream-browserify-0.1.3.tgz";
+      sha1 = "95cf1b369772e27adaf46352265152689c6c4be9";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "process-0.5.2" = self.by-version."process"."0.5.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-browserify" ];
+    peerDependencies = [];
   };
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
-  by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-combiner"."0.0.4" = self.buildNodePackage {
     name = "stream-combiner-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-combiner" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-combiner" ];
+    peerDependencies = [];
   };
   by-spec."stream-combiner2"."~1.0.0" =
     self.by-version."stream-combiner2"."1.0.2";
-  by-version."stream-combiner2"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-combiner2"."1.0.2" = self.buildNodePackage {
     name = "stream-combiner2-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz";
-        name = "stream-combiner2-1.0.2.tgz";
-        sha1 = "ba72a6b50cbfabfa950fc8bc87604bd01eb60671";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-combiner2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz";
+      name = "stream-combiner2-1.0.2.tgz";
+      sha1 = "ba72a6b50cbfabfa950fc8bc87604bd01eb60671";
+    };
     deps = {
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-combiner2" ];
+    peerDependencies = [];
   };
   by-spec."stream-consume"."~0.1.0" =
     self.by-version."stream-consume"."0.1.0";
-  by-version."stream-consume"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-consume"."0.1.0" = self.buildNodePackage {
     name = "stream-consume-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz";
-        name = "stream-consume-0.1.0.tgz";
-        sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-consume" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz";
+      name = "stream-consume-0.1.0.tgz";
+      sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-consume" ];
+    peerDependencies = [];
   };
   by-spec."stream-counter"."^1.0.0" =
     self.by-version."stream-counter"."1.0.0";
-  by-version."stream-counter"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-counter"."1.0.0" = self.buildNodePackage {
     name = "stream-counter-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
-        name = "stream-counter-1.0.0.tgz";
-        sha1 = "91cf2569ce4dc5061febcd7acb26394a5a114751";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-counter" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
+      name = "stream-counter-1.0.0.tgz";
+      sha1 = "91cf2569ce4dc5061febcd7acb26394a5a114751";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-counter" ];
+    peerDependencies = [];
   };
   by-spec."stream-counter"."~0.2.0" =
     self.by-version."stream-counter"."0.2.0";
-  by-version."stream-counter"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-counter"."0.2.0" = self.buildNodePackage {
     name = "stream-counter-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
-        name = "stream-counter-0.2.0.tgz";
-        sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-counter" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
+      name = "stream-counter-0.2.0.tgz";
+      sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de";
+    };
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-counter" ];
+    peerDependencies = [];
   };
   by-spec."stream-splicer"."^1.1.0" =
     self.by-version."stream-splicer"."1.3.1";
-  by-version."stream-splicer"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-splicer"."1.3.1" = self.buildNodePackage {
     name = "stream-splicer-1.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz";
-        name = "stream-splicer-1.3.1.tgz";
-        sha1 = "87737a08777aa00d6a27d92562e7bc88070c081d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-splicer" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz";
+      name = "stream-splicer-1.3.1.tgz";
+      sha1 = "87737a08777aa00d6a27d92562e7bc88070c081d";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
@@ -27982,419 +26537,372 @@
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
       "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-splicer" ];
+    peerDependencies = [];
   };
   by-spec."stream-splitter-transform"."*" =
     self.by-version."stream-splitter-transform"."0.0.4";
-  by-version."stream-splitter-transform"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-splitter-transform"."0.0.4" = self.buildNodePackage {
     name = "stream-splitter-transform-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz";
-        name = "stream-splitter-transform-0.0.4.tgz";
-        sha1 = "0de54e94680633a8d703b252b20fa809ed99331c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-splitter-transform" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz";
+      name = "stream-splitter-transform-0.0.4.tgz";
+      sha1 = "0de54e94680633a8d703b252b20fa809ed99331c";
+    };
     deps = {
       "buffertools-1.1.1" = self.by-version."buffertools"."1.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-splitter-transform" ];
+    peerDependencies = [];
   };
   "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4";
+  by-spec."stream-to-array"."~1.0.0" =
+    self.by-version."stream-to-array"."1.0.0";
+  by-version."stream-to-array"."1.0.0" = self.buildNodePackage {
+    name = "stream-to-array-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-to-array/-/stream-to-array-1.0.0.tgz";
+      name = "stream-to-array-1.0.0.tgz";
+      sha1 = "94166bb29f3ea24f082d2f8cd3ebb2cc0d6eca2c";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."stream-transcoder"."0.0.5" =
     self.by-version."stream-transcoder"."0.0.5";
-  by-version."stream-transcoder"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."stream-transcoder"."0.0.5" = self.buildNodePackage {
     name = "stream-transcoder-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz";
-        name = "stream-transcoder-0.0.5.tgz";
-        sha1 = "68261be4efb48840239b5791af23ee3b8bd79808";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-transcoder" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz";
+      name = "stream-transcoder-0.0.5.tgz";
+      sha1 = "68261be4efb48840239b5791af23ee3b8bd79808";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-transcoder" ];
+    peerDependencies = [];
+  };
+  by-spec."streamsearch"."0.1.2" =
+    self.by-version."streamsearch"."0.1.2";
+  by-version."streamsearch"."0.1.2" = self.buildNodePackage {
+    name = "streamsearch-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+      name = "streamsearch-0.1.2.tgz";
+      sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."string"."1.6.1" =
     self.by-version."string"."1.6.1";
-  by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."string"."1.6.1" = self.buildNodePackage {
     name = "string-1.6.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz";
-        name = "string-1.6.1.tgz";
-        sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."string" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz";
+      name = "string-1.6.1.tgz";
+      sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "string" ];
+    peerDependencies = [];
   };
   by-spec."string-length"."^0.1.2" =
     self.by-version."string-length"."0.1.2";
-  by-version."string-length"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."string-length"."0.1.2" = self.buildNodePackage {
     name = "string-length-0.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz";
-        name = "string-length-0.1.2.tgz";
-        sha1 = "ab04bb33867ee74beed7fb89bb7f089d392780f2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."string-length" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz";
+      name = "string-length-0.1.2.tgz";
+      sha1 = "ab04bb33867ee74beed7fb89bb7f089d392780f2";
+    };
     deps = {
       "strip-ansi-0.2.2" = self.by-version."strip-ansi"."0.2.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "string-length" ];
+    peerDependencies = [];
   };
   by-spec."string-length"."^1.0.0" =
     self.by-version."string-length"."1.0.0";
-  by-version."string-length"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."string-length"."1.0.0" = self.buildNodePackage {
     name = "string-length-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz";
-        name = "string-length-1.0.0.tgz";
-        sha1 = "5f0564b174feb299595a763da71513266370d3a9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."string-length" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz";
+      name = "string-length-1.0.0.tgz";
+      sha1 = "5f0564b174feb299595a763da71513266370d3a9";
+    };
     deps = {
-      "strip-ansi-2.0.0" = self.by-version."strip-ansi"."2.0.0";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "string-length" ];
+    peerDependencies = [];
+  };
+  by-spec."string-template"."~0.2.0" =
+    self.by-version."string-template"."0.2.0";
+  by-version."string-template"."0.2.0" = self.buildNodePackage {
+    name = "string-template-0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string-template/-/string-template-0.2.0.tgz";
+      name = "string-template-0.2.0.tgz";
+      sha1 = "7fd73e64316666552808af4508956987addc5f5b";
+    };
+    deps = {
+      "js-string-escape-1.0.0" = self.by-version."js-string-escape"."1.0.0";
+    };
+    peerDependencies = [];
   };
   by-spec."string2compact"."^1.1.1" =
     self.by-version."string2compact"."1.2.1";
-  by-version."string2compact"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."string2compact"."1.2.1" = self.buildNodePackage {
     name = "string2compact-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.1.tgz";
-        name = "string2compact-1.2.1.tgz";
-        sha1 = "a560cd737415e380f2518b83c38bb97093e981af";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."string2compact" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.1.tgz";
+      name = "string2compact-1.2.1.tgz";
+      sha1 = "a560cd737415e380f2518b83c38bb97093e981af";
+    };
     deps = {
       "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0";
       "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "string2compact" ];
+    peerDependencies = [];
   };
   by-spec."string_decoder"."~0.0.0" =
     self.by-version."string_decoder"."0.0.1";
-  by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."string_decoder"."0.0.1" = self.buildNodePackage {
     name = "string_decoder-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz";
-        name = "string_decoder-0.0.1.tgz";
-        sha1 = "f5472d0a8d1650ec823752d24e6fd627b39bf141";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."string_decoder" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz";
+      name = "string_decoder-0.0.1.tgz";
+      sha1 = "f5472d0a8d1650ec823752d24e6fd627b39bf141";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "string_decoder" ];
+    peerDependencies = [];
   };
   by-spec."string_decoder"."~0.10.0" =
     self.by-version."string_decoder"."0.10.31";
-  by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage {
+  by-version."string_decoder"."0.10.31" = self.buildNodePackage {
     name = "string_decoder-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."string_decoder" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "string_decoder" ];
+    peerDependencies = [];
   };
   by-spec."string_decoder"."~0.10.x" =
     self.by-version."string_decoder"."0.10.31";
   by-spec."stringify-object"."~1.0.0" =
     self.by-version."stringify-object"."1.0.0";
-  by-version."stringify-object"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."stringify-object"."1.0.0" = self.buildNodePackage {
     name = "stringify-object-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-1.0.0.tgz";
-        name = "stringify-object-1.0.0.tgz";
-        sha1 = "333875ef8fd210f696d70b374146be84646bc346";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stringify-object" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stringify-object/-/stringify-object-1.0.0.tgz";
+      name = "stringify-object-1.0.0.tgz";
+      sha1 = "333875ef8fd210f696d70b374146be84646bc346";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stringify-object" ];
+    peerDependencies = [];
+  };
+  by-spec."stringmap"."~0.2.2" =
+    self.by-version."stringmap"."0.2.2";
+  by-version."stringmap"."0.2.2" = self.buildNodePackage {
+    name = "stringmap-0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz";
+      name = "stringmap-0.2.2.tgz";
+      sha1 = "556c137b258f942b8776f5b2ef582aa069d7d1b1";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."stringset"."~0.2.1" =
+    self.by-version."stringset"."0.2.1";
+  by-version."stringset"."0.2.1" = self.buildNodePackage {
+    name = "stringset-0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz";
+      name = "stringset-0.2.1.tgz";
+      sha1 = "ef259c4e349344377fcd1c913dd2e848c9c042b5";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."stringstream"."~0.0.4" =
     self.by-version."stringstream"."0.0.4";
-  by-version."stringstream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."stringstream"."0.0.4" = self.buildNodePackage {
     name = "stringstream-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stringstream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
+      name = "stringstream-0.0.4.tgz";
+      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stringstream" ];
+    peerDependencies = [];
   };
   by-spec."strip-ansi"."^0.2.1" =
     self.by-version."strip-ansi"."0.2.2";
-  by-version."strip-ansi"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."strip-ansi"."0.2.2" = self.buildNodePackage {
     name = "strip-ansi-0.2.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz";
-        name = "strip-ansi-0.2.2.tgz";
-        sha1 = "854d290c981525fc8c397a910b025ae2d54ffc08";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-ansi" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz";
+      name = "strip-ansi-0.2.2.tgz";
+      sha1 = "854d290c981525fc8c397a910b025ae2d54ffc08";
+    };
     deps = {
       "ansi-regex-0.1.0" = self.by-version."ansi-regex"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-ansi" ];
+    peerDependencies = [];
   };
   by-spec."strip-ansi"."^0.3.0" =
     self.by-version."strip-ansi"."0.3.0";
-  by-version."strip-ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."strip-ansi"."0.3.0" = self.buildNodePackage {
     name = "strip-ansi-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-ansi" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-ansi" ];
+    peerDependencies = [];
   };
   by-spec."strip-ansi"."^1.0.0" =
     self.by-version."strip-ansi"."1.0.0";
-  by-version."strip-ansi"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."strip-ansi"."1.0.0" = self.buildNodePackage {
     name = "strip-ansi-1.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz";
-        name = "strip-ansi-1.0.0.tgz";
-        sha1 = "6c021321d6ece161a3c608fbab268c7328901c73";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-ansi" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz";
+      name = "strip-ansi-1.0.0.tgz";
+      sha1 = "6c021321d6ece161a3c608fbab268c7328901c73";
+    };
     deps = {
       "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-ansi" ];
+    peerDependencies = [];
   };
   by-spec."strip-ansi"."^2.0.0" =
-    self.by-version."strip-ansi"."2.0.0";
-  by-version."strip-ansi"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "strip-ansi-2.0.0";
+    self.by-version."strip-ansi"."2.0.1";
+  by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
+    name = "strip-ansi-2.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.0.tgz";
-        name = "strip-ansi-2.0.0.tgz";
-        sha1 = "fa8d69432e97674746f55f51d076ae78b18df13f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-ansi" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
+      name = "strip-ansi-2.0.1.tgz";
+      sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
+    };
     deps = {
       "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-ansi" ];
+    peerDependencies = [];
   };
+  by-spec."strip-ansi"."^2.0.1" =
+    self.by-version."strip-ansi"."2.0.1";
   by-spec."strip-ansi"."~0.1.0" =
     self.by-version."strip-ansi"."0.1.1";
-  by-version."strip-ansi"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."strip-ansi"."0.1.1" = self.buildNodePackage {
     name = "strip-ansi-0.1.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
-        name = "strip-ansi-0.1.1.tgz";
-        sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-ansi" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
+      name = "strip-ansi-0.1.1.tgz";
+      sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-ansi" ];
+    peerDependencies = [];
   };
   by-spec."strip-bom"."^1.0.0" =
     self.by-version."strip-bom"."1.0.0";
-  by-version."strip-bom"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."strip-bom"."1.0.0" = self.buildNodePackage {
     name = "strip-bom-1.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz";
-        name = "strip-bom-1.0.0.tgz";
-        sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-bom" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz";
+      name = "strip-bom-1.0.0.tgz";
+      sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794";
+    };
     deps = {
       "first-chunk-stream-1.0.0" = self.by-version."first-chunk-stream"."1.0.0";
       "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-bom" ];
+    peerDependencies = [];
   };
   by-spec."strip-json-comments"."0.1.x" =
     self.by-version."strip-json-comments"."0.1.3";
-  by-version."strip-json-comments"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."strip-json-comments"."0.1.3" = self.buildNodePackage {
     name = "strip-json-comments-0.1.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
-        name = "strip-json-comments-0.1.3.tgz";
-        sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-json-comments" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
+      name = "strip-json-comments-0.1.3.tgz";
+      sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-json-comments" ];
+    peerDependencies = [];
   };
   by-spec."strip-json-comments"."1.0.x" =
     self.by-version."strip-json-comments"."1.0.2";
-  by-version."strip-json-comments"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."strip-json-comments"."1.0.2" = self.buildNodePackage {
     name = "strip-json-comments-1.0.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz";
-        name = "strip-json-comments-1.0.2.tgz";
-        sha1 = "5a48ab96023dbac1b7b8d0ffabf6f63f1677be9f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-json-comments" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz";
+      name = "strip-json-comments-1.0.2.tgz";
+      sha1 = "5a48ab96023dbac1b7b8d0ffabf6f63f1677be9f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-json-comments" ];
+    peerDependencies = [];
   };
   by-spec."strong-data-uri"."~0.1.0" =
     self.by-version."strong-data-uri"."0.1.1";
-  by-version."strong-data-uri"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."strong-data-uri"."0.1.1" = self.buildNodePackage {
     name = "strong-data-uri-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz";
-        name = "strong-data-uri-0.1.1.tgz";
-        sha1 = "8660241807461d1d2dd247c70563f2f33e66c8ab";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strong-data-uri" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz";
+      name = "strong-data-uri-0.1.1.tgz";
+      sha1 = "8660241807461d1d2dd247c70563f2f33e66c8ab";
+    };
     deps = {
       "truncate-1.0.4" = self.by-version."truncate"."1.0.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "strong-data-uri" ];
+    peerDependencies = [];
   };
   by-spec."stylus"."*" =
     self.by-version."stylus"."0.49.3";
-  by-version."stylus"."0.49.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."stylus"."0.49.3" = self.buildNodePackage {
     name = "stylus-0.49.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
-        name = "stylus-0.49.3.tgz";
-        sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stylus" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
+      name = "stylus-0.49.3.tgz";
+      sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511";
+    };
     deps = {
       "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
@@ -28403,50 +26911,19 @@
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stylus" ];
+    peerDependencies = [];
   };
   "stylus" = self.by-version."stylus"."0.49.3";
   by-spec."stylus"."0.42.2" =
     self.by-version."stylus"."0.42.2";
-  by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."stylus"."0.42.2" = self.buildNodePackage {
     name = "stylus-0.42.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.42.2.tgz";
-        name = "stylus-0.42.2.tgz";
-        sha1 = "bed29107803129bed1983efc4c7e33f4fd34fee7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stylus" or []);
-    deps = {
-      "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "sax-0.5.8" = self.by-version."sax"."0.5.8";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stylus/-/stylus-0.42.2.tgz";
+      name = "stylus-0.42.2.tgz";
+      sha1 = "bed29107803129bed1983efc4c7e33f4fd34fee7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stylus" ];
-  };
-  by-spec."stylus"."0.45.x" =
-    self.by-version."stylus"."0.45.1";
-  by-version."stylus"."0.45.1" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.45.1";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.45.1.tgz";
-        name = "stylus-0.45.1.tgz";
-        sha1 = "ef69f62c984a480adc0c9d4aaafb2382a389e453";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stylus" or []);
     deps = {
       "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
@@ -28454,66 +26931,84 @@
       "sax-0.5.8" = self.by-version."sax"."0.5.8";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "stylus" ];
+    peerDependencies = [];
   };
+  by-spec."stylus"."0.49.x" =
+    self.by-version."stylus"."0.49.3";
   by-spec."subarg"."0.0.1" =
     self.by-version."subarg"."0.0.1";
-  by-version."subarg"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."subarg"."0.0.1" = self.buildNodePackage {
     name = "subarg-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz";
-        name = "subarg-0.0.1.tgz";
-        sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."subarg" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz";
+      name = "subarg-0.0.1.tgz";
+      sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a";
+    };
     deps = {
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "subarg" ];
+    peerDependencies = [];
   };
   by-spec."subarg"."^1.0.0" =
     self.by-version."subarg"."1.0.0";
-  by-version."subarg"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."subarg"."1.0.0" = self.buildNodePackage {
     name = "subarg-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz";
-        name = "subarg-1.0.0.tgz";
-        sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."subarg" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz";
+      name = "subarg-1.0.0.tgz";
+      sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
+    };
     deps = {
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "subarg" ];
+    peerDependencies = [];
+  };
+  by-spec."sugar"."^1.4.1" =
+    self.by-version."sugar"."1.4.1";
+  by-version."sugar"."1.4.1" = self.buildNodePackage {
+    name = "sugar-1.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sugar/-/sugar-1.4.1.tgz";
+      name = "sugar-1.4.1.tgz";
+      sha1 = "1310d4dedc699e5a173183718541b0d7844a7598";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."superagent"."0.13.0" =
+    self.by-version."superagent"."0.13.0";
+  by-version."superagent"."0.13.0" = self.buildNodePackage {
+    name = "superagent-0.13.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/superagent/-/superagent-0.13.0.tgz";
+      name = "superagent-0.13.0.tgz";
+      sha1 = "ddfbfa5c26f16790f9c5bce42815ccbde2ca36f2";
+    };
+    deps = {
+      "qs-0.5.2" = self.by-version."qs"."0.5.2";
+      "formidable-1.0.9" = self.by-version."formidable"."1.0.9";
+      "mime-1.2.5" = self.by-version."mime"."1.2.5";
+      "emitter-component-0.0.6" = self.by-version."emitter-component"."0.0.6";
+      "methods-0.0.1" = self.by-version."methods"."0.0.1";
+      "cookiejar-1.3.0" = self.by-version."cookiejar"."1.3.0";
+    };
+    peerDependencies = [];
   };
   by-spec."superagent"."~0.21.0" =
     self.by-version."superagent"."0.21.0";
-  by-version."superagent"."0.21.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."superagent"."0.21.0" = self.buildNodePackage {
     name = "superagent-0.21.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
-        name = "superagent-0.21.0.tgz";
-        sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."superagent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
+      name = "superagent-0.21.0.tgz";
+      sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
+    };
     deps = {
       "qs-1.2.0" = self.by-version."qs"."1.2.0";
       "formidable-1.0.14" = self.by-version."formidable"."1.0.14";
@@ -28527,297 +27022,240 @@
       "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
       "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "superagent" ];
+    peerDependencies = [];
   };
   by-spec."supertest"."*" =
     self.by-version."supertest"."0.15.0";
-  by-version."supertest"."0.15.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."supertest"."0.15.0" = self.buildNodePackage {
     name = "supertest-0.15.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/supertest/-/supertest-0.15.0.tgz";
-        name = "supertest-0.15.0.tgz";
-        sha1 = "86118695de4be58869b3ee94c45e1d084ca7fac5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."supertest" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supertest/-/supertest-0.15.0.tgz";
+      name = "supertest-0.15.0.tgz";
+      sha1 = "86118695de4be58869b3ee94c45e1d084ca7fac5";
+    };
     deps = {
       "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "supertest" ];
+    peerDependencies = [];
   };
   "supertest" = self.by-version."supertest"."0.15.0";
   by-spec."supports-color"."^0.2.0" =
     self.by-version."supports-color"."0.2.0";
-  by-version."supports-color"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."supports-color"."0.2.0" = self.buildNodePackage {
     name = "supports-color-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."supports-color" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "supports-color" ];
+    peerDependencies = [];
   };
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
-  by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."swig"."0.14.0" = self.buildNodePackage {
     name = "swig-0.14.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
-        name = "swig-0.14.0.tgz";
-        sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."swig" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
+      name = "swig-0.14.0.tgz";
+      sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
+    };
     deps = {
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "swig" ];
+    peerDependencies = [];
   };
   "swig" = self.by-version."swig"."0.14.0";
   by-spec."sylvester".">= 0.0.12" =
     self.by-version."sylvester"."0.0.21";
-  by-version."sylvester"."0.0.21" = lib.makeOverridable self.buildNodePackage {
+  by-version."sylvester"."0.0.21" = self.buildNodePackage {
     name = "sylvester-0.0.21";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
-        name = "sylvester-0.0.21.tgz";
-        sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sylvester" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
+      name = "sylvester-0.0.21.tgz";
+      sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sylvester" ];
+    peerDependencies = [];
   };
   by-spec."sylvester".">= 0.0.8" =
     self.by-version."sylvester"."0.0.21";
   by-spec."syntax-error"."^1.1.1" =
     self.by-version."syntax-error"."1.1.2";
-  by-version."syntax-error"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."syntax-error"."1.1.2" = self.buildNodePackage {
     name = "syntax-error-1.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz";
-        name = "syntax-error-1.1.2.tgz";
-        sha1 = "660f025b170b7eb944efc2a889d451312bcef451";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."syntax-error" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz";
+      name = "syntax-error-1.1.2.tgz";
+      sha1 = "660f025b170b7eb944efc2a889d451312bcef451";
+    };
     deps = {
       "acorn-0.9.0" = self.by-version."acorn"."0.9.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "syntax-error" ];
+    peerDependencies = [];
   };
   by-spec."syntax-error"."~0.0.0" =
     self.by-version."syntax-error"."0.0.1";
-  by-version."syntax-error"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."syntax-error"."0.0.1" = self.buildNodePackage {
     name = "syntax-error-0.0.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.0.1.tgz";
-        name = "syntax-error-0.0.1.tgz";
-        sha1 = "019d075348cd8c5b79f0603c73e53891a7c5235d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."syntax-error" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.0.1.tgz";
+      name = "syntax-error-0.0.1.tgz";
+      sha1 = "019d075348cd8c5b79f0603c73e53891a7c5235d";
+    };
     deps = {
       "esprima-0.9.9" = self.by-version."esprima"."0.9.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "syntax-error" ];
+    peerDependencies = [];
   };
   by-spec."syntax-error"."~0.1.0" =
     self.by-version."syntax-error"."0.1.0";
-  by-version."syntax-error"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."syntax-error"."0.1.0" = self.buildNodePackage {
     name = "syntax-error-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz";
-        name = "syntax-error-0.1.0.tgz";
-        sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."syntax-error" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz";
+      name = "syntax-error-0.1.0.tgz";
+      sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65";
+    };
     deps = {
       "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "syntax-error" ];
+    peerDependencies = [];
   };
   by-spec."tabtab"."git+https://github.com/mixu/node-tabtab.git" =
     self.by-version."tabtab"."0.0.2";
-  by-version."tabtab"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."tabtab"."0.0.2" = self.buildNodePackage {
     name = "tabtab-0.0.2";
     bin = false;
-    src = [
-      (fetchgit {
-        url = "https://github.com/mixu/node-tabtab.git";
-        rev = "94af2b878b174527b6636aec88acd46979247755";
-        sha256 = "7be2daa2fe7893478d38d90b213de359c9a662a7ef06ad9cbfaac11ad399a149";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tabtab" or []);
+    src = fetchgit {
+      url = "https://github.com/mixu/node-tabtab.git";
+      rev = "94af2b878b174527b6636aec88acd46979247755";
+      sha256 = "7be2daa2fe7893478d38d90b213de359c9a662a7ef06ad9cbfaac11ad399a149";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tabtab" ];
+    peerDependencies = [];
+  };
+  by-spec."tap"."~0.3.3" =
+    self.by-version."tap"."0.3.3";
+  by-version."tap"."0.3.3" = self.buildNodePackage {
+    name = "tap-0.3.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz";
+      name = "tap-0.3.3.tgz";
+      sha1 = "c862237af0a213f97fff46594bd1d44eca705d63";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "yamlish-0.0.6" = self.by-version."yamlish"."0.0.6";
+      "slide-1.1.6" = self.by-version."slide"."1.1.6";
+      "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2";
+      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "difflet-0.2.6" = self.by-version."difflet"."0.2.6";
+      "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
+      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
+    };
+    peerDependencies = [];
   };
   by-spec."tape"."~0.2.2" =
     self.by-version."tape"."0.2.2";
-  by-version."tape"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."tape"."0.2.2" = self.buildNodePackage {
     name = "tape-0.2.2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz";
-        name = "tape-0.2.2.tgz";
-        sha1 = "64ccfa4b7ecf4a0060007e61716d424781671637";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tape" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz";
+      name = "tape-0.2.2.tgz";
+      sha1 = "64ccfa4b7ecf4a0060007e61716d424781671637";
+    };
     deps = {
       "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
       "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tape" ];
+    peerDependencies = [];
   };
   by-spec."tar"."*" =
     self.by-version."tar"."1.0.3";
-  by-version."tar"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."tar"."1.0.3" = self.buildNodePackage {
     name = "tar-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
-        name = "tar-1.0.3.tgz";
-        sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
+      name = "tar-1.0.3.tgz";
+      sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44";
+    };
     deps = {
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "fstream-1.0.3" = self.by-version."fstream"."1.0.3";
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar" ];
+    peerDependencies = [];
   };
   "tar" = self.by-version."tar"."1.0.3";
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
-  by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage {
+  by-version."tar"."0.1.17" = self.buildNodePackage {
     name = "tar-0.1.17";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
-        name = "tar-0.1.17.tgz";
-        sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+      name = "tar-0.1.17.tgz";
+      sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
+    };
     deps = {
       "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
       "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar" ];
+    peerDependencies = [];
   };
   by-spec."tar"."1.0.2" =
     self.by-version."tar"."1.0.2";
-  by-version."tar"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."tar"."1.0.2" = self.buildNodePackage {
     name = "tar-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-1.0.2.tgz";
-        name = "tar-1.0.2.tgz";
-        sha1 = "8b0f6740f9946259de26a3ed9c9a22890dff023f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar/-/tar-1.0.2.tgz";
+      name = "tar-1.0.2.tgz";
+      sha1 = "8b0f6740f9946259de26a3ed9c9a22890dff023f";
+    };
     deps = {
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "fstream-1.0.3" = self.by-version."fstream"."1.0.3";
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar" ];
+    peerDependencies = [];
   };
   by-spec."tar"."^1.0.0" =
     self.by-version."tar"."1.0.3";
   by-spec."tar"."~0.1.17" =
     self.by-version."tar"."0.1.20";
-  by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
+  by-version."tar"."0.1.20" = self.buildNodePackage {
     name = "tar-0.1.20";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
-        name = "tar-0.1.20.tgz";
-        sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
+      name = "tar-0.1.20.tgz";
+      sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+    };
     deps = {
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
       "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar" ];
+    peerDependencies = [];
   };
   by-spec."tar"."~1.0.1" =
     self.by-version."tar"."1.0.3";
@@ -28825,41 +27263,31 @@
     self.by-version."tar"."1.0.3";
   by-spec."tar-fs"."0.5.2" =
     self.by-version."tar-fs"."0.5.2";
-  by-version."tar-fs"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."tar-fs"."0.5.2" = self.buildNodePackage {
     name = "tar-fs-0.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz";
-        name = "tar-fs-0.5.2.tgz";
-        sha1 = "0f59424be7eeee45232316e302f66d3f6ea6db3e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar-fs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz";
+      name = "tar-fs-0.5.2.tgz";
+      sha1 = "0f59424be7eeee45232316e302f66d3f6ea6db3e";
+    };
     deps = {
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "pump-0.3.5" = self.by-version."pump"."0.3.5";
       "tar-stream-0.4.7" = self.by-version."tar-stream"."0.4.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar-fs" ];
+    peerDependencies = [];
   };
   by-spec."tar-pack"."~2.0.0" =
     self.by-version."tar-pack"."2.0.0";
-  by-version."tar-pack"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."tar-pack"."2.0.0" = self.buildNodePackage {
     name = "tar-pack-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz";
-        name = "tar-pack-2.0.0.tgz";
-        sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar-pack" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz";
+      name = "tar-pack-2.0.0.tgz";
+      sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab";
+    };
     deps = {
       "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3";
       "once-1.1.1" = self.by-version."once"."1.1.1";
@@ -28871,269 +27299,197 @@
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar-pack" ];
+    peerDependencies = [];
   };
   by-spec."tar-stream"."^0.4.6" =
     self.by-version."tar-stream"."0.4.7";
-  by-version."tar-stream"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."tar-stream"."0.4.7" = self.buildNodePackage {
     name = "tar-stream-0.4.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz";
-        name = "tar-stream-0.4.7.tgz";
-        sha1 = "1f1d2ce9ebc7b42765243ca0e8f1b7bfda0aadcd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar-stream" or []);
-    deps = {
-      "bl-0.9.3" = self.by-version."bl"."0.9.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz";
+      name = "tar-stream-0.4.7.tgz";
+      sha1 = "1f1d2ce9ebc7b42765243ca0e8f1b7bfda0aadcd";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar-stream" ];
+    peerDependencies = [];
   };
   by-spec."tar-stream"."~1.0.0" =
     self.by-version."tar-stream"."1.0.2";
-  by-version."tar-stream"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."tar-stream"."1.0.2" = self.buildNodePackage {
     name = "tar-stream-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar-stream/-/tar-stream-1.0.2.tgz";
-        name = "tar-stream-1.0.2.tgz";
-        sha1 = "fd19b4a17900fa704f6a133e3045aead0562ab95";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar-stream" or []);
-    deps = {
-      "bl-0.9.3" = self.by-version."bl"."0.9.3";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar-stream/-/tar-stream-1.0.2.tgz";
+      name = "tar-stream-1.0.2.tgz";
+      sha1 = "fd19b4a17900fa704f6a133e3045aead0562ab95";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar-stream" ];
+    peerDependencies = [];
   };
   by-spec."temp"."*" =
     self.by-version."temp"."0.8.1";
-  by-version."temp"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."temp"."0.8.1" = self.buildNodePackage {
     name = "temp-0.8.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/temp/-/temp-0.8.1.tgz";
-        name = "temp-0.8.1.tgz";
-        sha1 = "4b7b4ffde85bb09f2dd6ba6cc43b44213c94fd3a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."temp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/temp/-/temp-0.8.1.tgz";
+      name = "temp-0.8.1.tgz";
+      sha1 = "4b7b4ffde85bb09f2dd6ba6cc43b44213c94fd3a";
+    };
     deps = {
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "temp" ];
+    peerDependencies = [];
   };
   "temp" = self.by-version."temp"."0.8.1";
   by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
-  by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."temp"."0.6.0" = self.buildNodePackage {
     name = "temp-0.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
-        name = "temp-0.6.0.tgz";
-        sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."temp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
+      name = "temp-0.6.0.tgz";
+      sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07";
+    };
     deps = {
       "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4";
       "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "temp" ];
+    peerDependencies = [];
   };
+  by-spec."temp".">=0.5.0" =
+    self.by-version."temp"."0.8.1";
   by-spec."temp"."~0.6.0" =
     self.by-version."temp"."0.6.0";
   by-spec."temp"."~0.8.1" =
     self.by-version."temp"."0.8.1";
   by-spec."text-table"."~0.2.0" =
     self.by-version."text-table"."0.2.0";
-  by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."text-table"."0.2.0" = self.buildNodePackage {
     name = "text-table-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
-        name = "text-table-0.2.0.tgz";
-        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."text-table" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
+      name = "text-table-0.2.0.tgz";
+      sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "text-table" ];
+    peerDependencies = [];
   };
   by-spec."thenify"."3" =
     self.by-version."thenify"."3.1.0";
-  by-version."thenify"."3.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."thenify"."3.1.0" = self.buildNodePackage {
     name = "thenify-3.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/thenify/-/thenify-3.1.0.tgz";
-        name = "thenify-3.1.0.tgz";
-        sha1 = "c27cbbc62b7c287edf1a1a3d5cc8426d8aed49f0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."thenify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/thenify/-/thenify-3.1.0.tgz";
+      name = "thenify-3.1.0.tgz";
+      sha1 = "c27cbbc62b7c287edf1a1a3d5cc8426d8aed49f0";
+    };
     deps = {
       "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "thenify" ];
+    peerDependencies = [];
   };
   by-spec."thenify".">= 3.1.0 < 4" =
     self.by-version."thenify"."3.1.0";
   by-spec."thenify-all"."1" =
-    self.by-version."thenify-all"."1.5.1";
-  by-version."thenify-all"."1.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "thenify-all-1.5.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/thenify-all/-/thenify-all-1.5.1.tgz";
-        name = "thenify-all-1.5.1.tgz";
-        sha1 = "dd96e62e31c2ac3161edfa12ab9afe3e2692e307";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."thenify-all" or []);
+    self.by-version."thenify-all"."1.6.0";
+  by-version."thenify-all"."1.6.0" = self.buildNodePackage {
+    name = "thenify-all-1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz";
+      name = "thenify-all-1.6.0.tgz";
+      sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726";
+    };
     deps = {
       "thenify-3.1.0" = self.by-version."thenify"."3.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "thenify-all" ];
+    peerDependencies = [];
   };
   by-spec."thirty-two"."~0.0.1" =
     self.by-version."thirty-two"."0.0.2";
-  by-version."thirty-two"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."thirty-two"."0.0.2" = self.buildNodePackage {
     name = "thirty-two-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz";
-        name = "thirty-two-0.0.2.tgz";
-        sha1 = "4253e29d8cb058f0480267c5698c0e4927e54b6a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."thirty-two" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz";
+      name = "thirty-two-0.0.2.tgz";
+      sha1 = "4253e29d8cb058f0480267c5698c0e4927e54b6a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "thirty-two" ];
+    peerDependencies = [];
   };
   by-spec."throttleit"."~0.0.2" =
     self.by-version."throttleit"."0.0.2";
-  by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."throttleit"."0.0.2" = self.buildNodePackage {
     name = "throttleit-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
-        name = "throttleit-0.0.2.tgz";
-        sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."throttleit" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
+      name = "throttleit-0.0.2.tgz";
+      sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "throttleit" ];
+    peerDependencies = [];
   };
   by-spec."through"."2.3.4" =
     self.by-version."through"."2.3.4";
-  by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."through"."2.3.4" = self.buildNodePackage {
     name = "through-2.3.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
-        name = "through-2.3.4.tgz";
-        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
+      name = "through-2.3.4.tgz";
+      sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "through" ];
+    peerDependencies = [];
   };
   by-spec."through".">=2.2.7 <3" =
     self.by-version."through"."2.3.6";
-  by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."through"."2.3.6" = self.buildNodePackage {
     name = "through-2.3.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz";
-        name = "through-2.3.6.tgz";
-        sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz";
+      name = "through-2.3.6.tgz";
+      sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "through" ];
+    peerDependencies = [];
   };
   by-spec."through"."~2.2.0" =
     self.by-version."through"."2.2.7";
-  by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."through"."2.2.7" = self.buildNodePackage {
     name = "through-2.2.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz";
-        name = "through-2.2.7.tgz";
-        sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz";
+      name = "through-2.2.7.tgz";
+      sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "through" ];
+    peerDependencies = [];
   };
   by-spec."through"."~2.2.7" =
     self.by-version."through"."2.2.7";
@@ -29141,25 +27497,19 @@
     self.by-version."through"."2.3.6";
   by-spec."through2"."0.6.3" =
     self.by-version."through2"."0.6.3";
-  by-version."through2"."0.6.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."through2"."0.6.3" = self.buildNodePackage {
     name = "through2-0.6.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.6.3.tgz";
-        name = "through2-0.6.3.tgz";
-        sha1 = "795292fde9f254c2a368b38f9cc5d1bd4663afb6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through2/-/through2-0.6.3.tgz";
+      name = "through2-0.6.3.tgz";
+      sha1 = "795292fde9f254c2a368b38f9cc5d1bd4663afb6";
+    };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "through2" ];
+    peerDependencies = [];
   };
   by-spec."through2"."^0.6.1" =
     self.by-version."through2"."0.6.3";
@@ -29167,274 +27517,231 @@
     self.by-version."through2"."0.6.3";
   by-spec."through2"."^1.0.0" =
     self.by-version."through2"."1.1.1";
-  by-version."through2"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."through2"."1.1.1" = self.buildNodePackage {
     name = "through2-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
-        name = "through2-1.1.1.tgz";
-        sha1 = "0847cbc4449f3405574dbdccd9bb841b83ac3545";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
+      name = "through2-1.1.1.tgz";
+      sha1 = "0847cbc4449f3405574dbdccd9bb841b83ac3545";
+    };
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "through2" ];
+    peerDependencies = [];
   };
   by-spec."through2"."~0.4.1" =
     self.by-version."through2"."0.4.2";
-  by-version."through2"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."through2"."0.4.2" = self.buildNodePackage {
     name = "through2-0.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz";
-        name = "through2-0.4.2.tgz";
-        sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz";
+      name = "through2-0.4.2.tgz";
+      sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b";
+    };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "xtend-2.1.2" = self.by-version."xtend"."2.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "through2" ];
+    peerDependencies = [];
   };
   by-spec."through2"."~0.5.1" =
     self.by-version."through2"."0.5.1";
-  by-version."through2"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."through2"."0.5.1" = self.buildNodePackage {
     name = "through2-0.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
-        name = "through2-0.5.1.tgz";
-        sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
+      name = "through2-0.5.1.tgz";
+      sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
+    };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "through2" ];
+    peerDependencies = [];
+  };
+  by-spec."thunkify"."~2.1.1" =
+    self.by-version."thunkify"."2.1.2";
+  by-version."thunkify"."2.1.2" = self.buildNodePackage {
+    name = "thunkify-2.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz";
+      name = "thunkify-2.1.2.tgz";
+      sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."thunky"."^0.1.0" =
     self.by-version."thunky"."0.1.0";
-  by-version."thunky"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."thunky"."0.1.0" = self.buildNodePackage {
     name = "thunky-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz";
-        name = "thunky-0.1.0.tgz";
-        sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."thunky" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz";
+      name = "thunky-0.1.0.tgz";
+      sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "thunky" ];
+    peerDependencies = [];
   };
   by-spec."thunky"."~0.1.0" =
     self.by-version."thunky"."0.1.0";
   by-spec."tildify"."^1.0.0" =
     self.by-version."tildify"."1.0.0";
-  by-version."tildify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."tildify"."1.0.0" = self.buildNodePackage {
     name = "tildify-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz";
-        name = "tildify-1.0.0.tgz";
-        sha1 = "2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tildify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz";
+      name = "tildify-1.0.0.tgz";
+      sha1 = "2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd";
+    };
     deps = {
-      "user-home-1.1.0" = self.by-version."user-home"."1.1.0";
+      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tildify" ];
+    peerDependencies = [];
+  };
+  by-spec."time".">=0.9.2" =
+    self.by-version."time"."0.11.0";
+  by-version."time"."0.11.0" = self.buildNodePackage {
+    name = "time-0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/time/-/time-0.11.0.tgz";
+      name = "time-0.11.0.tgz";
+      sha1 = "955d4ce3d690e506a82b2c2a523a806a64e1d9ec";
+    };
+    deps = {
+      "bindings-1.2.0" = self.by-version."bindings"."1.2.0";
+      "debug-0.8.1" = self.by-version."debug"."0.8.1";
+      "nan-1.1.2" = self.by-version."nan"."1.1.2";
+    };
+    peerDependencies = [];
   };
   by-spec."time-line"."^1.0.1" =
     self.by-version."time-line"."1.0.1";
-  by-version."time-line"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."time-line"."1.0.1" = self.buildNodePackage {
     name = "time-line-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz";
-        name = "time-line-1.0.1.tgz";
-        sha1 = "afb89542301c3b5010d118c66b5d63920f5e9a7a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."time-line" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz";
+      name = "time-line-1.0.1.tgz";
+      sha1 = "afb89542301c3b5010d118c66b5d63920f5e9a7a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "time-line" ];
+    peerDependencies = [];
   };
   by-spec."timers-browserify"."^1.0.1" =
     self.by-version."timers-browserify"."1.2.0";
-  by-version."timers-browserify"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."timers-browserify"."1.2.0" = self.buildNodePackage {
     name = "timers-browserify-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.2.0.tgz";
-        name = "timers-browserify-1.2.0.tgz";
-        sha1 = "411865ceba9e2c0fafc1d2f3b7a6a87bca44194b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."timers-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.2.0.tgz";
+      name = "timers-browserify-1.2.0.tgz";
+      sha1 = "411865ceba9e2c0fafc1d2f3b7a6a87bca44194b";
+    };
     deps = {
       "process-0.10.0" = self.by-version."process"."0.10.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "timers-browserify" ];
+    peerDependencies = [];
   };
   by-spec."timers-browserify"."~1.0.1" =
     self.by-version."timers-browserify"."1.0.3";
-  by-version."timers-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."timers-browserify"."1.0.3" = self.buildNodePackage {
     name = "timers-browserify-1.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz";
-        name = "timers-browserify-1.0.3.tgz";
-        sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."timers-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz";
+      name = "timers-browserify-1.0.3.tgz";
+      sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551";
+    };
     deps = {
       "process-0.5.2" = self.by-version."process"."0.5.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "timers-browserify" ];
+    peerDependencies = [];
   };
   by-spec."timers-ext"."0.1" =
     self.by-version."timers-ext"."0.1.0";
-  by-version."timers-ext"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."timers-ext"."0.1.0" = self.buildNodePackage {
     name = "timers-ext-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz";
-        name = "timers-ext-0.1.0.tgz";
-        sha1 = "00345a2ca93089d1251322054389d263e27b77e2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."timers-ext" or []);
-    deps = {
-      "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz";
+      name = "timers-ext-0.1.0.tgz";
+      sha1 = "00345a2ca93089d1251322054389d263e27b77e2";
+    };
+    deps = {
+      "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5";
       "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "timers-ext" ];
+    peerDependencies = [];
   };
   by-spec."timers-ext"."0.1.x" =
     self.by-version."timers-ext"."0.1.0";
-  by-spec."timespan"."~2.3.0" =
+  by-spec."timespan"."2.x.x" =
     self.by-version."timespan"."2.3.0";
-  by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."timespan"."2.3.0" = self.buildNodePackage {
     name = "timespan-2.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz";
-        name = "timespan-2.3.0.tgz";
-        sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."timespan" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz";
+      name = "timespan-2.3.0.tgz";
+      sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "timespan" ];
+    peerDependencies = [];
   };
+  by-spec."timespan"."~2.3.0" =
+    self.by-version."timespan"."2.3.0";
   by-spec."timezone"."*" =
     self.by-version."timezone"."0.0.38";
-  by-version."timezone"."0.0.38" = lib.makeOverridable self.buildNodePackage {
+  by-version."timezone"."0.0.38" = self.buildNodePackage {
     name = "timezone-0.0.38";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.38.tgz";
-        name = "timezone-0.0.38.tgz";
-        sha1 = "76edf157e220a685fb9a6284ecdc860fcb9de608";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."timezone" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/timezone/-/timezone-0.0.38.tgz";
+      name = "timezone-0.0.38.tgz";
+      sha1 = "76edf157e220a685fb9a6284ecdc860fcb9de608";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "timezone" ];
+    peerDependencies = [];
   };
   "timezone" = self.by-version."timezone"."0.0.38";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
-  by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."tinycolor"."0.0.1" = self.buildNodePackage {
     name = "tinycolor-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tinycolor" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+      name = "tinycolor-0.0.1.tgz";
+      sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tinycolor" ];
+    peerDependencies = [];
   };
   by-spec."titanium"."*" =
     self.by-version."titanium"."3.4.1";
-  by-version."titanium"."3.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."titanium"."3.4.1" = self.buildNodePackage {
     name = "titanium-3.4.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/titanium/-/titanium-3.4.1.tgz";
-        name = "titanium-3.4.1.tgz";
-        sha1 = "af10520a20dfcacaadfde07a2572b82f2b9d3648";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."titanium" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/titanium/-/titanium-3.4.1.tgz";
+      name = "titanium-3.4.1.tgz";
+      sha1 = "af10520a20dfcacaadfde07a2572b82f2b9d3648";
+    };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
@@ -29452,30 +27759,52 @@
       "winston-0.6.2" = self.by-version."winston"."0.6.2";
       "wrench-1.5.8" = self.by-version."wrench"."1.5.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "titanium" ];
+    peerDependencies = [];
   };
   "titanium" = self.by-version."titanium"."3.4.1";
+  by-spec."tldtools"."0.0.19" =
+    self.by-version."tldtools"."0.0.19";
+  by-version."tldtools"."0.0.19" = self.buildNodePackage {
+    name = "tldtools-0.0.19";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.19.tgz";
+      name = "tldtools-0.0.19.tgz";
+      sha1 = "1df2277a43e291fd0a929c0e096a0a0917d75b1b";
+    };
+    deps = {
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
+  by-spec."tldtools".">=0.0.6" =
+    self.by-version."tldtools"."0.0.21";
+  by-version."tldtools"."0.0.21" = self.buildNodePackage {
+    name = "tldtools-0.0.21";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.21.tgz";
+      name = "tldtools-0.0.21.tgz";
+      sha1 = "8a8be8b57a8728599617a5b5415348aa6f5a4c35";
+    };
+    deps = {
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+    };
+    peerDependencies = [];
+  };
   by-spec."tls-connect"."^0.2.2" =
     self.by-version."tls-connect"."0.2.2";
-  by-version."tls-connect"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."tls-connect"."0.2.2" = self.buildNodePackage {
     name = "tls-connect-0.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tls-connect/-/tls-connect-0.2.2.tgz";
-        name = "tls-connect-0.2.2.tgz";
-        sha1 = "1d88d4f4cb829a0741b6acd05d1df73e0d566fd0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tls-connect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tls-connect/-/tls-connect-0.2.2.tgz";
+      name = "tls-connect-0.2.2.tgz";
+      sha1 = "1d88d4f4cb829a0741b6acd05d1df73e0d566fd0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tls-connect" ];
+    peerDependencies = [];
   };
   by-spec."tls-connect"."~0.2.0" =
     self.by-version."tls-connect"."0.2.2";
@@ -29483,88 +27812,116 @@
     self.by-version."tls-connect"."0.2.2";
   by-spec."tmp"."0.0.23" =
     self.by-version."tmp"."0.0.23";
-  by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage {
+  by-version."tmp"."0.0.23" = self.buildNodePackage {
     name = "tmp-0.0.23";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz";
-        name = "tmp-0.0.23.tgz";
-        sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tmp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz";
+      name = "tmp-0.0.23.tgz";
+      sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tmp" ];
+    peerDependencies = [];
   };
   by-spec."tmp"."0.0.24" =
     self.by-version."tmp"."0.0.24";
-  by-version."tmp"."0.0.24" = lib.makeOverridable self.buildNodePackage {
+  by-version."tmp"."0.0.24" = self.buildNodePackage {
     name = "tmp-0.0.24";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
-        name = "tmp-0.0.24.tgz";
-        sha1 = "d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tmp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
+      name = "tmp-0.0.24.tgz";
+      sha1 = "d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tmp" ];
+    peerDependencies = [];
   };
   by-spec."tmp"."~0.0.20" =
     self.by-version."tmp"."0.0.24";
+  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";
+    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 = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."tomahawk"."0.1.6" =
+    self.by-version."tomahawk"."0.1.6";
+  by-version."tomahawk"."0.1.6" = self.buildNodePackage {
+    name = "tomahawk-0.1.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tomahawk/-/tomahawk-0.1.6.tgz";
+      name = "tomahawk-0.1.6.tgz";
+      sha1 = "9726580ec9f51c148cf2030c6255c110243d49a5";
+    };
+    deps = {
+      "body-parser-1.5.0" = self.by-version."body-parser"."1.5.0";
+      "connect-3.0.2" = self.by-version."connect"."3.0.2";
+      "errorhandler-1.1.1" = self.by-version."errorhandler"."1.1.1";
+      "express-4.6.1" = self.by-version."express"."4.6.1";
+      "morgan-1.2.0" = self.by-version."morgan"."1.2.0";
+      "node-options-0.0.6" = self.by-version."node-options"."0.0.6";
+      "socket.io-1.0.6" = self.by-version."socket.io"."1.0.6";
+      "winston-0.7.3" = self.by-version."winston"."0.7.3";
+    };
+    peerDependencies = [];
+  };
+  by-spec."tomahawk-plugin-kv-memory-store"."0.0.3" =
+    self.by-version."tomahawk-plugin-kv-memory-store"."0.0.3";
+  by-version."tomahawk-plugin-kv-memory-store"."0.0.3" = self.buildNodePackage {
+    name = "tomahawk-plugin-kv-memory-store-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tomahawk-plugin-kv-memory-store/-/tomahawk-plugin-kv-memory-store-0.0.3.tgz";
+      name = "tomahawk-plugin-kv-memory-store-0.0.3.tgz";
+      sha1 = "120547598bd72ca72bd2eedb0ee03ae85c667b02";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."toobusy"."*" =
     self.by-version."toobusy"."0.2.4";
-  by-version."toobusy"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."toobusy"."0.2.4" = self.buildNodePackage {
     name = "toobusy-0.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/toobusy/-/toobusy-0.2.4.tgz";
-        name = "toobusy-0.2.4.tgz";
-        sha1 = "d97a3ee760b2462388e15f8526579b4b64bb193d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."toobusy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/toobusy/-/toobusy-0.2.4.tgz";
+      name = "toobusy-0.2.4.tgz";
+      sha1 = "d97a3ee760b2462388e15f8526579b4b64bb193d";
+    };
     deps = {
       "bindings-1.1.0" = self.by-version."bindings"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "toobusy" ];
+    peerDependencies = [];
   };
   "toobusy" = self.by-version."toobusy"."0.2.4";
   by-spec."toobusy"."~0.2.4" =
     self.by-version."toobusy"."0.2.4";
   by-spec."torrent-stream"."^0.15.1" =
     self.by-version."torrent-stream"."0.15.1";
-  by-version."torrent-stream"."0.15.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."torrent-stream"."0.15.1" = self.buildNodePackage {
     name = "torrent-stream-0.15.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.15.1.tgz";
-        name = "torrent-stream-0.15.1.tgz";
-        sha1 = "98c86f8c135a58a7cd63e8cd7a78b99430473e06";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."torrent-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.15.1.tgz";
+      name = "torrent-stream-0.15.1.tgz";
+      sha1 = "98c86f8c135a58a7cd63e8cd7a78b99430473e06";
+    };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
       "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4";
-      "bittorrent-tracker-2.10.3" = self.by-version."bittorrent-tracker"."2.10.3";
+      "bittorrent-tracker-2.12.1" = self.by-version."bittorrent-tracker"."2.12.1";
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
       "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
@@ -29579,28 +27936,22 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "torrent-stream" ];
+    peerDependencies = [];
   };
   by-spec."torrent-stream"."^0.16.2" =
     self.by-version."torrent-stream"."0.16.2";
-  by-version."torrent-stream"."0.16.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."torrent-stream"."0.16.2" = self.buildNodePackage {
     name = "torrent-stream-0.16.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.16.2.tgz";
-        name = "torrent-stream-0.16.2.tgz";
-        sha1 = "f6460d2e1b25371ff82f4d5391450846d78b9164";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."torrent-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.16.2.tgz";
+      name = "torrent-stream-0.16.2.tgz";
+      sha1 = "f6460d2e1b25371ff82f4d5391450846d78b9164";
+    };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
       "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4";
-      "bittorrent-tracker-2.10.3" = self.by-version."bittorrent-tracker"."2.10.3";
+      "bittorrent-tracker-2.12.1" = self.by-version."bittorrent-tracker"."2.12.1";
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
       "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
@@ -29615,28 +27966,22 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "torrent-stream" ];
+    peerDependencies = [];
   };
   by-spec."torrent-stream"."~0.13.3" =
     self.by-version."torrent-stream"."0.13.5";
-  by-version."torrent-stream"."0.13.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."torrent-stream"."0.13.5" = self.buildNodePackage {
     name = "torrent-stream-0.13.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.13.5.tgz";
-        name = "torrent-stream-0.13.5.tgz";
-        sha1 = "13127bc81f668ad4dbd26cf3e984c3dd1cd70d40";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."torrent-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.13.5.tgz";
+      name = "torrent-stream-0.13.5.tgz";
+      sha1 = "13127bc81f668ad4dbd26cf3e984c3dd1cd70d40";
+    };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
       "bittorrent-dht-1.5.0" = self.by-version."bittorrent-dht"."1.5.0";
-      "bittorrent-tracker-2.10.3" = self.by-version."bittorrent-tracker"."2.10.3";
+      "bittorrent-tracker-2.12.1" = self.by-version."bittorrent-tracker"."2.12.1";
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
       "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
@@ -29650,308 +27995,331 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "torrent-stream" ];
+    peerDependencies = [];
   };
   by-spec."touch"."0.0.2" =
     self.by-version."touch"."0.0.2";
-  by-version."touch"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."touch"."0.0.2" = self.buildNodePackage {
     name = "touch-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz";
-        name = "touch-0.0.2.tgz";
-        sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."touch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz";
+      name = "touch-0.0.2.tgz";
+      sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4";
+    };
     deps = {
       "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "touch" ];
+    peerDependencies = [];
+  };
+  by-spec."touch"."~0.0.3" =
+    self.by-version."touch"."0.0.3";
+  by-version."touch"."0.0.3" = self.buildNodePackage {
+    name = "touch-0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/touch/-/touch-0.0.3.tgz";
+      name = "touch-0.0.3.tgz";
+      sha1 = "51aef3d449571d4f287a5d87c9c8b49181a0db1d";
+    };
+    deps = {
+      "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
+    };
+    peerDependencies = [];
   };
   by-spec."tough-cookie".">=0.12.0" =
     self.by-version."tough-cookie"."0.12.1";
-  by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."tough-cookie"."0.12.1" = self.buildNodePackage {
     name = "tough-cookie-0.12.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
-        name = "tough-cookie-0.12.1.tgz";
-        sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tough-cookie" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
+      name = "tough-cookie-0.12.1.tgz";
+      sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62";
+    };
     deps = {
       "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tough-cookie" ];
+    peerDependencies = [];
   };
   by-spec."tough-cookie"."^0.12.1" =
     self.by-version."tough-cookie"."0.12.1";
+  by-spec."tough-cookie"."~0.9.15" =
+    self.by-version."tough-cookie"."0.9.15";
+  by-version."tough-cookie"."0.9.15" = self.buildNodePackage {
+    name = "tough-cookie-0.9.15";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz";
+      name = "tough-cookie-0.9.15.tgz";
+      sha1 = "75617ac347e3659052b0350131885829677399f6";
+    };
+    deps = {
+      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
+    };
+    peerDependencies = [];
+  };
   by-spec."traceur"."0.0.55" =
     self.by-version."traceur"."0.0.55";
-  by-version."traceur"."0.0.55" = lib.makeOverridable self.buildNodePackage {
+  by-version."traceur"."0.0.55" = self.buildNodePackage {
     name = "traceur-0.0.55";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/traceur/-/traceur-0.0.55.tgz";
-        name = "traceur-0.0.55.tgz";
-        sha1 = "b1a44b69bfbabb9db2c7c284713f4ebacf46f733";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."traceur" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/traceur/-/traceur-0.0.55.tgz";
+      name = "traceur-0.0.55.tgz";
+      sha1 = "b1a44b69bfbabb9db2c7c284713f4ebacf46f733";
+    };
     deps = {
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "traceur" ];
+    peerDependencies = [];
   };
   by-spec."transformers"."2.1.0" =
     self.by-version."transformers"."2.1.0";
-  by-version."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."transformers"."2.1.0" = self.buildNodePackage {
     name = "transformers-2.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
-        name = "transformers-2.1.0.tgz";
-        sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."transformers" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
+      name = "transformers-2.1.0.tgz";
+      sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
+    };
     deps = {
       "promise-2.0.0" = self.by-version."promise"."2.0.0";
       "css-1.0.8" = self.by-version."css"."1.0.8";
       "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "transformers" ];
+    peerDependencies = [];
   };
   by-spec."trash"."*" =
-    self.by-version."trash"."1.3.0";
-  by-version."trash"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "trash-1.3.0";
+    self.by-version."trash"."1.3.1";
+  by-version."trash"."1.3.1" = self.buildNodePackage {
+    name = "trash-1.3.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/trash/-/trash-1.3.0.tgz";
-        name = "trash-1.3.0.tgz";
-        sha1 = "805a496cb24bd922cbf06886ec805d83877d0071";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."trash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/trash/-/trash-1.3.1.tgz";
+      name = "trash-1.3.1.tgz";
+      sha1 = "72325b066a66434e57358624f93b580dd2e585d9";
+    };
     deps = {
       "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0";
       "meow-2.1.0" = self.by-version."meow"."2.1.0";
       "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1";
-      "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2";
+      "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0";
       "xdg-trash-1.0.5" = self.by-version."xdg-trash"."1.0.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "trash" ];
+    peerDependencies = [];
+  };
+  "trash" = self.by-version."trash"."1.3.1";
+  by-spec."traverse"."0.6.x" =
+    self.by-version."traverse"."0.6.6";
+  by-version."traverse"."0.6.6" = self.buildNodePackage {
+    name = "traverse-0.6.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+      name = "traverse-0.6.6.tgz";
+      sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
-  "trash" = self.by-version."trash"."1.3.0";
+  by-spec."traverse".">=0.2.4" =
+    self.by-version."traverse"."0.6.6";
   by-spec."traverse".">=0.3.0 <0.4" =
     self.by-version."traverse"."0.3.9";
-  by-version."traverse"."0.3.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."traverse"."0.3.9" = self.buildNodePackage {
     name = "traverse-0.3.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz";
-        name = "traverse-0.3.9.tgz";
-        sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."traverse" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz";
+      name = "traverse-0.3.9.tgz";
+      sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "traverse" ];
+    peerDependencies = [];
+  };
+  by-spec."traverse"."~0.5.1" =
+    self.by-version."traverse"."0.5.2";
+  by-version."traverse"."0.5.2" = self.buildNodePackage {
+    name = "traverse-0.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
+      name = "traverse-0.5.2.tgz";
+      sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."truncate"."~1.0.2" =
     self.by-version."truncate"."1.0.4";
-  by-version."truncate"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."truncate"."1.0.4" = self.buildNodePackage {
     name = "truncate-1.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/truncate/-/truncate-1.0.4.tgz";
-        name = "truncate-1.0.4.tgz";
-        sha1 = "2bcfbbff4a97b9089b693c1ae37c5105ec8775aa";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."truncate" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/truncate/-/truncate-1.0.4.tgz";
+      name = "truncate-1.0.4.tgz";
+      sha1 = "2bcfbbff4a97b9089b693c1ae37c5105ec8775aa";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."tryor"."~0.1.2" =
+    self.by-version."tryor"."0.1.2";
+  by-version."tryor"."0.1.2" = self.buildNodePackage {
+    name = "tryor-0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz";
+      name = "tryor-0.1.2.tgz";
+      sha1 = "8145e4ca7caff40acde3ccf946e8b8bb75b4172b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "truncate" ];
+    peerDependencies = [];
   };
   by-spec."tty-browserify"."~0.0.0" =
     self.by-version."tty-browserify"."0.0.0";
-  by-version."tty-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."tty-browserify"."0.0.0" = self.buildNodePackage {
     name = "tty-browserify-0.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
-        name = "tty-browserify-0.0.0.tgz";
-        sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tty-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
+      name = "tty-browserify-0.0.0.tgz";
+      sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tty-browserify" ];
+    peerDependencies = [];
   };
   by-spec."tunnel-agent"."~0.2.0" =
     self.by-version."tunnel-agent"."0.2.0";
-  by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."tunnel-agent"."0.2.0" = self.buildNodePackage {
     name = "tunnel-agent-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
-        name = "tunnel-agent-0.2.0.tgz";
-        sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tunnel-agent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
+      name = "tunnel-agent-0.2.0.tgz";
+      sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tunnel-agent" ];
+    peerDependencies = [];
   };
   by-spec."tunnel-agent"."~0.3.0" =
     self.by-version."tunnel-agent"."0.3.0";
-  by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."tunnel-agent"."0.3.0" = self.buildNodePackage {
     name = "tunnel-agent-0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
-        name = "tunnel-agent-0.3.0.tgz";
-        sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tunnel-agent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+      name = "tunnel-agent-0.3.0.tgz";
+      sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tunnel-agent" ];
+    peerDependencies = [];
   };
   by-spec."tunnel-agent"."~0.4.0" =
     self.by-version."tunnel-agent"."0.4.0";
-  by-version."tunnel-agent"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
     name = "tunnel-agent-0.4.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
-        name = "tunnel-agent-0.4.0.tgz";
-        sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tunnel-agent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+      name = "tunnel-agent-0.4.0.tgz";
+      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tunnel-agent" ];
+    peerDependencies = [];
+  };
+  by-spec."twilio".">=1.1.4" =
+    self.by-version."twilio"."1.10.0";
+  by-version."twilio"."1.10.0" = self.buildNodePackage {
+    name = "twilio-1.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/twilio/-/twilio-1.10.0.tgz";
+      name = "twilio-1.10.0.tgz";
+      sha1 = "b4004f1187baf818233a4dd5e13478d8df9101da";
+    };
+    deps = {
+      "request-2.27.0" = self.by-version."request"."2.27.0";
+      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "jwt-simple-0.1.0" = self.by-version."jwt-simple"."0.1.0";
+      "q-0.9.7" = self.by-version."q"."0.9.7";
+      "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
+    };
+    peerDependencies = [];
   };
   by-spec."type-check"."~0.3.1" =
     self.by-version."type-check"."0.3.1";
-  by-version."type-check"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."type-check"."0.3.1" = self.buildNodePackage {
     name = "type-check-0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz";
-        name = "type-check-0.3.1.tgz";
-        sha1 = "9233923c4da174d0ac5480ecfd6ef84c349eb58d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."type-check" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz";
+      name = "type-check-0.3.1.tgz";
+      sha1 = "9233923c4da174d0ac5480ecfd6ef84c349eb58d";
+    };
     deps = {
       "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "type-check" ];
+    peerDependencies = [];
   };
   by-spec."type-detect"."0.1.1" =
     self.by-version."type-detect"."0.1.1";
-  by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."type-detect"."0.1.1" = self.buildNodePackage {
     name = "type-detect-0.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
-        name = "type-detect-0.1.1.tgz";
-        sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."type-detect" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
+      name = "type-detect-0.1.1.tgz";
+      sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "type-detect" ];
+    peerDependencies = [];
+  };
+  by-spec."type-is"."~1.3.2" =
+    self.by-version."type-is"."1.3.2";
+  by-version."type-is"."1.3.2" = self.buildNodePackage {
+    name = "type-is-1.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
+      name = "type-is-1.3.2.tgz";
+      sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
+    };
+    deps = {
+      "media-typer-0.2.0" = self.by-version."media-typer"."0.2.0";
+      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+    };
+    peerDependencies = [];
   };
   by-spec."type-is"."~1.5.1" =
     self.by-version."type-is"."1.5.5";
-  by-version."type-is"."1.5.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."type-is"."1.5.5" = self.buildNodePackage {
     name = "type-is-1.5.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/type-is/-/type-is-1.5.5.tgz";
-        name = "type-is-1.5.5.tgz";
-        sha1 = "45248af57f96366d0326ea0868f6bc8607dc4b21";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."type-is" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/type-is/-/type-is-1.5.5.tgz";
+      name = "type-is-1.5.5.tgz";
+      sha1 = "45248af57f96366d0326ea0868f6bc8607dc4b21";
+    };
     deps = {
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
       "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "type-is" ];
+    peerDependencies = [];
   };
   by-spec."type-is"."~1.5.2" =
     self.by-version."type-is"."1.5.5";
@@ -29961,184 +28329,150 @@
     self.by-version."type-is"."1.5.5";
   by-spec."typechecker"."~2.0.1" =
     self.by-version."typechecker"."2.0.8";
-  by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."typechecker"."2.0.8" = self.buildNodePackage {
     name = "typechecker-2.0.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz";
-        name = "typechecker-2.0.8.tgz";
-        sha1 = "e83da84bb64c584ccb345838576c40b0337db82e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."typechecker" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz";
+      name = "typechecker-2.0.8.tgz";
+      sha1 = "e83da84bb64c584ccb345838576c40b0337db82e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "typechecker" ];
+    peerDependencies = [];
   };
   by-spec."typedarray"."~0.0.5" =
     self.by-version."typedarray"."0.0.6";
-  by-version."typedarray"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."typedarray"."0.0.6" = self.buildNodePackage {
     name = "typedarray-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."typedarray" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+      name = "typedarray-0.0.6.tgz";
+      sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "typedarray" ];
+    peerDependencies = [];
   };
   by-spec."typescript"."*" =
-    self.by-version."typescript"."1.3.0";
-  by-version."typescript"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "typescript-1.3.0";
+    self.by-version."typescript"."1.4.1";
+  by-version."typescript"."1.4.1" = self.buildNodePackage {
+    name = "typescript-1.4.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/typescript/-/typescript-1.3.0.tgz";
-        name = "typescript-1.3.0.tgz";
-        sha1 = "b48262ac7444971b447ffc6bb56c69854eef02e1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."typescript" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/typescript/-/typescript-1.4.1.tgz";
+      name = "typescript-1.4.1.tgz";
+      sha1 = "eb4da986d1b7f01452eafb57559e0cc8f516cd48";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "typescript" ];
+    peerDependencies = [];
   };
-  "typescript" = self.by-version."typescript"."1.3.0";
+  "typescript" = self.by-version."typescript"."1.4.1";
   by-spec."uglify-js"."*" =
     self.by-version."uglify-js"."2.4.16";
-  by-version."uglify-js"."2.4.16" = lib.makeOverridable self.buildNodePackage {
+  by-version."uglify-js"."2.4.16" = self.buildNodePackage {
     name = "uglify-js-2.4.16";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz";
-        name = "uglify-js-2.4.16.tgz";
-        sha1 = "84143487eb480efd7d0789c7ecfbd48a695839f9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz";
+      name = "uglify-js-2.4.16.tgz";
+      sha1 = "84143487eb480efd7d0789c7ecfbd48a695839f9";
+    };
     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";
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
       "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-js" ];
+    peerDependencies = [];
   };
   "uglify-js" = self.by-version."uglify-js"."2.4.16";
   by-spec."uglify-js"."1.2.5" =
     self.by-version."uglify-js"."1.2.5";
-  by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."uglify-js"."1.2.5" = self.buildNodePackage {
     name = "uglify-js-1.2.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
-        name = "uglify-js-1.2.5.tgz";
-        sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
+      name = "uglify-js-1.2.5.tgz";
+      sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-js" ];
+    peerDependencies = [];
   };
   by-spec."uglify-js"."2.4.0" =
     self.by-version."uglify-js"."2.4.0";
-  by-version."uglify-js"."2.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."uglify-js"."2.4.0" = self.buildNodePackage {
     name = "uglify-js-2.4.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz";
-        name = "uglify-js-2.4.0.tgz";
-        sha1 = "a5f2b6b1b817fb34c16a04234328c89ba1e77137";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz";
+      name = "uglify-js-2.4.0.tgz";
+      sha1 = "a5f2b6b1b817fb34c16a04234328c89ba1e77137";
+    };
     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";
       "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-js" ];
+    peerDependencies = [];
   };
   by-spec."uglify-js"."^2.4.0" =
     self.by-version."uglify-js"."2.4.16";
   by-spec."uglify-js"."^2.4.15" =
     self.by-version."uglify-js"."2.4.16";
+  by-spec."uglify-js"."~1.1.1" =
+    self.by-version."uglify-js"."1.1.1";
+  by-version."uglify-js"."1.1.1" = self.buildNodePackage {
+    name = "uglify-js-1.1.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
+      name = "uglify-js-1.1.1.tgz";
+      sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."uglify-js"."~2.2" =
     self.by-version."uglify-js"."2.2.5";
-  by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."uglify-js"."2.2.5" = self.buildNodePackage {
     name = "uglify-js-2.2.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
-        name = "uglify-js-2.2.5.tgz";
-        sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+      name = "uglify-js-2.2.5.tgz";
+      sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
+    };
     deps = {
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
       "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-js" ];
+    peerDependencies = [];
   };
   by-spec."uglify-js"."~2.2.5" =
     self.by-version."uglify-js"."2.2.5";
   by-spec."uglify-js"."~2.3" =
     self.by-version."uglify-js"."2.3.6";
-  by-version."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."uglify-js"."2.3.6" = self.buildNodePackage {
     name = "uglify-js-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
+    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";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-js" ];
+    peerDependencies = [];
   };
   by-spec."uglify-js"."~2.3.6" =
     self.by-version."uglify-js"."2.3.6";
@@ -30146,418 +28480,342 @@
     self.by-version."uglify-js"."2.4.16";
   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" = lib.makeOverridable self.buildNodePackage {
+  by-version."uglify-to-browserify"."1.0.2" = self.buildNodePackage {
     name = "uglify-to-browserify-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-to-browserify" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-to-browserify" ];
+    peerDependencies = [];
   };
   by-spec."uid-number"."0.0.3" =
     self.by-version."uid-number"."0.0.3";
-  by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."uid-number"."0.0.3" = self.buildNodePackage {
     name = "uid-number-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
-        name = "uid-number-0.0.3.tgz";
-        sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uid-number" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
+      name = "uid-number-0.0.3.tgz";
+      sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uid-number" ];
+    peerDependencies = [];
   };
   by-spec."uid-number"."0.0.5" =
     self.by-version."uid-number"."0.0.5";
-  by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."uid-number"."0.0.5" = self.buildNodePackage {
     name = "uid-number-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
-        name = "uid-number-0.0.5.tgz";
-        sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uid-number" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
+      name = "uid-number-0.0.5.tgz";
+      sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uid-number" ];
+    peerDependencies = [];
   };
   by-spec."uid-number"."0.0.6" =
     self.by-version."uid-number"."0.0.6";
-  by-version."uid-number"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."uid-number"."0.0.6" = self.buildNodePackage {
     name = "uid-number-0.0.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
-        name = "uid-number-0.0.6.tgz";
-        sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uid-number" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
+      name = "uid-number-0.0.6.tgz";
+      sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uid-number" ];
+    peerDependencies = [];
   };
   by-spec."uid-safe"."1.0.1" =
     self.by-version."uid-safe"."1.0.1";
-  by-version."uid-safe"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."uid-safe"."1.0.1" = self.buildNodePackage {
     name = "uid-safe-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
-        name = "uid-safe-1.0.1.tgz";
-        sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uid-safe" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
+      name = "uid-safe-1.0.1.tgz";
+      sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8";
+    };
     deps = {
       "mz-1.2.1" = self.by-version."mz"."1.2.1";
-      "base64-url-1.1.0" = self.by-version."base64-url"."1.1.0";
+      "base64-url-1.2.0" = self.by-version."base64-url"."1.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uid-safe" ];
+    peerDependencies = [];
   };
   by-spec."uid-safe"."1.0.2" =
     self.by-version."uid-safe"."1.0.2";
-  by-version."uid-safe"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."uid-safe"."1.0.2" = self.buildNodePackage {
     name = "uid-safe-1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.2.tgz";
-        name = "uid-safe-1.0.2.tgz";
-        sha1 = "bcd1738b653fabe1288d88afd8cd0ae0af5a1580";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uid-safe" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.2.tgz";
+      name = "uid-safe-1.0.2.tgz";
+      sha1 = "bcd1738b653fabe1288d88afd8cd0ae0af5a1580";
+    };
     deps = {
       "base64-url-1.1.0" = self.by-version."base64-url"."1.1.0";
       "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uid-safe" ];
+    peerDependencies = [];
   };
   by-spec."uid-safe"."~1.0.2" =
     self.by-version."uid-safe"."1.0.2";
   by-spec."uid2"."0.0.3" =
     self.by-version."uid2"."0.0.3";
-  by-version."uid2"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."uid2"."0.0.3" = self.buildNodePackage {
     name = "uid2-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
-        name = "uid2-0.0.3.tgz";
-        sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uid2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
+      name = "uid2-0.0.3.tgz";
+      sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uid2" ];
+    peerDependencies = [];
   };
+  by-spec."uid2"."0.0.x" =
+    self.by-version."uid2"."0.0.3";
   by-spec."uid2"."~0.0.2" =
     self.by-version."uid2"."0.0.3";
+  by-spec."umask"."~1.1.0" =
+    self.by-version."umask"."1.1.0";
+  by-version."umask"."1.1.0" = self.buildNodePackage {
+    name = "umask-1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/umask/-/umask-1.1.0.tgz";
+      name = "umask-1.1.0.tgz";
+      sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."umd"."^2.1.0" =
     self.by-version."umd"."2.1.0";
-  by-version."umd"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."umd"."2.1.0" = self.buildNodePackage {
     name = "umd-2.1.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
-        name = "umd-2.1.0.tgz";
-        sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."umd" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
+      name = "umd-2.1.0.tgz";
+      sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf";
+    };
     deps = {
       "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
       "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0";
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "umd" ];
+    peerDependencies = [];
   };
   by-spec."umd"."~2.0.0" =
     self.by-version."umd"."2.0.0";
-  by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."umd"."2.0.0" = self.buildNodePackage {
     name = "umd-2.0.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz";
-        name = "umd-2.0.0.tgz";
-        sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."umd" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz";
+      name = "umd-2.0.0.tgz";
+      sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f";
+    };
     deps = {
       "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
       "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0";
       "through-2.3.6" = self.by-version."through"."2.3.6";
       "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "umd" ];
+    peerDependencies = [];
   };
   by-spec."umd"."~2.1.0" =
     self.by-version."umd"."2.1.0";
   by-spec."underscore"."*" =
     self.by-version."underscore"."1.7.0";
-  by-version."underscore"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore"."1.7.0" = self.buildNodePackage {
     name = "underscore-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+      name = "underscore-1.7.0.tgz";
+      sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
+    peerDependencies = [];
   };
   "underscore" = self.by-version."underscore"."1.7.0";
   by-spec."underscore"."1.2.1" =
     self.by-version."underscore"."1.2.1";
-  by-version."underscore"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore"."1.2.1" = self.buildNodePackage {
     name = "underscore-1.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz";
-        name = "underscore-1.2.1.tgz";
-        sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz";
+      name = "underscore-1.2.1.tgz";
+      sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
+    peerDependencies = [];
+  };
+  by-spec."underscore"."1.3.3" =
+    self.by-version."underscore"."1.3.3";
+  by-version."underscore"."1.3.3" = self.buildNodePackage {
+    name = "underscore-1.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.3.3.tgz";
+      name = "underscore-1.3.3.tgz";
+      sha1 = "47ac53683daf832bfa952e1774417da47817ae42";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."underscore"."1.6.x" =
     self.by-version."underscore"."1.6.0";
-  by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore"."1.6.0" = self.buildNodePackage {
     name = "underscore-1.6.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
-        name = "underscore-1.6.0.tgz";
-        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+      name = "underscore-1.6.0.tgz";
+      sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
+    peerDependencies = [];
   };
   by-spec."underscore"."1.7.0" =
     self.by-version."underscore"."1.7.0";
+  by-spec."underscore"."1.x" =
+    self.by-version."underscore"."1.7.0";
   by-spec."underscore".">=1.1.7" =
     self.by-version."underscore"."1.7.0";
   by-spec."underscore".">=1.3.1" =
     self.by-version."underscore"."1.7.0";
   by-spec."underscore".">=1.5.0" =
     self.by-version."underscore"."1.7.0";
+  by-spec."underscore".">=1.5.2" =
+    self.by-version."underscore"."1.7.0";
   by-spec."underscore"."^1.6.0" =
     self.by-version."underscore"."1.7.0";
+  by-spec."underscore"."^1.7.0" =
+    self.by-version."underscore"."1.7.0";
   by-spec."underscore"."~1.4.3" =
     self.by-version."underscore"."1.4.4";
-  by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore"."1.4.4" = self.buildNodePackage {
     name = "underscore-1.4.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-        name = "underscore-1.4.4.tgz";
-        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+      name = "underscore-1.4.4.tgz";
+      sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
+    peerDependencies = [];
   };
   by-spec."underscore"."~1.4.4" =
     self.by-version."underscore"."1.4.4";
   by-spec."underscore"."~1.5.2" =
     self.by-version."underscore"."1.5.2";
-  by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore"."1.5.2" = self.buildNodePackage {
     name = "underscore-1.5.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
-        name = "underscore-1.5.2.tgz";
-        sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
+      name = "underscore-1.5.2.tgz";
+      sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
+    peerDependencies = [];
   };
   by-spec."underscore"."~1.7.0" =
     self.by-version."underscore"."1.7.0";
   by-spec."underscore.string"."~2.2.1" =
     self.by-version."underscore.string"."2.2.1";
-  by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore.string"."2.2.1" = self.buildNodePackage {
     name = "underscore.string-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore.string" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore.string" ];
+    peerDependencies = [];
   };
   by-spec."underscore.string"."~2.3.1" =
     self.by-version."underscore.string"."2.3.3";
-  by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore.string"."2.3.3" = self.buildNodePackage {
     name = "underscore.string-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore.string" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore.string" ];
+    peerDependencies = [];
   };
   by-spec."underscore.string"."~2.3.3" =
     self.by-version."underscore.string"."2.3.3";
   by-spec."underscore.string"."~2.4.0" =
     self.by-version."underscore.string"."2.4.0";
-  by-version."underscore.string"."2.4.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore.string"."2.4.0" = self.buildNodePackage {
     name = "underscore.string-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore.string" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore.string" ];
+    peerDependencies = [];
   };
   by-spec."unfunk-diff"."~0.0.1" =
     self.by-version."unfunk-diff"."0.0.2";
-  by-version."unfunk-diff"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."unfunk-diff"."0.0.2" = self.buildNodePackage {
     name = "unfunk-diff-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz";
-        name = "unfunk-diff-0.0.2.tgz";
-        sha1 = "8560d6b5cb3dcb1ed4d541e7fe59cea514697578";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."unfunk-diff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz";
+      name = "unfunk-diff-0.0.2.tgz";
+      sha1 = "8560d6b5cb3dcb1ed4d541e7fe59cea514697578";
+    };
     deps = {
       "diff-1.0.8" = self.by-version."diff"."1.0.8";
       "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3";
       "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "unfunk-diff" ];
+    peerDependencies = [];
   };
   by-spec."ungit"."*" =
     self.by-version."ungit"."0.8.4";
-  by-version."ungit"."0.8.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."ungit"."0.8.4" = self.buildNodePackage {
     name = "ungit-0.8.4";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.8.4.tgz";
-        name = "ungit-0.8.4.tgz";
-        sha1 = "3956812e8f2005415d351a710350f88b38c2d99a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ungit" or []);
-    deps = {
-      "express-4.10.7" = self.by-version."express"."4.10.7";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ungit/-/ungit-0.8.4.tgz";
+      name = "ungit-0.8.4.tgz";
+      sha1 = "3956812e8f2005415d351a710350f88b38c2d99a";
+    };
+    deps = {
+      "express-4.10.8" = self.by-version."express"."4.10.8";
       "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "temp-0.8.1" = self.by-version."temp"."0.8.1";
@@ -30591,65 +28849,47 @@
       "express-session-1.9.3" = self.by-version."express-session"."1.9.3";
       "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ungit" ];
+    peerDependencies = [];
   };
   "ungit" = self.by-version."ungit"."0.8.4";
   by-spec."unique-stream"."^1.0.0" =
     self.by-version."unique-stream"."1.0.0";
-  by-version."unique-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."unique-stream"."1.0.0" = self.buildNodePackage {
     name = "unique-stream-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
-        name = "unique-stream-1.0.0.tgz";
-        sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."unique-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
+      name = "unique-stream-1.0.0.tgz";
+      sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "unique-stream" ];
+    peerDependencies = [];
   };
   by-spec."unorm"."1.3.3" =
     self.by-version."unorm"."1.3.3";
-  by-version."unorm"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."unorm"."1.3.3" = self.buildNodePackage {
     name = "unorm-1.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz";
-        name = "unorm-1.3.3.tgz";
-        sha1 = "16a8772671ebd6f7cde6f8c5e49bb60ac47dba93";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."unorm" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz";
+      name = "unorm-1.3.3.tgz";
+      sha1 = "16a8772671ebd6f7cde6f8c5e49bb60ac47dba93";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "unorm" ];
+    peerDependencies = [];
   };
   by-spec."update-notifier"."0.2.0" =
     self.by-version."update-notifier"."0.2.0";
-  by-version."update-notifier"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."update-notifier"."0.2.0" = self.buildNodePackage {
     name = "update-notifier-0.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz";
-        name = "update-notifier-0.2.0.tgz";
-        sha1 = "a010c928adcf02090b8e0ce7fef6fb0a7cacc34a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."update-notifier" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz";
+      name = "update-notifier-0.2.0.tgz";
+      sha1 = "a010c928adcf02090b8e0ce7fef6fb0a7cacc34a";
+    };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
@@ -30657,24 +28897,18 @@
       "semver-diff-0.1.0" = self.by-version."semver-diff"."0.1.0";
       "string-length-0.1.2" = self.by-version."string-length"."0.1.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "update-notifier" ];
-  };
-  by-spec."update-notifier"."^0.2.0" =
-    self.by-version."update-notifier"."0.2.2";
-  by-version."update-notifier"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "update-notifier-0.2.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz";
-        name = "update-notifier-0.2.2.tgz";
-        sha1 = "e69b3a784b4e686a2acd98f5e66944591996e187";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."update-notifier" or []);
+    peerDependencies = [];
+  };
+  by-spec."update-notifier"."^0.3.0" =
+    self.by-version."update-notifier"."0.3.0";
+  by-version."update-notifier"."0.3.0" = self.buildNodePackage {
+    name = "update-notifier-0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.3.0.tgz";
+      name = "update-notifier-0.3.0.tgz";
+      sha1 = "972b1b6def843d546f93736dbed346a7c10230e7";
+    };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
@@ -30683,203 +28917,159 @@
       "semver-diff-2.0.0" = self.by-version."semver-diff"."2.0.0";
       "string-length-1.0.0" = self.by-version."string-length"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "update-notifier" ];
+    peerDependencies = [];
   };
-  by-spec."update-notifier"."^0.2.1" =
-    self.by-version."update-notifier"."0.2.2";
   by-spec."update-notifier"."~0.1.8" =
     self.by-version."update-notifier"."0.1.10";
-  by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."update-notifier"."0.1.10" = self.buildNodePackage {
     name = "update-notifier-0.1.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.10.tgz";
-        name = "update-notifier-0.1.10.tgz";
-        sha1 = "215cbe1053369f0d4a44f84b51eba7cb80484695";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."update-notifier" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.10.tgz";
+      name = "update-notifier-0.1.10.tgz";
+      sha1 = "215cbe1053369f0d4a44f84b51eba7cb80484695";
+    };
     deps = {
       "chalk-0.4.0" = self.by-version."chalk"."0.4.0";
       "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
       "request-2.51.0" = self.by-version."request"."2.51.0";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "update-notifier" ];
+    peerDependencies = [];
   };
   by-spec."uri-path"."0.0.2" =
     self.by-version."uri-path"."0.0.2";
-  by-version."uri-path"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."uri-path"."0.0.2" = self.buildNodePackage {
     name = "uri-path-0.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz";
-        name = "uri-path-0.0.2.tgz";
-        sha1 = "803eb01f2feb17927dcce0f6187e72b75f53f554";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uri-path" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz";
+      name = "uri-path-0.0.2.tgz";
+      sha1 = "803eb01f2feb17927dcce0f6187e72b75f53f554";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uri-path" ];
+    peerDependencies = [];
   };
   by-spec."url"."~0.10.1" =
     self.by-version."url"."0.10.2";
-  by-version."url"."0.10.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."url"."0.10.2" = self.buildNodePackage {
     name = "url-0.10.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/url/-/url-0.10.2.tgz";
-        name = "url-0.10.2.tgz";
-        sha1 = "68621d6929ea1cad344ebf135d82fcf7eb1a7469";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."url" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/url/-/url-0.10.2.tgz";
+      name = "url-0.10.2.tgz";
+      sha1 = "68621d6929ea1cad344ebf135d82fcf7eb1a7469";
+    };
     deps = {
       "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "url" ];
+    peerDependencies = [];
   };
   by-spec."url"."~0.7.9" =
     self.by-version."url"."0.7.9";
-  by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."url"."0.7.9" = self.buildNodePackage {
     name = "url-0.7.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz";
-        name = "url-0.7.9.tgz";
-        sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."url" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz";
+      name = "url-0.7.9.tgz";
+      sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0";
+    };
     deps = {
       "querystring-0.1.0" = self.by-version."querystring"."0.1.0";
       "punycode-1.0.0" = self.by-version."punycode"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "url" ];
+    peerDependencies = [];
   };
   by-spec."user-home"."^1.0.0" =
-    self.by-version."user-home"."1.1.0";
-  by-version."user-home"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "user-home-1.1.0";
+    self.by-version."user-home"."1.1.1";
+  by-version."user-home"."1.1.1" = self.buildNodePackage {
+    name = "user-home-1.1.1";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz";
-        name = "user-home-1.1.0.tgz";
-        sha1 = "1f4e6bce5458aeec4ac80ebcdcc66119c1070cdf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."user-home" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz";
+      name = "user-home-1.1.1.tgz";
+      sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "user-home" ];
+    peerDependencies = [];
   };
   by-spec."user-home"."^1.1.0" =
-    self.by-version."user-home"."1.1.0";
+    self.by-version."user-home"."1.1.1";
   by-spec."useragent"."~2.0.4" =
     self.by-version."useragent"."2.0.10";
-  by-version."useragent"."2.0.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."useragent"."2.0.10" = self.buildNodePackage {
     name = "useragent-2.0.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/useragent/-/useragent-2.0.10.tgz";
-        name = "useragent-2.0.10.tgz";
-        sha1 = "af2c1cc641159361e4d830866eb716ba4679de33";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."useragent" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/useragent/-/useragent-2.0.10.tgz";
+      name = "useragent-2.0.10.tgz";
+      sha1 = "af2c1cc641159361e4d830866eb716ba4679de33";
+    };
     deps = {
       "lru-cache-2.2.4" = self.by-version."lru-cache"."2.2.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "useragent" ];
+    peerDependencies = [];
+  };
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz";
+      name = "utf8-2.0.0.tgz";
+      sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."utfx"."~1.0.0" =
     self.by-version."utfx"."1.0.0";
-  by-version."utfx"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."utfx"."1.0.0" = self.buildNodePackage {
     name = "utfx-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/utfx/-/utfx-1.0.0.tgz";
-        name = "utfx-1.0.0.tgz";
-        sha1 = "a6ecdd5c70b2bf1f7fe2381afd1a806d0343b6e1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."utfx" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utfx/-/utfx-1.0.0.tgz";
+      name = "utfx-1.0.0.tgz";
+      sha1 = "a6ecdd5c70b2bf1f7fe2381afd1a806d0343b6e1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "utfx" ];
+    peerDependencies = [];
   };
   by-spec."util"."0.10.3" =
     self.by-version."util"."0.10.3";
-  by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."util"."0.10.3" = self.buildNodePackage {
     name = "util-0.10.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
-        name = "util-0.10.3.tgz";
-        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."util" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
+      name = "util-0.10.3.tgz";
+      sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "util" ];
+    peerDependencies = [];
   };
   by-spec."util"."0.4.9" =
     self.by-version."util"."0.4.9";
-  by-version."util"."0.4.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."util"."0.4.9" = self.buildNodePackage {
     name = "util-0.4.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
-        name = "util-0.4.9.tgz";
-        sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."util" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
+      name = "util-0.4.9.tgz";
+      sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
+    };
     deps = {
       "events.node-0.4.9" = self.by-version."events.node"."0.4.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "util" ];
+    peerDependencies = [];
   };
   by-spec."util".">=0.10.3 <1" =
     self.by-version."util"."0.10.3";
@@ -30887,58 +29077,42 @@
     self.by-version."util"."0.10.3";
   by-spec."util-deprecate"."1.0.0" =
     self.by-version."util-deprecate"."1.0.0";
-  by-version."util-deprecate"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."util-deprecate"."1.0.0" = self.buildNodePackage {
     name = "util-deprecate-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz";
-        name = "util-deprecate-1.0.0.tgz";
-        sha1 = "3007af012c140eae26de05576ec22785cac3abf2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."util-deprecate" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz";
+      name = "util-deprecate-1.0.0.tgz";
+      sha1 = "3007af012c140eae26de05576ec22785cac3abf2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "util-deprecate" ];
+    peerDependencies = [];
   };
   by-spec."util-extend"."^1.0.1" =
     self.by-version."util-extend"."1.0.1";
-  by-version."util-extend"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."util-extend"."1.0.1" = self.buildNodePackage {
     name = "util-extend-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz";
-        name = "util-extend-1.0.1.tgz";
-        sha1 = "bb703b79480293ddcdcfb3c6a9fea20f483415bc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."util-extend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz";
+      name = "util-extend-1.0.1.tgz";
+      sha1 = "bb703b79480293ddcdcfb3c6a9fea20f483415bc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "util-extend" ];
+    peerDependencies = [];
   };
   by-spec."utile"."0.1.x" =
     self.by-version."utile"."0.1.7";
-  by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."utile"."0.1.7" = self.buildNodePackage {
     name = "utile-0.1.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
-        name = "utile-0.1.7.tgz";
-        sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."utile" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
+      name = "utile-0.1.7.tgz";
+      sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
+    };
     deps = {
       "async-0.1.22" = self.by-version."async"."0.1.22";
       "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
@@ -30947,24 +29121,18 @@
       "ncp-0.2.7" = self.by-version."ncp"."0.2.7";
       "rimraf-1.0.9" = self.by-version."rimraf"."1.0.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "utile" ];
+    peerDependencies = [];
   };
   by-spec."utile"."0.2.1" =
     self.by-version."utile"."0.2.1";
-  by-version."utile"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."utile"."0.2.1" = self.buildNodePackage {
     name = "utile-0.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
-        name = "utile-0.2.1.tgz";
-        sha1 = "930c88e99098d6220834c356cbd9a770522d90d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."utile" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
+      name = "utile-0.2.1.tgz";
+      sha1 = "930c88e99098d6220834c356cbd9a770522d90d7";
+    };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
@@ -30973,9 +29141,7 @@
       "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "utile" ];
+    peerDependencies = [];
   };
   by-spec."utile"."0.2.x" =
     self.by-version."utile"."0.2.1";
@@ -30983,379 +29149,334 @@
     self.by-version."utile"."0.2.1";
   by-spec."utils-merge"."1.0.0" =
     self.by-version."utils-merge"."1.0.0";
-  by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."utils-merge"."1.0.0" = self.buildNodePackage {
     name = "utils-merge-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."utils-merge" or []);
+    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 = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "utils-merge" ];
+    peerDependencies = [];
   };
+  by-spec."utils-merge"."1.x.x" =
+    self.by-version."utils-merge"."1.0.0";
   by-spec."uuid"."^2.0.1" =
     self.by-version."uuid"."2.0.1";
-  by-version."uuid"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."uuid"."2.0.1" = self.buildNodePackage {
     name = "uuid-2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
-        name = "uuid-2.0.1.tgz";
-        sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uuid" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
+      name = "uuid-2.0.1.tgz";
+      sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uuid" ];
+    peerDependencies = [];
   };
   by-spec."uuid"."~2.0.1" =
     self.by-version."uuid"."2.0.1";
   by-spec."v8-debug"."~0.3.0" =
     self.by-version."v8-debug"."0.3.3";
-  by-version."v8-debug"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."v8-debug"."0.3.3" = self.buildNodePackage {
     name = "v8-debug-0.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.3.tgz";
-        name = "v8-debug-0.3.3.tgz";
-        sha1 = "fb2ee93cef9acedca889e534e4706eff5393e82d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."v8-debug" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.3.tgz";
+      name = "v8-debug-0.3.3.tgz";
+      sha1 = "fb2ee93cef9acedca889e534e4706eff5393e82d";
+    };
     deps = {
       "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31";
       "nan-1.2.0" = self.by-version."nan"."1.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "v8-debug" ];
+    peerDependencies = [];
   };
   by-spec."v8-profiler"."~5.2.0" =
     self.by-version."v8-profiler"."5.2.2";
-  by-version."v8-profiler"."5.2.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."v8-profiler"."5.2.2" = self.buildNodePackage {
     name = "v8-profiler-5.2.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.2.tgz";
-        name = "v8-profiler-5.2.2.tgz";
-        sha1 = "1ad95f6b0ca7717172c61c28f32f19fd4a961995";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."v8-profiler" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.2.tgz";
+      name = "v8-profiler-5.2.2.tgz";
+      sha1 = "1ad95f6b0ca7717172c61c28f32f19fd4a961995";
+    };
     deps = {
       "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31";
       "nan-1.2.0" = self.by-version."nan"."1.2.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "v8-profiler" ];
+    peerDependencies = [];
   };
   by-spec."v8flags"."^1.0.1" =
     self.by-version."v8flags"."1.0.8";
-  by-version."v8flags"."1.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."v8flags"."1.0.8" = self.buildNodePackage {
     name = "v8flags-1.0.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.8.tgz";
-        name = "v8flags-1.0.8.tgz";
-        sha1 = "7e7aa6119c82e4fb2393ce1ffd2868b35cd91084";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."v8flags" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.8.tgz";
+      name = "v8flags-1.0.8.tgz";
+      sha1 = "7e7aa6119c82e4fb2393ce1ffd2868b35cd91084";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "v8flags" ];
+    peerDependencies = [];
   };
   by-spec."valid-identifier"."0.0.1" =
     self.by-version."valid-identifier"."0.0.1";
-  by-version."valid-identifier"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."valid-identifier"."0.0.1" = self.buildNodePackage {
     name = "valid-identifier-0.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz";
-        name = "valid-identifier-0.0.1.tgz";
-        sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."valid-identifier" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz";
+      name = "valid-identifier-0.0.1.tgz";
+      sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "valid-identifier" ];
+    peerDependencies = [];
+  };
+  by-spec."validator"."1.5.1" =
+    self.by-version."validator"."1.5.1";
+  by-version."validator"."1.5.1" = self.buildNodePackage {
+    name = "validator-1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/validator/-/validator-1.5.1.tgz";
+      name = "validator-1.5.1.tgz";
+      sha1 = "7ab356cbbcbbb000ab85c43b8cda12621b1344c0";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."validator"."^2.1.0" =
     self.by-version."validator"."2.1.0";
-  by-version."validator"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."validator"."2.1.0" = self.buildNodePackage {
     name = "validator-2.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/validator/-/validator-2.1.0.tgz";
-        name = "validator-2.1.0.tgz";
-        sha1 = "63276570def208adcf1c032c1f4e6a17d2bd8d8b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."validator" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/validator/-/validator-2.1.0.tgz";
+      name = "validator-2.1.0.tgz";
+      sha1 = "63276570def208adcf1c032c1f4e6a17d2bd8d8b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "validator" ];
+    peerDependencies = [];
   };
+  by-spec."validator"."~1.5.1" =
+    self.by-version."validator"."1.5.1";
   by-spec."vargs"."~0.1.0" =
     self.by-version."vargs"."0.1.0";
-  by-version."vargs"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."vargs"."0.1.0" = self.buildNodePackage {
     name = "vargs-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz";
-        name = "vargs-0.1.0.tgz";
-        sha1 = "6b6184da6520cc3204ce1b407cac26d92609ebff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vargs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz";
+      name = "vargs-0.1.0.tgz";
+      sha1 = "6b6184da6520cc3204ce1b407cac26d92609ebff";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vargs" ];
+    peerDependencies = [];
+  };
+  by-spec."vary"."0.1.0" =
+    self.by-version."vary"."0.1.0";
+  by-version."vary"."0.1.0" = self.buildNodePackage {
+    name = "vary-0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
+      name = "vary-0.1.0.tgz";
+      sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."vary"."~1.0.0" =
     self.by-version."vary"."1.0.0";
-  by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."vary"."1.0.0" = self.buildNodePackage {
     name = "vary-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
-        name = "vary-1.0.0.tgz";
-        sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vary" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
+      name = "vary-1.0.0.tgz";
+      sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vary" ];
+    peerDependencies = [];
   };
   by-spec."vasync"."1.3.3" =
     self.by-version."vasync"."1.3.3";
-  by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."vasync"."1.3.3" = self.buildNodePackage {
     name = "vasync-1.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz";
-        name = "vasync-1.3.3.tgz";
-        sha1 = "84917680717020b67e043902e63bc143174c8728";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vasync" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz";
+      name = "vasync-1.3.3.tgz";
+      sha1 = "84917680717020b67e043902e63bc143174c8728";
+    };
     deps = {
       "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
       "verror-1.1.0" = self.by-version."verror"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vasync" ];
+    peerDependencies = [];
+  };
+  by-spec."vasync"."1.4.0" =
+    self.by-version."vasync"."1.4.0";
+  by-version."vasync"."1.4.0" = self.buildNodePackage {
+    name = "vasync-1.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vasync/-/vasync-1.4.0.tgz";
+      name = "vasync-1.4.0.tgz";
+      sha1 = "6ea5a63582358868d8743cbdd6ffadc9083b910f";
+    };
+    deps = {
+      "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
+      "verror-1.1.0" = self.by-version."verror"."1.1.0";
+    };
+    peerDependencies = [];
   };
   by-spec."vasync"."1.4.3" =
     self.by-version."vasync"."1.4.3";
-  by-version."vasync"."1.4.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."vasync"."1.4.3" = self.buildNodePackage {
     name = "vasync-1.4.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
-        name = "vasync-1.4.3.tgz";
-        sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vasync" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
+      name = "vasync-1.4.3.tgz";
+      sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37";
+    };
     deps = {
       "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
       "verror-1.1.0" = self.by-version."verror"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vasync" ];
+    peerDependencies = [];
   };
   by-spec."verror"."1.1.0" =
     self.by-version."verror"."1.1.0";
-  by-version."verror"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."verror"."1.1.0" = self.buildNodePackage {
     name = "verror-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
-        name = "verror-1.1.0.tgz";
-        sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."verror" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
+      name = "verror-1.1.0.tgz";
+      sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0";
+    };
     deps = {
       "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "verror" ];
+    peerDependencies = [];
   };
   by-spec."verror"."1.3.3" =
     self.by-version."verror"."1.3.3";
-  by-version."verror"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."verror"."1.3.3" = self.buildNodePackage {
     name = "verror-1.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
-        name = "verror-1.3.3.tgz";
-        sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."verror" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
+      name = "verror-1.3.3.tgz";
+      sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
+    };
     deps = {
       "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "verror" ];
+    peerDependencies = [];
   };
   by-spec."verror"."1.3.6" =
     self.by-version."verror"."1.3.6";
-  by-version."verror"."1.3.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."verror"."1.3.6" = self.buildNodePackage {
     name = "verror-1.3.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
-        name = "verror-1.3.6.tgz";
-        sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."verror" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+      name = "verror-1.3.6.tgz";
+      sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+    };
     deps = {
       "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "verror" ];
+    peerDependencies = [];
+  };
+  by-spec."verror"."^1.4.0" =
+    self.by-version."verror"."1.6.0";
+  by-version."verror"."1.6.0" = self.buildNodePackage {
+    name = "verror-1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
+      name = "verror-1.6.0.tgz";
+      sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
+    };
+    deps = {
+      "extsprintf-1.2.0" = self.by-version."extsprintf"."1.2.0";
+    };
+    peerDependencies = [];
   };
   by-spec."vhost"."1.0.0" =
     self.by-version."vhost"."1.0.0";
-  by-version."vhost"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."vhost"."1.0.0" = self.buildNodePackage {
     name = "vhost-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
-        name = "vhost-1.0.0.tgz";
-        sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vhost" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
+      name = "vhost-1.0.0.tgz";
+      sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vhost" ];
+    peerDependencies = [];
   };
   by-spec."vhost"."~3.0.0" =
     self.by-version."vhost"."3.0.0";
-  by-version."vhost"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."vhost"."3.0.0" = self.buildNodePackage {
     name = "vhost-3.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz";
-        name = "vhost-3.0.0.tgz";
-        sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vhost" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz";
+      name = "vhost-3.0.0.tgz";
+      sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vhost" ];
+    peerDependencies = [];
   };
   by-spec."view-helpers"."*" =
     self.by-version."view-helpers"."0.1.5";
-  by-version."view-helpers"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."view-helpers"."0.1.5" = self.buildNodePackage {
     name = "view-helpers-0.1.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
-        name = "view-helpers-0.1.5.tgz";
-        sha1 = "175d220a6afeca8e3b497b003e2337bcc596f761";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."view-helpers" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
+      name = "view-helpers-0.1.5.tgz";
+      sha1 = "175d220a6afeca8e3b497b003e2337bcc596f761";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "view-helpers" ];
+    peerDependencies = [];
   };
   "view-helpers" = self.by-version."view-helpers"."0.1.5";
   by-spec."vinyl"."^0.4.0" =
     self.by-version."vinyl"."0.4.6";
-  by-version."vinyl"."0.4.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."vinyl"."0.4.6" = self.buildNodePackage {
     name = "vinyl-0.4.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz";
-        name = "vinyl-0.4.6.tgz";
-        sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vinyl" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz";
+      name = "vinyl-0.4.6.tgz";
+      sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847";
+    };
     deps = {
       "clone-0.2.0" = self.by-version."clone"."0.2.0";
       "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vinyl" ];
+    peerDependencies = [];
   };
   by-spec."vinyl"."^0.4.3" =
     self.by-version."vinyl"."0.4.6";
@@ -31363,18 +29484,14 @@
     self.by-version."vinyl"."0.4.6";
   by-spec."vinyl-fs"."^0.3.0" =
     self.by-version."vinyl-fs"."0.3.13";
-  by-version."vinyl-fs"."0.3.13" = lib.makeOverridable self.buildNodePackage {
+  by-version."vinyl-fs"."0.3.13" = self.buildNodePackage {
     name = "vinyl-fs-0.3.13";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.13.tgz";
-        name = "vinyl-fs-0.3.13.tgz";
-        sha1 = "3d384c5b3032e356cd388023e3a085303382ac23";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vinyl-fs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.13.tgz";
+      name = "vinyl-fs-0.3.13.tgz";
+      sha1 = "3d384c5b3032e356cd388023e3a085303382ac23";
+    };
     deps = {
       "defaults-1.0.0" = self.by-version."defaults"."1.0.0";
       "glob-stream-3.1.18" = self.by-version."glob-stream"."3.1.18";
@@ -31385,236 +29502,157 @@
       "through2-0.6.3" = self.by-version."through2"."0.6.3";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vinyl-fs" ];
+    peerDependencies = [];
   };
   by-spec."vinyl-fs"."^0.3.13" =
     self.by-version."vinyl-fs"."0.3.13";
   by-spec."vm-browserify"."~0.0.1" =
     self.by-version."vm-browserify"."0.0.4";
-  by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."vm-browserify"."0.0.4" = self.buildNodePackage {
     name = "vm-browserify-0.0.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
-        name = "vm-browserify-0.0.4.tgz";
-        sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vm-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
+      name = "vm-browserify-0.0.4.tgz";
+      sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
+    };
     deps = {
       "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vm-browserify" ];
+    peerDependencies = [];
   };
   by-spec."voc"."*" =
     self.by-version."voc"."0.5.0";
-  by-version."voc"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."voc"."0.5.0" = self.buildNodePackage {
     name = "voc-0.5.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/voc/-/voc-0.5.0.tgz";
-        name = "voc-0.5.0.tgz";
-        sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."voc" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/voc/-/voc-0.5.0.tgz";
+      name = "voc-0.5.0.tgz";
+      sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "voc" ];
+    peerDependencies = [];
   };
   by-spec."void-elements"."~1.0.0" =
     self.by-version."void-elements"."1.0.0";
-  by-version."void-elements"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."void-elements"."1.0.0" = self.buildNodePackage {
     name = "void-elements-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/void-elements/-/void-elements-1.0.0.tgz";
-        name = "void-elements-1.0.0.tgz";
-        sha1 = "6e5db1e35d591f5ac690ce1a340f793a817b2c2a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."void-elements" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/void-elements/-/void-elements-1.0.0.tgz";
+      name = "void-elements-1.0.0.tgz";
+      sha1 = "6e5db1e35d591f5ac690ce1a340f793a817b2c2a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "void-elements" ];
+    peerDependencies = [];
   };
   by-spec."vows".">=0.5.13" =
     self.by-version."vows"."0.9.0-rc2";
-  by-version."vows"."0.9.0-rc2" = lib.makeOverridable self.buildNodePackage {
+  by-version."vows"."0.9.0-rc2" = self.buildNodePackage {
     name = "vows-0.9.0-rc2";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vows/-/vows-0.9.0-rc2.tgz";
-        name = "vows-0.9.0-rc2.tgz";
-        sha1 = "8e2bccc46e8db8b5277e09f6818c514e444da631";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vows" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vows/-/vows-0.9.0-rc2.tgz";
+      name = "vows-0.9.0-rc2.tgz";
+      sha1 = "8e2bccc46e8db8b5277e09f6818c514e444da631";
+    };
     deps = {
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "diff-1.2.1" = self.by-version."diff"."1.2.1";
-      "glob-4.3.2" = self.by-version."glob"."4.3.2";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "vows" ];
+    peerDependencies = [];
   };
   by-spec."walk"."*" =
     self.by-version."walk"."2.3.9";
-  by-version."walk"."2.3.9" = lib.makeOverridable self.buildNodePackage {
+  by-version."walk"."2.3.9" = self.buildNodePackage {
     name = "walk-2.3.9";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
-        name = "walk-2.3.9.tgz";
-        sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."walk" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
+      name = "walk-2.3.9.tgz";
+      sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
+    };
     deps = {
       "foreachasync-3.0.0" = self.by-version."foreachasync"."3.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "walk" ];
+    peerDependencies = [];
   };
   "walk" = self.by-version."walk"."2.3.9";
-  by-spec."walk"."~2.2.1" =
-    self.by-version."walk"."2.2.1";
-  by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "walk-2.2.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz";
-        name = "walk-2.2.1.tgz";
-        sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."walk" or []);
-    deps = {
-      "forEachAsync-2.2.1" = self.by-version."forEachAsync"."2.2.1";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "walk" ];
-  };
+  by-spec."walk"."^2.3.9" =
+    self.by-version."walk"."2.3.9";
   by-spec."ware"."^1.2.0" =
     self.by-version."ware"."1.2.0";
-  by-version."ware"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."ware"."1.2.0" = self.buildNodePackage {
     name = "ware-1.2.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ware/-/ware-1.2.0.tgz";
-        name = "ware-1.2.0.tgz";
-        sha1 = "6c18d599312ca1d0fa8065f0d5a6b651313d9974";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ware" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ware/-/ware-1.2.0.tgz";
+      name = "ware-1.2.0.tgz";
+      sha1 = "6c18d599312ca1d0fa8065f0d5a6b651313d9974";
+    };
     deps = {
-      "wrap-fn-0.1.1" = self.by-version."wrap-fn"."0.1.1";
+      "wrap-fn-0.1.4" = self.by-version."wrap-fn"."0.1.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ware" ];
+    peerDependencies = [];
   };
   by-spec."watch"."0.5.x" =
     self.by-version."watch"."0.5.1";
-  by-version."watch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."watch"."0.5.1" = self.buildNodePackage {
     name = "watch-0.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
-        name = "watch-0.5.1.tgz";
-        sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."watch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
+      name = "watch-0.5.1.tgz";
+      sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "watch" ];
+    peerDependencies = [];
   };
   by-spec."watch"."~0.13.0" =
     self.by-version."watch"."0.13.0";
-  by-version."watch"."0.13.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."watch"."0.13.0" = self.buildNodePackage {
     name = "watch-0.13.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/watch/-/watch-0.13.0.tgz";
-        name = "watch-0.13.0.tgz";
-        sha1 = "fcc6d2b3f0e8c73482eb54239a19fd5bcf9a753c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."watch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/watch/-/watch-0.13.0.tgz";
+      name = "watch-0.13.0.tgz";
+      sha1 = "fcc6d2b3f0e8c73482eb54239a19fd5bcf9a753c";
+    };
     deps = {
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "watch" ];
+    peerDependencies = [];
   };
   by-spec."wcwidth"."^1.0.0" =
     self.by-version."wcwidth"."1.0.0";
-  by-version."wcwidth"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."wcwidth"."1.0.0" = self.buildNodePackage {
     name = "wcwidth-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz";
-        name = "wcwidth-1.0.0.tgz";
-        sha1 = "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wcwidth" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz";
+      name = "wcwidth-1.0.0.tgz";
+      sha1 = "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f";
+    };
     deps = {
       "defaults-1.0.0" = self.by-version."defaults"."1.0.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "wcwidth" ];
+    peerDependencies = [];
   };
   by-spec."wd"."~0.3.4" =
     self.by-version."wd"."0.3.11";
-  by-version."wd"."0.3.11" = lib.makeOverridable self.buildNodePackage {
+  by-version."wd"."0.3.11" = self.buildNodePackage {
     name = "wd-0.3.11";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.3.11.tgz";
-        name = "wd-0.3.11.tgz";
-        sha1 = "522716c79a7a10e781acbb2c6cafe588f701fcc0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wd" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wd/-/wd-0.3.11.tgz";
+      name = "wd-0.3.11.tgz";
+      sha1 = "522716c79a7a10e781acbb2c6cafe588f701fcc0";
+    };
     deps = {
       "archiver-0.12.0" = self.by-version."archiver"."0.12.0";
       "async-0.9.0" = self.by-version."async"."0.9.0";
@@ -31624,44 +29662,32 @@
       "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
       "vargs-0.1.0" = self.by-version."vargs"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "wd" ];
+    peerDependencies = [];
   };
   by-spec."weak-map"."^1.0.4" =
     self.by-version."weak-map"."1.0.5";
-  by-version."weak-map"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."weak-map"."1.0.5" = self.buildNodePackage {
     name = "weak-map-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
-        name = "weak-map-1.0.5.tgz";
-        sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."weak-map" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
+      name = "weak-map-1.0.5.tgz";
+      sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "weak-map" ];
+    peerDependencies = [];
   };
   by-spec."webdrvr"."*" =
     self.by-version."webdrvr"."2.43.0-0";
-  by-version."webdrvr"."2.43.0-0" = lib.makeOverridable self.buildNodePackage {
+  by-version."webdrvr"."2.43.0-0" = self.buildNodePackage {
     name = "webdrvr-2.43.0-0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-0.tgz";
-        name = "webdrvr-2.43.0-0.tgz";
-        sha1 = "b022266b1d5fba25e22d923337c55587048c2953";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."webdrvr" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-0.tgz";
+      name = "webdrvr-2.43.0-0.tgz";
+      sha1 = "b022266b1d5fba25e22d923337c55587048c2953";
+    };
     deps = {
       "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
       "kew-0.1.7" = self.by-version."kew"."0.1.7";
@@ -31671,93 +29697,83 @@
       "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
       "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "webdrvr" ];
+    peerDependencies = [];
   };
   "webdrvr" = self.by-version."webdrvr"."2.43.0-0";
+  by-spec."webkit-devtools-agent"."^0.2.4" =
+    self.by-version."webkit-devtools-agent"."0.2.5";
+  by-version."webkit-devtools-agent"."0.2.5" = self.buildNodePackage {
+    name = "webkit-devtools-agent-0.2.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/webkit-devtools-agent/-/webkit-devtools-agent-0.2.5.tgz";
+      name = "webkit-devtools-agent-0.2.5.tgz";
+      sha1 = "f93e2948bd1a5171d368be65b3676604104c4f90";
+    };
+    deps = {
+      "ws-0.4.31" = self.by-version."ws"."0.4.31";
+      "underscore-1.3.3" = self.by-version."underscore"."1.3.3";
+    };
+    peerDependencies = [];
+  };
   by-spec."websocket-driver".">=0.3.6" =
     self.by-version."websocket-driver"."0.5.1";
-  by-version."websocket-driver"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."websocket-driver"."0.5.1" = self.buildNodePackage {
     name = "websocket-driver-0.5.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.1.tgz";
-        name = "websocket-driver-0.5.1.tgz";
-        sha1 = "dd954c0a42a9962a31296f84cc465ca4b74c2611";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."websocket-driver" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.1.tgz";
+      name = "websocket-driver-0.5.1.tgz";
+      sha1 = "dd954c0a42a9962a31296f84cc465ca4b74c2611";
+    };
     deps = {
       "websocket-extensions-0.1.0" = self.by-version."websocket-extensions"."0.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "websocket-driver" ];
+    peerDependencies = [];
   };
   by-spec."websocket-driver".">=0.5.1" =
     self.by-version."websocket-driver"."0.5.1";
   by-spec."websocket-extensions".">=0.1.0" =
     self.by-version."websocket-extensions"."0.1.0";
-  by-version."websocket-extensions"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."websocket-extensions"."0.1.0" = self.buildNodePackage {
     name = "websocket-extensions-0.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.0.tgz";
-        name = "websocket-extensions-0.1.0.tgz";
-        sha1 = "43567457158085e83ce7050f17ac6d988936320a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."websocket-extensions" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.0.tgz";
+      name = "websocket-extensions-0.1.0.tgz";
+      sha1 = "43567457158085e83ce7050f17ac6d988936320a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "websocket-extensions" ];
+    peerDependencies = [];
   };
   by-spec."when"."~3.4.6" =
     self.by-version."when"."3.4.6";
-  by-version."when"."3.4.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."when"."3.4.6" = self.buildNodePackage {
     name = "when-3.4.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz";
-        name = "when-3.4.6.tgz";
-        sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."when" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz";
+      name = "when-3.4.6.tgz";
+      sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "when" ];
+    peerDependencies = [];
   };
   by-spec."which"."1" =
     self.by-version."which"."1.0.8";
-  by-version."which"."1.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."which"."1.0.8" = self.buildNodePackage {
     name = "which-1.0.8";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/which/-/which-1.0.8.tgz";
-        name = "which-1.0.8.tgz";
-        sha1 = "c2ff319534ac4a1fa45df2221b56c36279903ded";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."which" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/which/-/which-1.0.8.tgz";
+      name = "which-1.0.8.tgz";
+      sha1 = "c2ff319534ac4a1fa45df2221b56c36279903ded";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "which" ];
+    peerDependencies = [];
   };
   by-spec."which"."1.0.x" =
     self.by-version."which"."1.0.8";
@@ -31767,62 +29783,60 @@
     self.by-version."which"."1.0.8";
   by-spec."which"."~1.0.8" =
     self.by-version."which"."1.0.8";
+  by-spec."win-release"."^1.0.0" =
+    self.by-version."win-release"."1.0.0";
+  by-version."win-release"."1.0.0" = self.buildNodePackage {
+    name = "win-release-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/win-release/-/win-release-1.0.0.tgz";
+      name = "win-release-1.0.0.tgz";
+      sha1 = "8993308dedbd8d30ad5594b6b7382a8c1d96ae5a";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."windows-no-runnable"."~0.0.6" =
     self.by-version."windows-no-runnable"."0.0.6";
-  by-version."windows-no-runnable"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."windows-no-runnable"."0.0.6" = self.buildNodePackage {
     name = "windows-no-runnable-0.0.6";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz";
-        name = "windows-no-runnable-0.0.6.tgz";
-        sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."windows-no-runnable" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz";
+      name = "windows-no-runnable-0.0.6.tgz";
+      sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "windows-no-runnable" ];
+    peerDependencies = [];
   };
   by-spec."winser"."=0.1.6" =
     self.by-version."winser"."0.1.6";
-  by-version."winser"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."winser"."0.1.6" = self.buildNodePackage {
     name = "winser-0.1.6";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
-        name = "winser-0.1.6.tgz";
-        sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."winser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
+      name = "winser-0.1.6.tgz";
+      sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
+    };
     deps = {
       "sequence-2.2.1" = self.by-version."sequence"."2.2.1";
       "commander-1.3.1" = self.by-version."commander"."1.3.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "winser" ];
+    peerDependencies = [];
   };
   by-spec."winston"."*" =
     self.by-version."winston"."0.8.3";
-  by-version."winston"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."winston"."0.8.3" = self.buildNodePackage {
     name = "winston-0.8.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
-        name = "winston-0.8.3.tgz";
-        sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."winston" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
+      name = "winston-0.8.3.tgz";
+      sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
+    };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
@@ -31832,25 +29846,39 @@
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "winston" ];
+    peerDependencies = [];
   };
   "winston" = self.by-version."winston"."0.8.3";
+  by-spec."winston"."0.5.1" =
+    self.by-version."winston"."0.5.1";
+  by-version."winston"."0.5.1" = self.buildNodePackage {
+    name = "winston-0.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.5.1.tgz";
+      name = "winston-0.5.1.tgz";
+      sha1 = "2b2f40cdbf469b60f1885cc549757c4b9973e5ea";
+    };
+    deps = {
+      "async-0.1.22" = self.by-version."async"."0.1.22";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "loggly-0.3.11" = self.by-version."loggly"."0.3.11";
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+    };
+    peerDependencies = [];
+  };
   by-spec."winston"."0.6.2" =
     self.by-version."winston"."0.6.2";
-  by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."winston"."0.6.2" = self.buildNodePackage {
     name = "winston-0.6.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
-        name = "winston-0.6.2.tgz";
-        sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."winston" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+      name = "winston-0.6.2.tgz";
+      sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
+    };
     deps = {
       "async-0.1.22" = self.by-version."async"."0.1.22";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
@@ -31860,26 +29888,20 @@
       "request-2.9.203" = self.by-version."request"."2.9.203";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "winston" ];
+    peerDependencies = [];
   };
   by-spec."winston"."0.6.x" =
     self.by-version."winston"."0.6.2";
   by-spec."winston"."0.7.2" =
     self.by-version."winston"."0.7.2";
-  by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."winston"."0.7.2" = self.buildNodePackage {
     name = "winston-0.7.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
-        name = "winston-0.7.2.tgz";
-        sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."winston" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
+      name = "winston-0.7.2.tgz";
+      sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
+    };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
@@ -31889,24 +29911,39 @@
       "request-2.16.6" = self.by-version."request"."2.16.6";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "winston" ];
+    peerDependencies = [];
+  };
+  by-spec."winston"."0.7.3" =
+    self.by-version."winston"."0.7.3";
+  by-version."winston"."0.7.3" = self.buildNodePackage {
+    name = "winston-0.7.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz";
+      name = "winston-0.7.3.tgz";
+      sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "request-2.16.6" = self.by-version."request"."2.16.6";
+      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+    };
+    peerDependencies = [];
   };
   by-spec."winston"."0.8.0" =
     self.by-version."winston"."0.8.0";
-  by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."winston"."0.8.0" = self.buildNodePackage {
     name = "winston-0.8.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
-        name = "winston-0.8.0.tgz";
-        sha1 = "61d0830fa699706212206b0a2b5ca69a93043668";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."winston" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
+      name = "winston-0.8.0.tgz";
+      sha1 = "61d0830fa699706212206b0a2b5ca69a93043668";
+    };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
@@ -31915,9 +29952,7 @@
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "winston" ];
+    peerDependencies = [];
   };
   by-spec."winston"."0.8.x" =
     self.by-version."winston"."0.8.3";
@@ -31927,722 +29962,662 @@
     self.by-version."winston"."0.8.3";
   by-spec."with"."~1.1.0" =
     self.by-version."with"."1.1.1";
-  by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."with"."1.1.1" = self.buildNodePackage {
     name = "with-1.1.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz";
-        name = "with-1.1.1.tgz";
-        sha1 = "66bd6664deb318b2482dd0424ccdebe822434ac0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."with" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz";
+      name = "with-1.1.1.tgz";
+      sha1 = "66bd6664deb318b2482dd0424ccdebe822434ac0";
+    };
     deps = {
       "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "with" ];
+    peerDependencies = [];
   };
   by-spec."with"."~2.0.0" =
     self.by-version."with"."2.0.0";
-  by-version."with"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."with"."2.0.0" = self.buildNodePackage {
     name = "with-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz";
-        name = "with-2.0.0.tgz";
-        sha1 = "ec01ff021db9df05639047147ede012f5e6d0afd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."with" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz";
+      name = "with-2.0.0.tgz";
+      sha1 = "ec01ff021db9df05639047147ede012f5e6d0afd";
+    };
     deps = {
       "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "with" ];
+    peerDependencies = [];
   };
   by-spec."with"."~4.0.0" =
     self.by-version."with"."4.0.0";
-  by-version."with"."4.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."with"."4.0.0" = self.buildNodePackage {
     name = "with-4.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/with/-/with-4.0.0.tgz";
-        name = "with-4.0.0.tgz";
-        sha1 = "7a78d6642d9b72960a71d1c0c45fd6dd1b878dc7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."with" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/with/-/with-4.0.0.tgz";
+      name = "with-4.0.0.tgz";
+      sha1 = "7a78d6642d9b72960a71d1c0c45fd6dd1b878dc7";
+    };
     deps = {
       "acorn-0.8.0" = self.by-version."acorn"."0.8.0";
-      "acorn-globals-1.0.1" = self.by-version."acorn-globals"."1.0.1";
+      "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "with" ];
+    peerDependencies = [];
   };
   by-spec."wordwrap"."0.0.x" =
     self.by-version."wordwrap"."0.0.2";
-  by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."wordwrap"."0.0.2" = self.buildNodePackage {
     name = "wordwrap-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wordwrap" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+      name = "wordwrap-0.0.2.tgz";
+      sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "wordwrap" ];
+    peerDependencies = [];
   };
   by-spec."wordwrap".">=0.0.1 <0.1.0" =
     self.by-version."wordwrap"."0.0.2";
   by-spec."wordwrap"."~0.0.2" =
     self.by-version."wordwrap"."0.0.2";
   by-spec."wrap-fn"."^0.1.0" =
-    self.by-version."wrap-fn"."0.1.1";
-  by-version."wrap-fn"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "wrap-fn-0.1.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.1.tgz";
-        name = "wrap-fn-0.1.1.tgz";
-        sha1 = "d7f632de5c6ef1559557ae179be6bce14edc471b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wrap-fn" or []);
+    self.by-version."wrap-fn"."0.1.4";
+  by-version."wrap-fn"."0.1.4" = self.buildNodePackage {
+    name = "wrap-fn-0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.4.tgz";
+      name = "wrap-fn-0.1.4.tgz";
+      sha1 = "03eba5d07ac55c2a93fa2d37a2b01f81c07bddb2";
+    };
     deps = {
       "co-3.1.0" = self.by-version."co"."3.1.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "wrap-fn" ];
+    peerDependencies = [];
   };
   by-spec."wrappy"."1" =
     self.by-version."wrappy"."1.0.1";
-  by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."wrappy"."1.0.1" = self.buildNodePackage {
     name = "wrappy-1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
-        name = "wrappy-1.0.1.tgz";
-        sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wrappy" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
+      name = "wrappy-1.0.1.tgz";
+      sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "wrappy" ];
+    peerDependencies = [];
   };
   by-spec."wrappy"."~1.0.1" =
     self.by-version."wrappy"."1.0.1";
   by-spec."wrench"."~1.5.0" =
     self.by-version."wrench"."1.5.8";
-  by-version."wrench"."1.5.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."wrench"."1.5.8" = self.buildNodePackage {
     name = "wrench-1.5.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
-        name = "wrench-1.5.8.tgz";
-        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wrench" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
+      name = "wrench-1.5.8.tgz";
+      sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "wrench" ];
+    peerDependencies = [];
   };
   by-spec."wrench"."~1.5.4" =
     self.by-version."wrench"."1.5.8";
   by-spec."write-file-atomic"."~1.1.0" =
     self.by-version."write-file-atomic"."1.1.0";
-  by-version."write-file-atomic"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."write-file-atomic"."1.1.0" = self.buildNodePackage {
     name = "write-file-atomic-1.1.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz";
-        name = "write-file-atomic-1.1.0.tgz";
-        sha1 = "e114cfb8f82188353f98217c5945451c9b4dc060";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."write-file-atomic" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz";
+      name = "write-file-atomic-1.1.0.tgz";
+      sha1 = "e114cfb8f82188353f98217c5945451c9b4dc060";
+    };
     deps = {
       "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "write-file-atomic" ];
+    peerDependencies = [];
+  };
+  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";
+    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";
+    };
+    peerDependencies = [];
   };
   by-spec."ws"."0.4.x" =
     self.by-version."ws"."0.4.32";
-  by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage {
+  by-version."ws"."0.4.32" = self.buildNodePackage {
     name = "ws-0.4.32";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
-        name = "ws-0.4.32.tgz";
-        sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ws" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+      name = "ws-0.4.32.tgz";
+      sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
+    };
     deps = {
       "commander-2.1.0" = self.by-version."commander"."2.1.0";
       "nan-1.0.0" = self.by-version."nan"."1.0.0";
       "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
       "options-0.0.6" = self.by-version."options"."0.0.6";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ws" ];
+    peerDependencies = [];
   };
   by-spec."ws"."~0.4.31" =
     self.by-version."ws"."0.4.32";
   by-spec."wu"."*" =
     self.by-version."wu"."2.0.0";
-  by-version."wu"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."wu"."2.0.0" = self.buildNodePackage {
     name = "wu-2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wu/-/wu-2.0.0.tgz";
-        name = "wu-2.0.0.tgz";
-        sha1 = "abda06a014dd1c54c2163862f5c2c5230721bc27";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wu" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wu/-/wu-2.0.0.tgz";
+      name = "wu-2.0.0.tgz";
+      sha1 = "abda06a014dd1c54c2163862f5c2c5230721bc27";
+    };
     deps = {
       "traceur-0.0.55" = self.by-version."traceur"."0.0.55";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "wu" ];
+    peerDependencies = [];
   };
   "wu" = self.by-version."wu"."2.0.0";
   by-spec."x509"."*" =
     self.by-version."x509"."0.1.4";
-  by-version."x509"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."x509"."0.1.4" = self.buildNodePackage {
     name = "x509-0.1.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/x509/-/x509-0.1.4.tgz";
-        name = "x509-0.1.4.tgz";
-        sha1 = "08d016ed165db0c68a192edeb1cdca0f5d43cb22";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."x509" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/x509/-/x509-0.1.4.tgz";
+      name = "x509-0.1.4.tgz";
+      sha1 = "08d016ed165db0c68a192edeb1cdca0f5d43cb22";
+    };
     deps = {
-      "nan-1.4.1" = self.by-version."nan"."1.4.1";
+      "nan-1.6.1" = self.by-version."nan"."1.6.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "x509" ];
+    peerDependencies = [];
   };
   "x509" = self.by-version."x509"."0.1.4";
   by-spec."xcode"."0.6.7" =
     self.by-version."xcode"."0.6.7";
-  by-version."xcode"."0.6.7" = lib.makeOverridable self.buildNodePackage {
+  by-version."xcode"."0.6.7" = self.buildNodePackage {
     name = "xcode-0.6.7";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xcode/-/xcode-0.6.7.tgz";
-        name = "xcode-0.6.7.tgz";
-        sha1 = "df11a8615e43dfa397cbf593b0fd14ebeadf4e7a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xcode" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xcode/-/xcode-0.6.7.tgz";
+      name = "xcode-0.6.7.tgz";
+      sha1 = "df11a8615e43dfa397cbf593b0fd14ebeadf4e7a";
+    };
     deps = {
       "pegjs-0.6.2" = self.by-version."pegjs"."0.6.2";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xcode" ];
+    peerDependencies = [];
   };
   by-spec."xdg-basedir"."^1.0.0" =
-    self.by-version."xdg-basedir"."1.0.0";
-  by-version."xdg-basedir"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "xdg-basedir-1.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.0.tgz";
-        name = "xdg-basedir-1.0.0.tgz";
-        sha1 = "95ea42a738d98a9470fd5a21d08556dbd61dc74a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xdg-basedir" or []);
-    deps = {
-      "user-home-1.1.0" = self.by-version."user-home"."1.1.0";
+    self.by-version."xdg-basedir"."1.0.1";
+  by-version."xdg-basedir"."1.0.1" = self.buildNodePackage {
+    name = "xdg-basedir-1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz";
+      name = "xdg-basedir-1.0.1.tgz";
+      sha1 = "14ff8f63a4fdbcb05d5b6eea22b36f3033b9f04e";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xdg-basedir" ];
+    deps = {
+      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
+    };
+    peerDependencies = [];
   };
   by-spec."xdg-empty-trash"."^1.0.0" =
     self.by-version."xdg-empty-trash"."1.0.0";
-  by-version."xdg-empty-trash"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."xdg-empty-trash"."1.0.0" = self.buildNodePackage {
     name = "xdg-empty-trash-1.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xdg-empty-trash/-/xdg-empty-trash-1.0.0.tgz";
-        name = "xdg-empty-trash-1.0.0.tgz";
-        sha1 = "007ec95403863f705ec09335b8c9166858021959";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xdg-empty-trash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xdg-empty-trash/-/xdg-empty-trash-1.0.0.tgz";
+      name = "xdg-empty-trash-1.0.0.tgz";
+      sha1 = "007ec95403863f705ec09335b8c9166858021959";
+    };
     deps = {
       "each-async-1.1.1" = self.by-version."each-async"."1.1.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xdg-empty-trash" ];
+    peerDependencies = [];
   };
   by-spec."xdg-trash"."^1.0.0" =
     self.by-version."xdg-trash"."1.0.5";
-  by-version."xdg-trash"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."xdg-trash"."1.0.5" = self.buildNodePackage {
     name = "xdg-trash-1.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.5.tgz";
-        name = "xdg-trash-1.0.5.tgz";
-        sha1 = "5473316b2a1ec2e9329fbeb4d767ffe939cc1c82";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xdg-trash" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.5.tgz";
+      name = "xdg-trash-1.0.5.tgz";
+      sha1 = "5473316b2a1ec2e9329fbeb4d767ffe939cc1c82";
+    };
     deps = {
       "each-async-1.1.1" = self.by-version."each-async"."1.1.1";
       "fs-extra-0.12.0" = self.by-version."fs-extra"."0.12.0";
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
-      "xdg-trashdir-1.1.0" = self.by-version."xdg-trashdir"."1.1.0";
+      "xdg-trashdir-1.1.1" = self.by-version."xdg-trashdir"."1.1.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xdg-trash" ];
+    peerDependencies = [];
   };
   by-spec."xdg-trashdir"."^1.0.0" =
-    self.by-version."xdg-trashdir"."1.1.0";
-  by-version."xdg-trashdir"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "xdg-trashdir-1.1.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xdg-trashdir/-/xdg-trashdir-1.1.0.tgz";
-        name = "xdg-trashdir-1.1.0.tgz";
-        sha1 = "67972964f5b80947ca17ba72e8d995fef71351f3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xdg-trashdir" or []);
+    self.by-version."xdg-trashdir"."1.1.1";
+  by-version."xdg-trashdir"."1.1.1" = self.buildNodePackage {
+    name = "xdg-trashdir-1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xdg-trashdir/-/xdg-trashdir-1.1.1.tgz";
+      name = "xdg-trashdir-1.1.1.tgz";
+      sha1 = "3cbdc8de596642396725de40a20bcf402b6d5db5";
+    };
     deps = {
       "mount-point-1.0.3" = self.by-version."mount-point"."1.0.3";
-      "user-home-1.1.0" = self.by-version."user-home"."1.1.0";
-      "xdg-basedir-1.0.0" = self.by-version."xdg-basedir"."1.0.0";
+      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
+      "xdg-basedir-1.0.1" = self.by-version."xdg-basedir"."1.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xdg-trashdir" ];
+    peerDependencies = [];
+  };
+  by-spec."xhr2".">= 0.0.5" =
+    self.by-version."xhr2"."0.1.1";
+  by-version."xhr2"."0.1.1" = self.buildNodePackage {
+    name = "xhr2-0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xhr2/-/xhr2-0.1.1.tgz";
+      name = "xhr2-0.1.1.tgz";
+      sha1 = "a251b131a1069d7a21b43e769ee0852cb8f70e62";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."xml"."^1.0.0" =
+    self.by-version."xml"."1.0.0";
+  by-version."xml"."1.0.0" = self.buildNodePackage {
+    name = "xml-1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml/-/xml-1.0.0.tgz";
+      name = "xml-1.0.0.tgz";
+      sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."xml2js"."*" =
+    self.by-version."xml2js"."0.4.4";
+  by-version."xml2js"."0.4.4" = self.buildNodePackage {
+    name = "xml2js-0.4.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
+      name = "xml2js-0.4.4.tgz";
+      sha1 = "3111010003008ae19240eba17497b57c729c555d";
+    };
+    deps = {
+      "sax-0.6.1" = self.by-version."sax"."0.6.1";
+      "xmlbuilder-2.4.5" = self.by-version."xmlbuilder"."2.4.5";
+    };
+    peerDependencies = [];
   };
   by-spec."xml2js"."0.2.4" =
     self.by-version."xml2js"."0.2.4";
-  by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."xml2js"."0.2.4" = self.buildNodePackage {
     name = "xml2js-0.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
-        name = "xml2js-0.2.4.tgz";
-        sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xml2js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
+      name = "xml2js-0.2.4.tgz";
+      sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d";
+    };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xml2js" ];
+    peerDependencies = [];
   };
   by-spec."xml2js"."0.2.6" =
     self.by-version."xml2js"."0.2.6";
-  by-version."xml2js"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+  by-version."xml2js"."0.2.6" = self.buildNodePackage {
     name = "xml2js-0.2.6";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
-        name = "xml2js-0.2.6.tgz";
-        sha1 = "d209c4e4dda1fc9c452141ef41c077f5adfdf6c4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xml2js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
+      name = "xml2js-0.2.6.tgz";
+      sha1 = "d209c4e4dda1fc9c452141ef41c077f5adfdf6c4";
+    };
     deps = {
       "sax-0.4.2" = self.by-version."sax"."0.4.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xml2js" ];
+    peerDependencies = [];
   };
   by-spec."xml2js"."0.4.4" =
     self.by-version."xml2js"."0.4.4";
-  by-version."xml2js"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "xml2js-0.4.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
-        name = "xml2js-0.4.4.tgz";
-        sha1 = "3111010003008ae19240eba17497b57c729c555d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xml2js" or []);
-    deps = {
-      "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-2.4.5" = self.by-version."xmlbuilder"."2.4.5";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xml2js" ];
-  };
   by-spec."xml2js".">= 0.0.1" =
     self.by-version."xml2js"."0.4.4";
   by-spec."xml2js".">=0.1.7" =
     self.by-version."xml2js"."0.4.4";
   by-spec."xml2js"."^0.4.4" =
     self.by-version."xml2js"."0.4.4";
+  by-spec."xml2json".">=0.3.2" =
+    self.by-version."xml2json"."0.5.1";
+  by-version."xml2json"."0.5.1" = self.buildNodePackage {
+    name = "xml2json-0.5.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2json/-/xml2json-0.5.1.tgz";
+      name = "xml2json-0.5.1.tgz";
+      sha1 = "4667011bf0b34e8ec9830cf83e9476659a94d9ba";
+    };
+    deps = {
+      "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4";
+    };
+    peerDependencies = [];
+  };
+  by-spec."xml2json"."^0.5.1" =
+    self.by-version."xml2json"."0.5.1";
   by-spec."xmlbuilder"."0.4.2" =
     self.by-version."xmlbuilder"."0.4.2";
-  by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."xmlbuilder"."0.4.2" = self.buildNodePackage {
     name = "xmlbuilder-0.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
-        name = "xmlbuilder-0.4.2.tgz";
-        sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xmlbuilder" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
+      name = "xmlbuilder-0.4.2.tgz";
+      sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xmlbuilder" ];
+    peerDependencies = [];
   };
   by-spec."xmlbuilder"."0.4.x" =
     self.by-version."xmlbuilder"."0.4.3";
-  by-version."xmlbuilder"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."xmlbuilder"."0.4.3" = self.buildNodePackage {
     name = "xmlbuilder-0.4.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
-        name = "xmlbuilder-0.4.3.tgz";
-        sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xmlbuilder" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
+      name = "xmlbuilder-0.4.3.tgz";
+      sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xmlbuilder" ];
+    peerDependencies = [];
   };
   by-spec."xmlbuilder"."2.2.1" =
     self.by-version."xmlbuilder"."2.2.1";
-  by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."xmlbuilder"."2.2.1" = self.buildNodePackage {
     name = "xmlbuilder-2.2.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz";
-        name = "xmlbuilder-2.2.1.tgz";
-        sha1 = "9326430f130d87435d4c4086643aa2926e105a32";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xmlbuilder" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz";
+      name = "xmlbuilder-2.2.1.tgz";
+      sha1 = "9326430f130d87435d4c4086643aa2926e105a32";
+    };
     deps = {
       "lodash-node-2.4.1" = self.by-version."lodash-node"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xmlbuilder" ];
+    peerDependencies = [];
   };
   by-spec."xmlbuilder".">=1.0.0" =
     self.by-version."xmlbuilder"."2.4.5";
-  by-version."xmlbuilder"."2.4.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."xmlbuilder"."2.4.5" = self.buildNodePackage {
     name = "xmlbuilder-2.4.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.5.tgz";
-        name = "xmlbuilder-2.4.5.tgz";
-        sha1 = "0c1c27c8904162cc7f2572ab51cc2ac466007102";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xmlbuilder" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.5.tgz";
+      name = "xmlbuilder-2.4.5.tgz";
+      sha1 = "0c1c27c8904162cc7f2572ab51cc2ac466007102";
+    };
     deps = {
       "lodash-node-2.4.1" = self.by-version."lodash-node"."2.4.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xmlbuilder" ];
+    peerDependencies = [];
   };
   by-spec."xmldom"."0.1.x" =
     self.by-version."xmldom"."0.1.19";
-  by-version."xmldom"."0.1.19" = lib.makeOverridable self.buildNodePackage {
+  by-version."xmldom"."0.1.19" = self.buildNodePackage {
     name = "xmldom-0.1.19";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
-        name = "xmldom-0.1.19.tgz";
-        sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xmldom" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
+      name = "xmldom-0.1.19.tgz";
+      sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xmldom" ];
+    peerDependencies = [];
   };
   by-spec."xmldom"."~0.1.16" =
     self.by-version."xmldom"."0.1.19";
   by-spec."xmlhttprequest"."1.4.2" =
     self.by-version."xmlhttprequest"."1.4.2";
-  by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."xmlhttprequest"."1.4.2" = self.buildNodePackage {
     name = "xmlhttprequest-1.4.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
-        name = "xmlhttprequest-1.4.2.tgz";
-        sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xmlhttprequest" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
+      name = "xmlhttprequest-1.4.2.tgz";
+      sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xmlhttprequest" ];
+    peerDependencies = [];
+  };
+  by-spec."xmlhttprequest".">=1.5.0" =
+    self.by-version."xmlhttprequest"."1.7.0";
+  by-version."xmlhttprequest"."1.7.0" = self.buildNodePackage {
+    name = "xmlhttprequest-1.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.7.0.tgz";
+      name = "xmlhttprequest-1.7.0.tgz";
+      sha1 = "dc697a8df0258afacad526c1c296b1bdd12c4ab3";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz";
+      name = "xmlhttprequest-1.5.0.tgz";
+      sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f";
+    };
+    deps = {
+    };
+    peerDependencies = [];
   };
   by-spec."xoauth2"."~0.1.8" =
     self.by-version."xoauth2"."0.1.8";
-  by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."xoauth2"."0.1.8" = self.buildNodePackage {
     name = "xoauth2-0.1.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
-        name = "xoauth2-0.1.8.tgz";
-        sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xoauth2" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
+      name = "xoauth2-0.1.8.tgz";
+      sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
+  by-spec."xregexp"."2.0.0" =
+    self.by-version."xregexp"."2.0.0";
+  by-version."xregexp"."2.0.0" = self.buildNodePackage {
+    name = "xregexp-2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz";
+      name = "xregexp-2.0.0.tgz";
+      sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xoauth2" ];
+    peerDependencies = [];
   };
   by-spec."xtend".">=4.0.0 <4.1.0-0" =
     self.by-version."xtend"."4.0.0";
-  by-version."xtend"."4.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."xtend"."4.0.0" = self.buildNodePackage {
     name = "xtend-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xtend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
+      name = "xtend-4.0.0.tgz";
+      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xtend" ];
+    peerDependencies = [];
   };
   by-spec."xtend"."^3.0.0" =
     self.by-version."xtend"."3.0.0";
-  by-version."xtend"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."xtend"."3.0.0" = self.buildNodePackage {
     name = "xtend-3.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
-        name = "xtend-3.0.0.tgz";
-        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xtend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
+      name = "xtend-3.0.0.tgz";
+      sha1 = "5cce7407baf642cba7becda568111c493f59665a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xtend" ];
+    peerDependencies = [];
   };
   by-spec."xtend"."^4.0.0" =
     self.by-version."xtend"."4.0.0";
   by-spec."xtend"."~2.1.1" =
     self.by-version."xtend"."2.1.2";
-  by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."xtend"."2.1.2" = self.buildNodePackage {
     name = "xtend-2.1.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz";
-        name = "xtend-2.1.2.tgz";
-        sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."xtend" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz";
+      name = "xtend-2.1.2.tgz";
+      sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b";
+    };
     deps = {
       "object-keys-0.4.0" = self.by-version."object-keys"."0.4.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "xtend" ];
+    peerDependencies = [];
   };
   by-spec."xtend"."~3.0.0" =
     self.by-version."xtend"."3.0.0";
+  by-spec."xtraverse"."0.1.x" =
+    self.by-version."xtraverse"."0.1.0";
+  by-version."xtraverse"."0.1.0" = self.buildNodePackage {
+    name = "xtraverse-0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtraverse/-/xtraverse-0.1.0.tgz";
+      name = "xtraverse-0.1.0.tgz";
+      sha1 = "b741bad018ef78d8a9d2e83ade007b3f7959c732";
+    };
+    deps = {
+      "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
+    };
+    peerDependencies = [];
+  };
+  by-spec."yamlish"."*" =
+    self.by-version."yamlish"."0.0.6";
+  by-version."yamlish"."0.0.6" = self.buildNodePackage {
+    name = "yamlish-0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz";
+      name = "yamlish-0.0.6.tgz";
+      sha1 = "c5df8f7661731351e39eb52223f83a46659452e3";
+    };
+    deps = {
+    };
+    peerDependencies = [];
+  };
   by-spec."yargs"."^1.2.1" =
     self.by-version."yargs"."1.3.3";
-  by-version."yargs"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."yargs"."1.3.3" = self.buildNodePackage {
     name = "yargs-1.3.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
-        name = "yargs-1.3.3.tgz";
-        sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yargs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
+      name = "yargs-1.3.3.tgz";
+      sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "yargs" ];
+    peerDependencies = [];
   };
+  by-spec."yargs"."~1.3.1" =
+    self.by-version."yargs"."1.3.3";
   by-spec."zeparser"."0.0.5" =
     self.by-version."zeparser"."0.0.5";
-  by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."zeparser"."0.0.5" = self.buildNodePackage {
     name = "zeparser-0.0.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
-        name = "zeparser-0.0.5.tgz";
-        sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."zeparser" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
+      name = "zeparser-0.0.5.tgz";
+      sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "zeparser" ];
+    peerDependencies = [];
   };
   by-spec."zip-stream"."~0.4.0" =
     self.by-version."zip-stream"."0.4.1";
-  by-version."zip-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."zip-stream"."0.4.1" = self.buildNodePackage {
     name = "zip-stream-0.4.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz";
-        name = "zip-stream-0.4.1.tgz";
-        sha1 = "4ea795a8ce19e9fab49a31d1d0877214159f03a3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."zip-stream" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz";
+      name = "zip-stream-0.4.1.tgz";
+      sha1 = "4ea795a8ce19e9fab49a31d1d0877214159f03a3";
+    };
     deps = {
       "compress-commons-0.1.6" = self.by-version."compress-commons"."0.1.6";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "zip-stream" ];
+    peerDependencies = [];
   };
   by-spec."zlib-browserify"."~0.0.3" =
     self.by-version."zlib-browserify"."0.0.3";
-  by-version."zlib-browserify"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."zlib-browserify"."0.0.3" = self.buildNodePackage {
     name = "zlib-browserify-0.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz";
-        name = "zlib-browserify-0.0.3.tgz";
-        sha1 = "240ccdbfd0203fa842b130deefb1414122c8cc50";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."zlib-browserify" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz";
+      name = "zlib-browserify-0.0.3.tgz";
+      sha1 = "240ccdbfd0203fa842b130deefb1414122c8cc50";
+    };
     deps = {
       "tape-0.2.2" = self.by-version."tape"."0.2.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "zlib-browserify" ];
+    peerDependencies = [];
   };
 }
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index d19765e1a27..526b0b88310 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -32,7 +32,7 @@
 , "browserchannel"
 , "node-gyp"
 , "semver"
-, "npm2nix"
+, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.10.3" }
 , "ansi-remover"
 , "mkdirp"
 , "jshint"
@@ -149,4 +149,48 @@
 , "trash"
 , "empty-trash"
 , "castnow"
+, "parsoid"
+, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy" }
+, "react-tools"
+, "json"
+, "bipio"
+, "bip-pod-flickr"
+, "bip-pod-imgur"
+, "bip-pod-github"
+, "bip-pod-twilio"
+, "bip-pod-coindesk"
+, "bip-pod-twitter"
+, "bip-pod-crypto"
+, "bip-pod-embedly"
+, "bip-pod-mailgun"
+, "bip-pod-chain"
+, "bip-pod-trello"
+, "bip-pod-pusher"
+, "bip-pod-keenio"
+, "bip-pod-numerous"
+, "bip-pod-statuscake"
+, "bip-pod-mongodb"
+, "bip-pod-facebook"
+, "bip-pod-trello"
+, "bip-pod-wordpress"
+, "bip-pod-alchemy"
+, "bip-pod-dropbox"
+, "bip-pod-craigslist"
+, "bip-pod-soundcloud"
+, "bip-pod-mixcloud"
+, "bip-pod-instagram"
+, "bip-pod-witai"
+, "bip-pod-zoho"
+, "bip-pod-bitly"
+, "bip-pod-circonus"
+, "bip-pod-google"
+, "bip-pod-mailchimp"
+, "bip-pod-pushbullet"
+, "bip-pod-todoist"
+, "bip-pod-kato"
+, "bip-pod-evernote"
+, "bip-pod-gmail"
+, "bip-pod-github"
+, "bip-pod-google-drive"
+, "bip-pod-github"
 ]
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 9127dfbbb43..a0cbd5c4a8b 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -1,23 +1,66 @@
-{ pkgs, stdenv, nodejs, fetchurl, fetchgit, neededNatives, self, generated ? ./node-packages-generated.nix }:
+{
+  stdenv, pkgs, nodejs
+
+  # Self-reference
+, self
+
+  # Needed natives for installation
+, neededNatives ? [pkgs.python] ++ stdenv.lib.optionals stdenv.isLinux [ pkgs.utillinux ]
+
+  # Attribute set of generated packages
+, generated ? pkgs.callPackage ./node-packages-generated.nix { inherit self; }
+
+  # Attribute set of overrides
+, overrides ? {}
+, ...
+} @ args:
+
+with stdenv.lib;
 
 rec {
-  nativeDeps = {
-    "node-expat" = [ pkgs.expat ];
-    "node-stringprep" = [ pkgs.icu pkgs.which ];
-    "rbytes" = [ pkgs.openssl ];
-    "phantomjs" = [ pkgs.phantomjs ];
-    "node-protobuf" = [ pkgs.protobuf ];
-  };
-
-  buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
-    inherit stdenv nodejs neededNatives;
-    inherit (pkgs) runCommand;
-  };
+  overrides = {
+    phantomjs.buildInputs = [ pkgs.phantomjs ];
+    "node-expat".buildInputs = [ pkgs.expat ];
+    "node-stringprep".buildInputs = [ pkgs.icu pkgs.which ];
+    "node-protobuf".buildInputs = [ pkgs.protobuf ];
+    "rbytes".buildInputs = [ pkgs.openssl ];
 
-  patchSource = fn: srcAttrs: fn srcAttrs;
+    bipio.patchPhase = ''
+      ${self.json}/bin/json -I -f package.json -e 'this.scripts.install=""'
+    '';
+    bip-pod.patchPhase = ''
+      substituteInPlace index.js --replace \
+        "__dirname + (literal ? '/' : '/../bip-pod-') + podName" \
+        "(literal ? __dirname + '/' : \"bip-pod-\") + podName"
+    '';
+  } // args.overrides or {};
 
-  # Backwards compat
-  patchLatest = patchSource fetchurl;
+  # Apply overrides and back compatiblity transformations
+  buildNodePackage = {...} @ args:
+  let
+    pkg = makeOverridable (
+      pkgs.callPackage ../development/web/nodejs/build-node-package.nix {
+        inherit nodejs neededNatives;
+      }
+    ) (args // (optionalAttrs (isList args.src) {
+      # Backwards compatibility
+      src = head args.src;
+    }) // (optionalAttrs (attrByPath ["passthru" "names"] null args != null) {
+       pkgName = head args.passthru.names;
+    }));
+
+    override = overrides.${args.name} or overrides.${pkg.pkgName} or {};
+
+  in pkg.override override;
+
+  # Backwards compatibility
+  patchSource = fn: srcAttrs: fn srcAttrs;
+  patchLatest = patchSource pkgs.fetchurl;
 
   /* Put manual packages below here (ideally eventually managed by npm2nix */
-} // import generated { inherit self fetchurl fetchgit; inherit (pkgs) lib; }
+} // (
+  if isAttrs generated then generated
+
+  # Backwards compatiblity
+  else pkgs.callPackage generated { inherit self; }
+)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 11cbe593a59..18e50ffdfa4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4019,10 +4019,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Glib = buildPerlPackage rec {
-    name = "Glib-1.307";
+    name = "Glib-1.310";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "1km4261a5kaazz77qplpqj2yv91p0bqcjjvd6xdvdgdd4rib7ngr";
+      sha256 = "1iv8q7d0817m3byh2yn7bxxk5qp8bgapaflbglhkw467i31slign";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ];
     meta = {
@@ -4099,10 +4099,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Gtk2 = buildPerlPackage rec {
-    name = "Gtk2-1.2494";
+    name = "Gtk2-1.2495";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "1kkm1z1xqnrfdfjric5y3935dbi9qnhcd6c1z58g4m0y95mwpv9v";
+      sha256 = "1mpxkcy8j7r95z4g4xx6ggbgzaxj4zl0szz54y1k120z95rcgg3a";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ];
     meta = {
@@ -10129,7 +10129,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20111103.tar.gz;
       sha256 = "1igbbj14j5fssdqrbr60mg3w95wldfxdikplqdmqgf2zn5j65ibr";
     };
-    propagatedBuildInputs = [ URI URIURL ];
+    propagatedBuildInputs = [ URI ];
     meta = {
       homepage = http://search.cpan.org/dist/URI-Find;
       description = "Find URIs in arbitrary text";
@@ -10161,18 +10161,6 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [URI TestMore];
   };
 
-  URIURL = buildPerlPackage {
-    name = "URI-URL-1.60";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz;
-      sha256 = "0xr31mf7lfrwhyvlx4pzp6p7alls5gi4bj8pk5g89f5cckfd74hz";
-    };
-    meta = {
-      description = "Uniform Resource Identifiers (absolute and relative)";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
-
   VariableMagic = buildPerlPackage rec {
     name = "Variable-Magic-0.53";
     src = fetchurl {
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index 7ef83ef9072..8dbd010b9b6 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -144,5 +144,7 @@
   },
   { "name": "suds",
     "doCheck": false
+  },
+  { "name": "html2text"
   }
 ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1eeb11f5dc4..5cb17e42464 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3,6 +3,8 @@
 with pkgs.lib;
 
 let
+  pythonAtLeast = versionAtLeast python.pythonVersion;
+  pythonOlder = versionOlder python.pythonVersion;
   isPy26 = python.majorVersion == "2.6";
   isPy27 = python.majorVersion == "2.7";
   isPy33 = python.majorVersion == "3.3";
@@ -323,13 +325,13 @@ let
 
 
   alot = buildPythonPackage rec {
-    rev = "fa4ddf000dc2ac4933852b210901b649634a5f86";
-    name = "alot-0.3.5_${rev}";
+    rev = "0.3.6";
+    name = "alot-0.3.6";
 
     src = pkgs.fetchurl {
       url = "https://github.com/pazz/alot/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "0h11lqyxg0xbkc9y1xqjvd0kmfm5pdwnmv9chmlsi1614dxn08n0";
+      sha256 = "1rzy70w4isvypa94310xw403vq5him21q8rlx4laa0z530phkrmq";
     };
 
     # error: invalid command 'test'
@@ -683,12 +685,12 @@ let
   };
 
   batinfo = buildPythonPackage rec {
-    version = "0.1.9";
+    version = "0.2";
     name = "batinfo-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/batinfo/${name}.tar.gz";
-      sha256 = "0ppzbh8lii16xfq5piczn82hwps1fnbq9rbwwl3rdpdx0n86l560";
+      sha256 = "1kmrdr1c2ivpqgp2csln7vbanga3sh3nvaqmgbsg96z6fbg7f7w8";
     };
 
     meta = with stdenv.lib; {
@@ -1124,12 +1126,12 @@ let
   };
 
   bottle = buildPythonPackage rec {
-    version = "0.12.7";
+    version = "0.12.8";
     name = "bottle-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/bottle/${name}.tar.gz";
-      sha256 = "0wr0gfz0bqlzhxk691x0xnf80b8v5pnl3jpnbgs1m9bcy28j3sp3";
+      sha256 = "1b2hq0l4nwh75s2w6wgiqlkj4q1qvyx6a94axl2k4lsym1aifpfd";
     };
 
     propagatedBuildInputs = with self; [ setuptools ];
@@ -2992,11 +2994,14 @@ let
   };
 
   pew = buildPythonPackage rec {
-    name = "pew-0.1.9";
+    name = "pew-0.1.14";
+    namePrefix = "";
+
+    disabled = pythonOlder "3.4"; # old versions require backported libraries
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz";
-      md5 = "90a82400074b50a9e73c3045ed9ac217";
+      md5 = "0a06ab0885b39f1ef3890893942f3225";
     };
 
     propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ];
@@ -3005,6 +3010,7 @@ let
       description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite";
       license = licenses.mit;
       platforms = platforms.all;
+      maintainers = [ maintainers.berdario ];
     };
   };
 
@@ -3846,11 +3852,11 @@ let
 
   dulwich = buildPythonPackage rec {
     name = "dulwich-${version}";
-    version = "0.9.7";
+    version = "0.9.8";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/d/dulwich/${name}.tar.gz";
-      sha256 = "1wq083g9b1xsk89kb0wwpi4mxy63x6760vn9x5sk1fx36h27prqj";
+      sha256 = "0iwxp9n2c09wahq8bqnc5z431kq5bs75vbwl93nzwm2grj00l6lb";
     };
 
     # Only test dependencies
@@ -3867,11 +3873,11 @@ let
 
   hg-git = buildPythonPackage rec {
     name = "hg-git-${version}";
-    version = "0.6.1";
+    version = "0.7.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz";
-      sha256 = "136kz4w377ldcjdg865azi8aym0xnxzxl3rycnflgay26ar1309s";
+      sha256 = "1ab1phaqa8jrba6dqsf3b0lgx912j41b8dlkna9c2wxip63wvfcx";
     };
 
     propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ];
@@ -4028,11 +4034,9 @@ let
 
     buildInputs = with self; [ nose httplib2 pyopenssl  ];
 
-    propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ];
+    doCheck = false;  # too much transient errors to bother
 
-    preCheck = ''
-      substituteInPlace tests/__init__.py --replace "TEST_TIMEOUT = 1" "TEST_TIMEOUT = 60"
-    '';
+    propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ];
 
     meta = {
       homepage = http://pypi.python.org/pypi/eventlet/;
@@ -4252,6 +4256,10 @@ let
     };
   };
 
+  # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067
+  graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet"
+    else callPackage ../development/python-modules/graph-tool/2.x.x.nix { };
+
   grappelli_safe = buildPythonPackage rec {
     version = "0.3.13";
     name = "grappelli_safe-${version}";
@@ -4593,7 +4601,7 @@ let
       url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
       sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6";
     };
- 
+
     patches = [ ../development/python-modules/gevent_sslwrap.patch ];
 
     buildInputs = with self; [ pkgs.libev ];
@@ -5518,6 +5526,27 @@ let
     propagatedBuildInputs = with self; [ unittest2 ];
   };
 
+  loxodo = buildPythonPackage {
+    name = "loxodo-0.20150124";
+    disabled = isPy3k;
+
+    src = pkgs.fetchgit {
+      url = "https://github.com/sommer/loxodo.git";
+      rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795";
+      sha256 = "02whmv4am8cz401rplplqzbipkyf0wd69z43sd3yw05rh7f3xbs2";
+    };
+
+    propagatedBuildInputs = with self; [ wxPython modules.readline ];
+    postInstall = "mv $out/bin/loxodo.py $out/bin/loxodo";
+
+    meta = with stdenv.lib; {
+      description = "A Password Safe V3 compatible password vault";
+      homepage = http://www.christoph-sommer.de/loxodo/;
+      license = licenses.gpl2Plus;
+      platforms = platforms.linux;
+    };
+  };
+
   lxml = buildPythonPackage ( rec {
     name = "lxml-3.3.6";
 
@@ -7096,12 +7125,12 @@ let
 
   percol = buildPythonPackage rec {
     name = "percol-${version}";
-    version = "0.0.7";
+    version = "0.0.8";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/percol/${name}.tar.gz";
-      sha256 = "01444z62clvx9rms9aiqx47s0fbvsfgbp6hlfff344xl7kc4l2gj";
+      sha256 = "169s5mhw1s60qbsd6pkf9bb2x6wfgx8hn8nw9d4qgc68qnnpp2cj";
     };
 
     propagatedBuildInputs = with self; [ modules.curses ];
@@ -7169,6 +7198,29 @@ let
     };
   };
 
+  pgcli = buildPythonPackage rec {
+    name = "pgcli-${version}";
+    version = "0.13.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pgcli/${name}.tar.gz";
+      sha256 = "15qw4as8ryl4qv3p3diq31xwa7kygrnsx4ixlfijgvfwr2pcmgxm";
+    };
+
+    propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ];
+
+    meta = with stdenv.lib; {
+      description = "Command-line interface for PostgreSQL";
+      longDescription = ''
+        Rich command-line interface for PostgreSQL with auto-completion and
+        syntax highlighting.
+      '';
+      homepage = http://pgcli.com/about;
+      license = with licenses; [ bsd3 ];
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
   pip = buildPythonPackage rec {
     version = "1.5.6";
     name = "pip-${version}";
@@ -7306,6 +7358,25 @@ let
   };
 
 
+  polylint = buildPythonPackage rec {
+    name = "polylint-${version}";
+    version = "158125c6ab";
+
+    src = pkgs.fetchgit {
+      url = "https://github.com/bendavis78/polylint";
+      rev = version;
+      sha256 = "ea10c67e9ce6df0936d6e2015382acba4f9cc559e2d6a9471f474f6bda78a266";
+    };
+
+    propagatedBuildInputs = with self; [ html5lib lxml cssselect ];
+
+    meta = {
+      description = "Fast HTML linter for polymer";
+      homepage = https://github.com/bendavis78/polylint;
+    };
+  };
+
+
   powerline = buildPythonPackage rec {
     rev  = "db80fc95ed01d2c559c4bdc7da8514ed3cc7fcd9";
     name = "powerline-beta_${rev}";
@@ -7354,7 +7425,7 @@ let
       url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2";
       sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851";
     };
-        
+
     buildInputs = [ pkgs.glibcLocales ];
 
     preCheck = ''
@@ -7368,6 +7439,32 @@ let
   };
 
 
+  prompt_toolkit = buildPythonPackage rec {
+    name = "prompt_toolkit-${version}";
+    version = "0.26";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
+      sha256 = "1rd9gy3bcwp08agw5hiqckhaxbsz1i1kgkhjqw6vwhjdfgdjiq9l";
+    };
+
+    buildInputs = with self; [ jedi ipython pygments ];
+    propagatedBuildInputs = with self; [ docopt six wcwidth ];
+
+    meta = with stdenv.lib; {
+      description = "Python library for building powerful interactive command lines";
+      longDescription = ''
+        prompt_toolkit could be a replacement for readline, but it can be
+        much more than that. It is cross-platform, everything that you build
+        with it should run fine on both Unix and Windows systems. Also ships
+        with a nice interactive Python shell (called ptpython) built on top.
+      '';
+      homepage = https://github.com/jonathanslenders/python-prompt-toolkit;
+      license = with licenses; [ bsd3 ];
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
   protobuf = buildPythonPackage rec {
     inherit (pkgs.protobuf) name src;
 
@@ -7402,7 +7499,7 @@ let
 
 
   psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.5.3";
+    name = "psycopg2-2.5.4";
     disabled = isPyPy;
 
     # error: invalid command 'test'
@@ -7410,7 +7507,7 @@ let
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz";
-      sha256 = "02h33barxigsczpympnwa0yvw9hgdv8d63bxm5x251ri26xz6b9s";
+      sha256 = "07ivzl7bq8bjcq5n90w4bsl29gjfm5l8yamw0paxh25si8r3zfi4";
     };
 
     propagatedBuildInputs = with self; [ pkgs.postgresql ];
@@ -7459,6 +7556,8 @@ let
 
     propagatedBuildInputs = with self; [ requests audioread ];
 
+    patches = [ ../development/python-modules/pyacoustid-py3.patch ];
+
     postPatch = ''
       sed -i \
           -e '/^FPCALC_COMMAND *=/s|=.*|= "${pkgs.chromaprint}/bin/fpcalc"|' \
@@ -7534,6 +7633,48 @@ let
     };
   };
 
+  vobject = buildPythonPackage rec {
+    version = "0.8.1c";
+    name = "vobject-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/v/vobject/vobject-${version}.tar.gz";
+      sha256 = "1xanqn7rn96841s3lim5lnx5743gc4kyfg4ggj1ys5r0gw8i6har";
+    };
+
+    disabled = isPy3k;
+
+    propagatedBuildInputs = with self; [ dateutil ];
+
+    meta = with stdenv.lib; {
+      description = "Module for reading vCard and vCalendar files";
+      homepage = http://vobject.skyhouseconsulting.com/;
+      license = licenses.asl20;
+      maintainers = [ maintainers.DamienCassou ];
+    };
+  };
+
+  pycarddav = buildPythonPackage rec {
+    version = "0.7.0";
+    name = "pycarddav-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyCardDAV/pyCardDAV-${version}.tar.gz";
+      sha256 = "0avkrcpisfvhz103v7vmq2jd83hvmpqrb4mlbx6ikkk1wcvclsx8";
+    };
+
+    disabled = isPy3k;
+
+    propagatedBuildInputs = with self; [ sqlite3 vobject lxml requests urwid pyxdg ];
+
+    meta = with stdenv.lib; {
+      description = "Command-line interface carddav client";
+      homepage = http://lostpackets.de/pycarddav;
+      license = licenses.mit;
+      maintainers = [ maintainers.DamienCassou ];
+    };
+  };
+
   pycosat = pythonPackages.buildPythonPackage rec {
     name = "pycosat-0.6.0";
 
@@ -8130,14 +8271,16 @@ let
 
   pyqtgraph = buildPythonPackage rec {
     name = "pyqtgraph-${version}";
-    version = "0.9.8";
+    version = "0.9.10";
+
+    doCheck = false;  # "PyQtGraph requires either PyQt4 or PySide; neither package could be imported."
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pyqtgraph/${name}.tar.gz";
-      sha256 = "1fnhj26d9qrqqmjx092m1qspclh3mia3vag7rji5wciw0plpszi5";
+      sha256 = "188pcxf3sxxjf0aipjn820lx2rf9f42zzp0sibmcl90955a3ipf1";
     };
 
-    propagatedBuildInputs = with self; [ scipy pyqt4 pyopengl ];
+    propagatedBuildInputs = with self; [ scipy numpy pyqt4 pyopengl ];
 
     meta = with stdenv.lib; {
       description = "Scientific Graphics and GUI Library for Python";
@@ -8325,12 +8468,12 @@ let
   });
 
   ldap = buildPythonPackage rec {
-    name = "ldap-2.4.15";
+    name = "ldap-2.4.19";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/python-ldap/python-${name}.tar.gz";
-      sha256 = "0w0nn5yj0nbbkvpbqgfni56v7sjx6jf6s6zvp9zmahyrvqrsrg1h";
+      sha256 = "0j5hzaar4d0vhnrlpmkczgwm7ci2wibr99a7zx04xddzrhxdpz82";
     };
 
     NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl";
@@ -8906,11 +9049,11 @@ let
 
   restview = buildPythonPackage rec {
     name = "restview-${version}";
-    version = "2.1.1";
+    version = "2.2.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/r/restview/${name}.tar.gz";
-      sha256 = "07scf80hhr9rijrbfrplyi3gwkx74knnzfhvlg6yf1cd0x2yiy8v";
+      sha256 = "070qx694bpk2n67grm82jvvar4nqvvfmmibbnv8snl4qn41jw66s";
     };
 
     propagatedBuildInputs = with self; [ docutils mock pygments ];
@@ -10144,6 +10287,26 @@ let
   };
 
 
+  sqlparse = buildPythonPackage rec {
+    name = "sqlparse-${version}";
+    version = "0.1.14";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/sqlparse/${name}.tar.gz";
+      sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Non-validating SQL parser for Python";
+      longDescription = ''
+        Provides support for parsing, splitting and formatting SQL statements.
+      '';
+      homepage = https://github.com/andialbrecht/sqlparse;
+      license = with licenses; [ bsd3 ];
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
   python_statsd = buildPythonPackage rec {
     name = "python-statsd-${version}";
     version = "1.6.0";
@@ -10873,11 +11036,11 @@ let
   };
 
   virtualenv-clone = buildPythonPackage rec {
-    name = "virtualenv-clone-0.2.4";
+    name = "virtualenv-clone-0.2.5";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz";
-      md5 = "71168b975eaaa91e65559bcc79290b3b";
+      md5 = "23e71d255058b2543d839af7f4ce3208";
     };
 
     buildInputs = with self; [pytest];
@@ -11016,6 +11179,32 @@ let
   };
 
 
+  wcwidth = buildPythonPackage rec {
+    name = "wcwidth-${version}";
+    version = "0.1.4";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/w/wcwidth/${name}.tar.gz";
+      sha256 = "0awx28xi938nv55qlmai3b5ddqd1w5c294gy95xh4xsx0hik2vch";
+    };
+
+    # Checks fail due to missing tox.ini file:
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Measures number of Terminal column cells of wide-character codes";
+      longDescription = ''
+        This API is mainly for Terminal Emulator implementors -- any Python
+        program that attempts to determine the printable width of a string on
+        a Terminal. It is implemented in python (no C library calls) and has
+        no 3rd-party dependencies.
+      '';
+      homepage = https://github.com/jquast/wcwidth;
+      license = with licenses; [ mit ];
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
   webob = buildPythonPackage rec {
     version = "1.4";
     name = "webob-${version}";
@@ -12824,6 +13013,22 @@ let
     };
   };
 
+  toposort = buildPythonPackage rec {
+    name = "toposort-${version}";
+    version = "1.1";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/toposort/toposort-1.1.tar.gz";
+      sha256 = "1izmirbwmd9xrk7rq83p486cvnsslfa5ljvl7rijj1r64zkcnf3a";
+    };
+    meta = {
+      description = "A topological sort algorithm";
+      homepage = https://pypi.python.org/pypi/toposort/1.1;
+      maintainers = [ stdenv.lib.maintainers.tstrobel ];
+      platforms = stdenv.lib.platforms.linux;
+      #license = stdenv.lib.licenses.apache;
+    };
+  };
+
   snapperGUI = buildPythonPackage rec {
     name = "Snapper-GUI";
 
@@ -13061,7 +13266,7 @@ let
     propagatedBuildInputs = with self; [ dateutil ];
 
     preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-      sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.rubyLibs.terminal_notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py
+      sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py
     '';
 
     meta = with stdenv.lib; {
@@ -13124,5 +13329,35 @@ let
       license = licenses.mit;
     };
   };
+  
+  html2text = buildPythonPackage rec {
+    name = "html2text-2014.12.29";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/h/html2text/html2text-2014.12.29.tar.gz";
+      md5 = "c5bd796bdf7d1bfa43f55f1e2b5e4826";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [  ];
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/Alir3z4/html2text/;
+    };
+  };
+
+  pychart = buildPythonPackage rec {
+    name = "pychart-1.39";
+
+    src = pkgs.fetchurl {
+      url = "http://download.gna.org/pychart/PyChart-1.39.tar.gz";
+      sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts";
+      homepage = http://home.gna.org/pychart/;
+      license = licenses.gpl2;
+    };
+  };
 
 }); in pythonPackages
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index ea7ca4d501f..a7d3194cdbb 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -38,6 +38,7 @@ let
   pygame = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   pygobject = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   pygtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
+  pygtksourceview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   pyGtkGlade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   pyIRCt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   pyMAILt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };