diff --git a/doc/meta.xml b/doc/meta.xml index fc0ff9777922..a0ed3069b680 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -116,6 +116,13 @@ hello-2.3 A program that produces a familiar, friendly greeting Package version. + + branch + Release branch. Used to specify that a package is not + going to receive updates that are not in this branch; for example, Linux + kernel 3.0 is supposed to be updated to 3.0.X, not 3.1. + + homepage The package’s homepage. Example: diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 28e7b7d89f4b..8c6266b2672a 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -150,8 +150,8 @@ genericBuild GNU tar. - gzip and - bzip2. + gzip, bzip2 + and xz. GNU Make. It has been patched to provide nested output that can be fed into the @@ -341,9 +341,11 @@ It supports the following files by default: Tar files These can optionally be compressed using gzip (.tar.gz, - .tgz or .tar.Z) or + .tgz or .tar.Z), bzip2 (.tar.bz2 or - .tbz2). + .tbz2) or xz + (.tar.xz or + .tar.lzma). @@ -445,9 +447,10 @@ Additional file types can be supported by setting the The list of patches. They must be in the format accepted by the patch command, and may optionally be compressed using gzip - (.gz) or bzip2 - (.bz2). - + (.gz), bzip2 + (.bz2) or xz + (.xz). + patchFlags diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 5b0ef380f9af..3c9bcbbde9b0 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -13,6 +13,9 @@ trusted-binary-caches = http://hydra.nixos.org build-max-jobs = 4 EOF +echo "First of all, checking evaluation, including meta" +nix-env -f. -qa --json > /dev/null + if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then echo "Not a pull request, checking evaluation" nix-build pkgs/top-level/release.nix -A tarball diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh index 48c7d6dbef6b..78fb5d5dee44 100755 --- a/maintainers/scripts/vanity.sh +++ b/maintainers/scripts/vanity.sh @@ -13,7 +13,7 @@ maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" | grep '=' | sed -re 's/\\"/''/g; s/ *([^ =]*) *= *" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')" git_lines="$( ( echo "$git_data"; - cat vanity-manual-equalities.txt) | sort |uniq)" + cat "$(dirname "$0")/vanity-manual-equalities.txt") | sort |uniq)" # For RDF normalize_name () { diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index fa51f831481a..89ee3c675efb 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -154,6 +154,7 @@ collectd = 144; consul = 145; mailpile = 146; + redmine = 147; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -275,6 +276,7 @@ riemanndash = 138; uhub = 142; mailpile = 146; + redmine = 147; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3db44a4d8de5..46a343460715 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -174,6 +174,7 @@ ./services/misc/nixos-manual.nix ./services/misc/nix-ssh-serve.nix ./services/misc/phd.nix + ./services/misc/redmine.nix ./services/misc/rippled.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix new file mode 100644 index 000000000000..d7e64590f503 --- /dev/null +++ b/nixos/modules/services/misc/redmine.nix @@ -0,0 +1,222 @@ +{ config, lib, pkgs, ... }: + +# TODO: support non-postgresql + +with lib; + +let + cfg = config.services.redmine; + + ruby = pkgs.ruby; + rubyLibs = pkgs.rubyLibs; + + databaseYml = '' + production: + adapter: postgresql + database: ${cfg.databaseName} + host: ${cfg.databaseHost} + password: ${cfg.databasePassword} + username: ${cfg.databaseUsername} + encoding: utf8 + ''; + + configurationYml = '' + default: + # Absolute path to the directory where attachments are stored. + # The default is the 'files' directory in your Redmine instance. + # Your Redmine instance needs to have write permission on this + # directory. + # Examples: + # attachments_storage_path: /var/redmine/files + # attachments_storage_path: D:/redmine/files + attachments_storage_path: ${cfg.stateDir}/files + + # Absolute path to the SCM commands errors (stderr) log file. + # The default is to log in the 'log' directory of your Redmine instance. + # Example: + # scm_stderr_log_file: /var/log/redmine_scm_stderr.log + scm_stderr_log_file: ${cfg.stateDir}/redmine_scm_stderr.log + + ${cfg.extraConfig} + ''; + + unpackTheme = unpack "theme"; + unpackPlugin = unpack "plugin"; + unpack = id: (name: source: + pkgs.stdenv.mkDerivation { + name = "redmine-${id}-${name}"; + buildInputs = [ pkgs.unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unpackFile ${source} + ''; + }); + +in { + + options = { + services.redmine = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the redmine service. + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/redmine"; + description = "The state directory, logs and plugins are stored here"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Extra configuration in configuration.yml"; + }; + + themes = mkOption { + type = types.attrsOf types.path; + default = {}; + description = "Set of themes"; + }; + + plugins = mkOption { + type = types.attrsOf types.path; + default = {}; + description = "Set of plugins"; + }; + + #databaseType = mkOption { + # type = types.str; + # default = "postgresql"; + # description = "Type of database"; + #}; + + databaseHost = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Database hostname"; + }; + + databasePassword = mkOption { + type = types.str; + default = ""; + description = "Database user password"; + }; + + databaseName = mkOption { + type = types.str; + default = "redmine"; + description = "Database name"; + }; + + databaseUsername = mkOption { + type = types.str; + default = "redmine"; + description = "Database user"; + }; + }; + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.databasePassword != ""; + message = "databasePassword must be set"; + } + ]; + + users.extraUsers = [ + { name = "redmine"; + group = "redmine"; + uid = config.ids.uids.redmine; + } ]; + + users.extraGroups = [ + { name = "redmine"; + gid = config.ids.gids.redmine; + } ]; + + systemd.services.redmine = { + after = [ "network.target" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + environment.RAILS_ENV = "production"; + environment.RAILS_ETC = "${cfg.stateDir}/config"; + environment.RAILS_LOG = "${cfg.stateDir}/log"; + environment.RAILS_VAR = "${cfg.stateDir}/var"; + environment.RAILS_CACHE = "${cfg.stateDir}/cache"; + environment.RAILS_PLUGINS = "${cfg.stateDir}/plugins"; + environment.RAILS_PUBLIC = "${cfg.stateDir}/public"; + environment.RAILS_TMP = "${cfg.stateDir}/tmp"; + environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; + 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"; + path = with pkgs; [ + imagemagickBig + subversion + mercurial + cvs + config.services.postgresql.package + bazaar + gitAndTools.git + # once we build binaries for darc enable it + #darcs + ]; + preStart = '' + # TODO: use env vars + for i in plugins public/plugin_assets db files log config cache var/files tmp; do + mkdir -p ${cfg.stateDir}/$i + done + + chown -R redmine:redmine ${cfg.stateDir} + chmod -R 755 ${cfg.stateDir} + + rm -rf ${cfg.stateDir}/public/* + cp -R ${pkgs.redmine}/share/redmine/public/* ${cfg.stateDir}/public/ + for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do + ln -fs $theme/* ${cfg.stateDir}/public/themes/ + done + + rm -rf ${cfg.stateDir}/plugins/* + for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do + ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-} + done + + ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml + ln -fs ${pkgs.writeText "configuration.yml" configurationYml} ${cfg.stateDir}/config/configuration.yml + + if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then + if ! test -e "${cfg.stateDir}/db-created"; then + psql postgres -c "CREATE ROLE redmine WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" + ${config.services.postgresql.package}/bin/createdb --owner redmine redmine || true + touch "${cfg.stateDir}/db-created" + fi + fi + + cd ${pkgs.redmine}/share/redmine/ + ${ruby}/bin/rake db:migrate + ${ruby}/bin/rake redmine:plugins:migrate + ${ruby}/bin/rake redmine:load_default_data + ${ruby}/bin/rake generate_secret_token + ''; + + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + Type = "simple"; + User = "redmine"; + Group = "redmine"; + TimeoutSec = "300"; + WorkingDirectory = "${pkgs.redmine}/share/redmine"; + ExecStart="${ruby}/bin/ruby ${pkgs.redmine}/share/redmine/script/rails server webrick -e production -P ${cfg.stateDir}/redmine.pid"; + }; + + }; + + }; + +} diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 9ce0bcbec7eb..ded3010ec5ae 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -25,6 +25,10 @@ let sendmailPath = "/var/setuid-wrappers/sendmail"; }; + allFiles = map (f: "\"${f}\"") ( + [ "${systemCronJobsFile}" ] ++ config.services.cron.cronFiles + ); + in { @@ -71,6 +75,15 @@ in ''; }; + cronFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + A list of extra crontab files that will be read and appended to the main + crontab file when the cron service starts. + ''; + }; + }; }; @@ -78,14 +91,7 @@ in ###### implementation - config = mkIf config.services.cron.enable { - - environment.etc = singleton - # The system-wide crontab. - { source = systemCronJobsFile; - target = "crontab"; - mode = "0600"; # Cron requires this. - }; + config = mkIf (config.services.cron.enable && allFiles != []) { security.setuidPrograms = [ "crontab" ]; @@ -100,6 +106,10 @@ in preStart = '' + rm -f /etc/crontab + cat ${toString allFiles} > /etc/crontab + chmod 0600 /etc/crontab + mkdir -m 710 -p /var/cron # By default, allow all users to create a crontab. This diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 88931520c42a..1612752d4702 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.4.1"; + version = "1.4.2"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { src = fetchurl { inherit name; - url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60eXhuZ1Z3bGM2bjQ"; - sha256 = "b0d5a1798efd275d72dffb87bc0f016fc865dbd1384b7c9af039cebdffe0cca3"; + url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UDFOeU1qSkIzaVE"; + sha256 = "0ycwx75f1jlsaca170bz82av06bnlknl3q0df001rhmhb7wh4j6c"; }; buildInputs = diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 7197e4b95d96..a64b43372866 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "0.129.0"; + version = "0.135.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0a78cb7e74b75b5c1cdbdfdea3f56ecab9479e407575b1e3cfb10c0d3265e7a4"; + sha256 = "0dh8vjhr31y2ibnf4s7adskbx115w8ns9xgrb0md9xc9gm92h405"; name = "${name}.deb"; }; diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index da6838880630..e498533d63d2 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchurlGnome { project = "dia"; - major = "0"; minor = "97"; patchlevel = "2"; extension = "xz"; - sha256 = "1qgawm7rrf4wd1yc0fp39ywv8gbz4ry1s16k00dzg5w6p67lfqd7"; + major = "0"; minor = "97"; patchlevel = "3"; extension = "xz"; + sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492"; }; correctPersistence = fetchurl { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; - patches = [ ./glib-top-level-header.patch ]; + patches = [ ]; # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command # It have no reasons to exist in a redistribuable package diff --git a/pkgs/applications/graphics/dia/glib-top-level-header.patch b/pkgs/applications/graphics/dia/glib-top-level-header.patch deleted file mode 100644 index 80460ae9d722..000000000000 --- a/pkgs/applications/graphics/dia/glib-top-level-header.patch +++ /dev/null @@ -1,471 +0,0 @@ -diff -Naur dia-0.97.2-orig/app/app_procs.c dia-0.97.2/app/app_procs.c ---- dia-0.97.2-orig/app/app_procs.c 2011-03-20 07:18:13.000000000 -0400 -+++ dia-0.97.2/app/app_procs.c 2012-07-15 10:49:08.192726306 -0400 -@@ -50,7 +50,7 @@ - #include - #include - --#include -+#include - - #include "intl.h" - #include "app_procs.h" -diff -Naur dia-0.97.2-orig/app/dia-win-remote.c dia-0.97.2/app/dia-win-remote.c ---- dia-0.97.2-orig/app/dia-win-remote.c 2010-08-03 11:35:35.000000000 -0400 -+++ dia-0.97.2/app/dia-win-remote.c 2012-07-15 10:49:08.159726316 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - - /** - * PROTOTYPES: -diff -Naur dia-0.97.2-orig/app/filedlg.c dia-0.97.2/app/filedlg.c ---- dia-0.97.2-orig/app/filedlg.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/app/filedlg.c 2012-07-15 10:49:08.227726294 -0400 -@@ -28,7 +28,7 @@ - #include - #endif - #include --#include -+#include - - #undef GTK_DISABLE_DEPRECATED /* gtk_file_chooser_dialog_new_with_backend */ - #include -diff -Naur dia-0.97.2-orig/app/load_save.c dia-0.97.2/app/load_save.c ---- dia-0.97.2-orig/app/load_save.c 2011-09-25 07:55:11.000000000 -0400 -+++ dia-0.97.2/app/load_save.c 2012-07-15 10:49:08.203726303 -0400 -@@ -30,7 +30,7 @@ - #include - - #include --#include /* g_access() and friends */ -+#include /* g_access() and friends */ - #include - - #ifndef W_OK -diff -Naur dia-0.97.2-orig/app/sheets_dialog_callbacks.c dia-0.97.2/app/sheets_dialog_callbacks.c ---- dia-0.97.2-orig/app/sheets_dialog_callbacks.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/app/sheets_dialog_callbacks.c 2012-07-15 10:49:08.201726302 -0400 -@@ -44,7 +44,7 @@ - #endif - #endif - --#include -+#include - #include - - #undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu */ -diff -Naur dia-0.97.2-orig/ChangeLog.pre-git dia-0.97.2/ChangeLog.pre-git ---- dia-0.97.2-orig/ChangeLog.pre-git 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/ChangeLog.pre-git 2012-07-15 10:49:08.384726247 -0400 -@@ -4137,7 +4137,7 @@ - plug-ins/vdx/vdx-export.c plug-ins/vdx/vdx-import.c - plug-ins/wmf/wmf.cpp plug-ins/wpg/wpg.c - plug-ins/xfig/xfig-export.c plug-ins/xfig/xfig-import.c -- plug-ins/xslt/xslt.c : use to match GLib's filename -+ plug-ins/xslt/xslt.c : use to match GLib's filename - encoding to the io functions used, that is: g_open, g_fopen, g_stat, - g_unlink, g_mkdir, g_rename (, g_access, g_lstat, g_remove, g_freopen, - g_chdir, g_rmdir). Also replace gzopen() with gzdopen(g_open(), ...) -@@ -5995,7 +5995,7 @@ - Also special case strings starting with \tex - i.e. dont escape them - - to keep the use-case of direct tex input. - -- * lib/debug.c : #include not just -+ * lib/debug.c : #include - - - 2006-01-14 Hans Breuer -@@ -6207,7 +6207,7 @@ - * lib/makefile.msc : build debug.obj - - * plug-ins/makefile.msc : building pgf in the right alphabetical order -- * plug-ins/pgf/render_pgf.c : include -+ * plug-ins/pgf/render_pgf.c : include - - 2005-12-08 Lars Clausen - -diff -Naur dia-0.97.2-orig/lib/debug.c dia-0.97.2/lib/debug.c ---- dia-0.97.2-orig/lib/debug.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/lib/debug.c 2012-07-15 10:49:06.813726730 -0400 -@@ -21,7 +21,7 @@ - #include - - #include --#include -+#include - #include - - #include "debug.h" -diff -Naur dia-0.97.2-orig/lib/dia_dirs.c dia-0.97.2/lib/dia_dirs.c ---- dia-0.97.2-orig/lib/dia_dirs.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/lib/dia_dirs.c 2012-07-15 10:49:06.740726750 -0400 -@@ -30,7 +30,7 @@ - #include - #include - #endif --#include -+#include - - /** Get the name of a subdirectory of our data directory. - * This function does not create the subdirectory, just make the correct name. -diff -Naur dia-0.97.2-orig/lib/dia_xml.c dia-0.97.2/lib/dia_xml.c ---- dia-0.97.2-orig/lib/dia_xml.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/lib/dia_xml.c 2012-07-15 10:49:06.770726743 -0400 -@@ -25,7 +25,7 @@ - #include - - #include --#include -+#include - - #include - #include -diff -Naur dia-0.97.2-orig/objects/custom/shape_typeinfo.c dia-0.97.2/objects/custom/shape_typeinfo.c ---- dia-0.97.2-orig/objects/custom/shape_typeinfo.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/objects/custom/shape_typeinfo.c 2012-07-15 10:49:06.639726783 -0400 -@@ -27,8 +27,8 @@ - #include "custom_util.h" - #include - #include --#include --#include -+#include -+#include - #include - - /* -diff -Naur dia-0.97.2-orig/objects/SISSI/sissi.c dia-0.97.2/objects/SISSI/sissi.c ---- dia-0.97.2-orig/objects/SISSI/sissi.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/objects/SISSI/sissi.c 2012-07-15 10:49:06.570726804 -0400 -@@ -42,7 +42,7 @@ - #include "dia_xml_libxml.h" - - #include --#include -+#include - - #define DEFAULT_WIDTH 1.0 - #define DEFAULT_HEIGHT 1.0 -diff -Naur dia-0.97.2-orig/objects/standard/image.c dia-0.97.2/objects/standard/image.c ---- dia-0.97.2-orig/objects/standard/image.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/objects/standard/image.c 2012-07-15 10:49:06.683726770 -0400 -@@ -25,7 +25,7 @@ - #ifdef HAVE_UNIST_H - #include - #endif --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo.c dia-0.97.2/plug-ins/cairo/diacairo.c ---- dia-0.97.2-orig/plug-ins/cairo/diacairo.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/cairo/diacairo.c 2012-07-15 10:49:06.433726846 -0400 -@@ -28,7 +28,7 @@ - #include - #define G_LOG_DOMAIN "DiaCairo" - #include --#include -+#include - - /* - * To me the following looks rather suspicious. Why do we need to compile -diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c dia-0.97.2/plug-ins/cairo/diacairo-renderer.c ---- dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c 2011-01-07 06:54:21.000000000 -0500 -+++ dia-0.97.2/plug-ins/cairo/diacairo-renderer.c 2012-07-15 10:49:06.435726846 -0400 -@@ -28,7 +28,7 @@ - #include - #define G_LOG_DOMAIN "DiaCairo" - #include --#include -+#include - - #ifdef HAVE_PANGOCAIRO_H - #include -diff -Naur dia-0.97.2-orig/plug-ins/cgm/cgm.c dia-0.97.2/plug-ins/cgm/cgm.c ---- dia-0.97.2-orig/plug-ins/cgm/cgm.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/cgm/cgm.c 2012-07-15 10:49:06.425726846 -0400 -@@ -31,7 +31,7 @@ - #include - #include - --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/drs/dia-render-script.c dia-0.97.2/plug-ins/drs/dia-render-script.c ---- dia-0.97.2-orig/plug-ins/drs/dia-render-script.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/drs/dia-render-script.c 2012-07-15 10:49:06.427726848 -0400 -@@ -54,7 +54,7 @@ - - #define G_LOG_DOMAIN "DiaRenderScript" - #include --#include -+#include - - #include "intl.h" - #include "filter.h" -diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-export.c dia-0.97.2/plug-ins/dxf/dxf-export.c ---- dia-0.97.2-orig/plug-ins/dxf/dxf-export.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/dxf/dxf-export.c 2012-07-15 10:49:06.421726850 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - - #include "autocad_pal.h" - -diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-import.c dia-0.97.2/plug-ins/dxf/dxf-import.c ---- dia-0.97.2-orig/plug-ins/dxf/dxf-import.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/dxf/dxf-import.c 2012-07-15 10:49:06.419726851 -0400 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/hpgl/hpgl.c dia-0.97.2/plug-ins/hpgl/hpgl.c ---- dia-0.97.2-orig/plug-ins/hpgl/hpgl.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/hpgl/hpgl.c 2012-07-15 10:49:06.487726830 -0400 -@@ -37,7 +37,7 @@ - #include - - #include --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/libart/export_png.c dia-0.97.2/plug-ins/libart/export_png.c ---- dia-0.97.2-orig/plug-ins/libart/export_png.c 2011-07-03 06:56:08.000000000 -0400 -+++ dia-0.97.2/plug-ins/libart/export_png.c 2012-07-15 10:49:06.415726849 -0400 -@@ -29,7 +29,7 @@ - #include - #include - --#include -+#include - #include - - #include "intl.h" -diff -Naur dia-0.97.2-orig/plug-ins/metapost/render_metapost.c dia-0.97.2/plug-ins/metapost/render_metapost.c ---- dia-0.97.2-orig/plug-ins/metapost/render_metapost.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/metapost/render_metapost.c 2012-07-15 10:49:06.396726857 -0400 -@@ -43,7 +43,7 @@ - #endif - #include - --#include -+#include - - #include "intl.h" - #include "render_metapost.h" -diff -Naur dia-0.97.2-orig/plug-ins/pgf/render_pgf.c dia-0.97.2/plug-ins/pgf/render_pgf.c ---- dia-0.97.2-orig/plug-ins/pgf/render_pgf.c 2011-01-07 07:11:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/pgf/render_pgf.c 2012-07-15 10:49:06.445726842 -0400 -@@ -61,8 +61,8 @@ - #endif - #include - --#include --#include -+#include -+#include - - #include "intl.h" - #include "render_pgf.h" -diff -Naur dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c dia-0.97.2/plug-ins/postscript/paginate_psprint.c ---- dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/postscript/paginate_psprint.c 2012-07-15 10:49:06.451726838 -0400 -@@ -31,7 +31,7 @@ - #include - #include - --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/postscript/render_eps.c dia-0.97.2/plug-ins/postscript/render_eps.c ---- dia-0.97.2-orig/plug-ins/postscript/render_eps.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/postscript/render_eps.c 2012-07-15 10:49:06.451726838 -0400 -@@ -55,7 +55,7 @@ - #include - #include - --#include -+#include - - #include "intl.h" - #include "render_eps.h" -diff -Naur dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c dia-0.97.2/plug-ins/pstricks/render_pstricks.c ---- dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c 2011-01-07 07:11:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/pstricks/render_pstricks.c 2012-07-15 10:49:06.410726853 -0400 -@@ -50,7 +50,7 @@ - #endif - #include - --#include -+#include - - #include "intl.h" - #include "render_pstricks.h" -diff -Naur dia-0.97.2-orig/plug-ins/python/pydia-render.c dia-0.97.2/plug-ins/python/pydia-render.c ---- dia-0.97.2-orig/plug-ins/python/pydia-render.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/python/pydia-render.c 2012-07-15 10:49:06.503726822 -0400 -@@ -21,7 +21,7 @@ - - #include - #include --#include -+#include - - #include - -diff -Naur dia-0.97.2-orig/plug-ins/shape/shape-export.c dia-0.97.2/plug-ins/shape/shape-export.c ---- dia-0.97.2-orig/plug-ins/shape/shape-export.c 2009-11-08 06:14:56.000000000 -0500 -+++ dia-0.97.2/plug-ins/shape/shape-export.c 2012-07-15 10:49:06.489726827 -0400 -@@ -40,7 +40,7 @@ - #include - #endif - --#include -+#include - - /* the dots per centimetre to render this diagram at */ - /* this matches the setting `100%' setting in dia. */ -diff -Naur dia-0.97.2-orig/plug-ins/svg/render_svg.c dia-0.97.2/plug-ins/svg/render_svg.c ---- dia-0.97.2-orig/plug-ins/svg/render_svg.c 2011-12-17 11:30:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/svg/render_svg.c 2012-07-15 10:49:06.392726859 -0400 -@@ -30,7 +30,7 @@ - #endif - - #include --#include -+#include - - #include - #include -diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-export.c dia-0.97.2/plug-ins/vdx/vdx-export.c ---- dia-0.97.2-orig/plug-ins/vdx/vdx-export.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/vdx/vdx-export.c 2012-07-15 10:55:17.066579728 -0400 -@@ -32,11 +32,12 @@ - - #include - #include -+#include - #include - #include - #include - #include --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-import.c dia-0.97.2/plug-ins/vdx/vdx-import.c ---- dia-0.97.2-orig/plug-ins/vdx/vdx-import.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/vdx/vdx-import.c 2012-07-15 10:49:06.466726836 -0400 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff -Naur dia-0.97.2-orig/plug-ins/wmf/wmf.cpp dia-0.97.2/plug-ins/wmf/wmf.cpp ---- dia-0.97.2-orig/plug-ins/wmf/wmf.cpp 2011-03-13 09:07:48.000000000 -0400 -+++ dia-0.97.2/plug-ins/wmf/wmf.cpp 2012-07-15 10:49:06.482726831 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/wpg/wpg.c dia-0.97.2/plug-ins/wpg/wpg.c ---- dia-0.97.2-orig/plug-ins/wpg/wpg.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/wpg/wpg.c 2012-07-15 10:49:06.406726855 -0400 -@@ -40,7 +40,7 @@ - #include - - #include --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-export.c dia-0.97.2/plug-ins/xfig/xfig-export.c ---- dia-0.97.2-orig/plug-ins/xfig/xfig-export.c 2011-12-17 11:30:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/xfig/xfig-export.c 2012-07-15 10:49:06.400726856 -0400 -@@ -16,7 +16,7 @@ - #include - - #include --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-import.c dia-0.97.2/plug-ins/xfig/xfig-import.c ---- dia-0.97.2-orig/plug-ins/xfig/xfig-import.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/xfig/xfig-import.c 2012-07-15 10:49:06.402726853 -0400 -@@ -40,7 +40,7 @@ - #include - - #include --#include -+#include - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xslt/xslt.c dia-0.97.2/plug-ins/xslt/xslt.c ---- dia-0.97.2-orig/plug-ins/xslt/xslt.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/xslt/xslt.c 2012-07-15 10:49:06.440726844 -0400 -@@ -27,7 +27,7 @@ - #include - #include - --#include -+#include - - #include "filter.h" - #include "intl.h" -diff -Naur dia-0.97.2-orig/tests/test-boundingbox.c dia-0.97.2/tests/test-boundingbox.c ---- dia-0.97.2-orig/tests/test-boundingbox.c 2009-11-07 09:28:35.000000000 -0500 -+++ dia-0.97.2/tests/test-boundingbox.c 2012-07-15 10:49:06.986726677 -0400 -@@ -29,7 +29,7 @@ - #include - - #if GLIB_CHECK_VERSION(2,16,0) --#include -+#include - #endif - #include "dialib.h" - -diff -Naur dia-0.97.2-orig/tests/test-objects.c dia-0.97.2/tests/test-objects.c ---- dia-0.97.2-orig/tests/test-objects.c 2009-11-07 09:28:35.000000000 -0500 -+++ dia-0.97.2/tests/test-objects.c 2012-07-15 10:49:06.985726677 -0400 -@@ -29,7 +29,7 @@ - #include - - #if GLIB_CHECK_VERSION(2,16,0) --#include -+#include - #endif - - #include "object.h" diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ad8735a6dff3..b4becafdb0b4 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, lzip, texinfo }: stdenv.mkDerivation rec { - name = "ocrad-0.23"; + name = "ocrad-0.24"; src = fetchurl { url = "mirror://gnu/ocrad/${name}.tar.lz"; - sha256 = "0vx0v4sz8ivgcp04zggdq9cv9sb5zxnn7j1nm15cds0zq1wr9g7m"; + sha256 = "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv"; }; buildInputs = [ lzip texinfo ]; diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 2b68c58b12dd..242ee4e9c9f5 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.9.2.1"; + version = "0.9.3"; name = "bitcoin${toString (optional (!gui) "d")}-${version}"; src = fetchurl { url = "https://bitcoin.org/bin/${version}/bitcoin-${version}-linux.tar.gz"; - sha256 = "0060f7d38b98113ab912d4c184000291d7f026eaf77ca5830deec15059678f54"; + sha256 = "1kb59w7232qzfh952rz6vvjri2w26n9cq7baml0vifdsdhxph9f4"; }; # hexdump from utillinux is required for tests diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 17b5c92406b0..978dd19e3dfa 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -4,13 +4,13 @@ let mkSweetHome3D = - { name, module, version, src, license, description }: + { name, module, version, src, license, description, icon }: stdenv.mkDerivation rec { - inherit name version src description; + inherit name version src description icon; exec = stdenv.lib.toLower module; sweethome3dItem = makeDesktopItem { - inherit name exec; + inherit name exec icon; comment = description; desktopName = name; genericName = "Computer Aided (Interior) Design"; @@ -61,6 +61,10 @@ in rec { module = module; tag = "V_" + d2u version; }; + icon = fetchurl { + url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/sweethome3d.png"; + sha256 = "0lnv2sz2d3m8jx25hz92gzardf0iblykhy5q0q2cyb7mw2qb2p92"; + }; }; } diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index cdbc4233cf48..320e7094d484 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,51 +1,43 @@ -x@{builderDefsPackage - , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool - , libunwind, ncurses - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchgit +, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool +, libunwind, ncurses, curl, jansson, texinfo +, automake, autoconf +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { +let + s = rec { baseName="freetalk"; - version="3.2"; + version="4.0rc6"; name="${baseName}-${version}"; - url="mirror://savannah/${baseName}/${name}.tar.gz"; - hash="12dn7yj9k5xsrrjlnma77wzpvsdxjccwla1q0wy3lacl5l2p0jms"; + url="https://github.com/GNUFreetalk/freetalk"; + rev = "refs/tags/v${version}"; + sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz"; }; + buildInputs = [ + guile pkgconfig glib loudmouth gmp libidn readline libtool + libunwind ncurses curl jansson texinfo + autoconf automake + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; + src = fetchgit { + inherit (s) url rev sha256; + name = "git-export-${s.name}"; + }; - patches = [./01_callbacks_const_fix.diff]; + preConfigure = '' + patchShebangs . + ./autogen.sh + ''; - /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - meta = { - description = "Console XMPP client"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3Plus; + inherit (s) version; + description = "Console XMPP client"; + license = stdenv.lib.licenses.gpl3Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.gnu.org/software/freetalk/"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.gnu.org/software/freetalk/"; - }; - }; -}) x - +} diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d5902d143590..8584eb84273d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,20 +22,14 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.15.4"; + version = "0.16"; src = fetchurl { - url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; - sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g"; + url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; + sha256 = "14x15jwgl0c6vwj02ccpzmxr3fczp632mnj50cpklbaj4bxqvgbs"; }; patches = [ - (fetchurl { - name = "gajim-drill-srv.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/" - + "plain/trunk/gajim-drill.patch?h=packages/gajim"; - sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w"; - }) (fetchurl { name = "gajim-icon-index.patch"; url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; @@ -69,6 +63,7 @@ stdenv.mkDerivation rec { pythonPackages.pygobject pythonPackages.pyGtkGlade pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg + pythonPackages.nbxmpp pyopenssl pythonDBus ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto @@ -88,5 +83,7 @@ stdenv.mkDerivation rec { description = "Jabber client written in PyGTK"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.aszlig ]; + downloadPage = "http://gajim.org/downloads.php"; + updateWalker = true; }; } diff --git a/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch b/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch new file mode 100644 index 000000000000..889b8c930e73 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch @@ -0,0 +1,100 @@ +Description: FHS through env vars +Forwarded: not-needed +Author: Jérémy Lal +Last-Update: 2013-09-28 +--- redmine.orig/app/models/attachment.rb ++++ redmine/app/models/attachment.rb +@@ -46,10 +46,10 @@ class Attachment < ActiveRecord::Base + "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"} + + cattr_accessor :storage_path +- @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files") ++ @@storage_path = Redmine::Configuration['attachments_storage_path'] || ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], "files") : File.join(Rails.root, "files") + + cattr_accessor :thumbnails_storage_path +- @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") ++ @@thumbnails_storage_path = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], "thumbnails") : File.join(Rails.root, "tmp", "thumbnails") + + before_save :files_to_final_location + after_destroy :delete_from_disk +--- redmine.orig/lib/redmine/configuration.rb ++++ redmine/lib/redmine/configuration.rb +@@ -32,7 +32,7 @@ module Redmine + # * :file: the configuration file to load (default: config/configuration.yml) + # * :env: the environment to load the configuration for (default: Rails.env) + def load(options={}) +- filename = options[:file] || File.join(Rails.root, 'config', 'configuration.yml') ++ filename = options[:file] || ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'configuration.yml') : File.join(Rails.root, 'config', 'configuration.yml') + env = options[:env] || Rails.env + + @config = @defaults.dup +@@ -103,7 +103,7 @@ module Redmine + end + + def load_deprecated_email_configuration(env) +- deprecated_email_conf = File.join(Rails.root, 'config', 'email.yml') ++ deprecated_email_conf = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(Rails.root, 'config', 'email.yml') + if File.file?(deprecated_email_conf) + warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting." + @config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)}) +--- redmine.orig/lib/redmine/export/pdf.rb ++++ redmine/lib/redmine/export/pdf.rb +@@ -38,7 +38,7 @@ module Redmine + attr_accessor :footer_date + + def initialize(lang, orientation='P') +- @@k_path_cache = Rails.root.join('tmp', 'pdf') ++ @@k_path_cache = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'pdf') : Rails.root.join('tmp', 'pdf') + FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache) + set_language_if_valid lang + pdf_encoding = l(:general_pdf_encoding).upcase +--- redmine.orig/config/application.rb ++++ redmine/config/application.rb +@@ -52,8 +63,21 @@ module RedmineApp + # Do not include all helpers + config.action_controller.include_all_helpers = false + ++ # move tmp directory to RAILS_TMP ++ config.paths['tmp'] = ENV['RAILS_TMP'] ++ + config.session_store :cookie_store, :key => '_redmine_session' + ++ # log path ++ config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG'] ++ ++ config.paths['public'] = ENV['RAILS_PUBLIC'] unless !ENV['RAILS_PUBLIC'] ++ ++ config.cache_store = :file_store, File.join(ENV['RAILS_TMP'], "cache") ++ ++ # Set Active Record's database.yml path ++ config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC'] ++ + if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb')) + instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb')) + end +--- redmine.orig/lib/plugins/rfpdf/lib/tcpdf.rb ++++ redmine/lib/plugins/rfpdf/lib/tcpdf.rb +@@ -89,10 +89,10 @@ class TCPDF + @@k_small_ratio = 2/3.0 + + cattr_accessor :k_path_cache +- @@k_path_cache = Rails.root.join('tmp') ++ @@k_path_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp') + + cattr_accessor :k_path_url_cache +- @@k_path_url_cache = Rails.root.join('tmp') ++ @@k_path_url_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp') + + attr_accessor :barcode + +--- redmine.orig/lib/redmine/scm/adapters/abstract_adapter.rb ++++ redmine/lib/redmine/scm/adapters/abstract_adapter.rb +@@ -222,7 +222,7 @@ module Redmine + if @stderr_log_file.nil? + writable = false + path = Redmine::Configuration['scm_stderr_log_file'].presence +- path ||= Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s ++ path ||= ENV['RAILS_LOG'] ? File.join(ENV['RAILS_LOG'], "#{Rails.env}.scm.stderr.log").to_s : Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s + if File.exists?(path) + if File.file?(path) && File.writable?(path) + writable = true diff --git a/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch b/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch new file mode 100644 index 000000000000..39af8e02e556 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch @@ -0,0 +1,72 @@ +Description: Externalize session config to yml in /etc +Forwarded: not-needed +Author: Jérémy Lal +Last-Update: 2010-01-10 +--- redmine.orig/lib/tasks/initializers.rake ++++ redmine/lib/tasks/initializers.rake +@@ -1,11 +1,12 @@ + desc 'Generates a secret token for the application.' ++task :generate_secret_token do + +-file 'config/initializers/secret_token.rb' do +- path = File.join(Rails.root, 'config', 'initializers', 'secret_token.rb') +- secret = SecureRandom.hex(40) +- File.open(path, 'w') do |f| +- f.write <<"EOF" +-# This file was generated by 'rake generate_secret_token', and should ++filename = ENV['YML_SESSION_FILENAME'] ? ENV['YML_SESSION_FILENAME'] : 'session.yml' ++path = File.join(ENV['RAILS_ETC'] ? ENV['RAILS_ETC'] : File.join(Rails.root, 'config'), filename) ++secret = SecureRandom.hex(40) ++File.open(path, 'w') do |f| ++ f.write <<"EOF" ++# This file was generated by 'rake generate_session_store', + # not be made visible to public. + # If you have a load-balancing Redmine cluster, you will need to use the + # same version of this file on each machine. And be sure to restart your +@@ -15,10 +18,18 @@ file 'config/initializers/secret_token.r + # change this key, all old sessions will become invalid! Make sure the + # secret is at least 30 characters and all random, no regular words or + # you'll be exposed to dictionary attacks. +-RedmineApp::Application.config.secret_token = '#{secret}' ++ ++production: ++ key: _redmine_ ++ secret: #{secret} ++ ++development: ++ key: _redmine_ ++ secret: #{secret} ++ ++test: ++ key: _redmine_ ++ secret: #{secret} + EOF + end + end +- +-desc 'Generates a secret token for the application.' +-task :generate_secret_token => ['config/initializers/secret_token.rb'] +--- redmine.orig/config/application.rb ++++ redmine/config/application.rb +@@ -66,7 +66,20 @@ module RedmineApp + # move tmp directory to RAILS_TMP + config.paths['tmp'] = ENV['RAILS_TMP'] + +- config.session_store :cookie_store, :key => '_redmine_session' ++ # loads cookie based session session and secret keys ++ # this is needed here because initializers are loaded after plugins, ++ # and some plugins initialize ActionController which requires a secret to be set. ++ # crash if file not found ++ relativeUrlRoot = ENV['RAILS_RELATIVE_URL_ROOT'] ++ filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'session.yml') : File.join(File.dirname(__FILE__), '..', 'session.yml') ++ if File.exists?(filename) ++ sessionconfig = YAML::load_file(filename) ++ config.session_store :cookie_store, :key => sessionconfig[Rails.env]['key'], :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot ++ config.secret_token = sessionconfig[Rails.env]['secret'] ++ else ++ # temporary settings before session.yml is created ++ config.session_store :cookie_store, :key => '_redmine_session', :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot ++ end + + # log path + config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG'] diff --git a/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch b/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch new file mode 100644 index 000000000000..d9a6844a6a35 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch @@ -0,0 +1,11 @@ +--- redmine.orig/lib/redmine/plugin.rb ++++ redmine/lib/redmine/plugin.rb +@@ -47,7 +47,7 @@ module Redmine #:nodoc: + self.directory = File.join(Rails.root, 'plugins') + + cattr_accessor :public_directory +- self.public_directory = File.join(Rails.root, 'public', 'plugin_assets') ++ self.public_directory = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'plugin_assets') : File.join(Rails.root, 'public', 'plugin_assets') + + @registered_plugins = {} + class << self diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock new file mode 100644 index 000000000000..7d83583c019d --- /dev/null +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -0,0 +1,152 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (3.2.19) + actionpack (= 3.2.19) + mail (~> 2.5.4) + actionpack (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0.0) + activerecord (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + activesupport (3.2.19) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + arel (3.0.3) + awesome_nested_set (2.1.6) + activerecord (>= 3.0.0) + builder (3.0.0) + capybara (2.1.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.5.5) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.0) + erubis (2.7.0) + fastercsv (1.5.5) + ffi (1.9.5) + hike (1.2.3) + i18n (0.6.11) + journey (1.0.4) + jquery-rails (2.0.3) + railties (>= 3.1.0, < 5.0) + thor (~> 0.14) + json (1.8.1) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile (0.6.0) + mocha (1.0.0) + metaclass (~> 0.0.1) + multi_json (1.10.1) + net-ldap (0.3.1) + nokogiri (1.6.3.1) + mini_portile (= 0.6.0) + pg (0.17.1) + polyglot (0.3.5) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-openid (1.4.2) + rack (>= 1.1.0) + ruby-openid (>= 2.1.8) + rack-ssl (1.3.4) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.19) + actionmailer (= 3.2.19) + actionpack (= 3.2.19) + activerecord (= 3.2.19) + activeresource (= 3.2.19) + activesupport (= 3.2.19) + bundler (~> 1.0) + railties (= 3.2.19) + railties (3.2.19) + actionpack (= 3.2.19) + activesupport (= 3.2.19) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.1) + rdoc (3.12.2) + json (~> 1.4) + redcarpet (2.3.0) + rmagick (2.13.3) + ruby-openid (2.3.0) + rubyzip (1.1.6) + selenium-webdriver (2.43.0) + childprocess (~> 0.5) + multi_json (~> 1.0) + rubyzip (~> 1.0) + websocket (~> 1.0) + shoulda (3.3.2) + shoulda-context (~> 1.0.1) + shoulda-matchers (~> 1.4.1) + shoulda-context (1.0.2) + shoulda-matchers (1.4.1) + activesupport (>= 3.0.0) + sprockets (2.2.2) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + thor (0.19.1) + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.41) + websocket (1.2.1) + xpath (2.0.0) + nokogiri (~> 1.3) + yard (0.8.7.4) + +PLATFORMS + ruby + +DEPENDENCIES + activerecord-jdbc-adapter (~> 1.3.2) + activerecord-jdbcpostgresql-adapter + awesome_nested_set (= 2.1.6) + builder (= 3.0.0) + capybara (~> 2.1.0) + coderay (~> 1.1.0) + fastercsv (~> 1.5.0) + jquery-rails (~> 2.0.2) + mime-types + mocha (~> 1.0.0) + net-ldap (~> 0.3.1) + pg (>= 0.11.0) + rack-openid + rails (= 3.2.19) + rake (~> 10.1.1) + rdoc (>= 2.4.2) + redcarpet (~> 2.3.0) + rmagick (>= 2.0.0) + ruby-openid (~> 2.3.0) + selenium-webdriver + shoulda (~> 3.3.2) + yard diff --git a/pkgs/applications/version-management/redmine/Gemfile.nix b/pkgs/applications/version-management/redmine/Gemfile.nix new file mode 100644 index 000000000000..a7339097b146 --- /dev/null +++ b/pkgs/applications/version-management/redmine/Gemfile.nix @@ -0,0 +1,332 @@ +[ +{ +name = "actionmailer"; +hash = "cd9f0b22f755b0adeae13cf949adaf63fa1c068c72d0a100572c6a11aecd3ba7"; +url = "http://rubygems.org/downloads/actionmailer-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "actionpack"; +hash = "c58ca2342aff2062f4f478551ce46d81918ac93200bc62d099764d2cd7499fcd"; +url = "http://rubygems.org/downloads/actionpack-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activemodel"; +hash = "4ea3abf790eca9ee8228e9e2a465350e258294270a639b63f0e1dfad236fe70e"; +url = "http://rubygems.org/downloads/activemodel-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activerecord"; +hash = "052945ad510744aaa3e35a817a6f515a2316e7dd96df6460f75b36067bb60372"; +url = "http://rubygems.org/downloads/activerecord-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activeresource"; +hash = "8617d24537ca937cc67aac46aaa29782510d66136605426d0a23a3585a839daf"; +url = "http://rubygems.org/downloads/activeresource-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activesupport"; +hash = "2c837a59250da14b12a6b0cfb6774f0afae90aa749fd96ad4347344d8417ad3d"; +url = "http://rubygems.org/downloads/activesupport-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "arel"; +hash = "c0006e2169deee3b8cc2d258296388822eeb2db59832450b9b7316e1387d0da4"; +url = "http://rubygems.org/downloads/arel-3.0.3.gem"; +version = "3.0.3"; +} +{ +name = "awesome_nested_set"; +hash = "0dcd801aea5048f5ab907b62b4174b6763b191eaa4e1e11bb83f996f01349af8"; +url = "http://rubygems.org/downloads/awesome_nested_set-2.1.6.gem"; +version = "2.1.6"; +} +{ +name = "builder"; +hash = "fbd3e15e5de02245f7d649b3415b2c2875cdc9a14dccde89aa30fc14a314618e"; +url = "http://rubygems.org/downloads/builder-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "capybara"; +hash = "a9a19f8d6bb2dfcb1f05ea3e1727cb556d1cba0d234d1712b481e8d4f7bbb91e"; +url = "http://rubygems.org/downloads/capybara-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "childprocess"; +hash = "9b583295a11932d2eeffa1e8f5b8fb2fb0064a2f0111ad98c3b752b94f80bf33"; +url = "http://rubygems.org/downloads/childprocess-0.5.5.gem"; +version = "0.5.5"; +} +{ +name = "coderay"; +hash = "5a943c59e36f7ef9dd2677855735656413af02e3f302431e9c548aabe89f3c15"; +url = "http://rubygems.org/downloads/coderay-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "erubis"; +hash = "63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba"; +url = "http://rubygems.org/downloads/erubis-2.7.0.gem"; +version = "2.7.0"; +} +{ +name = "fastercsv"; +hash = "d098199e62e4e10eec436a9ea9b8c189dacd5c06f2825f00d1e0f1c29fdbc3b5"; +url = "http://rubygems.org/downloads/fastercsv-1.5.5.gem"; +version = "1.5.5"; +} +{ +name = "ffi"; +hash = "0d2ef90163eef8545689e8dfc27fb1245a2d82e3500d587de1e38290629e662f"; +url = "http://rubygems.org/downloads/ffi-1.9.5.gem"; +version = "1.9.5"; +} +{ +name = "hike"; +hash = "154e2f2593845e5bcd8ed2ba3092600c55c6ad8c630722857de3fdaf334ccc44"; +url = "http://rubygems.org/downloads/hike-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "i18n"; +hash = "b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b"; +url = "http://rubygems.org/downloads/i18n-0.6.11.gem"; +version = "0.6.11"; +} +{ +name = "journey"; +hash = "7454b8612530784000fbb17ea2df749a71b70702a0ac8ebef4a1e7f05aecc10f"; +url = "http://rubygems.org/downloads/journey-1.0.4.gem"; +version = "1.0.4"; +} +{ +name = "jquery-rails"; +hash = "cc4eab342fb3b1fcbb2fc1c9a61b09ecd86d795b1f74d607994b0bc6fd5ef444"; +url = "http://rubygems.org/downloads/jquery-rails-2.0.3.gem"; +version = "2.0.3"; +} +{ +name = "json"; +hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200"; +url = "http://rubygems.org/downloads/json-1.8.1.gem"; +version = "1.8.1"; +} +{ +name = "mail"; +hash = "446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c"; +url = "http://rubygems.org/downloads/mail-2.5.4.gem"; +version = "2.5.4"; +} +{ +name = "metaclass"; +hash = "8569685c902108b1845be4e5794d646f2a8adcb0280d7651b600dab0844fe942"; +url = "http://rubygems.org/downloads/metaclass-0.0.4.gem"; +version = "0.0.4"; +} +{ +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 = "mocha"; +hash = "788fd93c8009a7e0eebd155509953e5987f4681902aad666a294283baa09899a"; +url = "http://rubygems.org/downloads/mocha-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "multi_json"; +hash = "2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2"; +url = "http://rubygems.org/downloads/multi_json-1.10.1.gem"; +version = "1.10.1"; +} +{ +name = "net-ldap"; +hash = "953551665fb0d398740a72a26314c6d34bd70fa35419c96dc58351f17d9a5081"; +url = "http://rubygems.org/downloads/net-ldap-0.3.1.gem"; +version = "0.3.1"; +} +{ +name = "nokogiri"; +hash = "91761a654439406b5bed71adf6092d49829e26332b4c0e7c8a23a2e628442585"; +url = "http://rubygems.org/downloads/nokogiri-1.6.3.1.gem"; +version = "1.6.3.1"; +} +{ +name = "pg"; +hash = "e7933e8f7f184c28e820ed85ddfb3ad8a13933b2b2ab8656aa8f81cb0aa610a6"; +url = "http://rubygems.org/downloads/pg-0.17.1.gem"; +version = "0.17.1"; +} +{ +name = "polyglot"; +hash = "59d66ef5e3c166431c39cb8b7c1d02af419051352f27912f6a43981b3def16af"; +url = "http://rubygems.org/downloads/polyglot-0.3.5.gem"; +version = "0.3.5"; +} +{ +name = "rack"; +hash = "f7bf3faa8e09a2ff26475372de36a724e7470d6bdc33d189a0ec34b49605f308"; +url = "http://rubygems.org/downloads/rack-1.4.5.gem"; +version = "1.4.5"; +} +{ +name = "rack-cache"; +hash = "02bfed05f8b3266db804f2fa445801636ca2c6d211a3137ec796f88af5756e1c"; +url = "http://rubygems.org/downloads/rack-cache-1.2.gem"; +version = "1.2"; +} +{ +name = "rack-openid"; +hash = "8cd2305e738463a7da98791f9ac4df4cf3f6ed27908d982350430694ac2fe869"; +url = "http://rubygems.org/downloads/rack-openid-1.4.2.gem"; +version = "1.4.2"; +} +{ +name = "rack-ssl"; +hash = "d703764fa2a0d44a2163d6add65be89f5dba4477d1959b90d3727682a9c37dcf"; +url = "http://rubygems.org/downloads/rack-ssl-1.3.4.gem"; +version = "1.3.4"; +} +{ +name = "rack-test"; +hash = "7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306"; +url = "http://rubygems.org/downloads/rack-test-0.6.2.gem"; +version = "0.6.2"; +} +{ +name = "rails"; +hash = "33b64cf78dfcf3206d961ce03e8fe6d260081da696e60da39d0b2a4a160fe22b"; +url = "http://rubygems.org/downloads/rails-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "railties"; +hash = "c569009ee5c005190d208ac228087fdc094b10c6f0cf209f1d12c552b447cc10"; +url = "http://rubygems.org/downloads/railties-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "rake"; +hash = "85e446590871dd3469c80dfe70a0296c20b76a9006af6b728c1f47d0b460412d"; +url = "http://rubygems.org/downloads/rake-10.1.1.gem"; +version = "10.1.1"; +} +{ +name = "rdoc"; +hash = "a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed"; +url = "http://rubygems.org/downloads/rdoc-3.12.2.gem"; +version = "3.12.2"; +} +{ +name = "redcarpet"; +hash = "5c9bcc307fba97ff5a25eec74f08365c17e929d2a5c707db32d6fc99ec81f0b9"; +url = "http://rubygems.org/downloads/redcarpet-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rmagick"; +hash = "109f3b8be90afdea9abbdd2a79a955cd808b5cad65d937ed12676da22870d3b4"; +url = "http://rubygems.org/downloads/rmagick-2.13.3.gem"; +version = "2.13.3"; +} +{ +name = "ruby-openid"; +hash = "f69ed004e95f7094e23bfd8bc9ebfb1dc88a7b46637252ca2907a1189870ea7b"; +url = "http://rubygems.org/downloads/ruby-openid-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rubyzip"; +hash = "a996435ee9698be6a09d3748f4d23ee15aaf45cbfef1749def165af6ea3c0a9e"; +url = "http://rubygems.org/downloads/rubyzip-1.1.6.gem"; +version = "1.1.6"; +} +{ +name = "selenium-webdriver"; +hash = "09fe4374d1541cb45403ad1238c2d88129f3afb985218635af087a06c99a521a"; +url = "http://rubygems.org/downloads/selenium-webdriver-2.43.0.gem"; +version = "2.43.0"; +} +{ +name = "shoulda"; +hash = "52e70b71cbfb7c01dace14e268a62d86c21ddd1e5ec0116c8b1e632d8e04e412"; +url = "http://rubygems.org/downloads/shoulda-3.3.2.gem"; +version = "3.3.2"; +} +{ +name = "shoulda-context"; +hash = "ee5559aa13248c70fdec6868a3c144adf7438c904c59d1a76b04a002e5151de5"; +url = "http://rubygems.org/downloads/shoulda-context-1.0.2.gem"; +version = "1.0.2"; +} +{ +name = "shoulda-matchers"; +hash = "c35693cbfa84213212dffbc2c87487427ef364927340151329a842f0a06086b9"; +url = "http://rubygems.org/downloads/shoulda-matchers-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "sprockets"; +hash = "fae893b7e86e83c1936f6f2a64db3550510f86eabdd5fa9f0f23fb25d7e0cf96"; +url = "http://rubygems.org/downloads/sprockets-2.2.2.gem"; +version = "2.2.2"; +} +{ +name = "thor"; +hash = "9ff834f031b5550c743bb8a3139317fefdae9cdebd02d60de376658f427fe522"; +url = "http://rubygems.org/downloads/thor-0.19.1.gem"; +version = "0.19.1"; +} +{ +name = "tilt"; +hash = "39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903"; +url = "http://rubygems.org/downloads/tilt-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "treetop"; +hash = "ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff"; +url = "http://rubygems.org/downloads/treetop-1.4.15.gem"; +version = "1.4.15"; +} +{ +name = "tzinfo"; +hash = "381b22fd1744a35d0a0239f563f505773681e626e6d900063b14cb9b1b68e98c"; +url = "http://rubygems.org/downloads/tzinfo-0.3.41.gem"; +version = "0.3.41"; +} +{ +name = "websocket"; +hash = "e626c8c3e8593735d900265fb1fc3439fd06b394069860177d8f40733b12ae9e"; +url = "http://rubygems.org/downloads/websocket-1.2.1.gem"; +version = "1.2.1"; +} +{ +name = "xpath"; +hash = "9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12"; +url = "http://rubygems.org/downloads/xpath-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "yard"; +hash = "e65a26f9b9dc6e2aa9b1d1d2e1a45bee3edf540a6a7e6c30fa6aa1df7f7a29b4"; +url = "http://rubygems.org/downloads/yard-0.8.7.4.gem"; +version = "0.8.7.4"; +} +] diff --git a/pkgs/applications/version-management/redmine/README b/pkgs/applications/version-management/redmine/README new file mode 100644 index 000000000000..1cc4772568a4 --- /dev/null +++ b/pkgs/applications/version-management/redmine/README @@ -0,0 +1,6 @@ +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/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix new file mode 100644 index 000000000000..4b4359603c9b --- /dev/null +++ b/pkgs/applications/version-management/redmine/bootstrap.nix @@ -0,0 +1,45 @@ +{ pkgs ? import {} +}: + +with pkgs; + +let + +in stdenv.mkDerivation rec { + version = "2.5.2"; + name = "redmine-${version}"; + __noChroot = true; + src = fetchurl { + url = "http://www.redmine.org/releases/${name}.tar.gz"; + sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; + }; + buildInputs = [ + ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig + libffi imagemagickBig postgresql which stdenv + ]; + 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 < config/database.yml <> Gemfile + + # make rails server happy + mkdir -p tmp/pids + + # cleanup + rm config/database.yml + ''; + + meta = with stdenv.lib; { + homepage = http://www.redmine.org/; + platforms = platforms.linux; + maintainers = [ maintainers.garbas ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/version-management/redmine/generate_nix_requirements.rb b/pkgs/applications/version-management/redmine/generate_nix_requirements.rb new file mode 100644 index 000000000000..ed47d52c9c1b --- /dev/null +++ b/pkgs/applications/version-management/redmine/generate_nix_requirements.rb @@ -0,0 +1,56 @@ +#!/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/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 99e893c79d1c..179c70a5f47d 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.25"; + version = "3.1.1.26"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "1vrgw7qk4g78mjjapc1a1frribcgya4cdrwahv3i26z9s10g5h3d"; + sha256 = "1yz3cq8ys6ryc6x3a0qyc100swrg2q3az8x8in1lp7c2c0l02zb2"; }; buildInputs = [ mono pkgconfig autoconf automake which ]; diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix index 521933b0ed1f..66f53831374f 100644 --- a/pkgs/development/interpreters/clisp/2.44.1.nix +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { homepage = http://clisp.cons.org; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + branch = "2.44"; }; } diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix index c15e27695ac9..0d1f3bb14ee9 100644 --- a/pkgs/development/libraries/box2d/2.0.1.nix +++ b/pkgs/development/libraries/box2d/2.0.1.nix @@ -72,6 +72,7 @@ rec { platforms = with a.lib.platforms; linux; license = "bsd"; + branch = "2.0.1"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index 0f42e7cd0407..f489e95f5d4f 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -37,6 +37,7 @@ rec { platforms = with a.lib.platforms; linux; license = "free"; + branch = "0.5.1"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/celt/0.7.nix b/pkgs/development/libraries/celt/0.7.nix index 5c5dae866bb8..35cfae9ebb16 100644 --- a/pkgs/development/libraries/celt/0.7.nix +++ b/pkgs/development/libraries/celt/0.7.nix @@ -37,6 +37,7 @@ rec { platforms = with a.lib.platforms; linux; license = "free"; + branch = "0.7"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 6317dfe5887d..4ea9f068d39e 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + branch = "2"; }; } diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 4bd10216e6b5..3c712f320840 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.4.1"; + version = "2.4.2"; name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1wy7hdkaijsr6cbvgq5gkjdb0rd3m6583b8d68hlmsj15k7czbml"; + sha256 = "0zps80jyjvkmgmjvp9s7drbddr820hcw4w5r78hkbs5xsylr0kwp"; }; subtitleSupport = config.ffmpeg.subtitle or true; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 2b4c291f7f59..99a566cf1955 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "1.6.0"; in +let version = "1.6.2"; in stdenv.mkDerivation { name = "geoip-${version}"; @@ -15,5 +15,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.raskin ]; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; + homepage = "http://geolite.maxmind.com/"; + downloadPage = "http://geolite.maxmind.com/download/"; }; } diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 010a2aee88e2..a5b62c6b04ef 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "glm-0.9.5.3"; + name = "glm-0.9.5.4"; src = fetchurl { url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0ndwaw2mp7pzcwwm4dghbv5qqax5a8c5plnwdgnpc9adm79gj1rl"; + sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index a8a3943e409e..6564fc511867 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }: stdenv.mkDerivation rec { - name = "gmime-2.6.19"; + name = "gmime-2.6.20"; src = fetchurl { url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; - sha256 = "0jm1fgbjgh496rsc0il2y46qd4bqq2ln9168p4zzh68mk4ml1yxg"; + sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6c71116b5e81..ce6e7ccb0780 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.3.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.4.0.GA"}: let # We have to use Oracle's JDK. On Darwin, just simply expose the host system's @@ -31,6 +31,7 @@ rec { titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix 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 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 d595db408178..d00532a1b3b1 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,7 +1,7 @@ { nixpkgs ? , systems ? [ "x86_64-linux" "x86_64-darwin" ] , xcodeVersion ? "5.0" -, tiVersion ? "3.2.3.GA" +, tiVersion ? "3.4.0.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , allowUnfree ? false diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix new file mode 100644 index 000000000000..1baf57a94cfb --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix @@ -0,0 +1,77 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-3.4.0.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-linux.zip; + sha1 = "c281a3a3f3af35adc95fc00dcd525b84516c2083"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-osx.zip; + sha1 = "2f10426462e5f8e487be83c8038f2934d5079f0d"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + yes y | 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.4.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.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + '' + else ""} + + # Wrap builder script + + mv builder.py .builder.py + cat > builder.py < jack2 != null; @@ -49,11 +50,13 @@ stdenv.mkDerivation rec { "--disable-solaris" "--disable-jack" "--disable-oss-output" - "--disable-oss-wrapper" + ] ++ stdenv.lib.optional (!ossWrapper) "--disable-oss-wrapper" ++ + [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-access-group=audio" - ] ++ stdenv.lib.optional jackaudioSupport "--enable-jack" + ] + ++ stdenv.lib.optional jackaudioSupport "--enable-jack" ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/"; enableParallelBuilding = true; diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 41ba25d9f2f1..ae93d1a4b5f7 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -6,7 +6,7 @@ let esPlugin = a@{ pluginName, installPhase ? '' - mkdir -p $out + mkdir -p $out/bin ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin --install ${pluginName} --url file://$src '', ... @@ -23,11 +23,11 @@ let in { elasticsearch_river_jdbc = esPlugin rec { name = "elasticsearch-river-jdbc-${version}"; - pluginName = "jdbc"; - version = "1.2.1.1"; + pluginName = "elasticsearch-river-jdbc"; + version = "1.3.0.4"; src = fetchurl { url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip"; - sha1 = "68e7e1fdf45d0e5852b21610a84740595223ea11"; + sha256 = "0272l6cr032iccwwa803shzfjg3505jc48d9qdazrwxjmnlkkzqk"; }; meta = { homepage = "https://github.com/jprante/elasticsearch-river-jdbc"; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 619b4b9ff925..219068896926 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.16.1"; in +let version = "3.16.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "103ff31fn6x1r6y79hdzv5lqls68wqxmikwsl6q8mxllb5rqrwlk"; + sha256 = "0avk8x0k91zrqvlbk8r067aw49byr8hvvr4niy48d3ib1jz2mmnl"; }; buildInputs = [ diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 07fbbc967d91..fcc06871ef15 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "A program for visualising graphs"; homepage = http://www.graphviz.org/; + branch = "2.0"; }; } diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 0a86a8924174..801795397014 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ]; inherit version; + branch = "2.32"; }; } diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 909e44d98098..ca9a9453dbfc 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "byobu-5.68"; + name = "byobu-5.87"; src = fetchurl { - url = "https://launchpad.net/byobu/trunk/5.68/+download/byobu_5.68.orig.tar.gz"; - sha256 = "1xf2m18zx3075c0qvx4fzvn5afm274j5dl0jps7p2lbaq4k1lyhm"; + url = "https://launchpad.net/byobu/trunk/5.87/+download/byobu_5.87.orig.tar.gz"; + sha256 = "08v9y5hxb92caf5zp83fiq0jfwi167vw1ylf42s65x1ng8rvryqh"; }; doCheck = true; diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 36d49ce9b235..2ced43d29cb4 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.15"; + name = "ethtool-3.16"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "16kgw9y4fisldf1z6zpw3v965cc8nram0dycacwkc0js4l76klw8"; + sha256 = "11m2ghjgnbjbvxamgjkr94cw9sz1znla8rkw923svhq4m4zxvq6n"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 3cfc902711ea..4ae571f99e03 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,11 +1,11 @@ { pkgconfig, dbus_libs, nettle, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dnsmasq-2.71"; + name = "dnsmasq-2.72"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9"; + sha256 = "1c80hq09hfm8cp5pirfb8wdlc7dqkp7zzmbmdaradcvlblzx42vx"; }; # Can't rely on make flags because of space in one of the parameters diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 7fdb548e7b05..952771318be6 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -2,7 +2,7 @@ a : let s = import ./src-for-default.nix; buildInputs = with a; [ - openssl gmp + openssl gmp zlib ]; in rec { diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix index 88264c5d7715..3db30de0bdd9 100644 --- a/pkgs/tools/networking/gvpe/src-for-default.nix +++ b/pkgs/tools/networking/gvpe/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.24"; - name="gvpe-2.24"; - hash="1szwia7n24fx9n40yvmdidna55b97459ccq6d2c4863q4pfkqpjy"; - url="mirror://gnu/gvpe/gvpe-${version}.tar.gz"; - advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.24.tar.gz"; + version="2.25"; + name="gvpe-2.25"; + hash="1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk"; + url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.25.tar.gz"; } diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 3300d12ebfa3..0762254b706f 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Tracks the route taken by packets over an IP network"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.koral ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 5108174c8870..9a6e610389bb 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/setuid-wrappers/sendmail" }: stdenv.mkDerivation { - name = "at-3.1.15"; + name = "at-3.1.16"; src = fetchurl { # Debian is apparently the last location where it can be found. - url = mirror://debian/pool/main/a/at/at_3.1.15.orig.tar.gz; - sha256 = "1z7pgglr0zmwapb4sc1bdb3z0hgig1asyzqv4gs5xafmjd94za03"; + url = mirror://debian/pool/main/a/at/at_3.1.16.orig.tar.gz; + sha256 = "1hfmnhgi95vsfaa69qlakpwd22al0m0rhqms6sawxvaldafgb6nb"; }; patches = [ ./install.patch ]; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index e247c84dcf90..a164a26fbcd6 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lzip }: stdenv.mkDerivation rec { - name = "ddrescue-1.18.1"; + name = "ddrescue-1.19"; src = fetchurl { url = "mirror://gnu/ddrescue/${name}.tar.lz"; - sha256 = "1ad1ifby89wys8lxh4d24y5lih6hkz54jhv6sf6bs1i7sd7lnqaq"; + sha256 = "1f278w7i9sx45jk6fsw1kyzx743k3alx1c4w1q8sk05ckafhr3gd"; }; buildInputs = [ lzip ]; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 6851ca896783..9e21bd2f8fa7 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation { - name = "dos2unix-6.0.6"; + name = "dos2unix-7.0"; src = fetchurl { - url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.6.tar.gz; - sha256 = "0xnj4gmav1ypkgwmqldnq41b6l3cg08dyngkbygn9vrhlvlx9fwa"; + url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.0.tar.gz; + sha256 = "0az7nkgddnmimb88sj004klszbvkir02f4zlnij8drc6b80gw6jm"; }; configurePhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bdcf575cda6..d4a5d9f9e074 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1152,7 +1152,7 @@ let freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - guile = guile_1_8; + automake = automake114x; }; freetds = callPackage ../development/libraries/freetds { }; @@ -1338,7 +1338,7 @@ let gupnptools = callPackage ../tools/networking/gupnp-tools {}; gvpe = builderDefsPackage ../tools/networking/gvpe { - inherit openssl gmp nettools iproute; + inherit openssl gmp nettools iproute zlib; }; gvolicon = callPackage ../tools/audio/gvolicon {}; @@ -1628,7 +1628,10 @@ let mfoc = callPackage ../tools/security/mfoc { }; - minecraft = callPackage ../games/minecraft { }; + minecraft = callPackage ../games/minecraft { + pulseaudioSupport = config.pulseaudio or true; + pulseaudio = pulseaudio.override { ossWrapper = true; }; + }; minecraft-server = callPackage ../games/minecraft-server { }; @@ -2024,8 +2027,6 @@ let projectm = callPackage ../applications/audio/projectm { }; - proot = callPackage ../tools/system/proot { }; - proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; @@ -2080,6 +2081,8 @@ let privateer = callPackage ../games/privateer { }; + redmine = callPackage ../applications/version-management/redmine { }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; reaverwps = callPackage ../tools/networking/reaver-wps {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 7e4a0fbc4555..a709eb65419a 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -109,6 +109,8 @@ }; by-spec."abbrev"."1.0.x" = self.by-version."abbrev"."1.0.5"; + by-spec."abbrev"."~1.0.4" = + 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.0" = @@ -304,6 +306,26 @@ ]; passthru.names = [ "ansi" ]; }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ansi-regex" ]; + }; 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 { @@ -496,6 +518,8 @@ ]; passthru.names = [ "archy" ]; }; + by-spec."archy"."0.0.2" = + self.by-version."archy"."0.0.2"; by-spec."archy"."^0.0.2" = self.by-version."archy"."0.0.2"; by-spec."argparse"."0.1.15" = @@ -522,6 +546,66 @@ }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.15"; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "array-filter" ]; + }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "array-map" ]; + }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "array-reduce" ]; + }; by-spec."asap"."^1.0.0" = self.by-version."asap"."1.0.0"; by-version."asap"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -774,6 +858,8 @@ self.by-version."async"."0.9.0"; by-spec."async"."^0.2.10" = self.by-version."async"."0.2.10"; + 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" = @@ -782,6 +868,8 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.2.7" = self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.8" = + self.by-version."async"."0.2.10"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.10"; by-spec."async"."~0.7.0" = @@ -1200,6 +1288,28 @@ passthru.names = [ "bcrypt" ]; }; "bcrypt" = self.by-version."bcrypt"."0.8.0"; + by-spec."binary"."~0.3.0" = + self.by-version."binary"."0.3.0"; + by-version."binary"."0.3.0" = lib.makeOverridable 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 []); + 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" ]; + }; by-spec."bindings"."*" = self.by-version."bindings"."1.2.1"; by-version."bindings"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -1311,15 +1421,15 @@ 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.3.4"; - by-version."bluebird"."2.3.4" = lib.makeOverridable self.buildNodePackage { - name = "bluebird-2.3.4"; + self.by-version."bluebird"."2.3.5"; + by-version."bluebird"."2.3.5" = lib.makeOverridable self.buildNodePackage { + name = "bluebird-2.3.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.4.tgz"; - name = "bluebird-2.3.4.tgz"; - sha1 = "9f6c0d1e41d9862bdf4b6af0a4c0a7714602cb85"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.5.tgz"; + name = "bluebird-2.3.5.tgz"; + sha1 = "551366d041fdd09030109c2cab990ec444bf78b6"; }) ]; buildInputs = @@ -1448,6 +1558,260 @@ ]; passthru.names = [ "boom" ]; }; + by-spec."bower"."*" = + self.by-version."bower"."1.3.12"; + by-version."bower"."1.3.12" = lib.makeOverridable 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 []); + deps = { + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; + "archy-0.0.2" = self.by-version."archy"."0.0.2"; + "bower-config-0.5.2" = self.by-version."bower-config"."0.5.2"; + "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.1" = self.by-version."bower-registry-client"."0.2.1"; + "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.2" = self.by-version."fstream"."1.0.2"; + "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0"; + "inquirer-0.7.1" = self.by-version."inquirer"."0.7.1"; + "insight-0.4.3" = self.by-version."insight"."0.4.3"; + "is-root-1.0.0" = self.by-version."is-root"."1.0.0"; + "junk-1.0.0" = self.by-version."junk"."1.0.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"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "mout-0.9.1" = self.by-version."mout"."0.9.1"; + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "opn-1.0.0" = self.by-version."opn"."1.0.0"; + "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; + "p-throttler-0.1.0" = self.by-version."p-throttler"."0.1.0"; + "promptly-0.2.0" = self.by-version."promptly"."0.2.0"; + "q-1.0.1" = self.by-version."q"."1.0.1"; + "request-2.42.0" = self.by-version."request"."2.42.0"; + "request-progress-0.3.0" = self.by-version."request-progress"."0.3.0"; + "retry-0.6.0" = self.by-version."retry"."0.6.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + "shell-quote-1.4.2" = self.by-version."shell-quote"."1.4.2"; + "stringify-object-1.0.0" = self.by-version."stringify-object"."1.0.0"; + "tar-fs-0.5.2" = self.by-version."tar-fs"."0.5.2"; + "tmp-0.0.23" = self.by-version."tmp"."0.0.23"; + "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0"; + "which-1.0.5" = self.by-version."which"."1.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "bower" ]; + }; + "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 { + 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 []); + 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" ]; + }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-endpoint-parser" ]; + }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-endpoint-parser" ]; + }; + 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 { + 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 []); + 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" ]; + }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-logger" ]; + }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bower-logger" ]; + }; + by-spec."bower-registry-client"."~0.2.0" = + self.by-version."bower-registry-client"."0.2.1"; + by-version."bower-registry-client"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "bower-registry-client-0.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.1.tgz"; + name = "bower-registry-client-0.2.1.tgz"; + sha1 = "06fbff982f82a4a4045dc53ac9dcb1c43d9cd591"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-registry-client" or []); + 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-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" ]; + }; + by-spec."bower2nix"."*" = + self.by-version."bower2nix"."2.1.0"; + by-version."bower2nix"."2.1.0" = lib.makeOverridable 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 []); + deps = { + "temp-0.6.0" = self.by-version."temp"."0.6.0"; + "fs.extra-1.2.1" = self.by-version."fs.extra"."1.2.1"; + "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"; + "bower-1.3.12" = self.by-version."bower"."1.3.12"; + "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "clone-0.1.11" = self.by-version."clone"."0.1.11"; + "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" ]; + }; + "bower2nix" = self.by-version."bower2nix"."2.1.0"; by-spec."broadway"."0.2.9" = self.by-version."broadway"."0.2.9"; by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { @@ -1523,16 +1887,16 @@ ]; passthru.names = [ "broadway" ]; }; - by-spec."browser-pack"."^3.0.0" = - self.by-version."browser-pack"."3.1.1"; - by-version."browser-pack"."3.1.1" = lib.makeOverridable self.buildNodePackage { - name = "browser-pack-3.1.1"; + 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 { + name = "browser-pack-3.2.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.1.1.tgz"; - name = "browser-pack-3.1.1.tgz"; - sha1 = "b7600f080d2a7ef1a276ef4c0485a358ba9d1215"; + url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz"; + name = "browser-pack-3.2.0.tgz"; + sha1 = "faa1cbc41487b1acc4747e373e1148adffd0e2d9"; }) ]; buildInputs = @@ -1541,6 +1905,7 @@ "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"; "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; + "defined-0.0.0" = self.by-version."defined"."0.0.0"; "through2-0.5.1" = self.by-version."through2"."0.5.1"; "umd-2.1.0" = self.by-version."umd"."2.1.0"; }; @@ -1588,7 +1953,7 @@ deps = { "hat-0.0.3" = self.by-version."hat"."0.0.3"; "connect-2.26.4" = self.by-version."connect"."2.26.4"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0"; }; peerDependencies = [ @@ -1597,15 +1962,15 @@ }; "browserchannel" = self.by-version."browserchannel"."2.0.0"; by-spec."browserify"."*" = - self.by-version."browserify"."5.12.1"; - by-version."browserify"."5.12.1" = lib.makeOverridable self.buildNodePackage { - name = "browserify-5.12.1"; + self.by-version."browserify"."6.0.2"; + by-version."browserify"."6.0.2" = lib.makeOverridable self.buildNodePackage { + name = "browserify-6.0.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-5.12.1.tgz"; - name = "browserify-5.12.1.tgz"; - sha1 = "54181cf6e777ad59e0fc62a62e2c7867d31603fb"; + url = "http://registry.npmjs.org/browserify/-/browserify-6.0.2.tgz"; + name = "browserify-6.0.2.tgz"; + sha1 = "d6dd7a9f9e909f2e84163e544a9d1f358ddd9d58"; }) ]; buildInputs = @@ -1613,7 +1978,7 @@ 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.1.1" = self.by-version."browser-pack"."3.1.1"; + "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; "browser-resolve-1.3.2" = self.by-version."browser-resolve"."1.3.2"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; "buffer-2.7.0" = self.by-version."buffer"."2.7.0"; @@ -1622,7 +1987,7 @@ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; "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.2.5" = self.by-version."crypto-browserify"."3.2.5"; + "crypto-browserify-3.2.6" = self.by-version."crypto-browserify"."3.2.6"; "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"; @@ -1640,7 +2005,7 @@ "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-0.0.3" = self.by-version."parents"."0.0.3"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; - "process-0.7.0" = self.by-version."process"."0.7.0"; + "process-0.8.0" = self.by-version."process"."0.8.0"; "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; "querystring-es3-0.2.1-0" = self.by-version."querystring-es3"."0.2.1-0"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; @@ -1649,9 +2014,8 @@ "shasum-1.0.0" = self.by-version."shasum"."1.0.0"; "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"; - "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; - "string_decoder-0.0.1" = self.by-version."string_decoder"."0.0.1"; - "subarg-0.0.1" = self.by-version."subarg"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "subarg-1.0.0" = self.by-version."subarg"."1.0.0"; "syntax-error-1.1.1" = self.by-version."syntax-error"."1.1.1"; "through2-1.1.1" = self.by-version."through2"."1.1.1"; "timers-browserify-1.1.0" = self.by-version."timers-browserify"."1.1.0"; @@ -1666,7 +2030,7 @@ ]; passthru.names = [ "browserify" ]; }; - "browserify" = self.by-version."browserify"."5.12.1"; + "browserify" = self.by-version."browserify"."6.0.2"; 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 { @@ -1877,6 +2241,26 @@ }; by-spec."buffer-crc32"."~0.2.1" = self.by-version."buffer-crc32"."0.2.3"; + by-spec."buffers"."~0.1.1" = + self.by-version."buffers"."0.1.1"; + by-version."buffers"."0.1.1" = lib.makeOverridable 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "buffers" ]; + }; by-spec."buffertools"."*" = self.by-version."buffertools"."2.1.2"; by-version."buffertools"."2.1.2" = lib.makeOverridable self.buildNodePackage { @@ -2064,6 +2448,27 @@ ]; passthru.names = [ "callsite" ]; }; + by-spec."cardinal"."0.4.0" = + self.by-version."cardinal"."0.4.0"; + by-version."cardinal"."0.4.0" = lib.makeOverridable 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 []); + deps = { + "redeyed-0.4.4" = self.by-version."redeyed"."0.4.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cardinal" ]; + }; by-spec."caseless"."~0.6.0" = self.by-version."caseless"."0.6.0"; by-version."caseless"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -2107,6 +2512,52 @@ passthru.names = [ "chai" ]; }; "chai" = self.by-version."chai"."1.9.2"; + by-spec."chainsaw"."~0.1.0" = + self.by-version."chainsaw"."0.1.0"; + by-version."chainsaw"."0.1.0" = lib.makeOverridable 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 []); + deps = { + "traverse-0.3.9" = self.by-version."traverse"."0.3.9"; + }; + peerDependencies = [ + ]; + passthru.names = [ "chainsaw" ]; + }; + by-spec."chalk"."0.5.0" = + self.by-version."chalk"."0.5.0"; + by-version."chalk"."0.5.0" = lib.makeOverridable 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 []); + 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"; + "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0"; + "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0"; + "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "chalk" ]; + }; by-spec."chalk"."^0.4.0" = self.by-version."chalk"."0.4.0"; by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -2219,7 +2670,7 @@ ]; passthru.names = [ "child-process-close" ]; }; - by-spec."chmodr"."~0.1.0" = + by-spec."chmodr"."0.1.0" = self.by-version."chmodr"."0.1.0"; by-version."chmodr"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "chmodr-0.1.0"; @@ -2239,6 +2690,8 @@ ]; passthru.names = [ "chmodr" ]; }; + by-spec."chmodr"."~0.1.0" = + self.by-version."chmodr"."0.1.0"; by-spec."chokidar".">=0.8.2" = self.by-version."chokidar"."0.9.0"; by-version."chokidar"."0.9.0" = lib.makeOverridable self.buildNodePackage { @@ -2326,6 +2779,30 @@ ]; passthru.names = [ "cli" ]; }; + 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 { + 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 []); + 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"; + "memoizee-0.3.7" = self.by-version."memoizee"."0.3.7"; + "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cli-color" ]; + }; by-spec."cliff"."0.1.8" = self.by-version."cliff"."0.1.8"; by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -2372,6 +2849,26 @@ ]; passthru.names = [ "cliff" ]; }; + by-spec."clone"."0.1.11" = + self.by-version."clone"."0.1.11"; + by-version."clone"."0.1.11" = lib.makeOverridable 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "clone" ]; + }; by-spec."clone"."0.1.5" = self.by-version."clone"."0.1.5"; by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -2469,7 +2966,7 @@ buildInputs = (self.nativeDeps."cmd-shim" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; }; peerDependencies = [ @@ -2996,21 +3493,21 @@ passthru.names = [ "compress-commons" ]; }; by-spec."compressible"."~2.0.0" = - self.by-version."compressible"."2.0.0"; - by-version."compressible"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "compressible-2.0.0"; + self.by-version."compressible"."2.0.1"; + by-version."compressible"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "compressible-2.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compressible/-/compressible-2.0.0.tgz"; - name = "compressible-2.0.0.tgz"; - sha1 = "90086ce57102e9e2427ee945a5fb2a98dd51dfb4"; + url = "http://registry.npmjs.org/compressible/-/compressible-2.0.1.tgz"; + name = "compressible-2.0.1.tgz"; + sha1 = "3550115793eb3435f7eb16775afe05df1a333ebc"; }) ]; buildInputs = (self.nativeDeps."compressible" or []); deps = { - "mime-db-1.0.3" = self.by-version."mime-db"."1.0.3"; + "mime-db-1.1.0" = self.by-version."mime-db"."1.1.0"; }; peerDependencies = [ ]; @@ -3033,7 +3530,7 @@ deps = { "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "compressible-2.0.0" = self.by-version."compressible"."2.0.0"; + "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; @@ -3131,7 +3628,7 @@ buildInputs = (self.nativeDeps."configstore" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "js-yaml-3.0.2" = self.by-version."js-yaml"."3.0.2"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1"; @@ -3142,6 +3639,8 @@ ]; passthru.names = [ "configstore" ]; }; + by-spec."configstore"."^0.3.1" = + self.by-version."configstore"."0.3.1"; by-spec."connect"."1.x" = self.by-version."connect"."1.9.2"; by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage { @@ -3948,7 +4447,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = { - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; }; peerDependencies = [ ]; @@ -4125,15 +4624,15 @@ passthru.names = [ "crypto" ]; }; by-spec."crypto-browserify"."^3.0.0" = - self.by-version."crypto-browserify"."3.2.5"; - by-version."crypto-browserify"."3.2.5" = lib.makeOverridable self.buildNodePackage { - name = "crypto-browserify-3.2.5"; + self.by-version."crypto-browserify"."3.2.6"; + by-version."crypto-browserify"."3.2.6" = lib.makeOverridable self.buildNodePackage { + name = "crypto-browserify-3.2.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.5.tgz"; - name = "crypto-browserify-3.2.5.tgz"; - sha1 = "26c92bba20c8bfa7c50aa71ca95972b353ebbec2"; + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.6.tgz"; + name = "crypto-browserify-3.2.6.tgz"; + sha1 = "e65a44893ad85138dbf0eaf515675adfd917cdb4"; }) ]; buildInputs = @@ -4356,6 +4855,27 @@ ]; passthru.names = [ "cycle" ]; }; + by-spec."d"."~0.1.1" = + self.by-version."d"."0.1.1"; + by-version."d"."0.1.1" = lib.makeOverridable 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 []); + deps = { + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "d" ]; + }; by-spec."dashdash"."1.3.2" = self.by-version."dashdash"."1.3.2"; by-version."dashdash"."1.3.2" = lib.makeOverridable self.buildNodePackage { @@ -4590,6 +5110,33 @@ ]; passthru.names = [ "debuglog" ]; }; + 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 { + 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 []); + deps = { + "q-1.0.1" = self.by-version."q"."1.0.1"; + "mkpath-0.1.0" = self.by-version."mkpath"."0.1.0"; + "binary-0.3.0" = self.by-version."binary"."0.3.0"; + "touch-0.0.2" = self.by-version."touch"."0.0.2"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "decompress-zip" ]; + }; 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 { @@ -5160,26 +5707,6 @@ ]; passthru.names = [ "dtrace-provider" ]; }; - by-spec."duplexer"."~0.1.1" = - self.by-version."duplexer"."0.1.1"; - by-version."duplexer"."0.1.1" = lib.makeOverridable 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 []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "duplexer" ]; - }; by-spec."duplexer2"."0.0.2" = self.by-version."duplexer2"."0.0.2"; by-version."duplexer2"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -5346,6 +5873,27 @@ ]; passthru.names = [ "end-of-stream" ]; }; + 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 { + 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 []); + deps = { + "once-1.3.1" = self.by-version."once"."1.3.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "end-of-stream" ]; + }; by-spec."entities"."1.0" = self.by-version."entities"."1.0.0"; by-version."entities"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5412,6 +5960,75 @@ ]; passthru.names = [ "errorhandler" ]; }; + 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 []); + deps = { + "es6-iterator-0.1.1" = self.by-version."es6-iterator"."0.1.1"; + "es6-symbol-0.1.0" = self.by-version."es6-symbol"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "es5-ext" ]; + }; + by-spec."es5-ext"."~0.10.4" = + self.by-version."es5-ext"."0.10.4"; + by-spec."es6-iterator"."~0.1.1" = + self.by-version."es6-iterator"."0.1.1"; + by-version."es6-iterator"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "es6-iterator-0.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.1.tgz"; + name = "es6-iterator-0.1.1.tgz"; + sha1 = "5e136c899aa1c26296414f90859b73934812d275"; + }) + ]; + buildInputs = + (self.nativeDeps."es6-iterator" or []); + 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"; + "es6-symbol-0.1.0" = self.by-version."es6-symbol"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "es6-iterator" ]; + }; + by-spec."es6-symbol"."0.1.x" = + self.by-version."es6-symbol"."0.1.0"; + by-version."es6-symbol"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "es6-symbol-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.0.tgz"; + name = "es6-symbol-0.1.0.tgz"; + sha1 = "ba5878f37a652f6c713244716fc7b24d61d2dc39"; + }) + ]; + buildInputs = + (self.nativeDeps."es6-symbol" or []); + 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"; + }; + peerDependencies = [ + ]; + passthru.names = [ "es6-symbol" ]; + }; by-spec."escape-html"."*" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -5789,6 +6406,28 @@ ]; passthru.names = [ "etag" ]; }; + 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"; + "d-0.1.1" = self.by-version."d"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "event-emitter" ]; + }; 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 { @@ -6496,6 +7135,28 @@ by-spec."eyes".">=0.1.6" = self.by-version."eyes"."0.1.8"; by-spec."faye-websocket"."*" = + self.by-version."faye-websocket"."0.7.3"; + by-version."faye-websocket"."0.7.3" = lib.makeOverridable 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 []); + deps = { + "websocket-driver-0.3.6" = self.by-version."websocket-driver"."0.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "faye-websocket" ]; + }; + "faye-websocket" = self.by-version."faye-websocket"."0.7.3"; + by-spec."faye-websocket"."0.7.2" = self.by-version."faye-websocket"."0.7.2"; by-version."faye-websocket"."0.7.2" = lib.makeOverridable self.buildNodePackage { name = "faye-websocket-0.7.2"; @@ -6510,15 +7171,36 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = { - "websocket-driver-0.3.5" = self.by-version."websocket-driver"."0.3.5"; + "websocket-driver-0.3.6" = self.by-version."websocket-driver"."0.3.6"; }; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; - "faye-websocket" = self.by-version."faye-websocket"."0.7.2"; - by-spec."faye-websocket"."0.7.2" = - self.by-version."faye-websocket"."0.7.2"; + 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 { + 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 []); + 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" ]; + }; by-spec."fields"."~0.1.11" = self.by-version."fields"."0.1.16"; by-version."fields"."0.1.16" = lib.makeOverridable self.buildNodePackage { @@ -6562,6 +7244,8 @@ ]; passthru.names = [ "figures" ]; }; + by-spec."figures"."^1.3.2" = + self.by-version."figures"."1.3.3"; by-spec."fileset"."0.1.x" = self.by-version."fileset"."0.1.5"; by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -7286,7 +7970,7 @@ buildInputs = (self.nativeDeps."fs-vacuum" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = [ @@ -7330,7 +8014,7 @@ buildInputs = (self.nativeDeps."fs-write-stream-atomic" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; }; peerDependencies = [ ]; @@ -7359,6 +8043,8 @@ ]; passthru.names = [ "fs.extra" ]; }; + by-spec."fs.extra".">=1.2.1 <2" = + self.by-version."fs.extra"."1.2.1"; by-spec."fsevents"."0.3.0" = self.by-version."fsevents"."0.3.0"; by-version."fsevents"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -7395,7 +8081,7 @@ buildInputs = (self.nativeDeps."fstream" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "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"; @@ -7421,7 +8107,7 @@ buildInputs = (self.nativeDeps."fstream" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "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"; @@ -7455,6 +8141,8 @@ ]; passthru.names = [ "fstream-ignore" ]; }; + by-spec."fstream-ignore"."~1.0.1" = + self.by-version."fstream-ignore"."1.0.1"; by-spec."fstream-npm"."~1.0.0" = self.by-version."fstream-npm"."1.0.0"; by-version."fstream-npm"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -7643,7 +8331,7 @@ buildInputs = (self.nativeDeps."glob" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "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"; @@ -7701,6 +8389,8 @@ self.by-version."glob"."3.2.11"; by-spec."glob"."4.x" = self.by-version."glob"."4.0.6"; + by-spec."glob".">=3.2.7 <4" = + self.by-version."glob"."3.2.11"; by-spec."glob"."^4.0.0" = self.by-version."glob"."4.0.6"; by-spec."glob"."^4.0.2" = @@ -7740,6 +8430,8 @@ self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.9" = self.by-version."glob"."3.2.11"; + by-spec."glob"."~4.0.2" = + self.by-version."glob"."4.0.6"; by-spec."glob"."~4.0.5" = self.by-version."glob"."4.0.6"; by-spec."glob-stream"."^3.1.5" = @@ -7833,16 +8525,37 @@ ]; passthru.names = [ "globule" ]; }; - by-spec."graceful-fs"."2 || 3" = - self.by-version."graceful-fs"."3.0.2"; - by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-3.0.2"; + by-spec."got"."^0.3.0" = + self.by-version."got"."0.3.0"; + by-version."got"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "got-0.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; - name = "graceful-fs-3.0.2.tgz"; - sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + url = "http://registry.npmjs.org/got/-/got-0.3.0.tgz"; + name = "got-0.3.0.tgz"; + sha1 = "888ec66ca4bc735ab089dbe959496d0f79485493"; + }) + ]; + buildInputs = + (self.nativeDeps."got" or []); + deps = { + "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "got" ]; + }; + by-spec."graceful-fs"."2 || 3" = + self.by-version."graceful-fs"."3.0.3"; + by-version."graceful-fs"."3.0.3" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-3.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.3.tgz"; + name = "graceful-fs-3.0.3.tgz"; + sha1 = "277141085e739ae7d54361119a62797b08a1d8c0"; }) ]; buildInputs = @@ -7854,13 +8567,13 @@ passthru.names = [ "graceful-fs" ]; }; by-spec."graceful-fs"."3" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.3"; by-spec."graceful-fs".">3.0.1 <4.0.0-0" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.3"; by-spec."graceful-fs"."^3.0.0" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.3"; by-spec."graceful-fs"."^3.0.2" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.3"; by-spec."graceful-fs"."~1" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -7906,11 +8619,11 @@ by-spec."graceful-fs"."~2.0.1" = self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~3.0.0" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.3"; by-spec."graceful-fs"."~3.0.1" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.3"; by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.2"; + self.by-version."graceful-fs"."3.0.3"; by-spec."gridfs-stream"."*" = self.by-version."gridfs-stream"."0.5.1"; by-version."gridfs-stream"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -8464,6 +9177,28 @@ ]; passthru.names = [ "handlebars" ]; }; + by-spec."handlebars"."~2.0.0" = + self.by-version."handlebars"."2.0.0"; + by-version."handlebars"."2.0.0" = lib.makeOverridable 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 []); + 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" ]; + }; 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 { @@ -9323,6 +10058,61 @@ ]; passthru.names = [ "inline-source-map" ]; }; + by-spec."inquirer"."0.7.1" = + self.by-version."inquirer"."0.7.1"; + by-version."inquirer"."0.7.1" = lib.makeOverridable 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 []); + 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.3" = self.by-version."figures"."1.3.3"; + "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.12" = self.by-version."rx"."2.3.12"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "inquirer" ]; + }; + by-spec."inquirer"."^0.6.0" = + self.by-version."inquirer"."0.6.0"; + by-version."inquirer"."0.6.0" = lib.makeOverridable 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 []); + 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.12" = self.by-version."rx"."2.3.12"; + "through-2.3.6" = self.by-version."through"."2.3.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "inquirer" ]; + }; by-spec."insert-module-globals"."^6.1.0" = self.by-version."insert-module-globals"."6.1.0"; by-version."insert-module-globals"."6.1.0" = lib.makeOverridable self.buildNodePackage { @@ -9349,6 +10139,35 @@ ]; passthru.names = [ "insert-module-globals" ]; }; + by-spec."insight"."0.4.3" = + self.by-version."insight"."0.4.3"; + by-version."insight"."0.4.3" = lib.makeOverridable 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 []); + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; + "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"; + "request-2.45.0" = self.by-version."request"."2.45.0"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "insight" ]; + }; by-spec."interpret"."^0.3.2" = self.by-version."interpret"."0.3.7"; by-version."interpret"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -9369,6 +10188,26 @@ ]; passthru.names = [ "interpret" ]; }; + by-spec."intersect"."~0.0.3" = + self.by-version."intersect"."0.0.3"; + by-version."intersect"."0.0.3" = lib.makeOverridable 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "intersect" ]; + }; by-spec."ipaddr.js"."0.1.2" = self.by-version."ipaddr.js"."0.1.2"; by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -9486,6 +10325,26 @@ ]; passthru.names = [ "is-promise" ]; }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "is-root" ]; + }; 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 { @@ -10141,6 +11000,26 @@ ]; passthru.names = [ "jstransform" ]; }; + by-spec."junk"."~1.0.0" = + self.by-version."junk"."1.0.0"; + by-version."junk"."1.0.0" = lib.makeOverridable 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "junk" ]; + }; by-spec."karma"."*" = self.by-version."karma"."0.12.24"; by-version."karma"."0.12.24" = lib.makeOverridable self.buildNodePackage { @@ -10613,6 +11492,27 @@ ]; passthru.names = [ "labeled-stream-splicer" ]; }; + 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 { + 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 []); + deps = { + "package-json-0.2.0" = self.by-version."package-json"."0.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "latest-version" ]; + }; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -10713,7 +11613,7 @@ buildInputs = (self.nativeDeps."less" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "request-2.40.0" = self.by-version."request"."2.40.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; @@ -11108,6 +12008,29 @@ ]; passthru.names = [ "lodash._shimkeys" ]; }; + 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 { + 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 []); + 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" ]; + }; 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 { @@ -11153,6 +12076,26 @@ ]; passthru.names = [ "lodash.escape" ]; }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "lodash.isfunction" ]; + }; 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 { @@ -11197,6 +12140,27 @@ ]; passthru.names = [ "lodash.keys" ]; }; + 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 { + 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 []); + deps = { + "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "lodash.now" ]; + }; 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 { @@ -11432,8 +12396,49 @@ ]; passthru.names = [ "lru-cache" ]; }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "lru-cache" ]; + }; by-spec."lru-cache"."~2.5.0" = self.by-version."lru-cache"."2.5.0"; + by-spec."lru-queue"."0.1.x" = + self.by-version."lru-queue"."0.1.0"; + by-version."lru-queue"."0.1.0" = lib.makeOverridable 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 []); + deps = { + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "lru-queue" ]; + }; by-spec."lsmod"."~0.0.3" = self.by-version."lsmod"."0.0.3"; by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -11574,15 +12579,15 @@ passthru.names = [ "maxmin" ]; }; by-spec."meat"."*" = - self.by-version."meat"."0.2.5"; - by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "meat-0.2.5"; + self.by-version."meat"."0.3.2"; + by-version."meat"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "meat-0.3.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/meat/-/meat-0.2.5.tgz"; - name = "meat-0.2.5.tgz"; - sha1 = "8f277ec68f51794365e271166c7b7bba8d046869"; + url = "http://registry.npmjs.org/meat/-/meat-0.3.2.tgz"; + name = "meat-0.3.2.tgz"; + sha1 = "f385317a6273c6d92d00b40de91e99554cc6f194"; }) ]; buildInputs = @@ -11599,7 +12604,7 @@ ]; passthru.names = [ "meat" ]; }; - "meat" = self.by-version."meat"."0.2.5"; + "meat" = self.by-version."meat"."0.3.2"; by-spec."media-typer"."0.2.0" = self.by-version."media-typer"."0.2.0"; by-version."media-typer"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -11640,6 +12645,32 @@ ]; passthru.names = [ "media-typer" ]; }; + by-spec."memoizee"."0.3.x" = + self.by-version."memoizee"."0.3.7"; + by-version."memoizee"."0.3.7" = lib.makeOverridable self.buildNodePackage { + name = "memoizee-0.3.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.7.tgz"; + name = "memoizee-0.3.7.tgz"; + sha1 = "13ccfdd580e56cf7c10f4b6342a6800ef87e975b"; + }) + ]; + buildInputs = + (self.nativeDeps."memoizee" or []); + 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"; + "event-emitter-0.3.1" = self.by-version."event-emitter"."0.3.1"; + "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" ]; + }; 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 { @@ -11896,27 +12927,7 @@ self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.0.1" = - self.by-version."mime-db"."1.0.3"; - by-version."mime-db"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "mime-db-1.0.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.0.3.tgz"; - name = "mime-db-1.0.3.tgz"; - sha1 = "5680b12300b3cecea5620f20f269ee80f2632d81"; - }) - ]; - buildInputs = - (self.nativeDeps."mime-db" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mime-db" ]; - }; - by-spec."mime-db"."~1.1.0" = + by-spec."mime-db"."1.x" = self.by-version."mime-db"."1.1.0"; by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "mime-db-1.1.0"; @@ -11936,6 +12947,8 @@ ]; passthru.names = [ "mime-db" ]; }; + by-spec."mime-db"."~1.1.0" = + self.by-version."mime-db"."1.1.0"; by-spec."mime-types"."~1.0.0" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -12376,6 +13389,26 @@ self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.5.0" = 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mkpath" ]; + }; by-spec."mocha"."*" = self.by-version."mocha"."1.21.4"; by-version."mocha"."1.21.4" = lib.makeOverridable self.buildNodePackage { @@ -12901,6 +13934,26 @@ ]; passthru.names = [ "morgan" ]; }; + by-spec."mout"."~0.9.0" = + self.by-version."mout"."0.9.1"; + by-version."mout"."0.9.1" = lib.makeOverridable 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mout" ]; + }; by-spec."mpath"."0.1.1" = self.by-version."mpath"."0.1.1"; by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -13131,7 +14184,7 @@ ]; passthru.names = [ "muri" ]; }; - by-spec."mute-stream"."~0.0.4" = + 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 { name = "mute-stream-0.0.4"; @@ -13151,6 +14204,8 @@ ]; passthru.names = [ "mute-stream" ]; }; + 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 { @@ -13516,6 +14571,26 @@ ]; passthru.names = [ "net-ping" ]; }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "next-tick" ]; + }; by-spec."nib"."0.5.0" = self.by-version."nib"."0.5.0"; by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -13634,13 +14709,13 @@ deps = { "fstream-1.0.2" = self.by-version."fstream"."1.0.2"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-4.0.3" = self.by-version."semver"."4.0.3"; "tar-1.0.1" = self.by-version."tar"."1.0.1"; @@ -14066,6 +15141,10 @@ ]; passthru.names = [ "nopt" ]; }; + by-spec."nopt"."~2.2.0" = + self.by-version."nopt"."2.2.1"; + by-spec."nopt"."~3.0.0" = + self.by-version."nopt"."3.0.1"; by-spec."nopt"."~3.0.1" = self.by-version."nopt"."3.0.1"; by-spec."normalize-package-data"."^1.0.0" = @@ -14132,7 +15211,7 @@ "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.0.6" = self.by-version."glob"."4.0.6"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "ini-1.2.1" = self.by-version."ini"."1.2.1"; @@ -14261,7 +15340,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.0.11" = self.by-version."semver"."2.0.11"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -14292,12 +15371,12 @@ (self.nativeDeps."npm-registry-client" or []); deps = { "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "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-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; "retry-0.6.0" = self.by-version."retry"."0.6.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-4.0.3" = self.by-version."semver"."4.0.3"; @@ -14324,12 +15403,12 @@ (self.nativeDeps."npm-registry-client" or []); deps = { "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "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-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; "retry-0.6.0" = self.by-version."retry"."0.6.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-4.0.3" = self.by-version."semver"."4.0.3"; @@ -14476,6 +15555,8 @@ ]; passthru.names = [ "npmconf" ]; }; + by-spec."npmconf"."^2.0.1" = + self.by-version."npmconf"."2.1.0"; by-spec."npmconf"."^2.1.0" = self.by-version."npmconf"."2.1.0"; by-spec."npmconf"."~0.1.2" = @@ -14659,7 +15740,7 @@ ]; passthru.names = [ "object-additions" ]; }; - by-spec."object-assign"."~0.3.1" = + 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 { name = "object-assign-0.3.1"; @@ -14679,6 +15760,28 @@ ]; passthru.names = [ "object-assign" ]; }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "object-assign" ]; + }; + by-spec."object-assign"."~0.3.1" = + self.by-version."object-assign"."0.3.1"; 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 { @@ -14787,6 +15890,26 @@ self.by-version."once"."1.3.1"; by-spec."once"."~1.1.1" = 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "once" ]; + }; by-spec."once"."~1.3.0" = self.by-version."once"."1.3.1"; by-spec."open"."0.0.2" = @@ -14869,6 +15992,26 @@ ]; passthru.names = [ "openid" ]; }; + by-spec."opn"."~1.0.0" = + self.by-version."opn"."1.0.0"; + by-version."opn"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "opn-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/opn/-/opn-1.0.0.tgz"; + name = "opn-1.0.0.tgz"; + sha1 = "1baa822af649a45fca744179a29a8b4c19346574"; + }) + ]; + buildInputs = + (self.nativeDeps."opn" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "opn" ]; + }; by-spec."optimist"."*" = self.by-version."optimist"."0.6.1"; by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -14965,15 +16108,15 @@ by-spec."optimist"."~0.6.1" = self.by-version."optimist"."0.6.1"; by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.5"; - by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "options-0.0.5"; + self.by-version."options"."0.0.6"; + by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "options-0.0.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; - name = "options-0.0.5.tgz"; - sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; + url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; + name = "options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }) ]; buildInputs = @@ -15070,6 +16213,28 @@ ]; passthru.names = [ "os-browserify" ]; }; + 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"; + 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 []); + 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"; + }; + peerDependencies = [ + ]; + passthru.names = [ "os-name" ]; + }; by-spec."osenv"."0" = self.by-version."osenv"."0.1.0"; by-version."osenv"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -15110,10 +16275,33 @@ ]; passthru.names = [ "osenv" ]; }; + by-spec."osenv"."0.1.0" = + self.by-version."osenv"."0.1.0"; by-spec."osenv"."^0.1.0" = self.by-version."osenv"."0.1.0"; by-spec."osenv"."~0.1.0" = 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 { + 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 []); + deps = { + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "osx-release" ]; + }; by-spec."owl-deepcopy"."*" = self.by-version."owl-deepcopy"."0.0.4"; by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -15137,6 +16325,49 @@ "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 { + 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 []); + deps = { + "q-0.9.7" = self.by-version."q"."0.9.7"; + }; + peerDependencies = [ + ]; + passthru.names = [ "p-throttler" ]; + }; + 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 { + 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 []); + 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" ]; + }; by-spec."pako"."~0.2.0" = self.by-version."pako"."0.2.5"; by-version."pako"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -15716,16 +16947,16 @@ ]; passthru.names = [ "pretty-hrtime" ]; }; - by-spec."process"."^0.7.0" = - self.by-version."process"."0.7.0"; - by-version."process"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "process-0.7.0"; + by-spec."process"."^0.8.0" = + self.by-version."process"."0.8.0"; + by-version."process"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "process-0.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/process/-/process-0.7.0.tgz"; - name = "process-0.7.0.tgz"; - sha1 = "c52208161a34adf3812344ae85d3e6150469389d"; + url = "http://registry.npmjs.org/process/-/process-0.8.0.tgz"; + name = "process-0.8.0.tgz"; + sha1 = "7bbaf7187fe6ded3fd5be0cb6103fba9cacb9798"; }) ]; buildInputs = @@ -15867,6 +17098,27 @@ ]; passthru.names = [ "prompt" ]; }; + by-spec."promptly"."0.2.0" = + self.by-version."promptly"."0.2.0"; + by-version."promptly"."0.2.0" = lib.makeOverridable 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 []); + deps = { + "read-1.0.5" = self.by-version."read"."1.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "promptly" ]; + }; by-spec."promzard"."~0.2.0" = self.by-version."promzard"."0.2.2"; by-version."promzard"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -15974,6 +17226,28 @@ }; by-spec."ps-tree"."~0.0.3" = self.by-version."ps-tree"."0.0.3"; + by-spec."pump"."^0.3.5" = + self.by-version."pump"."0.3.5"; + by-version."pump"."0.3.5" = lib.makeOverridable 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 []); + 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" ]; + }; by-spec."punycode"."1.2.4" = self.by-version."punycode"."1.2.4"; by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -16061,7 +17335,7 @@ ]; passthru.names = [ "q" ]; }; - by-spec."q"."~0.9.6" = + 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"; @@ -16081,9 +17355,11 @@ ]; passthru.names = [ "q" ]; }; + by-spec."q"."~0.9.6" = + self.by-version."q"."0.9.7"; by-spec."q"."~0.9.7" = self.by-version."q"."0.9.7"; - by-spec."q"."~1.0.1" = + by-spec."q"."~1.0.0" = self.by-version."q"."1.0.1"; by-version."q"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "q-1.0.1"; @@ -16103,6 +17379,8 @@ ]; passthru.names = [ "q" ]; }; + by-spec."q"."~1.0.1" = + self.by-version."q"."1.0.1"; by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -16696,7 +17974,7 @@ "semver-4.0.3" = self.by-version."semver"."4.0.3"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; }; peerDependencies = [ ]; @@ -16722,7 +18000,7 @@ "glob-4.0.6" = self.by-version."glob"."4.0.6"; "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.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; }; peerDependencies = [ ]; @@ -16915,6 +18193,29 @@ ]; passthru.names = [ "readdirp" ]; }; + 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 []); + 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"; + }; + peerDependencies = [ + ]; + passthru.names = [ "readline2" ]; + }; by-spec."realize-package-specifier"."~1.1.0" = self.by-version."realize-package-specifier"."1.1.0"; by-version."realize-package-specifier"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -16957,6 +18258,27 @@ ]; passthru.names = [ "recursive-readdir" ]; }; + by-spec."redeyed"."~0.4.0" = + self.by-version."redeyed"."0.4.4"; + by-version."redeyed"."0.4.4" = lib.makeOverridable 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 []); + deps = { + "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "redeyed" ]; + }; by-spec."redis"."*" = self.by-version."redis"."0.12.1"; by-version."redis"."0.12.1" = lib.makeOverridable self.buildNodePackage { @@ -17103,6 +18425,27 @@ ]; passthru.names = [ "regexp-clone" ]; }; + 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 { + 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 []); + deps = { + "npmconf-2.1.0" = self.by-version."npmconf"."2.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "registry-url" ]; + }; by-spec."replace"."~0.2.4" = self.by-version."replace"."0.2.10"; by-version."replace"."0.2.10" = lib.makeOverridable self.buildNodePackage { @@ -17127,15 +18470,15 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.44.0"; - by-version."request"."2.44.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.44.0"; + self.by-version."request"."2.45.0"; + by-version."request"."2.45.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.45.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.44.0.tgz"; - name = "request-2.44.0.tgz"; - sha1 = "78d62454d68853cadfb07ad31f58b9ec98072ea8"; + url = "http://registry.npmjs.org/request/-/request-2.45.0.tgz"; + name = "request-2.45.0.tgz"; + sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c"; }) ]; buildInputs = @@ -17149,8 +18492,8 @@ "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "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"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; @@ -17162,9 +18505,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.44.0"; + self.by-version."request"."2.45.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.44.0"; + self.by-version."request"."2.45.0"; by-spec."request"."2.16.x" = self.by-version."request"."2.16.6"; by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage { @@ -17285,9 +18628,11 @@ passthru.names = [ "request" ]; }; by-spec."request"."^2.36.0" = - self.by-version."request"."2.44.0"; + self.by-version."request"."2.45.0"; + by-spec."request"."^2.40.0" = + self.by-version."request"."2.45.0"; by-spec."request"."~2" = - self.by-version."request"."2.44.0"; + self.by-version."request"."2.45.0"; by-spec."request"."~2.27.0" = self.by-version."request"."2.27.0"; by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { @@ -17326,6 +18671,60 @@ self.by-version."request"."2.42.0"; by-spec."request"."~2.44.0" = self.by-version."request"."2.44.0"; + by-version."request"."2.44.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.44.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.44.0.tgz"; + name = "request-2.44.0.tgz"; + sha1 = "78d62454d68853cadfb07ad31f58b9ec98072ea8"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = { + "bl-0.9.3" = self.by-version."bl"."0.9.3"; + "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.1" = self.by-version."node-uuid"."1.4.1"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + "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"; + "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; + "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 = [ + ]; + passthru.names = [ "request" ]; + }; + 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 { + 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 []); + deps = { + "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "request-progress" ]; + }; 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 { @@ -17347,6 +18746,27 @@ ]; passthru.names = [ "request-progress" ]; }; + 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 { + 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 []); + deps = { + "retry-0.6.1" = self.by-version."retry"."0.6.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "request-replay" ]; + }; by-spec."requirejs"."~2.1" = self.by-version."requirejs"."2.1.15"; by-version."requirejs"."2.1.15" = lib.makeOverridable self.buildNodePackage { @@ -17492,7 +18912,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = { - "bluebird-2.3.4" = self.by-version."bluebird"."2.3.4"; + "bluebird-2.3.5" = self.by-version."bluebird"."2.3.5"; }; peerDependencies = [ ]; @@ -17742,6 +19162,26 @@ ]; passthru.names = [ "ruglify" ]; }; + by-spec."rx"."^2.2.27" = + self.by-version."rx"."2.3.12"; + by-version."rx"."2.3.12" = lib.makeOverridable self.buildNodePackage { + name = "rx-2.3.12"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rx/-/rx-2.3.12.tgz"; + name = "rx-2.3.12.tgz"; + sha1 = "9bdc2c8e12cb0a62e528947de458277849f0c2f4"; + }) + ]; + buildInputs = + (self.nativeDeps."rx" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "rx" ]; + }; by-spec."s3http"."*" = self.by-version."s3http"."0.0.5"; by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -18034,6 +19474,10 @@ self.by-version."semver"."4.0.3"; by-spec."semver".">=2.0.10 <3.0.0" = self.by-version."semver"."2.3.2"; + by-spec."semver".">=2.2.1 <3" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.2.1" = + self.by-version."semver"."2.3.2"; by-spec."semver"."^2.3.0" = self.by-version."semver"."2.3.2"; by-spec."semver"."^2.3.0 || 3.x || 4" = @@ -18120,10 +19564,33 @@ ]; passthru.names = [ "semver" ]; }; + by-spec."semver"."~2.3.0" = + self.by-version."semver"."2.3.2"; by-spec."semver"."~3.0.1" = self.by-version."semver"."3.0.1"; by-spec."semver"."~4.0.0" = self.by-version."semver"."4.0.3"; + 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 { + 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 []); + deps = { + "semver-2.3.2" = self.by-version."semver"."2.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "semver-diff" ]; + }; by-spec."send"."*" = self.by-version."send"."0.9.3"; by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { @@ -18456,7 +19923,7 @@ buildInputs = (self.nativeDeps."sha" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; }; peerDependencies = [ @@ -18544,6 +20011,30 @@ ]; passthru.names = [ "shell-quote" ]; }; + 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 { + 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 []); + 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" ]; + }; by-spec."shelljs"."*" = self.by-version."shelljs"."0.3.0"; by-version."shelljs"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -19359,27 +20850,6 @@ ]; passthru.names = [ "stream-browserify" ]; }; - 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 { - 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 []); - deps = { - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "stream-combiner" ]; - }; 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 { @@ -19531,27 +21001,28 @@ ]; passthru.names = [ "string" ]; }; - 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 { - name = "string_decoder-0.0.1"; + 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 { + name = "string-length-0.1.2"; 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"; + 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_decoder" or []); + (self.nativeDeps."string-length" or []); deps = { + "strip-ansi-0.2.2" = self.by-version."strip-ansi"."0.2.2"; }; peerDependencies = [ ]; - passthru.names = [ "string_decoder" ]; + passthru.names = [ "string-length" ]; }; - by-spec."string_decoder"."~0.10.x" = + 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 { name = "string_decoder-0.10.31"; @@ -19571,6 +21042,28 @@ ]; passthru.names = [ "string_decoder" ]; }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "stringify-object" ]; + }; by-spec."stringstream"."~0.0.4" = self.by-version."stringstream"."0.0.4"; by-version."stringstream"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -19591,6 +21084,27 @@ ]; passthru.names = [ "stringstream" ]; }; + 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 { + 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 []); + deps = { + "ansi-regex-0.1.0" = self.by-version."ansi-regex"."0.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "strip-ansi" ]; + }; 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 { @@ -19809,6 +21323,27 @@ ]; passthru.names = [ "subarg" ]; }; + by-spec."subarg"."^1.0.0" = + self.by-version."subarg"."1.0.0"; + by-version."subarg"."1.0.0" = lib.makeOverridable 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 []); + deps = { + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "subarg" ]; + }; by-spec."superagent"."0.19.0" = self.by-version."superagent"."0.19.0"; by-version."superagent"."0.19.0" = lib.makeOverridable self.buildNodePackage { @@ -20099,7 +21634,30 @@ self.by-version."tar"."1.0.1"; by-spec."tar"."~1.0.1" = self.by-version."tar"."1.0.1"; - by-spec."tar-stream"."~0.4.0" = + 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 { + 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 []); + 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" ]; + }; + 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 { name = "tar-stream-0.4.7"; @@ -20123,6 +21681,8 @@ ]; passthru.names = [ "tar-stream" ]; }; + by-spec."tar-stream"."~0.4.0" = + self.by-version."tar-stream"."0.4.7"; by-spec."temp"."*" = self.by-version."temp"."0.8.1"; by-version."temp"."0.8.1" = lib.makeOverridable self.buildNodePackage { @@ -20365,6 +21925,28 @@ ]; passthru.names = [ "timers-browserify" ]; }; + by-spec."timers-ext"."0.1.x" = + self.by-version."timers-ext"."0.1.0"; + by-version."timers-ext"."0.1.0" = lib.makeOverridable 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"; + "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "timers-ext" ]; + }; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -20462,6 +22044,26 @@ passthru.names = [ "titanium" ]; }; "titanium" = self.by-version."titanium"."3.4.0"; + by-spec."tmp"."0.0.23" = + self.by-version."tmp"."0.0.23"; + by-version."tmp"."0.0.23" = lib.makeOverridable 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "tmp" ]; + }; by-spec."tmp"."0.0.24" = self.by-version."tmp"."0.0.24"; by-version."tmp"."0.0.24" = lib.makeOverridable self.buildNodePackage { @@ -20484,6 +22086,27 @@ }; by-spec."tmp"."~0.0.20" = self.by-version."tmp"."0.0.24"; + by-spec."touch"."0.0.2" = + self.by-version."touch"."0.0.2"; + by-version."touch"."0.0.2" = lib.makeOverridable 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 []); + deps = { + "nopt-1.0.10" = self.by-version."nopt"."1.0.10"; + }; + peerDependencies = [ + ]; + passthru.names = [ "touch" ]; + }; 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 { @@ -20505,6 +22128,8 @@ ]; passthru.names = [ "tough-cookie" ]; }; + by-spec."tough-cookie"."^0.12.1" = + self.by-version."tough-cookie"."0.12.1"; by-spec."traceur"."0.0.55" = self.by-version."traceur"."0.0.55"; by-version."traceur"."0.0.55" = lib.makeOverridable self.buildNodePackage { @@ -20551,6 +22176,26 @@ ]; passthru.names = [ "transformers" ]; }; + 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 { + 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 []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "traverse" ]; + }; by-spec."truncate"."~1.0.2" = self.by-version."truncate"."1.0.2"; by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -20779,15 +22424,15 @@ passthru.names = [ "typedarray" ]; }; by-spec."typescript"."*" = - self.by-version."typescript"."1.0.1"; - by-version."typescript"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "typescript-1.0.1"; + self.by-version."typescript"."1.1.0-1"; + by-version."typescript"."1.1.0-1" = lib.makeOverridable self.buildNodePackage { + name = "typescript-1.1.0-1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz"; - name = "typescript-1.0.1.tgz"; - sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a"; + url = "http://registry.npmjs.org/typescript/-/typescript-1.1.0-1.tgz"; + name = "typescript-1.1.0-1.tgz"; + sha1 = "ad83fb48dd52312564fc795fb2e1ecc43d5e9d6e"; }) ]; buildInputs = @@ -20798,7 +22443,7 @@ ]; passthru.names = [ "typescript" ]; }; - "typescript" = self.by-version."typescript"."1.0.1"; + "typescript" = self.by-version."typescript"."1.1.0-1"; by-spec."uglify-js"."*" = self.by-version."uglify-js"."2.4.15"; by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage { @@ -21261,6 +22906,31 @@ ]; passthru.names = [ "unique-stream" ]; }; + 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 { + 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 []); + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; + "latest-version-0.2.0" = self.by-version."latest-version"."0.2.0"; + "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.1.8" = self.by-version."update-notifier"."0.1.10"; by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage { @@ -21278,7 +22948,7 @@ deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -21837,7 +23507,7 @@ deps = { "glob-stream-3.1.15" = self.by-version."glob-stream"."3.1.15"; "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6"; - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0"; @@ -22094,15 +23764,15 @@ }; "webdrvr" = self.by-version."webdrvr"."2.43.0-0"; by-spec."websocket-driver".">=0.3.1" = - self.by-version."websocket-driver"."0.3.5"; - by-version."websocket-driver"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.3.5"; + self.by-version."websocket-driver"."0.3.6"; + by-version."websocket-driver"."0.3.6" = lib.makeOverridable self.buildNodePackage { + name = "websocket-driver-0.3.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.5.tgz"; - name = "websocket-driver-0.3.5.tgz"; - sha1 = "e3a51ff538f1653a49e62d78ecfc1eb1bde9e5a0"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.6.tgz"; + name = "websocket-driver-0.3.6.tgz"; + sha1 = "85d03e26be0b820b4466a78bbf36a6596bc2aa75"; }) ]; buildInputs = @@ -22113,6 +23783,8 @@ ]; passthru.names = [ "websocket-driver" ]; }; + by-spec."websocket-driver".">=0.3.6" = + self.by-version."websocket-driver"."0.3.6"; by-spec."when"."~3.4.6" = self.by-version."when"."3.4.6"; by-version."when"."3.4.6" = lib.makeOverridable self.buildNodePackage { @@ -22441,7 +24113,7 @@ buildInputs = (self.nativeDeps."write-file-atomic" or []); deps = { - "graceful-fs-3.0.2" = self.by-version."graceful-fs"."3.0.2"; + "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; }; peerDependencies = [ @@ -22466,7 +24138,7 @@ "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.5" = self.by-version."options"."0.0.5"; + "options-0.0.6" = self.by-version."options"."0.0.6"; }; peerDependencies = [ ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 0550048a13ee..500c3eb5ad65 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -126,4 +126,6 @@ , "shelljs" , "typescript" , "git-run" +, "bower" +, "bower2nix" ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9613fe5f83fa..39ada5a7d04a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5213,12 +5213,12 @@ let nbxmpp = buildPythonPackage rec { - name = "nbxmpp-0.5"; + name = "nbxmpp-0.5.1"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/5"; - sha256 = "0y270c9v4i9n58p4ghlm18h50qcfichmfkgcpqd3bypx4fkmdx90"; + url = "https://python-nbxmpp.gajim.org/downloads/6"; + sha256 = "0agr0ikfdmna5rjvm7lm0mx52cdwqp5b2xbx3inagp70whmdv219"; }; meta = { @@ -10228,13 +10228,13 @@ let tornadokick = buildPythonPackage rec { - name = "tornadokick-2014.07.23"; + name = "tornadokick-0.2.1"; propagatedBuildInputs = [ tornado ]; src = fetchurl { url = "https://pypi.python.org/packages/source/t/tornadokick/${name}.tar.gz"; - md5 = "201d26de2993a554b16140af3b4ee1b6"; + md5 = "95ee5a295ce3f361c6f843c4f39cbb8c"; }; meta = { @@ -10506,6 +10506,22 @@ let }; + ujson = buildPythonPackage rec { + name = "ujson-1.33"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/u/ujson/${name}.zip"; + md5 = "8148a2493fff78940feab1e11dc0a893"; + }; + + meta = { + homepage = http://pypi.python.org/pypi/ujson; + description = "Ultra fast JSON encoder and decoder for Python"; + license = licenses.bsd3; + }; + }; + + unidecode = buildPythonPackage rec { name = "Unidecode-0.04.12";