diff --git a/lib/sources.nix b/lib/sources.nix index 6f8554d340b..8d259c0837e 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -10,7 +10,7 @@ rec { cleanSource = let filter = name: type: let baseName = baseNameOf (toString name); in ! ( # Filter out Subversion and CVS directories. - (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS")) || + (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || # Filter out backup files. (lib.hasSuffix "~" baseName) ); diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml index 70001577692..92e7625555b 100644 --- a/nixos/doc/manual/installation.xml +++ b/nixos/doc/manual/installation.xml @@ -295,8 +295,73 @@ $ reboot } +
+ +UEFI Installation + +NixOS can also be installed on UEFI systems. The procedure +is by and large the same as a BIOS installation, with the following +changes: + + + + You should boot the livecd in UEFI mode (consult your specific + hardware's documentation for instructions how). + + + Instead of fdisk, you should use + gdisk to partition your disks. You will need to have a + separate partition for /boot with partition code + EF00, and it should be formatted with a vfat filesystem. + + + You must set to + true, and + to false. nixos-generate-config + should do this automatically for new configurations when booted in + UEFI mode. + + + You may want to look at the options starting with + and + as well. + + + To see console messages during early boot, put "fbcon" + in your + + + +
+
+ +Booting from a USB stick + +For systems withoua CD drive, the NixOS livecd can be booted from +a usb stick. For non-UEFI installations, +unetbootin +will work. For UEFI installations, you should mount the ISO, copy its contents +verbatim to your drive, then either: + + + + Change the label of the disk partition to the label of the ISO + (visible with the blkid command), or + + + Edit loader/entries/nixos-livecd.conf on the drive + and change the root= field in the options + line to point to your drive (see the documentation on root= + in + the kernel documentation for more details). + + + +
+ + diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 1aba67dcd9e..2a28131c28c 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -19,7 +19,7 @@ with pkgs.lib; # ISO naming. isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso"; - isoImage.volumeID = substring 0 32 "NIXOS_${config.system.nixosVersion}"; + isoImage.volumeID = substring 0 11 "NIXOS_${config.system.nixosVersion}"; # Make the installer more likely to succeed in low memory # environments. The kernel's overcommit heustistics bite us diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 6ff5277cf9c..15e05a3d675 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -12,18 +12,20 @@ let visible = true; }; + # warn option was renamed obsolete = from: to: rename { inherit from to; name = "Obsolete name"; - use = x: builtins.trace "Obsolete option `${showOption from}' is used instead of `${showOption to}'." x; - define = x: builtins.trace "Obsolete option `${showOption from}' is defined instead of `${showOption to}'." x; + use = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x; + define = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x; }; + # abort if deprecated option is used deprecated = from: to: rename { inherit from to; name = "Deprecated name"; - use = x: abort "Deprecated option `${showOption from}' is used instead of `${showOption to}'."; - define = x: abort "Deprecated option `${showOption from}' is defined instead of `${showOption to}'."; + use = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'."; + define = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; showOption = concatStringsSep "."; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 08a5d6de6a2..d4ec96a18f6 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -106,7 +106,6 @@ in { description = "DHCP Client"; wantedBy = [ "network.target" ]; - after = [ "systemd-udev-settle.service" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index e5e164021d3..cdab789cd28 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -15,6 +15,9 @@ let # chroot to ${stateDir}, we have to specify it as /ntp.drift. driftfile /ntp.drift + restrict default kod nomodify notrap nopeer noquery + restrict -6 default kod nomodify notrap nopeer noquery + ${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)} ''; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index b817b1df779..3259bdbbe12 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -5,6 +5,7 @@ with pkgs.lib; let nssModulesPath = config.system.nssModules.path; + cfg = config.services.nscd; inherit (pkgs.lib) singleton; @@ -24,6 +25,12 @@ in description = "Whether to enable the Name Service Cache Daemon."; }; + config = mkOption { + type = types.lines; + default = builtins.readFile ./nscd.conf; + description = "Configuration to use for Name Service Cache Daemon."; + }; + }; }; @@ -31,7 +38,7 @@ in ###### implementation - config = mkIf config.services.nscd.enable { + config = mkIf cfg.enable { users.extraUsers = singleton { name = "nscd"; @@ -56,7 +63,7 @@ in restartTriggers = [ config.environment.etc.hosts.source ]; serviceConfig = - { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${./nscd.conf}"; + { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${pkgs.writeText "nscd.conf" cfg.config}"; Type = "forking"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index e4125891e6c..0fa16a77c1b 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -55,8 +55,8 @@ let '' [LightDM] greeter-user = ${config.users.extraUsers.lightdm.name} - xgreeters-directory = ${cfg.greeter.package} - xsessions-directory = ${dmcfg.session.desktops} + greeters-directory = ${cfg.greeter.package} + sessions-directory = ${dmcfg.session.desktops} [SeatDefaults] xserver-command = ${xserverWrapper} diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 33ae3aef9fc..cb5b49692fe 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -93,8 +93,13 @@ sub parseFstab { sub parseUnit { my ($filename) = @_; + parseKeyValues(read_file($filename)); +} + +sub parseKeyValues { + my @lines = @_; my $info = {}; - foreach my $line (read_file($filename)) { + foreach my $line (@_) { # FIXME: not quite correct. $line =~ /^([^=]+)=(.*)$/ or next; $info->{$1} = $2; @@ -337,8 +342,21 @@ system("@systemd@/bin/systemctl", "reload", "dbus.service"); my (@failed, @new, @restarting); my $activeNew = getActiveUnits; while (my ($unit, $state) = each %{$activeNew}) { - push @failed, $unit if $state->{state} eq "failed" || $state->{substate} eq "auto-restart"; - push @new, $unit if $state->{state} ne "failed" && !defined $activePrev->{$unit}; + if ($state->{state} eq "failed") { + push @failed, $unit; + } + elsif ($state->{state} eq "auto-restart") { + # A unit in auto-restart state is a failure *if* it previously failed to start + my $lines = `@systemd@/bin/systemctl show '$unit'`; + my $info = parseKeyValues(split "\n", $lines); + + if ($info->{ExecMainStatus} ne '0') { + push @failed, $unit; + } + } + elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit}) { + push @new, $unit; + } } print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n" diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py index 9ea224b51f6..f49c55c7e95 100644 --- a/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py +++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py @@ -9,7 +9,6 @@ import tempfile import errno def copy_if_not_exists(source, dest): - known_paths.append(dest) if not os.path.exists(dest): shutil.copyfile(source, dest) @@ -38,12 +37,13 @@ def write_loader_conf(generation): print >> f, "default nixos-generation-%d" % (generation) os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") -def copy_from_profile(generation, name): +def copy_from_profile(generation, name, dry_run=False): store_file_path = os.readlink("%s/%s" % (system_dir(generation), name)) suffix = os.path.basename(store_file_path) store_dir = os.path.basename(os.path.dirname(store_file_path)) efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix) - copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path)) + if not dry_run: + copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path)) return efi_file_path def add_entry(generation): @@ -72,6 +72,10 @@ def get_generations(profile): def remove_old_entries(gens): slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-") slice_end = -1 * len(".conf") + known_paths = [] + for gen in gens: + known_paths.append copy_from_profile(gen, "kernel", True) + known_paths.append copy_from_profile(gen, "initrd", True) for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"): try: gen = int(path[slice_start:slice_end]) @@ -94,7 +98,6 @@ if os.getenv("NIXOS_INSTALL_GRUB") == "1": else: subprocess.check_call(["@gummiboot@/bin/gummiboot", "--path=@efiSysMountPoint@", "--no-variables", "install"]) -known_paths = [] mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") try: @@ -106,9 +109,8 @@ except IOError as e: machine_id = None gens = get_generations("system") +remove_old_entries(gens) for gen in gens: add_entry(gen) if os.readlink(system_dir(gen)) == args.default_config: write_loader_conf(gen) - -remove_old_entries(gens) diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 027a7ac99d5..f694fd29dd0 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -68,7 +68,10 @@ with pkgs.lib; config = mkIf (!config.boot.isContainer) { - environment.etc = singleton + environment.etc = [ + { source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + target = "modprobe.d/ubuntu.conf"; + } { source = pkgs.writeText "modprobe.conf" '' ${flip concatMapStrings config.boot.blacklistedKernelModules (name: '' @@ -77,26 +80,11 @@ with pkgs.lib; ${config.boot.extraModprobeConfig} ''; target = "modprobe.d/nixos.conf"; - }; + } + ]; environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; - boot.blacklistedKernelModules = - [ # This module is for debugging and generates gigantic amounts - # of log output, so it should never be loaded automatically. - "evbug" - - # This module causes ALSA to occassionally select the wrong - # default sound device, and is little more than an annoyance - # on modern machines. - "snd_pcsp" - - # The cirrusfb module prevents X11 from starting. FIXME: - # Ubuntu blacklists all framebuffer devices because they're - # "buggy" and cause suspend problems. Maybe we should too? - "cirrusfb" - ]; - system.activationScripts.modprobe = '' # Allow the kernel to find our wrapped modprobe (which searches diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 7581c10a01d..564792a1a9d 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -238,7 +238,7 @@ in { "mkfs.ext3 -L nixos /dev/vda3", "mount LABEL=nixos /mnt", "mkfs.ext3 -L boot /dev/vda1", - "mkdir /mnt/boot", + "mkdir -p /mnt/boot", "mount LABEL=boot /mnt/boot", ); ''; diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 0b8863752d2..0e75005d13b 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -10,18 +10,18 @@ let ver_branch = "1.6"; - version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts + version = "1.6.1"; in stdenv.mkDerivation rec { name = "lightdm-gtk-greeter-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc"; + sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz"; }; patches = [ ./lightdm-gtk-greeter.patch ]; - patchFlags = "-p0"; + patchFlags = "-p1"; buildInputs = [ pkgconfig lightdm intltool ] ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]); @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://launchpad.net/lightdm-gtk-greeter; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.ocharles ]; }; } diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch index 5ae5603b4dd..ea9e0eaec93 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch @@ -1,13 +1,13 @@ -=== modified file 'src/lightdm-gtk-greeter.c' ---- src/lightdm-gtk-greeter.c 2013-02-09 23:20:39 +0000 -+++ src/lightdm-gtk-greeter.c 2013-03-29 12:21:34 +0000 -@@ -1273,7 +1273,7 @@ - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0); - model = gtk_combo_box_get_model (session_combo); +diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c +index cc5f9e1..d615dc1 100644 +--- a/src/lightdm-gtk-greeter.c ++++ b/src/lightdm-gtk-greeter.c +@@ -1716,7 +1716,7 @@ main (int argc, char **argv) + gtk_container_add (GTK_CONTAINER (menuitem), image); + gtk_widget_show (GTK_WIDGET (menuitem)); + - items = lightdm_get_sessions (); + items = lightdm_get_sessions (greeter); + GSList *sessions = NULL; for (item = items; item; item = item->next) { - LightDMSession *session = item->data; - diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 598c42199be..d4c6f24d69a 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -3,18 +3,18 @@ let ver_branch = "1.8"; - version = "1.7.0"; + version = "1.8.6"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0nwwjgc9xvwili6714ag88wsrf0lr5hv1i6z9f0xvin4ym18cbs5"; + sha256 = "17ivc0c4dbnc0fzd581j53cn6hdav34zz2hswjzy8aczbpk605qi"; }; patches = [ ./lightdm.patch ]; - patchFlags = "-p0"; + patchFlags = "-p1"; buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://launchpad.net/lightdm; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.ocharles ]; }; } diff --git a/pkgs/applications/display-managers/lightdm/lightdm.patch b/pkgs/applications/display-managers/lightdm/lightdm.patch index a6e53bafcc7..d81e0aae56d 100644 --- a/pkgs/applications/display-managers/lightdm/lightdm.patch +++ b/pkgs/applications/display-managers/lightdm/lightdm.patch @@ -1,7 +1,8 @@ -=== modified file 'liblightdm-gobject/greeter.c' ---- liblightdm-gobject/greeter.c 2013-01-31 20:56:09 +0000 -+++ liblightdm-gobject/greeter.c 2013-03-29 14:15:58 +0000 -@@ -567,6 +567,21 @@ +diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c +index 9387118..635cea0 100644 +--- a/liblightdm-gobject/greeter.c ++++ b/liblightdm-gobject/greeter.c +@@ -567,6 +567,21 @@ lightdm_greeter_get_default_session_hint (LightDMGreeter *greeter) } /** @@ -23,11 +24,11 @@ * lightdm_greeter_get_hide_users_hint: * @greeter: A #LightDMGreeter * - -=== modified file 'liblightdm-gobject/lightdm/greeter.h' ---- liblightdm-gobject/lightdm/greeter.h 2013-01-31 20:56:09 +0000 -+++ liblightdm-gobject/lightdm/greeter.h 2013-03-29 11:56:11 +0000 -@@ -93,6 +93,8 @@ +diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h +index 7d8988f..2b54909 100644 +--- a/liblightdm-gobject/lightdm/greeter.h ++++ b/liblightdm-gobject/lightdm/greeter.h +@@ -93,6 +93,8 @@ gboolean lightdm_greeter_get_select_guest_hint (LightDMGreeter *greeter); const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter); @@ -36,19 +37,19 @@ gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter); gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter); - -=== modified file 'liblightdm-gobject/lightdm/session.h' ---- liblightdm-gobject/lightdm/session.h 2013-01-31 20:56:09 +0000 -+++ liblightdm-gobject/lightdm/session.h 2013-03-29 11:59:16 +0000 +diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h +index 13ddcd9..cdb2fd6 100644 +--- a/liblightdm-gobject/lightdm/session.h ++++ b/liblightdm-gobject/lightdm/session.h @@ -12,6 +12,7 @@ - #define _LIGHTDM_SESSION_H_ + #define LIGHTDM_SESSION_H_ #include +#include "greeter.h" G_BEGIN_DECLS -@@ -42,9 +43,9 @@ +@@ -42,9 +43,9 @@ typedef struct GType lightdm_session_get_type (void); @@ -60,10 +61,10 @@ const gchar *lightdm_session_get_key (LightDMSession *session); - -=== modified file 'liblightdm-gobject/session.c' ---- liblightdm-gobject/session.c 2013-01-31 20:56:09 +0000 -+++ liblightdm-gobject/session.c 2013-03-29 14:16:48 +0000 +diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c +index 949778f..db5e18a 100644 +--- a/liblightdm-gobject/session.c ++++ b/liblightdm-gobject/session.c @@ -11,6 +11,7 @@ #include #include @@ -72,7 +73,7 @@ #include "lightdm/session.h" enum { -@@ -167,7 +168,7 @@ +@@ -189,7 +190,7 @@ load_sessions (const gchar *sessions_dir) } static void @@ -81,18 +82,17 @@ { GKeyFile *config_key_file = NULL; gchar *config_path = NULL; -@@ -183,8 +184,8 @@ +@@ -205,8 +206,7 @@ update_sessions (void) remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR); /* Use session directory from configuration */ - /* FIXME: This should be sent in the greeter connection */ - config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL); + config_path = g_strdup (lightdm_greeter_get_config_path (greeter)); -+ config_key_file = g_key_file_new (); result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error); - if (error) -@@ -228,9 +229,9 @@ + if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) +@@ -250,9 +250,9 @@ update_sessions (void) * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession **/ GList * @@ -104,7 +104,7 @@ return local_sessions; } -@@ -242,9 +243,9 @@ +@@ -264,9 +264,9 @@ lightdm_get_sessions (void) * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession **/ GList * @@ -116,78 +116,29 @@ return remote_sessions; } - -=== modified file 'src/display.c' ---- src/display.c 2013-03-26 22:22:49 +0000 -+++ src/display.c 2013-03-29 12:12:43 +0000 -@@ -62,6 +62,9 @@ - /* Program to run sessions through */ - gchar *session_wrapper; - -+ /* Path to the configuration file that lightdm is running under */ -+ gchar *config_path; +diff --git a/src/lightdm.c b/src/lightdm.c +index 7d35034..910164c 100644 +--- a/src/lightdm.c ++++ b/src/lightdm.c +@@ -1142,6 +1142,9 @@ main (int argc, char **argv) + } + } + g_clear_error (&error); + - /* TRUE if in a user session */ - gboolean in_user_session; - -@@ -213,6 +216,14 @@ - } - - void -+display_set_config_path (Display *display, const gchar *config_path) -+{ -+ g_return_if_fail (display != NULL); -+ g_free (display->priv->config_path); -+ display->priv->config_path = g_strdup (config_path); -+} ++ config_set_string (config_get_instance (), "SeatDefaults", "config-path", config_path); + -+void - display_set_show_remote_login_hint (Display *display, gboolean show_remote_login) - { - g_return_if_fail (display != NULL); -@@ -436,6 +447,7 @@ - greeter_set_hint (display->priv->greeter, "show-remote-login", display->priv->greeter_show_remote_login ? "true" : "false"); - if (display->priv->greeter_is_lock) - greeter_set_hint (display->priv->greeter, "lock-screen", "true"); -+ greeter_set_hint (display->priv->greeter, "config-path", display->priv->config_path); - - /* Run greeter as unprivileged user */ - if (getuid () != 0) - -=== modified file 'src/display.h' ---- src/display.h 2013-03-26 22:22:49 +0000 -+++ src/display.h 2013-03-29 12:12:37 +0000 -@@ -80,6 +80,8 @@ - - void display_set_user_session (Display *display, SessionType type, const gchar *session_name); - -+void display_set_config_path (Display *display, const gchar *config_path); -+ - gboolean display_start (Display *display); - - gboolean display_get_is_ready (Display *display); - -=== modified file 'src/lightdm.c' ---- src/lightdm.c 2013-03-07 21:40:31 +0000 -+++ src/lightdm.c 2013-03-29 11:48:45 +0000 -@@ -1050,6 +1050,7 @@ - g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ()); - - g_debug ("Loaded configuration from %s", config_path); -+ config_set_string (config_get_instance (), "LightDM", "config-path", config_path); g_free (config_path); - g_debug ("Using D-Bus name %s", LIGHTDM_BUS_NAME); - -=== modified file 'src/seat.c' ---- src/seat.c 2013-03-26 22:22:49 +0000 -+++ src/seat.c 2013-03-29 12:13:00 +0000 -@@ -536,6 +536,7 @@ - if (!session_name) - session_name = seat_get_string_property (seat, "user-session"); - display_set_user_session (display, SESSION_TYPE_LOCAL, session_name); -+ display_set_config_path (display, config_get_string (config_get_instance (), "LightDM", "config-path")); + /* Set default values */ +diff --git a/src/seat.c b/src/seat.c +index e2b9c2c..a950ea2 100644 +--- a/src/seat.c ++++ b/src/seat.c +@@ -1137,6 +1137,7 @@ create_greeter_session (Seat *seat) + greeter_set_hint (greeter_session, "show-manual-login", seat_get_boolean_property (seat, "greeter-show-manual-login") ? "true" : "false"); + greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false"); + greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false"); ++ greeter_set_hint (greeter_session, "config-path", seat_get_string_property (seat, "config-path")); + + g_object_unref (session_config); - seat->priv->displays = g_list_append (seat->priv->displays, display); - g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display); - diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 7bd39cd2b4e..572ca8cdb22 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs major mode for Idris"; - homepage = https://github.com/idris-hackers/idris-modehttps://github.com/idris-hackers/idris-mode; + homepage = https://github.com/idris-hackers/idris-mode; license = "GPLv3"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index cba54bf8013..7ff253fd4e8 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.2"; + name = "gphoto2-2.5.3"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "16c8k1cxfypg7v5h8xi87grclw7a5ayaamn548ys3zkj727r5fcf"; + sha256 = "0i6qjyvgn3aaspiblmiwv51mfy92gm73xpbd3z41ki8mw7plg53i"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 53790cd2b8b..41a1abc5ee7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation rec { - name = "pidgin-2.10.8"; + name = "pidgin-2.10.9"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "09w2gbnplyw21lmf9jwk6vkk5gpx5lq15s38bmhkxzw86mz3ccxn"; + sha256 = "06gka47myl9f5x0flkq74ml75akkf28rx9sl8pm3wqkzazc2wdnw"; }; inherit nss ncurses; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 59aef8c6c43..23b09cf8fa1 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -2,8 +2,8 @@ , libtoxcore, pkgconfig }: let - version = "5570b7c98aa"; - date = "20131112"; + version = "da99d776df"; + date = "20140203"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "02jfdp10qcw4w62qpra59m9yzzk7a3k2nypkbq5q7ydksbqlx8sj"; + sha256 = "0d97crkslyk7sgcsawnnwyzp31azp80yprpd6xqjcraxd442dfyj"; }; preConfigure = '' diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index d4e3aa91cc0..3ae4f2a7483 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,28 +1,38 @@ -{stdenv, fetchurl, qt, libupnp, gpgme, libgnome_keyring, glib}: - -throw "still fails to build" +{ stdenv, fetchurl, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +, libXScrnSaver, speex, curl, libxml2, libxslt }: stdenv.mkDerivation { - name = "retroshare-0.5.1d"; + name = "retroshare-0.5.5c"; src = fetchurl { - url = mirror://sourceforge/retroshare/RetroShare-v0.5.1d.tar.gz; - sha256 = "15971wxx8djwcxn170jyn0mlh7cfzqsf031aa849wr9z234gwrcn"; + url = mirror://sourceforge/project/retroshare/RetroShare/0.5.5c/retroshare_0.5.5-0.7068.tar.gz; + sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp"; }; - buildInputs = [ qt libupnp gpgme libgnome_keyring glib ]; + NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2"; - buildPhase = '' - cd libbitdht/src - qmake libbitdht.pro PREFIX=$out - make - cd ../.. - cd libretroshare/src - qmake libretroshare.pro PREFIX=$out - make - cd ../../src - qmake libretroshare.pro PREFIX=$out - make + patchPhase = "sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' libretroshare/src/upnp/UPnPBase.cpp"; + + buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig + protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; + + sourceRoot = "retroshare-0.5.5/src"; + + configurePhase = '' + qmake PREFIX=$out DESTDIR=$out RetroShare.pro ''; + postInstall = '' + mkdir -p $out/bin + ln -s $out/retroshare-nogui $out/bin + ln -s $out/RetroShare $out/bin + ''; + + meta = with stdenv.lib; { + description = ""; + homepage = http://retroshare.sourceforge.net/; + #license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; } diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index b9a053211fa..87bb0a6d285 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hub-${version}"; - version = "1.10.6"; + version = "1.11.1"; src = fetchurl { url = "https://github.com/github/hub/archive/v${version}.tar.gz"; - sha256 = "0vfl1iq1927in81vd7zvp7yqqzay7pciyj87s83qfxrqyjpxn609"; + sha256 = "09wqxxzgrgcx6p3n3bhrb5ka3194qfwnli5j3frv37448hx6wd4n"; }; buildInputs = [ rake makeWrapper ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index fae0c6a5ed6..10283c171db 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - name = "mercurial-2.8.2"; + name = "mercurial-2.9"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "0vxyxx91k6z0knfqslbwxswbc52abrg2pdf395kwvij026ibm9f8"; + sha256 = "08m6h2zxik4hcqb5qq3k2anwgjrf0p9kj77lvikcaw8rqmz06y3h"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index e6d0b7cb40d..54d697d4275 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { - name = "OVMF-2012-10-09"; + name = "OVMF-2014-02-01"; unpackPhase = '' for file in \ diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix index ef0f871b5a8..95bf4b512c7 100644 --- a/pkgs/desktops/kde-4.11/default.nix +++ b/pkgs/desktops/kde-4.11/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.4" }: +{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }: let # Need callPackageOrig to avoid infinite cycle diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.5.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.5.nix new file mode 100644 index 00000000000..d9571a4d83c --- /dev/null +++ b/pkgs/desktops/kde-4.11/kde-package/4.11.5.nix @@ -0,0 +1,444 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="amor";value="0xqmb8aymsjkdfjwpk6kjbks7x74cg27x81sg5bhx16dzmmrlgyi";} + {name="analitza";value="0zc8ja74x9kgsxdri109sf70lgkx17y234gl82b9yv00snifx2kv";} + {name="ark";value="1gylhvql6769q4ys9rgnq1lvn0sk8hzr2m6790xvjd1bcgk7sfyw";} + {name="audiocd-kio";value="12xq1a0h6xbgz83q9dd82csw08s7srqmxddc8np0mqazlscb5v3i";} + {name="blinken";value="1arbj15v4sjlyzdx2ws7rc7ni4ad2aak8adca5r23rc2zmiw18xf";} + {name="bomber";value="0glb2sbzw4nnkdwwd16rn9wz9c46aldyb1sw75f7x45h64jj5da3";} + {name="bovo";value="102kd629c41fy6mmhd9cynbs77r55hz4y4dw14qnnfmc840c3mnm";} + {name="cantor";value="014wbn53lrmrxq6mra94m6dn02d6nl03jvykks6lg6sfsjl28dnx";} + {name="cervisia";value="02ipx5z20dszz0ghccjfpy0wzrcyg8wzpql4yc3j28j93waqrhsk";} + {name="dolphin-plugins";value="0m5l01mh29s1lnh5vc9m2dx0vzxsnba47p7xd7w4bjmv7yi72qlg";} + {name="dragon";value="1hsx5ccll7zvmsk243r3bvw2gap3kicx5cj8iis5p93iivb1ia4w";} + {name="ffmpegthumbs";value="0p51vxr4jgb1rk2jssg3qsl5n14afhf9ygkixv7v7bx0x378r3z3";} + {name="filelight";value="18hwm0k4k24hbdzbpk0rcisahyp5hjisq0gg8f5x46vwp424i1hn";} + {name="granatier";value="119jx58y8z69avrhs9a777dp38chrwf9a414hcqmbjdqsp7k489i";} + {name="gwenview";value="0f4xss58dfgvbzwv43cv58166hxvb1g42kz7d82sn184n1903lck";} + {name="jovie";value="0galc7jyy57mw1y5vfq53lqmykqvdr5dch9bqs0qv8wv7fry5mf0";} + {name="juk";value="0xy1bin8apmxmhn3bhiw8cpv73az6a3q16rflp99x1i0y5675795";} + {name="kaccessible";value="0bmffbdkm2cvgbvblq0rgp20f3zzhnmva2mksbpglfzbmivl5287";} + {name="kactivities";value="0a1xxm1is20pz7h2iw4rx0fpwnhlz049yizsy6zx7ld8jl60s0sc";} + {name="kajongg";value="1158axh5rqnm59jknx2gp57k65vpd839hqnhm8dwpk033v9a7d2r";} + {name="kalgebra";value="18wqkc3mv36vdski1xk1jqrd2jja16ckidy94lzmkksb46xpqysz";} + {name="kalzium";value="0bxrhd8x5020srv7w842v202akinvd4xc0kl860vfi633vs4nwp9";} + {name="kamera";value="0l858wgpsp961vyfd8i43j01iyi3vvgkniwp4w4c88iqhbsxl8wk";} + {name="kanagram";value="1bgp5a5m59wvpqqpb5r68sc8w1jz96cfjj6s6wrllj4r5ndn08zy";} + {name="kapman";value="0jchv7fc3b0r70k7r0apm7a9r28jihnjzf3ca08nsrc1l7p94rq3";} + {name="kapptemplate";value="0jnmvblyrim9ircnjcyw3djih559jhd27dly6msw3zn2106ky2pl";} + {name="kate";value="1dxiw83ym3lg4gwdydwchdmgvbqibsj48ff4hjizl2nabh6v6yxv";} + {name="katomic";value="03x7bvixaafakxd3v6lms8x2a5v9awx0nldh7g3piq1pb27pgbz1";} + {name="kblackbox";value="1dnqnyp8dkg6p5vh48asm3qx7w582n0vb174g5xdk600zxpdcpaj";} + {name="kblocks";value="0r23zf8bkxdiljvd241q179pg6glij5kysm50ccjj1j7ni1qvzg2";} + {name="kbounce";value="0j70k5d4wcfv2zqai3m8xm244wdn1irl1zy4iq6clnbhfaaad30a";} + {name="kbreakout";value="1nlw3xk53srramz1dgcm4cii50ivgs160hha4v3ks47qkfll0gb5";} + {name="kbruch";value="0b9116g88n066nrl4hmw57k61zcc2qjhxwkz0cp68y8d5p5nr4hq";} + {name="kcachegrind";value="14wdd2nnf9s0a3a3jh86ylgwf8sqgxxw9909bbs82rlfclc6l2lf";} + {name="kcalc";value="10lqkb8x9izc1yv45qlav0zbmdq4ygw2xy93ks2fr5k0p8byc31d";} + {name="kcharselect";value="1qbjg9950ksryw12ff8djmwj0lnd14q0ws2461smpyvhbd552vwg";} + {name="kcolorchooser";value="1a1rsnnavwlj2fij356z2cl60lnxlc3nzisdmibnmq4lfa4chgk6";} + {name="kcron";value="011pv51rznrmy91fp4z6fdv4zlsj0gdf2j2pbqgcm1smgbv0mdhq";} + {name="kdeartwork";value="1qsd9493gr4mkd4xvh83rjn84vchqgv1s0q3ga4rbxqwxk3ymlfc";} + {name="kde-baseapps";value="0v0k0nk2zypd84gaaxlkdcsaqfklp8501xq40fphdci74qcq7hz2";} + {name="kde-base-artwork";value="1cirdsaikp9n3w4qxd3h18v1zq1f2jyzy3cpk51k6dnzvpmyqprx";} + {name="kde-dev-scripts";value="1d1i5jcs6kvq9piabk9qpf0s885zym8bll5i71a6yfr1di2gp0xk";} + {name="kde-dev-utils";value="0ay04ivb24b43lkf7czr92nm42zaprbw08d9qqgshszcrg5nlffn";} + {name="kdegraphics-mobipocket";value="1336md4r28vl0dq6r6dfzjyagn95sj1i9y7s4wqgczdcw28kbsyq";} + {name="kdegraphics-strigi-analyzer";value="0rxnigayhyikxiws7ayh0v5j8aidcqc2yhpqkg31mxwm23zmi9pc";} + {name="kdegraphics-thumbnailers";value="0qqp6fk3vz02hsn5s3nkbakj3bhm7z2l2nx588yazhwl27g23cff";} + {name="kdelibs";value="1gdkiviqkmwax54pg33rk1anby5rhsyv6rk2z6px99phgjk58wph";} + {name="kdenetwork-filesharing";value="16fmzszggh7ish0jlj4r0x08dzwk9plc1vmcvryhkp1wx7zy5p60";} + {name="kdenetwork-strigi-analyzers";value="1c3cpg5cl7rd8ablm38jn8mdccwalvsfnfqx2vb7rbkigkapgcg9";} + {name="kdepim";value="066c28iz7s1a4pjf10bv0kv1pqbfcpgzgl1w38pnq7491nmlsyhc";} + {name="kdepimlibs";value="18y0awr6m53rhkx076knbf3zsd1c6frf44qpqkcgvcy1r5wk0ab4";} + {name="kdepim-runtime";value="1i339a9qhpnihz9scfnh7kv6wjb2jrnmqikwlc13zymnsw0wk0jg";} + {name="kdeplasma-addons";value="0829qvhnxqg6bskbnpiwp4dgsr886bixpz0py9xv7mirfsizdqw9";} + {name="kde-runtime";value="1qsnp2r4s7zk78k46p0cqjsddpjai78zyx38w1ygz2mfimz5k83z";} + {name="kdesdk-kioslaves";value="0ww9ln4c06vsmrcj5qxr52w22md60209193qdvfyw8dmh2c6bjv4";} + {name="kdesdk-strigi-analyzers";value="09869ji9f86rrk0jcwvixkiw6jim2yqfmwb6zd792wf87nlfxjbi";} + {name="kdesdk-thumbnailers";value="0r2d6g0nm0j8azr7gs40p9g7cwil0spydczx48qa7lqyags43njq";} + {name="kde-wallpapers";value="0gzxll9kkrdp07i96bwxwrpwq3537g3chas5vnwp1rvskqyv6ipq";} + {name="kdewebdev";value="0waip70ga76p855yyhdgdkhy8gga7mhwz0dqmw96hh84lr4pirfd";} + {name="kde-workspace";value="1kqkhryzj1qkfl8fxj560xf83fya62npx9ld2nj1m2vd3ncs769v";} + {name="kdf";value="1iwxp8xjy0rz4sf5bc5dblfjxv98k84svwg2d1s021l9kngfggah";} + {name="kdiamond";value="1bvnsbjpwcpdqyzjc7qgbba7dir0y34sns7g11sld7ajxdvl3dxj";} + {name="kdnssd";value="1fwh4xab5h0zf8a63r0jk5q9xbg1akl2v092lwl5dw84sh2yqxfb";} + {name="kfloppy";value="0pwdgbxi7xf8lml7zwqiaqk8pxl8px999b4jvbbkirf6833854f8";} + {name="kfourinline";value="1f3h4izv5vh9jdkzv7c2wd5p3j62n8cp7zwglpwrckcgyj0mp3nv";} + {name="kgamma";value="0pgrx2mp072i8wq1hjp9kl0ha6jyjhn3a6x6b35lha8qnjkk7bdh";} + {name="kgeography";value="1fyn6bk8gn3cqvzxsywwq34py35w0ampblnd6n3dj48928zc9vlr";} + {name="kget";value="1709bjfygnbwav1plsdrqmwmhqi6p7wnzziwhh6vamk7pspfhac5";} + {name="kgoldrunner";value="19ywv7pkzgc4yx67aqmkcry47japgbpf9gp2namv0mcrwdnzx6y3";} + {name="kgpg";value="1l3sc9kgw4qrcl4p3hqnrr9iw6fz981ayn687s78hf9pb5j94dkv";} + {name="khangman";value="06r20f9zix26j8s3k3awamrcqzr6xmdx6adk3nda4akyz7li73d6";} + {name="kig";value="06dmhhwgnps4pvsmm45ipmgivfjhg5ig40n6z3lgi3hgnknp08an";} + {name="kigo";value="1bxnk3lwg3yr2q28dm6k7257k2288gy22ikzvcgsp09y0g0ci1p9";} + {name="killbots";value="1dvi1ffd5kjxhz3lssknv4lj4dghh3i7q1lnpzl0d5i8b2rdgg7b";} + {name="kimono";value="0k8mp0f6z4rfhfi3jjjvryidy415wiq5pls8pvffis012f8i8xni";} + {name="kiriki";value="11svzhki6zh8rvb6ynm3qdhxnbkkj32b4v8aj1fcma9f8vnmvgn0";} + {name="kiten";value="1inszkhzwbwf2b6w5nnvia700ar6d0ixrm1kam8gzdh6mkq7z9pw";} + {name="kjumpingcube";value="1wc1lrjp4m4p2l1fx7ncwvs5nmxmbbna3ym5x9cpb8jx7w50psqx";} + {name="klettres";value="139053skjg2xf8crz9w9z00fx8wm6scxrx0r6610jwhdbbdq7j50";} + {name="klickety";value="0i1k8w1s97hppna1qidjnd3vkp2283pism3g3nxi45s0xjb292xi";} + {name="klines";value="11ma1p8fqp9dqw3cgfsvh0yirsivddjcjb4y4s7dpgk5m0sd0dcg";} + {name="kmag";value="1hgk676l9bxavszzh3n2705d2s6512liflivyq6zrgm23m623h41";} + {name="kmahjongg";value="1xk6pc54q6v75v2b409lhh3mhnw0n4h5ngrhqxhrd9lrmzw5w3wh";} + {name="kmines";value="0sh1lsqmc25lhfisfzf1qsmb9x9gmiy2a8siaifaaj2p4mnm36fv";} + {name="kmix";value="1m9rr5sqh1k8a94f0ypsw7vwvzg1aaijs8gwzyxmb6jpq09ky31x";} + {name="kmousetool";value="1yxcb7x5zlrz1vz3aha6naf6gi00v7xgvqlj4s9nxi4684a3gcdj";} + {name="kmouth";value="1ga56k2mfrl9ams4gcag60q0id3plysqzlp0jic314zv3xdrj4mz";} + {name="kmplot";value="0d6ifl34s1d35zq6jn4qgwvv49x23f8z9r24x2w4i3zg8hxql48n";} + {name="knavalbattle";value="1ipll0cw0vr99dj5asncrdz74d8499knich5hjpsp8igrzxv6h48";} + {name="knetwalk";value="0ncy8icsrfzr9hafqxds45fp1mxzdg0325gl4zd5b8bpvsf7cg6p";} + {name="kolf";value="1rg39mgwj7fgyy7svwwb18q1w7w7q5wbvd694hzwj30akf2z169s";} + {name="kollision";value="0qgmbmrjq7g1b63rdlspfxkm69aly5swp3mqi2v88z4irxfyksia";} + {name="kolourpaint";value="0sskfwam1nqjc86dyhpyrg4jwv3a5nfmnk7aqff0zd7qnp712zsy";} + {name="kompare";value="1f7cwrnz04d5m7fqsi5xwybi2429bkhi5y169y76fqmy3aiywq7c";} + {name="konquest";value="1r3vzd8112dq2xw1ml9v458zdgrbbnmcrq3phgml1q73fn7lya11";} + {name="konsole";value="0d9gl124bbbwvi77bhz9dwlz3l42da4nhv88wa63w2ghm4kka44d";} + {name="kopete";value="0kz8d4m6apm493v8xlm7mh4q17nj0ijbrzin7255hipqqq1fqvn5";} + {name="korundum";value="0vfnq32ip9xhkhvhm3f0g7kxgjaschlfskrahsib7j2aqssq1rmm";} + {name="kpat";value="0jl34j9drh6q26d3iiv11azd18kqsvyvgfqs70jfbwj0vpa5y5v3";} + {name="kppp";value="1lspvj49cdywj5wj9bbydp1fl7hadhmh25p40l36is2bj1malmn6";} + {name="krdc";value="163ly4scznpvwf11ns8by5ph8kamy3lwnhfam1c43rgrhnx5h9rl";} + {name="kremotecontrol";value="14nxskj1rwqszk0z9dl0mq6z1c5d7951pwwfnhmrnkw53xsl6x6f";} + {name="kreversi";value="035ikzf9ndb4s1zcrh20xmjyci6kfy9l1racg280vwyvlgh38kkp";} + {name="krfb";value="11aphkp33wdwd0viwq74s9wbl7rnihvc1vja8miq6kjjlpdkr82m";} + {name="kross-interpreters";value="09zgg3afs4z13m5dzr6ddvlv5fdx2n1v50y61pb5yah8jl8vmynp";} + {name="kruler";value="1wljhmdzaqznccslrpxvg88y3imr674dxm4dp93sh61wl5a90fa3";} + {name="ksaneplugin";value="0aia98rrjq8fhzdlwn6j4jpfa2gpzkr82m3mxgbfvx9k7fh8fisp";} + {name="kscd";value="02ss42fyp2liwiizi08fdgk5fjv5kcrzraq05ryaily9szv5in4c";} + {name="kshisen";value="1b7v9vf4sq54svd05j1hssmip2kjlzrwbyisyzf6dm8v58m9j5lm";} + {name="ksirk";value="17wn20a3ifc5rfg77b9pcnz48ldzxpgwi5i4gy3zsd8d4ykyr7n6";} + {name="ksnakeduel";value="03wawqbxp402nqnk0iqm47mcyhc0b5r6mla8chm42q88y542ynvz";} + {name="ksnapshot";value="0rbc3ff69d7sgvg7lna85m9qkl5lak9acngaw9x11c9zvxwyx994";} + {name="kspaceduel";value="1qv5bny5z442xbciqh2qf2mginx7bbpcgyn80znq0fvmyg0z39qx";} + {name="ksquares";value="1hj4k9q594rnxqdf81lc1dzh5fck2bxbvb8bgfsb4qr8qlmj47i2";} + {name="kstars";value="0hkxins67q34z99z4db6j15iy2h5l7dz3ww81q371wb0ckmj9svb";} + {name="ksudoku";value="0ppqyb7z9pf13h0j6y8faxxn9n5xbrkk3gzi73gwld8ipkm742mc";} + {name="ksystemlog";value="0pwqji6h382l6vvwy5zlggcfba4yjmjcfrj0zyaixcq2y1g698s6";} + {name="kteatime";value="0zbnnxhag82vfw0krma8ih331vg5n96xqbkiappgi4wz22lz9i1j";} + {name="ktimer";value="0p4ybw40rspm3phbipnagkhlwfnkyb21zmiq0wh6md0b5gvcvgwa";} + {name="ktouch";value="07xsgsfcsjklaclb540ylfmrjadzy8ig63n7svdfjc19g2kfjyrr";} + {name="ktuberling";value="0n1j9z55mval6q1m7hbvm1xrzf8jbvl8fpadjnb12bxfyxszck3m";} + {name="kturtle";value="1x0ymm2wr2y0f5ih1f7r9p8pswm95b5ymhsh7c105sh1d5ib6mgq";} + {name="ktux";value="1fa11fx48bxvlpq9vfh6q0ywmlcmjbkk60fph66zaazzydjj36cj";} + {name="kubrick";value="0lnwq2r4rczr9yqn5fvzazzkbsal2fgslcmmdmk94vvwms7jhkfn";} + {name="kuser";value="1l0s2x7jj6rka8jwiyazh916z0glz32aq19skvia3i8n3k4x2xk3";} + {name="kwallet";value="1jwpp9klcsnh6shbykvfz25cn8m28r62nb9q9nfhfgz96l9ni8rf";} + {name="kwordquiz";value="1qq4vv742di0r1azcn0nycchypkm9ygjp4b08m2gmyfid5b2wscb";} + {name="libkcddb";value="18d005vzimazamwri4p1dqdg80l98rj38jglvw8r962bw97rk04s";} + {name="libkcompactdisc";value="02g0k81rzdgwah45bh7wj0hzh9akfdcpkbyalahn33q2x10inm39";} + {name="libkdcraw";value="0b9g4635j0j5m7aw333r7qpjzy63h6c2xhzp64k4f7jcyp5y0z15";} + {name="libkdeedu";value="1cmqm78kw9762axhz5am0gh28p2xibnq49gj5b03wjqi9h122mzr";} + {name="libkdegames";value="15xb639x83hy1nnyaqby4ypca03wr9yr8kqw1jnfx6d3f994mlyd";} + {name="libkexiv2";value="1cnvvrkqdsrdx6n6907a4ki3gfymaclwdcy1frmnjbsa0hyxzi33";} + {name="libkipi";value="0ilxsjld8s7nz59wgn90bsyvd20ikkdf69fkwmxvj850ci2qr9cv";} + {name="libkmahjongg";value="0kqn55fdbfmhm0m4ani9iz76rrbsyi953sig57vx3b9x0ljahkh0";} + {name="libksane";value="1nmrqkzbqqgs57kgg1b6i0kg65l9rga0hs98n8is5c233z4h3bnr";} + {name="lokalize";value="062l2zd0x5rrzdxf592kvvw49rvlkd3v65bg2ya8n6qr083xsr79";} + {name="lskat";value="13px2vvxdi38lgr21f3zp3wdr0qsrcpynd787qpx0ckg97x567bi";} + {name="marble";value="0m9dqabyf17640n2zcf9d003h7svm678g497r4kzslisznaddvxb";} + {name="mplayerthumbs";value="0g8h79vxxgfb2zrh04j79pc4iva4qr2jl56w23crp9sw9cv2f5av";} + {name="nepomuk-core";value="0jkbpnk70njw4acwhz908k60wjy84ydwqp62m1fsir5gh7rl3n72";} + {name="nepomuk-widgets";value="0snfsvaxv04w2vrj51cf5zl06q4dwywxnqcvbd9ys5nj2hz3i9vq";} + {name="okteta";value="0dj271z8f61j58iknk1xdk4nz705xgna6gpm7cxfgrkxkiwqqxyy";} + {name="okular";value="1slwk6q4q9gl25v9xvj2m0hmrvl7zagririna3543hxa7cpf0kcj";} + {name="oxygen-icons";value="1mg64p8pfayzq72v95pz2gr56b5ghajp6qva63gbg6l17h0ahyss";} + {name="pairs";value="0ac8712z6dhy948nk9jhzjcixykda3l97zg8n2p2njg2wggbycxz";} + {name="palapeli";value="0x7nfd3wplildnc0fvrlf59iv1z85g4s72525wj5lfg5kavdad4p";} + {name="parley";value="0pqgf7lyfp3gj2zk67snj7y7l3j8cnpj2g1zl1pj7mkcd7v9j1fh";} + {name="perlkde";value="0x0v0hsk60xjvqnn2v1q3l66hvimy3wvfjk4ds80qvy5a29v5qxg";} + {name="perlqt";value="1kkrxyfqxjy3rc6h0r879rd88n4qy2ha1fs4jlmzgf4cmc4g4kvl";} + {name="picmi";value="0qpxfvpibc2fj1yz1q0g6srk1z1vqc1db521ngywxx9hbpi2h95g";} + {name="poxml";value="17lxxh4km09k9xkr1z62xy1ky1yyqnnj6y82xwpazi9lkn1vnpfk";} + {name="print-manager";value="1qwzmy15q84gv7jwp8k3jnfa0l27d2174ll5ln6i29ii2rzzcjw1";} + {name="pykde4";value="1p6j85s716r6f13mqxaayqjr4lbfzz5lvgdzmpxfc3fk4n2vbws9";} + {name="qtruby";value="1zcfxql3pwlfxwfvy3capc7g447ygpg5bliv9azpzaql051dg5bm";} + {name="qyoto";value="0447fzldwcy1nwh2cbqjy81s7xkrz5gn8jiy4ya6bd3d00jisa7v";} + {name="rocs";value="0s5k80z0n07qz120zbj6bxs7zp923bilkd3h1swa931fhhxg2gy7";} + {name="smokegen";value="1pksnjkawqqgw5l8pjdmfjs4ggxdm8j1429iw9s1xf91z5zpnmk7";} + {name="smokekde";value="1075cl0vxz7izrvl0krs8wbqpn32qj4ax7fgyfgf5662cwf8pifg";} + {name="smokeqt";value="1w1bfycn2gk9axsjf5vpxxrrvadasnw5zvb8qpg01p2q34jh1gdg";} + {name="step";value="0k4xqwxdk1fz69i787njy1bsdappsa5ldx42n6g87lz7dvzwc3vd";} + {name="superkaramba";value="1ymb7c2s8x72x2z621xccinxkqpkh9kk1fhyal169nys42cwadhh";} + {name="svgpart";value="0r2xl69l2j0qd13wwi007qmxkszciysqfxkcpjiryy9h2rcsl3fv";} + {name="sweeper";value="0dfdz7jchhlwx7skina9q47z407fjh47r7f743bllmniqcsswfs2";} + {name="umbrello";value="0ss77g4fwvz7w1a9nna0d5d9fxs176b0qapy4ji1qn9hz0igcd0n";} +]; +modules=[ +{ + module="kdemultimedia"; + split=true; + pkgs=[ + { name="audiocd-kio"; sane="audiocd_kio"; } + { name="dragon"; } + { name="ffmpegthumbs"; } + { name="juk"; } + { name="kmix"; } + { name="kscd"; } + { name="libkcddb"; } + { name="libkcompactdisc"; } + { name="mplayerthumbs"; } + ]; +} +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdelibs"; + split=true; + pkgs=[ + { name="kdelibs"; } + { name="nepomuk-core"; sane="nepomuk_core"; } + { name="nepomuk-widgets"; sane="nepomuk_widgets"; } + ]; +} +{ + module="kdenetwork"; + split=true; + pkgs=[ + { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } + { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } + { name="kdnssd"; } + { name="kget"; } + { name="kopete"; } + { name="kppp"; } + { name="krdc"; } + { name="krfb"; } + ]; +} +{ + module="kdeutils"; + split=true; + pkgs=[ + { name="ark"; } + { name="filelight"; } + { name="kcalc"; } + { name="kcharselect"; } + { name="kdf"; } + { name="kfloppy"; } + { name="kgpg"; } + { name="kremotecontrol"; } + { name="ktimer"; } + { name="kwallet"; } + { name="print-manager"; sane="print_manager"; } + { name="superkaramba"; } + { name="sweeper"; } + ]; +} +{ + module="applications"; + split=true; + pkgs=[ + { name="kate"; } + { name="konsole"; } + ]; +} +{ + module="kdetoys"; + split=true; + pkgs=[ + { name="amor"; } + { name="kteatime"; } + { name="ktux"; } + ]; +} +{ + module="kdesdk"; + split=true; + pkgs=[ + { name="cervisia"; } + { name="dolphin-plugins"; sane="dolphin_plugins"; } + { name="kapptemplate"; } + { name="kcachegrind"; } + { name="kde-dev-scripts"; sane="kde_dev_scripts"; } + { name="kde-dev-utils"; sane="kde_dev_utils"; } + { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } + { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } + { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } + { name="kompare"; } + { name="lokalize"; } + { name="okteta"; } + { name="poxml"; } + { name="umbrello"; } + ]; +} +{ + module="kdegames"; + split=true; + pkgs=[ + { name="bomber"; } + { name="bovo"; } + { name="granatier"; } + { name="kajongg"; } + { name="kapman"; } + { name="katomic"; } + { name="kblackbox"; } + { name="kblocks"; } + { name="kbounce"; } + { name="kbreakout"; } + { name="kdiamond"; } + { name="kfourinline"; } + { name="kgoldrunner"; } + { name="kigo"; } + { name="killbots"; } + { name="kiriki"; } + { name="kjumpingcube"; } + { name="klickety"; } + { name="klines"; } + { name="kmahjongg"; } + { name="kmines"; } + { name="knavalbattle"; } + { name="knetwalk"; } + { name="kolf"; } + { name="kollision"; } + { name="konquest"; } + { name="kpat"; } + { name="kreversi"; } + { name="kshisen"; } + { name="ksirk"; } + { name="ksnakeduel"; } + { name="kspaceduel"; } + { name="ksquares"; } + { name="ksudoku"; } + { name="ktuberling"; } + { name="kubrick"; } + { name="libkdegames"; } + { name="libkmahjongg"; } + { name="lskat"; } + { name="palapeli"; } + { name="picmi"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="analitza"; } + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="pairs"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdeadmin"; + split=true; + pkgs=[ + { name="kcron"; } + { name="ksystemlog"; } + { name="kuser"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kdeaccessibility"; + split=true; + pkgs=[ + { name="jovie"; } + { name="kaccessible"; } + { name="kmag"; } + { name="kmousetool"; } + { name="kmouth"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kde-baseapps"; sane="kde_baseapps"; } + ]; +} +{ module="kactivities"; split=false;} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + ]; + +} +{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} +{ module="kdelibs"; split=false;} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix new file mode 100644 index 00000000000..17236c067b9 --- /dev/null +++ b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix @@ -0,0 +1,272 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "1yfvdz1s46sg5d2x7jgr0srxc7mh844ir14n9mmiyk6hk69yzxpg"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "076mpcc5m52ap29hjf144d77c3xmg40qc3dypqxgpx1ya4an1lr1"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "15y1h0j7yw03h28mjhmnlbwnaa5cdv0n20f5gby77b3v2b7kjn5q"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "09md2hcj0bkjpsgqviw475v0g0pgbld728p8kx0aqckywsixagsp"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "1adxgg4hp2s7js4q6pi6krjy32gl0dk9dgvw40310zb7nh59zbd0"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "00c8dd8w0d47fp113r3bbd1v1rpqd4qqjamsxbs0ygy0vc644d29"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "0aa40dmrh3brdqra5c72czch75a44lcng68a7j6zzngdmjcn8wh8"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "0kq0z37fxgl25zh6a7rj4fjram794iwchg8hqfdvzx3k6kfjgb9s"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "09gn22hlz99j3kra6k1hs76ypvv6whc9rav1hk1hqrvqaz0v78yf"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "178dqdmmgz52l8anmnnms91c39y9492ksl003snan1yd7r6dbfwj"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0amb1d4y201la37kmambhxwh1pb7b284z48npag863f4bqk491vm"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "04hyginzrzcf4143nw6ps3fpp3sx8wq30irfm4z2lpzl22137rr3"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "0dwxcvnissa5jmng3dj5mgq7sm3lvfmzk11h4fhjnnjkna4ihsnm"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "1xyg93g3c0p8bibv1vdx1wvivddfc41py1mn8kmib0cnkfprx5bw"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "1acazq7x8lzb4r3qcmwllxhgnyc23lq0aamxrcnq7c8i8xya8byl"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "03a466yxp8wcnbgyrgzbpfy2kbnl9c0grsqqqbpkdfc07q1287rj"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "0mqlrm6jq29w432s9qx8nsq7iyswlpi1n6l990i5gyk74n1jp03i"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "05gz0jj2bvq339qz190j79rb24avvgsih5dzibxapx99wq6s7v6x"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "0gxjs051qfwhdp8g6ir3caxjflsv5k8va9w6zw5ziimfqkc78vph"; +} +{ + lang = "hi"; + saneName = "hi"; + sha256 = "05arlhsbb8qnsz22h020f4dgxqdy4fgf8fzkjjay1f5w47h381gw"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "0kn7ngq6qrrbjk6m4178dkg81a2q1hcb3hg5jqz95875c08hsrjx"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "1ca61pk19x3bm8fkf7mv9nwfvvawn8w4wlzgcprw3zba94dwm2zj"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "046fyhh4b1qca2m241w55xby9nh2lifdmb44z62i31bgvcfkgvp8"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "1vid1xpqsdb3jvhm0vdb14d02p5s2vsks59inp50ympsmlsy2967"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "113sq6d1hlcmbdkwz61bbb0pmwj0wixa1pgv9gm1r61qnix6hskb"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "1rlnazib921cv8fjzjm6c928cwlh6si116iq5l1jq4czwcb3j9d3"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "1prpqwznyxpxm4i0ka4ja5j1d0gljpvhbh9r7a574ai8k419p6jq"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "09p3vpyj0lw6f470jcbahalw8nh5k7adxaxh4vby7k6r8vip4d74"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "1lfv6xf5dhw9hr9jq1ak0dyz3yzwqf3g4cxv3xm27lxks95ddh3r"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "1s7vi6952pqrm5b1qm1vlmkxna1lijnbgcdmr0n9y31gi066nh5j"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "1lvc0zz5wh5f4nihrvwag4q7dajczm50nfdyvhmbl68gjkar1asw"; +} +{ + lang = "mr"; + saneName = "mr"; + sha256 = "001fjpvqg3z4g214cl8qmvsn1yc7rmkqnajbb1c4wflipvhyyq2w"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "18h2y6i4mzkwwwva5jq2wrbc159hdk9djhr26ilzqb8h065j83bn"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "19kc92ipw94mp9pawxgm0kbq3g1rf6p05892c62nm28vqbmmxbp0"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "1zrz65m9q6jylc32rch7iscjjzr5w8cjkxja9xjl0gip409cnl33"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "1yj0jv0p4scy8q6f6g7zl2c2qybhnp6skj8jnv6sj4q9prp6qwmb"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "0sq17776sjkr6lmj4323377a2aljaf1clrm1qk0zmd3036nh2pgx"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "1xg1fjk77g581fihvspn3936b7j3acgiipn9y4z4fxfr0flmvcxx"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "0y8w7nl1ck1hnb5bs2zirpp62cqzh1hps153gqkl2p1hw47dq92k"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1bvilvia5k4a556d5pn4lvmlm58xxv1d7d858gsr5yvnkrixdryi"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "0gcb87gwymcz197y0fbb6qnd1w5kkid25sywnjp06nymjnspwqhp"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "1z3g2xmskyh9ykimh396055ywhv9hj49nc2rk7fgc20g61wcnglc"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "055a055h3nhvpgaxs87d55va2kyhk72gf9chrqgqjp5wgbs4cpx4"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "07qw1azmqq7rlyd9ngv3wf474w44cqn40fvcpa4hm13kvf19q7d3"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "1qks72arnk10k4brms6p1m3i4b6kxrgf581xnyhf2v4rch80ccdn"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "0dxkjrcpq9c8qbh5hkjzqcwpqpsfxa5ki8x975kqlh40gcc0942i"; +} +{ + lang = "tg"; + saneName = "tg"; + sha256 = "1qi2sr3l7q2cdypi1m3axhm2ciqnzf88hk52dfcvwqfa4y8n3zgv"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "1d6s3n7v6a8wwrh9lbnjh74dxdxnbg138mm5s09418fxl5vi7gaq"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "145j3k5qc6792q955vyxd582sw3ssvp1anvindf04n4dv3nqk24s"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "0vasjp5liigq2gp9dzwz59316jkj7bv3a9kfmfkyj7bs11rbvsx6"; +} +{ + lang = "vi"; + saneName = "vi"; + sha256 = "1xqa0cb5fcras13vsmnsrdag26csgab0jrgwhsdisrsisrla6dxk"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "1gblglgbznlsxghm2ib9h83jchsa07g8kr1cnb4zn43n7dsr8h6s"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "1ff14fxsm2m86i90v7dp4872r3hlxz13dfmkhhpyscy62fl3bzy4"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "039ww6fa0hcmshd4ximwmj29102qg4xx1p96idcwqwkcf3lryhw2"; +} +] diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 074fc4f334f..0f46b7aeb6d 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -14,6 +14,5 @@ let version = "0.0.3"; in stdenv.mkDerivation { description = "A statically typed programming language that unifies implementation with formal specification"; homepage = http://www.ats-lang.org/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 3c2a4f779fd..9787d0da929 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -10,12 +10,12 @@ else throw "Unsupported architecture"; edk2 = stdenv.mkDerivation { - name = "edk2-2013-10-09"; + name = "edk2-2014-02-01"; src = fetchgit { url = git://github.com/tianocore/edk2; - rev = "5bcb62a4098c9bde9be6af0833a025adc768e08d"; - sha256 = "3e2958877061bf6bbfb28b150743d7244486929c1c320bdb1ff2586774aa042a"; + rev = "2818c158de6a164d012e6afb0fc145656aed4e4b"; + sha256 = "a756b5de3a3e71d82ce1de8c7832bc69d2affb98d704894b26540571f9f5e214"; }; buildInputs = [ libuuid pythonFull ]; @@ -47,10 +47,10 @@ edk2 = stdenv.mkDerivation { configurePhase = '' mkdir -v Conf sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \ - 's|MYTOOLS|GCC46|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\ + 's|MYTOOLS|GCC48|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\ < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt - sed -e 's|DEFINE GCC46_IA32_PREFIX = /usr/bin/|DEFINE GCC46_IA32_PREFIX = ""|' \ - -e 's|DEFINE GCC46_X64_PREFIX = /usr/bin/|DEFINE GCC46_X64_PREFIX = ""|' \ + sed -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ + -e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \ -e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' \ < ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt export WORKSPACE="$PWD" diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 796fc8fde53..3ed0f7ad0e6 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -456,7 +456,6 @@ stdenv.mkDerivation ({ maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric - stdenv.lib.maintainers.shlevy ]; # Volunteers needed for the {Cyg,Dar}win ports of *PPL. diff --git a/pkgs/development/compilers/gcc/4.8/arm-eabi.patch b/pkgs/development/compilers/gcc/4.8/arm-eabi.patch deleted file mode 100644 index 63b017062b5..00000000000 --- a/pkgs/development/compilers/gcc/4.8/arm-eabi.patch +++ /dev/null @@ -1,230 +0,0 @@ -Index: gcc-4_7-branch/libstdc++-v3/configure.host -=================================================================== ---- gcc-4_7-branch/libstdc++-v3/configure.host (revision 194579) -+++ gcc-4_7-branch/libstdc++-v3/configure.host (revision 194580) -@@ -340,7 +340,7 @@ - fi - esac - case "${host}" in -- arm*-*-linux-*eabi) -+ arm*-*-linux-*eabi*) - port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver" - ;; - esac -Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc -=================================================================== ---- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc (revision 194579) -+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc (revision 194580) -@@ -1,5 +1,5 @@ - // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" } --// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } -+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } } - - // 2007-05-03 Benjamin Kosnik - // -Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc -=================================================================== ---- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc (revision 194579) -+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc (revision 194580) -@@ -1,5 +1,5 @@ - // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" } --// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } -+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } } - - // 2007-05-03 Benjamin Kosnik - // -Index: gcc-4_7-branch/libjava/configure.ac -=================================================================== ---- gcc-4_7-branch/libjava/configure.ac (revision 194579) -+++ gcc-4_7-branch/libjava/configure.ac (revision 194580) -@@ -931,7 +931,7 @@ - # on Darwin -single_module speeds up loading of the dynamic libraries. - extra_ldflags_libjava=-Wl,-single_module - ;; --arm*linux*eabi) -+arm*-*-linux*eabi*) - # Some of the ARM unwinder code is actually in libstdc++. We - # could in principle replicate it in libgcj, but it's better to - # have a dependency on libstdc++. -Index: gcc-4_7-branch/libjava/configure -=================================================================== ---- gcc-4_7-branch/libjava/configure (revision 194579) -+++ gcc-4_7-branch/libjava/configure (revision 194580) -@@ -20542,7 +20542,7 @@ - # on Darwin -single_module speeds up loading of the dynamic libraries. - extra_ldflags_libjava=-Wl,-single_module - ;; --arm*linux*eabi) -+arm*-*-linux*eabi*) - # Some of the ARM unwinder code is actually in libstdc++. We - # could in principle replicate it in libgcj, but it's better to - # have a dependency on libstdc++. -Index: gcc-4_7-branch/libgcc/config.host -=================================================================== ---- gcc-4_7-branch/libgcc/config.host (revision 194579) -+++ gcc-4_7-branch/libgcc/config.host (revision 194580) -@@ -327,7 +327,7 @@ - arm*-*-linux*) # ARM GNU/Linux with ELF - tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix" - case ${host} in -- arm*-*-linux-*eabi) -+ arm*-*-linux-*eabi*) - tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc" - tm_file="$tm_file arm/bpabi-lib.h" - unwind_header=config/arm/unwind-arm.h -Index: gcc-4_7-branch/gcc/doc/install.texi -=================================================================== ---- gcc-4_7-branch/gcc/doc/install.texi (revision 194579) -+++ gcc-4_7-branch/gcc/doc/install.texi (revision 194580) -@@ -3222,7 +3222,7 @@ - @heading @anchor{arm-x-eabi}arm-*-eabi - ARM-family processors. Subtargets that use the ELF object format - require GNU binutils 2.13 or newer. Such subtargets include: --@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi} -+@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*} - and @code{arm-*-rtemseabi}. - - @html -Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c -=================================================================== ---- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c (revision 194579) -+++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c (revision 194580) -@@ -1,4 +1,4 @@ --/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */ -+/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */ - - void *foo (void) - { -Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C -=================================================================== ---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C (revision 194579) -+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C (revision 194580) -@@ -7,10 +7,10 @@ - // enum-size attributes should only be emitted if there are values of - // enum type that can escape the compilation unit, gcc cannot currently - // detect this; if this facility is added then this linker option should --// not be needed. arm-*-linux*eabi should be a good approximation to -+// not be needed. arm-*-linux*eabi* should be a good approximation to - // those platforms where the EABI supplement defines enum values to be - // 32 bits wide. --// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } -+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } } - - #include - -Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C -=================================================================== ---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C (revision 194579) -+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C (revision 194580) -@@ -9,10 +9,10 @@ - // enum-size attributes should only be emitted if there are values of - // enum type that can escape the compilation unit, gcc cannot currently - // detect this; if this facility is added then this linker option should --// not be needed. arm-*-linux*eabi should be a good approximation to -+// not be needed. arm-*-linux*eabi* should be a good approximation to - // those platforms where the EABI supplement defines enum values to be - // 32 bits wide. --// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } -+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } } - - enum E { - a = -312 -Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C -=================================================================== ---- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C (revision 194579) -+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C (revision 194580) -@@ -7,10 +7,10 @@ - // enum-size attributes should only be emitted if there are values of - // enum type that can escape the compilation unit, gcc cannot currently - // detect this; if this facility is added then this linker option should --// not be needed. arm-*-linux*eabi should be a good approximation to -+// not be needed. arm-*-linux*eabi* should be a good approximation to - // those platforms where the EABI supplement defines enum values to be - // 32 bits wide. --// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } -+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } } - - // GROUPS passed enums - extern "C" int printf (const char *, ...); -Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp -=================================================================== ---- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp (revision 194579) -+++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp (revision 194580) -@@ -3818,7 +3818,7 @@ - } - } "" - }] -- } elseif { [istarget arm*-*-linux-gnueabi] } { -+ } elseif { [istarget arm*-*-linux-gnueabi*] } { - return [check_runtime sync_longlong_runtime { - #include - int main () -@@ -3860,7 +3860,7 @@ - || [istarget i?86-*-*] - || [istarget x86_64-*-*] - || [istarget alpha*-*-*] -- || [istarget arm*-*-linux-gnueabi] -+ || [istarget arm*-*-linux-gnueabi*] - || [istarget bfin*-*linux*] - || [istarget hppa*-*linux*] - || [istarget s390*-*-*] -@@ -3890,7 +3890,7 @@ - || [istarget i?86-*-*] - || [istarget x86_64-*-*] - || [istarget alpha*-*-*] -- || [istarget arm*-*-linux-gnueabi] -+ || [istarget arm*-*-linux-gnueabi*] - || [istarget hppa*-*linux*] - || [istarget s390*-*-*] - || [istarget powerpc*-*-*] -Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90 -=================================================================== ---- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90 (revision 194579) -+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90 (revision 194580) -@@ -1,6 +1,6 @@ - ! { dg-do run } - ! { dg-options "-fshort-enums" } --! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } -+! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } } - ! Program to test enumerations when option -fshort-enums is given - - program main -Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90 -=================================================================== ---- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90 (revision 194579) -+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90 (revision 194580) -@@ -1,7 +1,7 @@ - ! { dg-do run } - ! { dg-additional-sources enum_10.c } - ! { dg-options "-fshort-enums -w" } --! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } -+! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } } - ! Make sure short enums are indeed interoperable with the - ! corresponding C type. - -Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in -=================================================================== ---- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in (revision 194579) -+++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in (revision 194580) -@@ -1866,7 +1866,7 @@ - LIBRARY_VERSION := $(LIB_VERSION) - endif - --ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),) -+ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),) - LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads - /etc/fonts/conf.d - /etc/fonts/conf.d + /etc/fonts/conf.d + /etc/fonts/conf.d - /var/cache/fontconfig - ~/.fontconfig + /var/cache/fontconfig + ~/.fontconfig diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 1d02e6459ab..b68de91c240 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -12,4 +12,6 @@ rec { gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; }; gst-libav = callPackage ./libav { inherit gst-plugins-base; }; + + gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; }; } diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix new file mode 100644 index 00000000000..eaf284e950d --- /dev/null +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, pkgconfig, python, gstreamer + , gst-plugins-base, pygtk, pygobject3 +}: + +stdenv.mkDerivation rec { + name = "gst-python-1.1.90"; + + src = fetchurl { + urls = [ + "${meta.homepage}/src/gst-python/${name}.tar.bz2" + "mirror://gentoo/distfiles/${name}.tar.bz2" + ]; + sha256 = "1vsykx2l5360y19c0rxspa9nf1ilml2c1ybsv8cw8p696scryb2l"; + }; + + buildInputs = + [ pkgconfig gst-plugins-base pygtk pygobject3 ] + ; + + preConfigure = '' + export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides" + ''; + + propagatedBuildInputs = [ gstreamer python ]; + + meta = { + homepage = http://gstreamer.freedesktop.org; + + description = "Python bindings for GStreamer"; + + license = "LGPLv2+"; + }; +} + diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix similarity index 85% rename from pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix rename to pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix index da2c7f2b863..1cfd9a37eb0 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.5.0.2"; - sha256 = "0v6lwxn9karmym4fzd0hramcj86sb4wgiyqn47hmcg1dd1fsnhb5"; + version = "2.5.1.0"; + sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s"; buildDepends = [ OpenGL OpenGLRaw ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index 263cd049a3d..03ae29aef73 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -1,11 +1,15 @@ -{ cabal, HUnit, random, testFramework, testFrameworkHunit }: +{ cabal, HUnit, random, testFramework, testFrameworkHunit, time }: cabal.mkDerivation (self: { pname = "abstract-deque"; - version = "0.2.2"; - sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb"; - buildDepends = [ HUnit random testFramework testFrameworkHunit ]; - testDepends = [ HUnit random testFramework testFrameworkHunit ]; + version = "0.2.2.1"; + sha256 = "0saf7j8fdqqk9msxrfja22zx8v0ibzrqx3v9l07g5n84yh4ydbdx"; + buildDepends = [ + HUnit random testFramework testFrameworkHunit time + ]; + testDepends = [ + HUnit random testFramework testFrameworkHunit time + ]; doCheck = false; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 9f1c2eedc66..c5bc0dd2b47 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.5"; - sha256 = "0pni44gi9sh4l3hxwh7bqadhh6nc7v8w869sv9n45vkxwhhwbk4i"; + version = "0.6"; + sha256 = "0jj4mv9vzk7s257gnjs00fza6shr7j9bv8p48gj61yncg0qdypiz"; buildDepends = [ Cabal primitive ]; meta = { - homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; + homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "A safe approach to CAS and other atomic ops in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index af0dbd33898..74a4385aa92 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "boomerang"; - version = "1.4.1"; - sha256 = "0pmaysp6vw6cnxh3px47pwflm4fc83idld09bpnfnh2jkscp630a"; + version = "1.4.2"; + sha256 = "0vy70anwnh7649za6nzb65fx09vqkf50a961da6gzwvbaf526rd0"; buildDepends = [ mtl text ]; meta = { description = "Library for invertible parsing and printing"; diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 53e9e0ac2cd..78de7fa1f8e 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.0.1"; - sha256 = "16h1xz5amn0yd3h9rss0skaq08k1cy91cncxb9ky020s0wcix9fm"; + version = "1.0.1.1"; + sha256 = "0mjc24sir0mm1kqhkk26mfbz90kc71hdylral4bjymxs6fpx7crh"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable lens mtl split statestack time diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 4f1dfdc8672..42289164144 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.0.1"; - sha256 = "15adic3dl4qqrd63jx1rc1w4wx270vm7zc3hr69mnh0wn0cr0ga5"; + version = "1.0.1.1"; + sha256 = "0wjk2f7xh7ihkvdri669mw25bdwszzx03np32fy66k56x7adgxzc"; buildDepends = [ blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable lens monoidExtras mtl split time vectorSpace diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 46e69c95f94..843fd6239dc 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "doctest"; - version = "0.9.10"; - sha256 = "1xislgmg62i2bngq8ghg31r4ip4qdbqzr6rqhm5wac7nchjv0j83"; + version = "0.9.10.1"; + sha256 = "1kl6bihhyj08ifij7ddpy6067s1lv2lnnp4an9wany3fzwlifbyi"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 3ba05926179..a1b09433782 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "email-validate"; - version = "1.0.0"; - sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg"; + version = "2.0.1"; + sha256 = "1qxvcm8xiyz50ganzic8cm8nxswq361i80yi939y3n89dk067lzj"; buildDepends = [ attoparsec ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 90432dfe975..9c9cae45b4b 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fast-logger"; - version = "2.1.4"; - sha256 = "1fb75wx1v9h7690x43kd85lq1h9zi8nq438pqclzzrcfidsnm6z5"; + version = "2.1.5"; + sha256 = "12f7yad2f6q846rw2ji5fsx3d7qd8jdrnnzsbji5bpv00mvvsiza"; buildDepends = [ blazeBuilder filepath text ]; testDepends = [ hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index adc29231d62..fdce9907056 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.19.0.1"; - sha256 = "036z4wz7vziaczhx1ysbm7d2302n2sb6l1z48py8spai5awkbvh0"; + version = "0.19.0.2"; + sha256 = "025yhl32xr5fcsxval5rcj8jrgd6qnjq9bqbhbsr5ni8dz3ks5r3"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 22ad997b32a..e027111c6b6 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -27,8 +27,10 @@ cabal.mkDerivation (self: { ]; doCheck = false; patchPhase = '' - sed -i -e 's|blaze-markup.*,|blaze-markup,|' -e 's|blaze-html.*,|blaze-html,|' \ - -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal + sed -i -e 's|blaze-markup.*,|blaze-markup,|' \ + -e 's|blaze-html.*,|blaze-html,|' \ + -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' \ + -e 's|regex-tdfa.*,|regex-tdfa,|' hakyll.cabal ''; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix index 46edfb8946a..01cf7262783 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happstack-lite"; - version = "7.3.1"; - sha256 = "0y8d0xv26szfjmkfqzak19zqjgv0w6rkc1rzrd2jkvsbchnwacjy"; + version = "7.3.3"; + sha256 = "0iv60cch0fiy9kh21wcpk3s4nvd4j2p50pqr3y56bsqwxk53hhv8"; buildDepends = [ happstackServer mtl text ]; meta = { homepage = "http://www.happstack.com/"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 4d773603c04..40da6037e7d 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.2"; - sha256 = "11wnnadxy1j786p81nkvd28vgpjjhm1amy34k5r0ynz0nkanfp3z"; + version = "7.3.3"; + sha256 = "18z706n9idszmn5j2cm2aqhs8zavk2sas6fwwywh38j536qzz36l"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 26ebbb9f8b0..eff9ada1da5 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.10.1.1"; - sha256 = "0qvbl3bms2mf650w9j3r0pnl151vzkggy2if3f4rj34qwb2sxmvp"; + version = "3000.10.2"; + sha256 = "10fgz1vvrx09pvlxp0k772xbfni8c8lxbjp59vzm95v2kc4hnagc"; buildDepends = [ base64Bytestring blazeBuilder HaXml HTTP mtl network time utf8String diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index ba1c86d8d2d..8c657e780ec 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.2.6.8"; - sha256 = "0brz7lxbnkwhjlbvs7xk3012mp9419v9wpczwa3nahl5afzbsp3i"; + version = "0.2.7"; + sha256 = "03ddrszirx3xg7lxbykhwbzs4vqr8xravn2krc7v0q308rh070nr"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/3.10.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/lens/default.nix rename to pkgs/development/libraries/haskell/lens/3.10.2.nix diff --git a/pkgs/development/libraries/haskell/lens/4.0.nix b/pkgs/development/libraries/haskell/lens/4.0.nix new file mode 100644 index 00000000000..9046558c22d --- /dev/null +++ b/pkgs/development/libraries/haskell/lens/4.0.nix @@ -0,0 +1,35 @@ +{ cabal, aeson, bifunctors, comonad, constraints, contravariant +, deepseq, distributive, doctest, exceptions, filepath +, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel +, primitive, profunctors, QuickCheck, reflection, scientific +, semigroupoids, semigroups, simpleReflect, split, tagged +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, testFrameworkTh, text, transformers, transformersCompat +, unorderedContainers, utf8String, vector, void, zlib +}: + +cabal.mkDerivation (self: { + pname = "lens"; + version = "4.0"; + sha256 = "1mrpbwnj1k2my71lm0ajxsx5r44sz372gfxn78vz4182yv3bmla1"; + buildDepends = [ + aeson bifunctors comonad constraints contravariant distributive + exceptions filepath hashable mtl parallel primitive profunctors + reflection scientific semigroupoids semigroups split tagged text + transformers transformersCompat unorderedContainers utf8String + vector void zlib + ]; + testDepends = [ + deepseq doctest filepath genericDeriving hlint HUnit mtl nats + parallel QuickCheck semigroups simpleReflect split testFramework + testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text + transformers unorderedContainers vector + ]; + doCheck = false; + meta = { + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix similarity index 100% rename from pkgs/development/libraries/haskell/llvm-general-pure/default.nix rename to pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix new file mode 100644 index 00000000000..71947f00a23 --- /dev/null +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix @@ -0,0 +1,20 @@ +{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, transformers +}: + +cabal.mkDerivation (self: { + pname = "llvm-general-pure"; + version = "3.4.0.0"; + sha256 = "1b8nl4w16w6dsszmnvylrysi4fd86jcn2bvv531d13p81ybnxlx1"; + buildDepends = [ mtl parsec setenv transformers ]; + testDepends = [ + HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + description = "Pure Haskell LLVM functionality (no FFI)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.nix similarity index 100% rename from pkgs/development/libraries/haskell/llvm-general/default.nix rename to pkgs/development/libraries/haskell/llvm-general/3.3.nix diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.nix new file mode 100644 index 00000000000..3206493eee3 --- /dev/null +++ b/pkgs/development/libraries/haskell/llvm-general/3.4.nix @@ -0,0 +1,25 @@ +{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec +, QuickCheck, setenv, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, transformers, utf8String +, ncurses, zlib +}: + +cabal.mkDerivation (self: { + pname = "llvm-general"; + version = "3.4.0.0"; + sha256 = "1hj96wkgdqyvckgmk7r43n9s9fcq4gijnv0ghrj92ggd13hhmv7b"; + buildDepends = [ + llvmGeneralPure mtl parsec setenv transformers utf8String + ]; + testDepends = [ + HUnit llvmGeneralPure mtl QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; + buildTools = [ llvmConfig ]; + doCheck = false; + meta = { + description = "General purpose LLVM bindings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix index 156b89244ee..2552970717d 100644 --- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix +++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-aeson"; - version = "0.2.0"; - sha256 = "12y5dywrhx3mvmlq26bc1cwybnclqbf91zvlz5ig2pi01ji3q94y"; + version = "0.2.1"; + sha256 = "19zrbk9jbls8zsnhx8bm9dzd7rxvf98bpjkr3k9ggmx2g5p08mgz"; buildDepends = [ aeson attoparsec pipes pipesAttoparsec pipesParse transformers ]; diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 4e085105c20..8847f5e93f0 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -1,10 +1,13 @@ -{ cabal, pipes, pipesParse, transformers }: +{ cabal, pipes, pipesGroup, pipesParse, profunctors, transformers +}: cabal.mkDerivation (self: { pname = "pipes-bytestring"; - version = "1.0.3"; - sha256 = "11jiaf5vs0jz8m0x9dlcvflh636131bj4jnlrj3r5nz1v7a64v6b"; - buildDepends = [ pipes pipesParse transformers ]; + version = "2.0.0"; + sha256 = "17l74g7xfl1i32jj9qa9ivbb3ndi68hkc1b6jchwnn19rmg51j9i"; + buildDepends = [ + pipes pipesGroup pipesParse profunctors transformers + ]; meta = { description = "ByteString support for pipes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix index 7136a281f89..00336e8077d 100644 --- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-concurrency"; - version = "2.0.1"; - sha256 = "0grfwmmwzxrska2218php22f898nn3x92bz1lmhpw2qi8mywvkzh"; + version = "2.0.2"; + sha256 = "0g4fbh8dk8ph2ga0vyanqj52rxk9c1zi6g4yk3a1g6bnf4bklhm8"; buildDepends = [ pipes stm ]; testDepends = [ async pipes stm ]; meta = { diff --git a/pkgs/development/libraries/haskell/pipes-group/default.nix b/pkgs/development/libraries/haskell/pipes-group/default.nix new file mode 100644 index 00000000000..5fd5d7e1251 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-group/default.nix @@ -0,0 +1,13 @@ +{ cabal, free, pipes, pipesParse, transformers }: + +cabal.mkDerivation (self: { + pname = "pipes-group"; + version = "1.0.0"; + sha256 = "1izc2z3cwz7dihhfrngjyiaxmcpp794ragbl6v17y8c2pj0s34kh"; + buildDepends = [ free pipes pipesParse transformers ]; + meta = { + description = "Group streams into substreams"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix index 7a6c21db997..b70527ecdad 100644 --- a/pkgs/development/libraries/haskell/pipes-network/default.nix +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-network"; - version = "0.6.1"; - sha256 = "0ds6v98jamda8p72rnrwnj3x77mfx3kss57hj9ns97gga5jq88kl"; + version = "0.6.2"; + sha256 = "1y64cyi1lq7y5x3b1rv2iixlwqnz4g82nxk2m14x214fmj3np965"; buildDepends = [ network networkSimple pipes pipesSafe transformers ]; diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index 61c0f34a57e..ea83701f702 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -1,10 +1,10 @@ -{ cabal, free, pipes, transformers }: +{ cabal, pipes, transformers }: cabal.mkDerivation (self: { pname = "pipes-parse"; - version = "2.0.2"; - sha256 = "1jcws5i9jhh4i6bh2j6m9pz1462qm05byibkkxfqvyx392sxy4wz"; - buildDepends = [ free pipes transformers ]; + version = "3.0.0"; + sha256 = "07ycdnx24qlysbf78sgfl2g8rfsrxnaiq1rimc4656in4cmcjn9g"; + buildDepends = [ pipes transformers ]; meta = { description = "Parsing infrastructure for the pipes ecosystem"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix index 029bbd158b8..dddc27157dd 100644 --- a/pkgs/development/libraries/haskell/pipes-safe/default.nix +++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-safe"; - version = "2.0.1"; - sha256 = "11516rixqdym5rf5z5f5gwbfk689dl3ka3dj44c7a2qy7xl4sqzr"; + version = "2.0.2"; + sha256 = "004xjf0aqa73gxn8kj9844pwbkriv3hk9sbnwxx26pgvqvwjlrsj"; buildDepends = [ exceptions pipes transformers ]; meta = { description = "Safety for the pipes ecosystem"; diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 766393d7b45..3ca6969f159 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -1,12 +1,12 @@ { cabal, mmorph, mtl, QuickCheck, testFramework -, testFrameworkQuickcheck2, transformers, void +, testFrameworkQuickcheck2, transformers }: cabal.mkDerivation (self: { pname = "pipes"; - version = "4.0.2"; - sha256 = "18hcpklryyq9f6iwycxzi3sd6gyd9h0gy0ckg4rl7rhgy73hzgcz"; - buildDepends = [ mmorph mtl transformers void ]; + version = "4.1.0"; + sha256 = "1n10plmrjvmkyv502195mkms48y3lfp5gy08lhyhqqr7kn1gzkf0"; + buildDepends = [ mmorph mtl transformers ]; testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers ]; diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix index 004bd9d7052..7f9bce42cf6 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "regex-tdfa"; - version = "1.1.8"; - sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x"; + version = "1.2.0"; + sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw"; buildDepends = [ mtl parsec regexBase ]; - patches = [ ./fix-build-with-array5.patch ]; meta = { homepage = "http://hackage.haskell.org/package/regex-tdfa"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch b/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch deleted file mode 100644 index 2460e6bfc7a..00000000000 --- a/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs ---- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs 2011-03-12 00:46:39.000000000 +0100 -+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs 2013-12-19 12:42:27.048813869 +0100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - -- | This is the code for the main engine. This captures the posix - -- subexpressions. There is also a non-capturing engine, and a - -- testing engine. -@@ -20,7 +21,12 @@ - - import Prelude hiding ((!!)) - import Control.Monad(when,unless,forM,forM_,liftM2,foldM) -+#if MIN_VERSION_array(0,4,0) -+import Data.Array.MArray(MArray(..)) -+import Data.Array.Unsafe(unsafeFreeze) -+#else - import Data.Array.MArray(MArray(..),unsafeFreeze) -+#endif - import Data.Array.IArray(Array,bounds,assocs,Ix(range)) - import qualified Data.IntMap.CharMap2 as CMap(findWithDefault) - import Data.IntMap(IntMap) -@@ -574,7 +580,7 @@ - case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) -> - (# s2#, () #) }} - {- --#else /* !__GLASGOW_HASKELL__ */ -+-- #else /* !__GLASGOW_HASKELL__ */ - - copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e) - copySTU source destination = do -@@ -585,5 +591,5 @@ - forM_ (range b) $ \index -> - set destination index =<< source !! index - return destination --#endif /* !__GLASGOW_HASKELL__ */ -+-- #endif /* !__GLASGOW_HASKELL__ */ - -} -diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs ---- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs 2011-03-12 00:46:39.000000000 +0100 -+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs 2013-12-19 12:42:27.049813918 +0100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - -- | This is the code for the main engine. This captures the posix subexpressions. This 'execMatch' - -- also dispatches to "Engine_NC", "Engine_FA", and "Engine_FC_NA" - -- -@@ -19,7 +20,12 @@ - -} - import Prelude hiding ((!!)) - -+#if MIN_VERSION_array(0,4,0) -+import Data.Array.MArray(MArray(..)) -+import Data.Array.Unsafe(unsafeFreeze) -+#else - import Data.Array.MArray(MArray(..),unsafeFreeze) -+#endif - import Data.Array.IArray(Array,bounds,assocs,Ix(rangeSize,range)) - import qualified Data.IntMap.CharMap2 as CMap(findWithDefault) - import Data.IntMap(IntMap) -@@ -716,7 +722,7 @@ - case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) -> - (# s2#, () #) }} - {- --#else /* !__GLASGOW_HASKELL__ */ -+-- #else /* !__GLASGOW_HASKELL__ */ - - copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e) - copySTU source destination = do -@@ -727,5 +733,5 @@ - forM_ (range b) $ \index -> - set destination index =<< source !! index - return destination --#endif /* !__GLASGOW_HASKELL__ */ -+-- #endif /* !__GLASGOW_HASKELL__ */ - -} -diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs ---- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs 2011-03-12 00:46:39.000000000 +0100 -+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs 2013-12-19 12:42:27.048813869 +0100 -@@ -1,10 +1,16 @@ -+{-# LANGUAGE CPP #-} - -- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String - module Text.Regex.TDFA.NewDFA.Engine_NC_FA(execMatch) where - - import Control.Monad(unless) - import Prelude hiding ((!!)) - -+#if MIN_VERSION_array(0,4,0) -+import Data.Array.MArray(MArray(newArray)) -+import Data.Array.Unsafe(unsafeFreeze) -+#else - import Data.Array.MArray(MArray(newArray),unsafeFreeze) -+#endif - import Data.Array.ST(STArray) - import qualified Data.IntMap.CharMap2 as CMap(findWithDefault) - import qualified Data.IntMap as IMap(null) -diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs ---- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs 2011-03-12 00:46:39.000000000 +0100 -+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs 2013-12-19 12:42:27.048813869 +0100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - -- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String - module Text.Regex.TDFA.NewDFA.Engine_NC(execMatch) where - -@@ -5,7 +6,12 @@ - import Data.Array.Base(unsafeRead,unsafeWrite) - import Prelude hiding ((!!)) - -+#if MIN_VERSION_array(0,4,0) -+import Data.Array.MArray(MArray(..)) -+import Data.Array.Unsafe(unsafeFreeze) -+#else - import Data.Array.MArray(MArray(..),unsafeFreeze) -+#endif - import Data.Array.IArray(Ix) - import Data.Array.ST(STArray,STUArray) - import qualified Data.IntMap.CharMap2 as CMap(findWithDefault) -@@ -248,4 +254,3 @@ - wsToGroup (WScratch start stop) = do - ma <- newArray (0,0) (start,stop-start) :: S.ST s (STArray s Int (MatchOffset,MatchLength)) - unsafeFreeze ma -- diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index 6c16af12107..49c77c5ea26 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "safe"; - version = "0.3.3"; - sha256 = "0ig9laq1p4iic24smjb304mvlsvdyn90lvxh64c4p75c8g459489"; + version = "0.3.4"; + sha256 = "0mwdaj0sjvqkgg077x1d896xphx64yrjvwbdhv7khdk3rh0vfl64"; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; description = "Library for safe (pattern match free) functions"; diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 5a53a2f64c1..72b3e280b3b 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -1,12 +1,13 @@ -{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat +{ cabal, async, mtl, systemFileio, systemFilepath, text, time +, unixCompat }: cabal.mkDerivation (self: { pname = "shelly"; - version = "1.4.1"; - sha256 = "04yi5kc9jfcpc1rq3prypc832xgv94lrzv3i8saf1rg8a6najwbx"; + version = "1.4.4"; + sha256 = "0gxmwwpg7p5ai35ng8fsx743w3q9p5jl0c1c3ckiqvz4jbwgyf7y"; buildDepends = [ - mtl systemFileio systemFilepath text time unixCompat + async mtl systemFileio systemFilepath text time unixCompat ]; meta = { homepage = "https://github.com/yesodweb/Shelly.hs"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 92c02a27f42..3a656d65b33 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.1"; - sha256 = "0jkjxyw7pcfl8r6gs0amzpkxardncvxsh20m7lad6aqjkcwh8r4l"; + version = "0.13.2.2"; + sha256 = "097bv45646g5qanc5ik0lpfm8g7zd1f5ymlxkilgcnvc72wiwkjm"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix index 67c3ae28d58..4f5841d6881 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix @@ -17,7 +17,9 @@ cabal.mkDerivation (self: { postPatch = '' substituteInPlace trifecta.cabal \ --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ + --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ + --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ --replace "comonad == 3.*," "comonad >= 3 && < 5," \ diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix index 447e0d36c9c..fae592e73f0 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix @@ -17,7 +17,9 @@ cabal.mkDerivation (self: { postPatch = '' substituteInPlace trifecta.cabal \ --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ + --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ + --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ --replace "comonad == 3.*," "comonad >= 3 && < 5," \ diff --git a/pkgs/development/libraries/haskell/trifecta/1.4.nix b/pkgs/development/libraries/haskell/trifecta/1.4.nix new file mode 100644 index 00000000000..84759406d00 --- /dev/null +++ b/pkgs/development/libraries/haskell/trifecta/1.4.nix @@ -0,0 +1,34 @@ +{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml +, blazeMarkup, charset, comonad, deepseq, doctest, filepath +, fingertree, hashable, lens, mtl, parsers, reducers, semigroups +, transformers, unorderedContainers, utf8String +}: + +cabal.mkDerivation (self: { + pname = "trifecta"; + version = "1.4"; + sha256 = "1wz9rqd5nf1y4vpwn0vrbdlxdbrdp967p5ivpd0b2w5493m3mvax"; + buildDepends = [ + ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup + charset comonad deepseq fingertree hashable lens mtl parsers + reducers semigroups transformers unorderedContainers utf8String + ]; + testDepends = [ doctest filepath ]; + postPatch = '' + substituteInPlace trifecta.cabal \ + --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ + --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ + --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ + --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ + --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ + --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ + --replace "comonad == 3.*," "comonad >= 3 && < 5," \ + --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," + ''; + meta = { + homepage = "http://github.com/ekmett/trifecta/"; + description = "A modern parser combinator library with convenient diagnostics"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 8086ba20ca0..b8008447e40 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,23 +1,23 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, doctest, hashable, hspec, HTTP, httpAttoparsec, httpDate -, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck +, conduit, doctest, hashable, hspec, HTTP, httpDate, httpTypes +, HUnit, liftedBase, network, networkConduit, QuickCheck , simpleSendfile, time, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "2.0.2"; - sha256 = "1v28kfs311kr7n4hraqh5dzhw2gy0da2rp30732adivy9aj9grl9"; + version = "2.0.2.1"; + sha256 = "0r8kpg2k7mr9y7nlccvfk6qbzgv459gidbaw6sgaxb26f6bgipgk"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - httpAttoparsec httpDate httpTypes liftedBase network networkConduit - simpleSendfile transformers unixCompat void wai + httpDate httpTypes liftedBase network networkConduit simpleSendfile + transformers unixCompat void wai ]; testDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest - hashable hspec HTTP httpAttoparsec httpDate httpTypes HUnit - liftedBase network networkConduit QuickCheck simpleSendfile time - transformers unixCompat void wai + hashable hspec HTTP httpDate httpTypes HUnit liftedBase network + networkConduit QuickCheck simpleSendfile time transformers + unixCompat void wai ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix index ee6c19b0d93..ab89944d60f 100644 --- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "web-routes-boomerang"; - version = "0.28.1"; - sha256 = "1a655d73fr7b9k033wyqgc8waq7ii3s5rh0w3nkb1phxl9ldg0pi"; + version = "0.28.2"; + sha256 = "17237xq8nvy0c1mxzf7pad5kw0mrgbzazy0rflp382ig9q6ipd05"; buildDepends = [ boomerang mtl parsec text webRoutes ]; meta = { description = "Library for maintaining correctness and composability of URLs within an application"; diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 76fbf12540a..8c84f81bcc9 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.27.4"; - sha256 = "1n9gdaxzy22m3fmrq3j1jkm16c4wvffjbh19xckfpva53zdhsal4"; + version = "0.27.5"; + sha256 = "1jx5wwmlylwrf45wy3w29ck1p7509mgy8m02vipd8apibx6ghp22"; buildDepends = [ blazeBuilder httpTypes mtl parsec split text utf8String ]; diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index af6b4f339f6..f53c8f554b0 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.5.7"; - sha256 = "0vxkwdqmfi2ccknmgx0xh6w1p7bw3wi24w3c3fw80g72j9sxr5hn"; + version = "1.2.5.8"; + sha256 = "1k9afj8f463rs0w9bzxda587jhm1g3fq3l42mabydmg8mx4hbm2c"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index afda7d777d6..0b9284b8f14 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.6.5"; - sha256 = "1xry2jhm4rj3a7fg4xdx5q6fah8dixnrhzyk4176a60a3q8j3lal"; + version = "1.2.6.6"; + sha256 = "1wmcsblzr9mq831yp7g90m0rk8a1rgsz1vcdcsr7dsjrykcvxqfq"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 1fb2e487e7c..f87938f9a03 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.4.4"; - sha256 = "0g5kxcb29qa7xq1s57bvl38fbrsm6jvmvw65nw14as0hbqlv67fh"; + version = "1.3.5"; + sha256 = "01qh2s4z9w8g70xz613b2dirfrbag6c861c2niy85c6x8h05nnwy"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index ca61a00f034..5ced635aa66 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: let - version = "2.1"; + version = "2.2.1"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "16a2w5z4g2bma25fqcrkpidqzlq8a2jxkk93ajl721q85406j105"; + sha256 = "0p8wmchqsj9kwa8pg2is7v0h83q5lqns3vnm6sxrld7gaz979zh5"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index f93a44c2e1d..d9775c25610 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.0.3"; + name = "libassuan-2.1.1"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds"; + sha256 = "1783nb0b6nr9yjhb5wfh8ykc5w89f4anppz1kz9913mqg5vxdqi3"; }; propagatedBuildInputs = [ libgpgerror pth ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 6678984ebbe..c99059bf034 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,15 +26,15 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_9 = libavFun "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3"; - libav_0_8 = libavFun "0.8.9" "0zzphhkpwsdp2k3ijqr8miqsp4vk7dgcrcrv06qda1s09qb82lag"; + libav_9 = libavFun "9.11" "1ad7vyxp0w8dw6ngc16fz0ngsjlgk6h8bpphghqia5sqkbl10ca3"; + libav_0_8 = libavFun "0.8.10" "0sxmj4qsd3ljygvdjz7ly46nf7sqmaqka4hx65b1jdji12al1djc"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { name = "libav-${version}"; src = fetchurl { - url = "http://libav.org/releases/${name}.tar.xz"; + url = "${meta.homepage}/releases/${name}.tar.xz"; inherit sha256; }; configureFlags = @@ -105,6 +105,7 @@ let license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; }; }; # libavFun diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 695c0fa1a32..34441d8fa7f 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,11 +1,11 @@ { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: stdenv.mkDerivation rec { - name = "libcangjie-1.0"; + name = "libcangjie-1.1"; src = fetchurl { - url = "https://github.com/Cangjians/libcangjie/archive/v1.0.tar.gz"; - sha256 = "15la1pxa2fvhznlbkl32qp2cgd602bvrx2zmahybypbfik0cgqk1"; + url = "https://github.com/Cangjians/libcangjie/archive/v1.1.tar.gz"; + sha256 = "1iy57vlmwgai9763adx6q4fisg2c63cmp31d1cd8mk00c222bw1z"; }; buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ]; diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix new file mode 100644 index 00000000000..fc26fb9aca1 --- /dev/null +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: + +stdenv.mkDerivation rec { + name = "libcdio-0.82"; + + src = fetchurl { + url = "mirror://gnu/libcdio/${name}.tar.gz"; + sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; + }; + + buildInputs = [ libcddb pkgconfig ncurses help2man ]; + + # Disabled because one test (check_paranoia.sh) fails. + #doCheck = true; + + meta = { + description = "A library for OS-independent CD-ROM and CD image access"; + longDescription = '' + GNU libcdio is a library for OS-idependent CD-ROM and + CD image access. It includes a library for working with + ISO-9660 filesystems (libiso9660), as well as utility + programs such as an audio CD player and an extractor. + ''; + license = "GPLv2+"; + homepage = http://www.gnu.org/software/libcdio/; + }; +} diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 000112008a3..56d15cd1e80 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -79,7 +79,7 @@ else stdenv.mkDerivation { meta = with stdenv.lib; { description = "Spotify API library"; homepage = https://developer.spotify.com/technologies/libspotify; - maintainers = with maintainers; [ lovek323 shlevy ]; + maintainers = with maintainers; [ lovek323 ]; license = licenses.unfree; }; } diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index a3de6f99418..91f9e4f2f2b 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libconfig, pkgconfig }: let - version = "18c98eb"; - date = "20131112"; + version = "dbe256cc82"; + date = "20140203"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "1g69fz9aspzsrlzlk6fpmjyyhb38v8mmp25nszlbra17n3f209yh"; + sha256 = "0mqbwwqbm15p16ya8nlij23fgbafjdmnc44nm2vh47m8pyb119lc"; }; preConfigure = '' diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 1273146c342..8f26f29c377 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: stdenv.mkDerivation rec { - name = "openldap-2.4.35"; + name = "openldap-2.4.38"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz"; - sha256 = "1swy3rly6y0asikp862sigmab8gcll6scb65ln10vps7q5s0640n"; + sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848"; }; buildInputs = [ openssl cyrus_sasl db4 groff ]; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index a6a624c0a87..e41bd9fdb02 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -2,12 +2,12 @@ , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }: stdenv.mkDerivation rec { - name = "${pname}-0.4.0"; + name = "${pname}-0.6.0"; pname = "telepathy-farstream"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "13mllgfx4b1hh1vpzq8lk5qfr3ivkkkmwbxgi6d47avgk746kznd"; + sha256 = "04v414jij2ba71krk7vh4avsz07sfp5w38dmvjwig5isdygy0905"; }; buildInputs = [ gst_plugins_base gst_python pygobject ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 47925520ab4..11dc34176f5 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -30,8 +30,8 @@ args : with args; }; # official postgres connector psql = rec { - deriv = stdenv.mkDerivation { - name = "psql-odbc-08.03.0200"; + deriv = stdenv.mkDerivation rec { + name = "psqlodbc-09.03.0100"; buildInputs = [ unixODBC libtool postgresql openssl ]; preConfigure=" export CPPFLAGS=-I${unixODBC}/include @@ -39,9 +39,8 @@ args : with args; "; # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose' src = fetchurl { - url = http://wwwmaster.postgresql.org/redir?setmir=53&typ=h&url=http://ftp.de.postgresql.org/mirror/postgresql//odbc/versions/src/psqlodbc-08.03.0200.tar.gz; - name = "psqlodbc-08.03.0200.tar.gz"; - sha256 = "1401hgzvs3m2yr2nbbf9gfy2wwijrk4ihwz972arbn0krsiwxya1"; + url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + sha256 = "0mh10chkmlppidnmvgbp47v5jnphsrls28zwbvyk2crcn8gdx9q1"; }; meta = { description = "unix odbc driver for postgresql"; @@ -91,8 +90,11 @@ args : with args; configureFlags = "--with-sqlite3=${sqlite} --with-odbc=${unixODBC}"; + # move libraries to $out/lib where they're expected to be postInstall = '' - mkdir -p $out/lib + mkdir -p "$out/lib" + mv "$out"/*.so "$out/lib" + mv "$out"/*.la "$out/lib" ''; meta = { diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix index 0b551b753f5..ecfc9b88a0e 100644 --- a/pkgs/development/libraries/wvstreams/default.nix +++ b/pkgs/development/libraries/wvstreams/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { preConfigure = '' find -type f | xargs sed -i 's@/bin/bash@bash@g' + + sed -e '1i#include ' -i $(find . -name '*.c' -o -name '*.cc') ''; buildInputs = [ qt4 dbus zlib openssl readline perl ]; diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix new file mode 100644 index 00000000000..04f7e434a54 --- /dev/null +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie +, sqlite, python3, cython3 +}: + +stdenv.mkDerivation rec { + name = "pycangjie-${version}"; + version = "1.0"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/Cangjians/pycangjie/archive/v${version}.tar.gz"; + sha256 = "1wx0m0chcpgxhj6cdxrwyi8hq05xlbap1ifs0wzb6nkglir0sb4j"; + }; + + buildInputs = [ + autoconf automake libtool pkgconfig libcangjie sqlite python3 cython3 + ]; + + preConfigure = '' + find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' + sed -i 's@/usr@${libcangjie}@' tests/__init__.py + ''; + + configureScript = "./autogen.sh"; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Python wrapper to libcangjie"; + homepage = http://cangjians.github.io/projects/pycangjie/; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.linquize ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index b78785f8fc1..c8ede663be4 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.55"; - sha256 = "184y0vh5rwsv13vj49zvgwwpgdf5y7wxfisry9pv2998flwkf4rj"; + version = "1.8.56"; + sha256 = "1idff4jaca324acbr0aa64j977l5nxnlfk9nny33i81b5hzciwmw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 42d11ebe7c5..1d223d83a65 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }: +{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }: stdenv.mkDerivation rec { name = "lttng-tools-2.3.0"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ popt libuuid liburcu lttngUst ]; - patches = [ ./lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch ]; + prePatch = '' + sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ + -i src/bin/lttng-sessiond/modprobe.c + ''; meta = with stdenv.lib; { description = "Tracing tools (kernel + user space) for Linux"; diff --git a/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch b/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch deleted file mode 100644 index 7d9edbda97a..00000000000 --- a/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch +++ /dev/null @@ -1,53 +0,0 @@ -From daba2e936571a236817022b760d91c48b730c30b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= -Date: Tue, 9 Jul 2013 23:47:47 +0200 -Subject: [PATCH] Change modprobe path from "/sbin/modprobe" to "modprobe" - (rely on PATH lookup) - ---- - src/bin/lttng-sessiond/modprobe.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c -index 7e06dad..4075efe 100644 ---- a/src/bin/lttng-sessiond/modprobe.c -+++ b/src/bin/lttng-sessiond/modprobe.c -@@ -90,7 +90,7 @@ void modprobe_remove_lttng_control(void) - - for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) { - ret = snprintf(modprobe, sizeof(modprobe), -- "/sbin/modprobe -r -q %s", -+ "modprobe -r -q %s", - kern_modules_control[i].name); - if (ret < 0) { - PERROR("snprintf modprobe -r"); -@@ -125,7 +125,7 @@ void modprobe_remove_lttng_data(void) - - for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) { - ret = snprintf(modprobe, sizeof(modprobe), -- "/sbin/modprobe -r -q %s", -+ "modprobe -r -q %s", - kern_modules_list[i].name); - if (ret < 0) { - PERROR("snprintf modprobe -r"); -@@ -169,7 +169,7 @@ int modprobe_lttng_control(void) - - for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) { - ret = snprintf(modprobe, sizeof(modprobe), -- "/sbin/modprobe %s%s", -+ "modprobe %s%s", - kern_modules_control[i].required ? "" : "-q ", - kern_modules_control[i].name); - if (ret < 0) { -@@ -205,7 +205,7 @@ int modprobe_lttng_data(void) - - for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) { - ret = snprintf(modprobe, sizeof(modprobe), -- "/sbin/modprobe %s%s", -+ "modprobe %s%s", - kern_modules_list[i].required ? "" : "-q ", - kern_modules_list[i].name); - if (ret < 0) { --- -1.8.2.3 - diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 7c10bcb51de..2c2d343838c 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http_parser, c-ares, pkgconfig, runCommand }: +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand }: let dtrace = runCommand "dtrace-native" {} '' @@ -6,13 +6,12 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.24"; + version = "0.10.25"; # !!! Should we also do shared libuv? deps = { - inherit v8 openssl zlib; + inherit v8 openssl zlib http-parser; cares = c-ares; - http-parser = http_parser; }; sharedConfigureFlags = name: [ @@ -27,7 +26,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "0yip81va8nd3kzj64385avcx7ck13a2xcdj3amzwnhk830rxf331"; + sha256 = "0vxkyvl8hyhxxpkh96zws4j6i9f3ykqpqbrbvj0j0nj7snwz7vj6"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch index c0e8ec92493..e88168b68a7 100644 --- a/pkgs/development/web/nodejs/no-xcode.patch +++ b/pkgs/development/web/nodejs/no-xcode.patch @@ -1,7 +1,7 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py ---- a/tools/gyp/pylib/gyp/xcode_emulation.py 2013-12-19 00:49:45.000000000 +0100 -+++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2014-01-13 13:46:19.000000000 +0100 -@@ -295,11 +295,20 @@ +--- a/tools/gyp/pylib/gyp/xcode_emulation.py 2014-01-23 06:05:51.000000000 +0100 ++++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2014-02-04 17:49:48.000000000 +0100 +@@ -302,10 +302,17 @@ def _XcodeSdkPath(self, sdk_root): if sdk_root not in XcodeSettings._sdk_path_cache: @@ -9,87 +9,85 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_ - XcodeSettings._sdk_path_cache[sdk_root] = sdk_path - if sdk_root: - XcodeSettings._sdk_root_cache[sdk_path] = sdk_root -- return XcodeSettings._sdk_path_cache[sdk_root] -+ try: -+ sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path') -+ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path -+ -+ if sdk_root: -+ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root -+ except: -+ # if this fails it's because xcodebuild failed, which means -+ # the user is probably on a CLT-only system, where there -+ # is no valid SDK root -+ XcodeSettings._sdk_path_cache[sdk_root] = None -+ -+ return None; -+ #return XcodeSettings._sdk_path_cache[sdk_root] ++ try: ++ sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path') ++ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path ++ if sdk_root: ++ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root ++ except: ++ # if this fails it's because xcodebuild failed, which means ++ # the user is probably on a CLT-only system, where there ++ # is no valid SDK root ++ XcodeSettings._sdk_path_cache[sdk_root] = None ++ + return XcodeSettings._sdk_path_cache[sdk_root] def _AppendPlatformVersionMinFlags(self, lst): - self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s') -@@ -409,10 +418,11 @@ - - cflags += self._Settings().get('WARNING_CFLAGS', []) - +@@ -420,10 +427,12 @@ + framework_root = sdk_root + else: + framework_root = '' - config = self.spec['configurations'][self.configname] - framework_dirs = config.get('mac_framework_dirs', []) - for directory in framework_dirs: -- cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) +- cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) ++ + if 'SDKROOT' in self._Settings(): + config = self.spec['configurations'][self.configname] + framework_dirs = config.get('mac_framework_dirs', []) + for directory in framework_dirs: -+ cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) self.configname = None return cflags -@@ -659,10 +669,11 @@ - for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []): - ldflags.append('-Wl,-rpath,' + rpath) - +@@ -673,10 +682,12 @@ + sdk_root = self._SdkPath() + if not sdk_root: + sdk_root = '' - config = self.spec['configurations'][self.configname] - framework_dirs = config.get('mac_framework_dirs', []) - for directory in framework_dirs: -- ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) +- ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ + if 'SDKROOT' in self._Settings(): + config = self.spec['configurations'][self.configname] + framework_dirs = config.get('mac_framework_dirs', []) + for directory in framework_dirs: -+ ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) ++ ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) self.configname = None return ldflags -@@ -843,7 +854,10 @@ - l = '-l' + m.group(1) - else: - l = library -- return l.replace('$(SDKROOT)', self._SdkPath(config_name)) +@@ -863,7 +874,11 @@ + sdk_root = self._SdkPath(config_name) + if not sdk_root: + sdk_root = '' +- return l.replace('$(SDKROOT)', sdk_root) ++ + if self._SdkPath(): -+ return l.replace('$(SDKROOT)', self._SdkPath(config_name)) ++ return l.replace('$(SDKROOT)', sdk_root) + else: + return l def AdjustLibraries(self, libraries, config_name=None): """Transforms entries like 'Cocoa.framework' in libraries into entries like -@@ -956,12 +970,15 @@ +@@ -1018,12 +1033,16 @@ # Since the value returned by this function is only used when ARCHS is not # set, then on iOS we return "i386", as the default xcode project generator # does not set ARCHS if it is not set in the .gyp file. - if self.isIOS: -- return 'i386' ++ ++ try: ++ if self.isIOS: ++ return 'i386' ++ version, build = self._XcodeVersion() ++ if version >= '0500': ++ return 'x86_64' + return 'i386' - version, build = self._XcodeVersion() - if version >= '0500': -- return 'x86_64' -- return 'i386' -+ try: -+ if self.isIOS: -+ return 'i386' -+ version, build = self._XcodeVersion() -+ if version >= '0500': -+ return 'x86_64' -+ return 'i386' + except: -+ return 'x86_64' + return 'x86_64' +- return 'i386' class MacPrefixHeader(object): """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature. diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index dc221f37dd6..4b1cab6531c 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ SDL mesa SDL_image freealut openal libvorbis pkgconfig ]; + postPatch = '' + sed -e '1i#include ' -i $(find . -name '*.c' -o -name '*.cpp') + ''; + meta = { homepage = http://www.ultimatestunts.nl/; description = "Remake of the popular racing DOS-game Stunts"; diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix new file mode 100644 index 00000000000..682c36401de --- /dev/null +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, gnugrep, findutils }: +let + version = "3ubuntu1"; # Saucy +in +stdenv.mkDerivation { + name = "kmod-blacklist-${version}"; + + src = fetchurl { + url = "http://archive.ubuntu.com/ubuntu/pool/main/k/kmod/kmod_9-${version}.debian.tar.gz"; + sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; + }; + + installPhase = '' + mkdir "$out" + for f in modprobe.d/*.conf; do + echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf + cat "$f" >> "$out"/modprobe.conf + done + + substituteInPlace "$out"/modprobe.conf \ + --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ + --replace /sbin/rmmod /run/booted-system/sw/sbin/rmmod \ + --replace /sbin/modprobe /run/booted-system/sw/sbin/modprobe \ + --replace " grep " " ${gnugrep}/bin/grep " \ + --replace " xargs " " ${findutils}/bin/xargs " + ''; + + meta = { + homepage = http://packages.ubuntu.com/source/saucy/kmod; + description = "Linux kernel module blacklists from Ubuntu"; + }; +} diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index acea2e4435c..378e1a87d07 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "kmod-15"; + name = "kmod-16"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "17nasn7kpbmbcgyfn9lh50k00bg6qmccxrhzd2m4d6wjw6khxvz8"; + sha256 = "63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5"; }; # Disable xz/zlib support to prevent needing them in the initrd. diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 354027dbd71..388ec857b4a 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, bison, flex, which, perl }: -let version = "3.3.4"; in +let version = "3.3.5"; in stdenv.mkDerivation rec { name = "lm-sensors-${version}"; src = fetchurl { url = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"; - sha256 = "0vd7dgpcri7cbvgl5fwvja53lqz829vkbbp17x7b5r2xrc88cq5l"; + sha256 = "1ksgrynxgrq590nb2fwxrl1gwzisjkqlyg3ljfd1al0ibrk6mbjx"; }; buildInputs = [ bison flex which perl ]; diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix index eb9d09d2a11..7decd42b376 100644 --- a/pkgs/os-specific/linux/wvdial/default.nix +++ b/pkgs/os-specific/linux/wvdial/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { export makeFlags="prefix=$out" # not sure about this line sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in + + sed -e '1i#include ' -i $(find . -name '*.cc') ''; meta = { diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 2dd4d7eb794..283b751cf26 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ucl, zlib}: stdenv.mkDerivation { - name = "upx-3.09"; + name = "upx-3.91"; src = fetchurl { - url = mirror://sourceforge/upx/upx-3.09-src.tar.bz2; - sha256 = "16jwynharr1silfd6vlxl9i94fs8mg79qp72dr48r3wv9mlra6pn"; + url = mirror://sourceforge/upx/upx-3.91-src.tar.bz2; + sha256 = "0g3aiinlcb37z1xhs202h2qrgbf8dygiyarmflbgahcq89byfz2j"; }; buildInputs = [ ucl zlib ]; diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix new file mode 100644 index 00000000000..f8adedc7c24 --- /dev/null +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, libpcap }: + +stdenv.mkDerivation rec { + name = "arp-scan-1.9"; + + src = fetchurl { + url = "http://www.nta-monitor.com/files/arp-scan/${name}.tar.gz"; + sha256 = "14nqjzbmnlx2nac7lwa93y5m5iqk3layakyxyvfmvs283k3qm46f"; + }; + + buildInputs = [ libpcap ]; + + meta = with stdenv.lib; { + description = "ARP scanning and fingerprinting tool"; + longDescription = '' + Arp-scan is a command-line tool that uses the ARP protocol to discover + and fingerprint IP hosts on the local network. + ''; + homepage = http://www.nta-monitor.com/tools-resources/security-tools/arp-scan; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index 1098e9d0920..502d9044c5d 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { - name = "gummiboot-38"; + name = "gummiboot-43"; buildInputs = [ gnu-efi pkgconfig libxslt utillinux ]; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-38.tar.xz/0504791387e1998bf2075728c237f27e/gummiboot-38.tar.xz; - sha256 = "1aid2a29ym8dqldxpcihnrls7vrr9ijbla3dad0r8qwkca43d4lm"; + url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-43.tar.xz/c9b46a3504a2f7e335404a1475818d98/gummiboot-43.tar.xz; + sha256 = "1hwaan3985ap9r5ncf9bykbaixbm0xn4x09silssngwfl2srn4iv"; }; meta = { diff --git a/pkgs/tools/misc/refind/default.nix b/pkgs/tools/misc/refind/default.nix deleted file mode 100644 index 6f4e031e441..00000000000 --- a/pkgs/tools/misc/refind/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, gnu-efi, unzip }: - -let version = "0.4.5"; in - -stdenv.mkDerivation { - name = "refind-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/refind/refind-src-${version}.zip"; - sha256 = "05nbalsl5csgph0v2amzgay9k2vzm47z8n1n6blbh9hvb7j5vn2c"; - }; - - buildInputs = [ unzip ]; - - buildFlags = [ "prefix=" "EFIINC=${gnu-efi}/include/efi" "GNUEFILIB=${gnu-efi}/lib" "EFILIB=${gnu-efi}/lib" "EFICRT0=${gnu-efi}/lib" "LOCAL_CFLAGS=-I${gnu-efi}/include" ]; - - installPhase = '' - mkdir -pv $out - install -v -m644 refind/refind*.efi refind.conf-sample $out - mv -v icons $out - ''; - - meta = { - description = "An EFI boot manager"; - - homepage = http://www.rodsbooks.com/refind/; - - license = "GPLv3+"; - - maintainers = with stdenv.lib.maintainers; [ shlevy ]; - - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix index 2cd3892eede..c7ccefd045b 100644 --- a/pkgs/tools/networking/aria/default.nix +++ b/pkgs/tools/networking/aria/default.nix @@ -1,11 +1,11 @@ args : with args; -let version="0.16.2"; in +let version="1.18.3"; in rec { src = /* Here a fetchurl expression goes */ fetchurl { - url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2"; - sha256 = "02qj3j7a1r477pmk969nd3aa93m33kh4101azy001i9jacpjvzrp"; + url = "mirror://sourceforge/aria2/stable/aria2-${version}.tar.bz2"; + sha256 = "0y5wv7llq5sdwrsxqkc67wzk8gpb1kl4l1c0zl6l7kr0bkidna9r"; }; buildInputs = []; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index ad0b62d19f8..fe683c38285 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-5.6.8"; + name = "dhcpcd-6.2.1"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3"; + sha256 = "1gs23zwhzml2aam4j6rdncaqfv3z5n1ifx6lq4b8ccifqa87gbga"; }; patches = [ ./lxc_ro_promote_secondaries.patch ]; + buildInputs = [ pkgconfig udev ]; + configureFlags = "--sysconfdir=/etc"; makeFlags = "PREFIX=\${out}"; @@ -18,6 +20,9 @@ stdenv.mkDerivation rec { # at runtime. installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc"; + # Check that the udev plugin got built. + postInstall = "[ -e $out/lib/dhcpcd/dev/udev.so ]"; + meta = { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = http://roy.marples.name/projects/dhcpcd; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index a3b347f6423..465f15184f1 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,24 +1,26 @@ -{stdenv, fetchurl, libcap}: +{ stdenv, fetchurl, libcap }: assert stdenv.isLinux -> libcap != null; - + stdenv.mkDerivation rec { - name = "ntp-4.2.6p4"; - + name = "ntp-4.2.6p5"; + src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "1ww1hpy0yfmj13vs46d80hs48hy8ig6kn6p6d8q2syym02khxhyy"; + sha256 = "077r69a41hasl8zf5c44km7cqgfhrkaj6a4jnr75j7nkz5qq7ayn"; }; - + configureFlags = '' --without-crypto ${if stdenv.isLinux then "--enable-linuxcaps" else ""} ''; - + buildInputs = stdenv.lib.optional stdenv.isLinux libcap; meta = { homepage = http://www.ntp.org/; description = "An implementation of the Network Time Protocol"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 3271941f884..36d3bfeca56 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -23,9 +23,11 @@ stdenv.mkDerivation rec { installFlags = "SYSCONFDIR=$(out)/etc"; - meta = { + meta = { description = "A program to manage /etc/resolv.conf"; homepage = http://roy.marples.name/projects/openresolv; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index e29433adae3..fee3db878ac 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, lib }: -let - version = "3.0.5"; - baseName = "siege"; -in stdenv.mkDerivation rec { - name = "${baseName}-${version}"; +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "siege-3.0.6"; + src = fetchurl { url = "http://www.joedog.org/pub/siege/${name}.tar.gz"; - sha256 = "16faa6kappg23bdriyiy3ym94rmddpvw8cl8xgv5nxq2v17n4gi8"; - }; - meta = { - description = "HTTP load tester"; - maintainers = with lib.maintainers; [ ocharles raskin ]; - platforms = with lib.platforms; linux; - license = with lib.licenses; gpl2Plus; + sha256 = "0nwcj2s804z7yd20pa0cl010m0qgf22a02305i9jwxynwdj9kdvq"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + + meta = with stdenv.lib; { + description = "HTTP load tester"; + maintainers = with maintainers; [ ocharles raskin ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; } diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index adc8d9ec486..e8a1ee96505 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,15 +1,17 @@ {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}: -let release = "0.19.1"; in +let release = "0.19.2"; in stdenv.mkDerivation { name = "silver-searcher-${release}"; src = fetchgit { url = "https://github.com/ggreer/the_silver_searcher.git"; rev = "refs/tags/${release}"; - sha256 = "1km3ap74mls7vkp6si4f302zb1ifmldipjyfw2z9akqpvr3n44p9"; + sha256 = "b6993e077f650eb0976cbc924640665fa9b2499a899ecba5a6cad5cf9addfdff"; }; + NIX_LDFLAGS = "-lgcc_s"; + buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ]; meta = { diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index b5e3c981e1c..3158f285933 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -6,13 +6,13 @@ rec { }; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20131219.orig.tar.xz; - sha256 = "1kcfw6n9rv3wznyqkvkad60p1zljbn1cw2jhajzcrn8m39y0ad3x"; + url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20140123.orig.tar.xz; + sha256 = "1lwvqryfykz0d9pcjkhq1qh7dlcb6lsvjp7fizl18ji6166159iw"; }; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20131219.orig.tar.xz; - sha256 = "139hb91ks62q56dnnrzhcxmm2wpz0b40ka7smaqgw86r002albb0"; + url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20140123.orig.tar.xz; + sha256 = "1smzkg31msn9ci7fc69xq5klhxab00z8bcxmz5daqzcal8ak3d2d"; }; passthru = { inherit texmfSrc langTexmfSrc; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 464a23c8520..50df51b36c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -435,6 +435,8 @@ let argyllcms = callPackage ../tools/graphics/argyllcms {}; + arp-scan = callPackage ../tools/misc/arp-scan { }; + ascii = callPackage ../tools/text/ascii { }; asymptote = builderDefsPackage ../tools/graphics/asymptote { @@ -1251,11 +1253,11 @@ let nodejs = callPackage ../development/web/nodejs {}; - nodePackages = import ./node-packages.nix { + nodePackages = recurseIntoAttrs (import ./node-packages.nix { inherit pkgs stdenv nodejs fetchurl fetchgit; neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux; self = pkgs.nodePackages; - }; + }); ldapvi = callPackage ../tools/misc/ldapvi { }; @@ -1702,6 +1704,8 @@ let pwnat = callPackage ../tools/networking/pwnat { }; + pycangjie = callPackage ../development/python-modules/pycangjie { }; + pydb = callPackage ../development/tools/pydb { }; pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; @@ -1738,8 +1742,6 @@ let recoll = callPackage ../applications/search/recoll { }; - refind = callPackage ../tools/misc/refind { }; - reiser4progs = callPackage ../tools/filesystems/reiser4progs { }; reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; @@ -2796,7 +2798,13 @@ let else stdenv; }; - llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope stdenv fetchurl; isl = isl_0_12; }); + llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { + inherit newScope fetchurl; + isl = isl_0_12; + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }); llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; mentorToolchains = recurseIntoAttrs ( @@ -2959,6 +2967,7 @@ let ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; + ocamlPackages_latest = ocamlPackages_4_01_0; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; @@ -3201,7 +3210,9 @@ let polyml = callPackage ../development/compilers/polyml { }; - pure = callPackage ../development/interpreters/pure {}; + pure = callPackage ../development/interpreters/pure { + llvm = llvm_33 ; + }; python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); python33 = callPackage ../development/interpreters/python/3.3 { }; @@ -4038,7 +4049,11 @@ let farsight2 = callPackage ../development/libraries/farsight2 { }; - farstream = callPackage ../development/libraries/farstream { }; + farstream = callPackage ../development/libraries/farstream { + inherit (gst_all_1) + gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad + gst-libav; + }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -4436,7 +4451,7 @@ let hsqldb = callPackage ../development/libraries/java/hsqldb { }; - http_parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; @@ -4581,6 +4596,7 @@ let libcddb = callPackage ../development/libraries/libcddb { }; libcdio = callPackage ../development/libraries/libcdio { }; + libcdio082 = callPackage ../development/libraries/libcdio/0.82.nix { }; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; @@ -6850,6 +6866,8 @@ let kmod = callPackage ../os-specific/linux/kmod { }; + kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { }; + kvm = qemu_kvm; libcap = callPackage ../os-specific/linux/libcap { }; @@ -7324,6 +7342,7 @@ let abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; + libcdio = libcdio082; }; abiword = callPackage ../applications/office/abiword { @@ -7719,6 +7738,7 @@ let prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral { + texinfo = texinfo4 ; texLive = pkgs.texLiveAggregationFun { paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; }; @@ -8766,7 +8786,7 @@ let stumpwm = lispPackages.stumpwm; sublime = callPackage ../applications/editors/sublime { }; - + sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { }); subversion = callPackage ../applications/version-management/subversion/default.nix { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ae55febf893..105799eaf35 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -146,7 +146,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x caseInsensitive = self.caseInsensitive_1_1_0_3; cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_5_0_2; + GLUT = self.GLUT_2_5_1_0; GLURaw = self.GLURaw_1_4_0_0; haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; @@ -525,7 +525,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; - aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {}; + aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix { + attoparsec = self.attoparsec_0_11_1_0; + }; aeson = self.aeson_0_6_2_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; @@ -1188,10 +1190,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { OpenGL = self.OpenGL_2_8_0_0; }; - GLUT_2_5_0_2 = callPackage ../development/libraries/haskell/GLUT/2.5.0.2.nix { + GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix { OpenGL = self.OpenGL_2_9_1_0; }; - GLUT = self.GLUT_2_5_0_1; + GLUT = self.GLUT_2_5_1_0; gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; @@ -1530,7 +1532,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; - lens = callPackage ../development/libraries/haskell/lens {}; + lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {}; + lens_4_0 = callPackage ../development/libraries/haskell/lens/4.0.nix {}; + lens = self.lens_3_10_2; lensAeson = callPackage ../development/libraries/haskell/lens-aeson {}; @@ -1562,12 +1566,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; - llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { - # !!! llvm-general pre-release supports 3.4... + # Needed for idris for now + llvmGeneral_3_3 = callPackage ../development/libraries/haskell/llvm-general/3.3.nix { llvmConfig = pkgs.llvm_33; + llvmGeneralPure = self.llvmGeneralPure_3_3; }; - llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; + llvmGeneral = callPackage ../development/libraries/haskell/llvm-general/3.4.nix { + llvmConfig = pkgs.llvm; + inherit (pkgs) zlib ncurses; + }; + + llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { }; + + llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {}; lrucache = callPackage ../development/libraries/haskell/lrucache {}; @@ -1861,6 +1873,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pipesNetwork = callPackage ../development/libraries/haskell/pipes-network {}; + pipesGroup = callPackage ../development/libraries/haskell/pipes-group {}; + pipesParse = callPackage ../development/libraries/haskell/pipes-parse {}; pipesPostgresqlSimple = callPackage ../development/libraries/haskell/pipes-postgresql-simple {}; @@ -2017,8 +2031,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {}; regexPosix = self.regexPosix_0_95_2; - regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {}; - regexTdfa = self.regexTDFA; + regexTdfa = callPackage ../development/libraries/haskell/regex-tdfa {}; regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {}; @@ -2351,7 +2364,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsers = self.parsers_0_9; }; trifecta_1_2 = callPackage ../development/libraries/haskell/trifecta/1.2.nix {}; - trifecta = self.trifecta_1_2; + trifecta_1_4 = callPackage ../development/libraries/haskell/trifecta/1.4.nix {}; + trifecta = self.trifecta_1_4; tuple = callPackage ../development/libraries/haskell/tuple {}; @@ -2707,6 +2721,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x idris_plain = callPackage ../development/compilers/idris { parsers = self.parsers_0_9; trifecta = self.trifecta_1_1; + llvmGeneral = self.llvmGeneral_3_3; + llvmGeneralPure = self.llvmGeneralPure_3_3; }; idris = callPackage ../development/compilers/idris/wrapper.nix {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 9aec47445b5..fd4077e4e4c 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -4,7 +4,7 @@ by-spec."CSSselect"."0.x" = self.by-version."CSSselect"."0.4.0"; by-version."CSSselect"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "CSSselect-0.4.0"; + name = "node-CSSselect-0.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.0.tgz"; @@ -27,7 +27,7 @@ by-spec."CSSwhat"."0.4" = self.by-version."CSSwhat"."0.4.1"; by-version."CSSwhat"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "CSSwhat-0.4.1"; + name = "node-CSSwhat-0.4.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.1.tgz"; @@ -46,7 +46,7 @@ by-spec."StringScanner"."~0.0.3" = self.by-version."StringScanner"."0.0.3"; by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "StringScanner-0.0.3"; + name = "node-StringScanner-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/StringScanner/-/StringScanner-0.0.3.tgz"; @@ -65,7 +65,7 @@ by-spec."abbrev"."1" = self.by-version."abbrev"."1.0.4"; by-version."abbrev"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "abbrev-1.0.4"; + name = "node-abbrev-1.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; @@ -88,7 +88,7 @@ by-spec."active-x-obfuscator"."0.0.1" = self.by-version."active-x-obfuscator"."0.0.1"; by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "active-x-obfuscator-0.0.1"; + name = "node-active-x-obfuscator-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; @@ -108,7 +108,7 @@ by-spec."addressparser"."~0.2.0" = self.by-version."addressparser"."0.2.0"; by-version."addressparser"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "addressparser-0.2.0"; + name = "node-addressparser-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.0.tgz"; @@ -127,7 +127,7 @@ by-spec."adm-zip"."0.2.1" = self.by-version."adm-zip"."0.2.1"; by-version."adm-zip"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "adm-zip-0.2.1"; + name = "node-adm-zip-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz"; @@ -146,7 +146,7 @@ by-spec."adm-zip"."~0.4.3" = self.by-version."adm-zip"."0.4.3"; by-version."adm-zip"."0.4.3" = lib.makeOverridable self.buildNodePackage { - name = "adm-zip-0.4.3"; + name = "node-adm-zip-0.4.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.3.tgz"; @@ -165,7 +165,7 @@ by-spec."almond"."*" = self.by-version."almond"."0.2.9"; by-version."almond"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "almond-0.2.9"; + name = "node-almond-0.2.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/almond/-/almond-0.2.9.tgz"; @@ -185,7 +185,7 @@ by-spec."amdefine"."*" = self.by-version."amdefine"."0.1.0"; by-version."amdefine"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "amdefine-0.1.0"; + name = "node-amdefine-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; @@ -226,7 +226,7 @@ by-spec."ansi-remover"."*" = self.by-version."ansi-remover"."0.0.2"; by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "ansi-remover-0.0.2"; + name = "node-ansi-remover-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz"; @@ -246,7 +246,7 @@ by-spec."ansi-styles"."~0.1.0" = self.by-version."ansi-styles"."0.1.2"; by-version."ansi-styles"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "ansi-styles-0.1.2"; + name = "node-ansi-styles-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.1.2.tgz"; @@ -265,7 +265,7 @@ by-spec."ansi-styles"."~0.2.0" = self.by-version."ansi-styles"."0.2.0"; by-version."ansi-styles"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "ansi-styles-0.2.0"; + name = "node-ansi-styles-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.2.0.tgz"; @@ -284,7 +284,7 @@ by-spec."ansi-styles"."~1.0.0" = self.by-version."ansi-styles"."1.0.0"; by-version."ansi-styles"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "ansi-styles-1.0.0"; + name = "node-ansi-styles-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; @@ -303,7 +303,7 @@ by-spec."ansicolors"."~0.2.1" = self.by-version."ansicolors"."0.2.1"; by-version."ansicolors"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "ansicolors-0.2.1"; + name = "node-ansicolors-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz"; @@ -322,7 +322,7 @@ by-spec."ansicolors"."~0.3.2" = self.by-version."ansicolors"."0.3.2"; by-version."ansicolors"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "ansicolors-0.3.2"; + name = "node-ansicolors-0.3.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; @@ -341,7 +341,7 @@ by-spec."ansistyles"."~0.1.3" = self.by-version."ansistyles"."0.1.3"; by-version."ansistyles"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "ansistyles-0.1.3"; + name = "node-ansistyles-0.1.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; @@ -357,10 +357,10 @@ ]; passthru.names = [ "ansistyles" ]; }; - by-spec."apparatus".">= 0.0.4" = + by-spec."apparatus".">= 0.0.6" = self.by-version."apparatus"."0.0.8"; by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "apparatus-0.0.8"; + name = "node-apparatus-0.0.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz"; @@ -377,22 +377,25 @@ ]; passthru.names = [ "apparatus" ]; }; - by-spec."archiver"."~0.4.10" = - self.by-version."archiver"."0.4.10"; - by-version."archiver"."0.4.10" = lib.makeOverridable self.buildNodePackage { - name = "archiver-0.4.10"; + by-spec."archiver"."~0.5.2" = + self.by-version."archiver"."0.5.2"; + by-version."archiver"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-archiver-0.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/archiver/-/archiver-0.4.10.tgz"; - name = "archiver-0.4.10.tgz"; - sha1 = "df0feac8f1d1295e5eceb3a205559072d21f4747"; + url = "http://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz"; + name = "archiver-0.5.2.tgz"; + sha1 = "4e021b1fea5d902201f4886fca6a19fcc760083b"; }) ]; buildInputs = (self.nativeDeps."archiver" or []); deps = [ - self.by-version."readable-stream"."1.0.24" - self.by-version."iconv-lite"."0.2.11" + self.by-version."readable-stream"."1.0.25" + self.by-version."zip-stream"."0.1.3" + self.by-version."lazystream"."0.1.0" + self.by-version."file-utils"."0.1.5" + self.by-version."lodash"."2.4.1" ]; peerDependencies = [ ]; @@ -401,7 +404,7 @@ by-spec."archy"."0" = self.by-version."archy"."0.0.2"; by-version."archy"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "archy-0.0.2"; + name = "node-archy-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz"; @@ -422,7 +425,7 @@ by-spec."argparse"."0.1.15" = self.by-version."argparse"."0.1.15"; by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { - name = "argparse-0.1.15"; + name = "node-argparse-0.1.15"; src = [ (fetchurl { url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; @@ -445,7 +448,7 @@ by-spec."ascli"."*" = self.by-version."ascli"."0.3.0"; by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "ascli-0.3.0"; + name = "node-ascli-0.3.0"; src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; @@ -466,7 +469,7 @@ by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "asn1-0.1.11"; + name = "node-asn1-0.1.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; @@ -485,7 +488,7 @@ by-spec."assert"."*" = self.by-version."assert"."1.1.0"; by-version."assert"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "assert-1.1.0"; + name = "node-assert-1.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/assert/-/assert-1.1.0.tgz"; @@ -506,7 +509,7 @@ by-spec."assert-plus"."0.1.2" = self.by-version."assert-plus"."0.1.2"; by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "assert-plus-0.1.2"; + name = "node-assert-plus-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; @@ -525,7 +528,7 @@ by-spec."assertion-error"."1.0.0" = self.by-version."assertion-error"."1.0.0"; by-version."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "assertion-error-1.0.0"; + name = "node-assertion-error-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz"; @@ -542,14 +545,14 @@ passthru.names = [ "assertion-error" ]; }; by-spec."async"."*" = - self.by-version."async"."0.2.9"; - by-version."async"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.9"; + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.2.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; - name = "async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }) ]; buildInputs = @@ -560,11 +563,11 @@ ]; passthru.names = [ "async" ]; }; - "async" = self.by-version."async"."0.2.9"; + "async" = self.by-version."async"."0.2.10"; by-spec."async"."0.1.15" = self.by-version."async"."0.1.15"; by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage { - name = "async-0.1.15"; + name = "node-async-0.1.15"; src = [ (fetchurl { url = "http://registry.npmjs.org/async/-/async-0.1.15.tgz"; @@ -583,7 +586,7 @@ by-spec."async"."0.1.22" = self.by-version."async"."0.1.22"; by-version."async"."0.1.22" = lib.makeOverridable self.buildNodePackage { - name = "async-0.1.22"; + name = "node-async-0.1.22"; src = [ (fetchurl { url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; @@ -603,27 +606,44 @@ self.by-version."async"."0.1.22"; by-spec."async"."0.2.9" = self.by-version."async"."0.2.9"; + by-version."async"."0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.2.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + name = "async-0.2.9.tgz"; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; by-spec."async"."0.2.x" = - self.by-version."async"."0.2.9"; + self.by-version."async"."0.2.10"; by-spec."async"."~0.1.22" = self.by-version."async"."0.1.22"; by-spec."async"."~0.2.6" = - self.by-version."async"."0.2.9"; + self.by-version."async"."0.2.10"; by-spec."async"."~0.2.7" = - self.by-version."async"."0.2.9"; + self.by-version."async"."0.2.10"; by-spec."async"."~0.2.8" = - self.by-version."async"."0.2.9"; + self.by-version."async"."0.2.10"; by-spec."async"."~0.2.9" = - self.by-version."async"."0.2.9"; + self.by-version."async"."0.2.10"; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.0-rc8"; - by-version."aws-sdk"."2.0.0-rc8" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.0-rc8"; + self.by-version."aws-sdk"."2.0.0-rc9"; + by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage { + name = "node-aws-sdk-2.0.0-rc9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc8.tgz"; - name = "aws-sdk-2.0.0-rc8.tgz"; - sha1 = "30583789843db95ecd090b0d73f42be09fbd6cf3"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc9.tgz"; + name = "aws-sdk-2.0.0-rc9.tgz"; + sha1 = "caa7653837f7886e7f9e4da5df3b3c8324d7d0ab"; }) ]; buildInputs = @@ -636,16 +656,16 @@ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc8"; + "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc9"; by-spec."aws-sdk".">=1.2.0 <2" = - self.by-version."aws-sdk"."1.17.3"; - by-version."aws-sdk"."1.17.3" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.17.3"; + self.by-version."aws-sdk"."1.18.0"; + by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage { + name = "node-aws-sdk-1.18.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.17.3.tgz"; - name = "aws-sdk-1.17.3.tgz"; - sha1 = "fd0ee0e0222b6a2dc313fa59788ae595fe55dffe"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; + name = "aws-sdk-1.18.0.tgz"; + sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }) ]; buildInputs = @@ -661,7 +681,7 @@ by-spec."aws-sign"."~0.2.0" = self.by-version."aws-sign"."0.2.0"; by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sign-0.2.0"; + name = "node-aws-sign-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; @@ -680,7 +700,7 @@ by-spec."aws-sign"."~0.3.0" = self.by-version."aws-sign"."0.3.0"; by-version."aws-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sign-0.3.0"; + name = "node-aws-sign-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"; @@ -699,7 +719,7 @@ by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sign2-0.5.0"; + name = "node-aws-sign2-0.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; @@ -718,7 +738,7 @@ by-spec."backbone"."*" = self.by-version."backbone"."1.1.0"; by-version."backbone"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "backbone-1.1.0"; + name = "node-backbone-1.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/backbone/-/backbone-1.1.0.tgz"; @@ -739,7 +759,7 @@ by-spec."backoff"."2.1.0" = self.by-version."backoff"."2.1.0"; by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "backoff-2.1.0"; + name = "node-backoff-2.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz"; @@ -758,7 +778,7 @@ by-spec."base64id"."0.1.0" = self.by-version."base64id"."0.1.0"; by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "base64id-0.1.0"; + name = "node-base64id-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; @@ -777,7 +797,7 @@ by-spec."batch"."0.5.0" = self.by-version."batch"."0.5.0"; by-version."batch"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "batch-0.5.0"; + name = "node-batch-0.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz"; @@ -796,7 +816,7 @@ by-spec."bcrypt"."*" = self.by-version."bcrypt"."0.7.7"; by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage { - name = "bcrypt-0.7.7"; + name = "node-bcrypt-0.7.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz"; @@ -817,7 +837,7 @@ 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"; + name = "node-binary-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; @@ -838,7 +858,7 @@ by-spec."bindings"."*" = self.by-version."bindings"."1.1.1"; by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "bindings-1.1.1"; + name = "node-bindings-1.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz"; @@ -857,7 +877,7 @@ by-spec."bindings"."1.0.0" = self.by-version."bindings"."1.0.0"; by-version."bindings"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "bindings-1.0.0"; + name = "node-bindings-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz"; @@ -876,7 +896,7 @@ by-spec."block-stream"."*" = self.by-version."block-stream"."0.0.7"; by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "block-stream-0.0.7"; + name = "node-block-stream-0.0.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; @@ -898,7 +918,7 @@ by-spec."blueimp-md5"."~1.1.0" = self.by-version."blueimp-md5"."1.1.0"; by-version."blueimp-md5"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "blueimp-md5-1.1.0"; + name = "node-blueimp-md5-1.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz"; @@ -917,7 +937,7 @@ by-spec."boom"."0.3.x" = self.by-version."boom"."0.3.8"; by-version."boom"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "boom-0.3.8"; + name = "node-boom-0.3.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; @@ -937,7 +957,7 @@ by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "boom-0.4.2"; + name = "node-boom-0.4.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; @@ -999,7 +1019,7 @@ self.by-version."retry"."0.6.0" self.by-version."rimraf"."2.2.6" self.by-version."semver"."2.1.0" - self.by-version."stringify-object"."0.1.7" + self.by-version."stringify-object"."0.1.8" self.by-version."sudo-block"."0.2.1" self.by-version."tar"."0.1.19" self.by-version."tmp"."0.0.23" @@ -1021,7 +1041,7 @@ by-spec."bower-config"."~0.4.3" = self.by-version."bower-config"."0.4.5"; by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "bower-config-0.4.5"; + name = "node-bower-config-0.4.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.5.tgz"; @@ -1044,7 +1064,7 @@ by-spec."bower-config"."~0.5.0" = self.by-version."bower-config"."0.5.0"; by-version."bower-config"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "bower-config-0.5.0"; + name = "node-bower-config-0.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz"; @@ -1067,7 +1087,7 @@ 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"; + name = "node-bower-endpoint-parser-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz"; @@ -1088,7 +1108,7 @@ 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"; + name = "node-bower-json-0.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz"; @@ -1099,7 +1119,7 @@ buildInputs = (self.nativeDeps."bower-json" or []); deps = [ - self.by-version."deep-extend"."0.2.6" + self.by-version."deep-extend"."0.2.8" self.by-version."graceful-fs"."2.0.1" self.by-version."intersect"."0.0.3" ]; @@ -1112,7 +1132,7 @@ 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"; + name = "node-bower-logger-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz"; @@ -1131,7 +1151,7 @@ by-spec."bower-logger"."~0.2.1" = 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"; + name = "node-bower-logger-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz"; @@ -1150,7 +1170,7 @@ by-spec."bower-registry-client"."~0.1.4" = self.by-version."bower-registry-client"."0.1.6"; by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "bower-registry-client-0.1.6"; + name = "node-bower-registry-client-0.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.6.tgz"; @@ -1161,7 +1181,7 @@ buildInputs = (self.nativeDeps."bower-registry-client" or []); deps = [ - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."bower-config"."0.4.5" self.by-version."graceful-fs"."2.0.1" self.by-version."lru-cache"."2.3.1" @@ -1204,7 +1224,7 @@ by-spec."broadway"."0.2.9" = self.by-version."broadway"."0.2.9"; by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "broadway-0.2.9"; + name = "node-broadway-0.2.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/broadway/-/broadway-0.2.9.tgz"; @@ -1230,7 +1250,7 @@ by-spec."browserchannel"."*" = self.by-version."browserchannel"."1.0.8"; by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage { - name = "browserchannel-1.0.8"; + name = "node-browserchannel-1.0.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz"; @@ -1253,7 +1273,7 @@ by-spec."bson"."0.1.8" = self.by-version."bson"."0.1.8"; by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.1.8"; + name = "node-bson-0.1.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; @@ -1272,7 +1292,7 @@ by-spec."bson"."0.2.2" = self.by-version."bson"."0.2.2"; by-version."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.2"; + name = "node-bson-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz"; @@ -1291,7 +1311,7 @@ by-spec."bson"."0.2.5" = self.by-version."bson"."0.2.5"; by-version."bson"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.5"; + name = "node-bson-0.2.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz"; @@ -1310,7 +1330,7 @@ by-spec."buffer-crc32"."0.1.1" = self.by-version."buffer-crc32"."0.1.1"; by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-crc32-0.1.1"; + name = "node-buffer-crc32-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; @@ -1329,7 +1349,7 @@ by-spec."buffer-crc32"."0.2.1" = self.by-version."buffer-crc32"."0.2.1"; by-version."buffer-crc32"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-crc32-0.2.1"; + name = "node-buffer-crc32-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; @@ -1350,7 +1370,7 @@ 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"; + name = "node-buffers-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; @@ -1369,7 +1389,7 @@ by-spec."buffertools"."*" = self.by-version."buffertools"."2.0.1"; by-version."buffertools"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "buffertools-2.0.1"; + name = "node-buffertools-2.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.1.tgz"; @@ -1389,7 +1409,7 @@ by-spec."buffertools".">=1.1.1 <2.0.0" = self.by-version."buffertools"."1.1.1"; by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "buffertools-1.1.1"; + name = "node-buffertools-1.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz"; @@ -1429,7 +1449,7 @@ by-spec."bytebuffer".">=2.2 <3" = self.by-version."bytebuffer"."2.3.1"; by-version."bytebuffer"."2.3.1" = lib.makeOverridable self.buildNodePackage { - name = "bytebuffer-2.3.1"; + name = "node-bytebuffer-2.3.1"; src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.3.1.tgz"; @@ -1449,7 +1469,7 @@ by-spec."bytes"."0.1.0" = self.by-version."bytes"."0.1.0"; by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "bytes-0.1.0"; + name = "node-bytes-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; @@ -1468,7 +1488,7 @@ by-spec."bytes"."0.2.0" = self.by-version."bytes"."0.2.0"; by-version."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "bytes-0.2.0"; + name = "node-bytes-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; @@ -1487,7 +1507,7 @@ by-spec."bytes"."0.2.1" = self.by-version."bytes"."0.2.1"; by-version."bytes"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "bytes-0.2.1"; + name = "node-bytes-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; @@ -1527,14 +1547,14 @@ passthru.names = [ "cardinal" ]; }; by-spec."chai"."*" = - self.by-version."chai"."1.8.1"; - by-version."chai"."1.8.1" = lib.makeOverridable self.buildNodePackage { - name = "chai-1.8.1"; + self.by-version."chai"."1.9.0"; + by-version."chai"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-chai-1.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/chai/-/chai-1.8.1.tgz"; - name = "chai-1.8.1.tgz"; - sha1 = "cc77866d5e7ebca2bd75144b1edc370a88785f72"; + url = "http://registry.npmjs.org/chai/-/chai-1.9.0.tgz"; + name = "chai-1.9.0.tgz"; + sha1 = "3ebe99f3bab9241ed3fcd576f8fe96cad9ed7413"; }) ]; buildInputs = @@ -1547,11 +1567,11 @@ ]; passthru.names = [ "chai" ]; }; - "chai" = self.by-version."chai"."1.8.1"; + "chai" = self.by-version."chai"."1.9.0"; 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"; + name = "node-chainsaw-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; @@ -1571,7 +1591,7 @@ by-spec."chalk"."~0.1.1" = self.by-version."chalk"."0.1.1"; by-version."chalk"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "chalk-0.1.1"; + name = "node-chalk-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.1.1.tgz"; @@ -1582,7 +1602,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.2" + self.by-version."has-color"."0.1.3" self.by-version."ansi-styles"."0.1.2" ]; peerDependencies = [ @@ -1592,7 +1612,7 @@ by-spec."chalk"."~0.2.0" = self.by-version."chalk"."0.2.1"; by-version."chalk"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "chalk-0.2.1"; + name = "node-chalk-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.2.1.tgz"; @@ -1603,7 +1623,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.2" + self.by-version."has-color"."0.1.3" self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ @@ -1615,7 +1635,7 @@ by-spec."chalk"."~0.3.0" = self.by-version."chalk"."0.3.0"; by-version."chalk"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "chalk-0.3.0"; + name = "node-chalk-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.3.0.tgz"; @@ -1626,7 +1646,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.2" + self.by-version."has-color"."0.1.3" self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ @@ -1636,7 +1656,7 @@ by-spec."chalk"."~0.4.0" = self.by-version."chalk"."0.4.0"; by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "chalk-0.4.0"; + name = "node-chalk-0.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; @@ -1647,7 +1667,7 @@ buildInputs = (self.nativeDeps."chalk" or []); deps = [ - self.by-version."has-color"."0.1.2" + self.by-version."has-color"."0.1.3" self.by-version."ansi-styles"."1.0.0" self.by-version."strip-ansi"."0.1.1" ]; @@ -1658,7 +1678,7 @@ by-spec."character-parser"."1.2.0" = self.by-version."character-parser"."1.2.0"; by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "character-parser-1.2.0"; + name = "node-character-parser-1.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"; @@ -1677,7 +1697,7 @@ by-spec."cheerio"."~0.12.0" = self.by-version."cheerio"."0.12.4"; by-version."cheerio"."0.12.4" = lib.makeOverridable self.buildNodePackage { - name = "cheerio-0.12.4"; + name = "node-cheerio-0.12.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.4.tgz"; @@ -1700,7 +1720,7 @@ by-spec."cheerio"."~0.13.0" = self.by-version."cheerio"."0.13.1"; by-version."cheerio"."0.13.1" = lib.makeOverridable self.buildNodePackage { - name = "cheerio-0.13.1"; + name = "node-cheerio-0.13.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.1.tgz"; @@ -1723,7 +1743,7 @@ by-spec."cheerio-select"."*" = self.by-version."cheerio-select"."0.0.3"; by-version."cheerio-select"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "cheerio-select-0.0.3"; + name = "node-cheerio-select-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/cheerio-select/-/cheerio-select-0.0.3.tgz"; @@ -1743,7 +1763,7 @@ by-spec."child-process-close"."~0.1.1" = self.by-version."child-process-close"."0.1.1"; by-version."child-process-close"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "child-process-close-0.1.1"; + name = "node-child-process-close-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"; @@ -1762,7 +1782,7 @@ 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"; + name = "node-chmodr-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz"; @@ -1781,7 +1801,7 @@ by-spec."chokidar"."~0.8.0" = self.by-version."chokidar"."0.8.1"; by-version."chokidar"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.8.1"; + name = "node-chokidar-0.8.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz"; @@ -1800,7 +1820,7 @@ by-spec."chownr"."0" = self.by-version."chownr"."0.0.1"; by-version."chownr"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "chownr-0.0.1"; + name = "node-chownr-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz"; @@ -1819,7 +1839,7 @@ by-spec."class-extend"."~0.1.0" = self.by-version."class-extend"."0.1.1"; by-version."class-extend"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "class-extend-0.1.1"; + name = "node-class-extend-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/class-extend/-/class-extend-0.1.1.tgz"; @@ -1861,7 +1881,7 @@ by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "cli-0.4.5"; + name = "node-cli-0.4.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; @@ -1881,7 +1901,7 @@ by-spec."cli-color"."~0.2.2" = self.by-version."cli-color"."0.2.3"; by-version."cli-color"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "cli-color-0.2.3"; + name = "node-cli-color-0.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz"; @@ -1902,7 +1922,7 @@ by-spec."cliff"."0.1.8" = self.by-version."cliff"."0.1.8"; by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "cliff-0.1.8"; + name = "node-cliff-0.1.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz"; @@ -1924,7 +1944,7 @@ 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"; + name = "node-clone-0.1.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz"; @@ -1943,7 +1963,7 @@ by-spec."clone"."0.1.5" = self.by-version."clone"."0.1.5"; by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "clone-0.1.5"; + name = "node-clone-0.1.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; @@ -1962,7 +1982,7 @@ by-spec."clone"."0.1.6" = self.by-version."clone"."0.1.6"; by-version."clone"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "clone-0.1.6"; + name = "node-clone-0.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; @@ -1981,7 +2001,7 @@ by-spec."cmd-shim"."~1.1.1" = self.by-version."cmd-shim"."1.1.1"; by-version."cmd-shim"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "cmd-shim-1.1.1"; + name = "node-cmd-shim-1.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz"; @@ -2000,6 +2020,27 @@ passthru.names = [ "cmd-shim" ]; }; by-spec."coffee-script"."*" = + self.by-version."coffee-script"."1.7.1"; + by-version."coffee-script"."1.7.1" = lib.makeOverridable self.buildNodePackage { + name = "coffee-script-1.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz"; + name = "coffee-script-1.7.1.tgz"; + sha1 = "62996a861780c75e6d5069d13822723b73404bfc"; + }) + ]; + buildInputs = + (self.nativeDeps."coffee-script" or []); + deps = [ + self.by-version."mkdirp"."0.3.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "coffee-script" ]; + }; + "coffee-script" = self.by-version."coffee-script"."1.7.1"; + by-spec."coffee-script"."1.6.3" = self.by-version."coffee-script"."1.6.3"; by-version."coffee-script"."1.6.3" = lib.makeOverridable self.buildNodePackage { name = "coffee-script-1.6.3"; @@ -2018,13 +2059,10 @@ ]; passthru.names = [ "coffee-script" ]; }; - "coffee-script" = self.by-version."coffee-script"."1.6.3"; - by-spec."coffee-script"."1.6.3" = - self.by-version."coffee-script"."1.6.3"; by-spec."coffee-script".">= 0.0.1" = - self.by-version."coffee-script"."1.6.3"; + self.by-version."coffee-script"."1.7.1"; by-spec."coffee-script".">=1.2.0" = - self.by-version."coffee-script"."1.6.3"; + self.by-version."coffee-script"."1.7.1"; by-spec."coffee-script"."~1.3.3" = self.by-version."coffee-script"."1.3.3"; by-version."coffee-script"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -2067,15 +2105,15 @@ ]; passthru.names = [ "coffee-script-redux" ]; }; - by-spec."color"."~0.4.4" = - self.by-version."color"."0.4.4"; - by-version."color"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "color-0.4.4"; + by-spec."color"."~0.5.0" = + self.by-version."color"."0.5.0"; + by-version."color"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-color-0.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/color/-/color-0.4.4.tgz"; - name = "color-0.4.4.tgz"; - sha1 = "f8bae8a848854616328704e64ce4a94ab336b7b5"; + url = "http://registry.npmjs.org/color/-/color-0.5.0.tgz"; + name = "color-0.5.0.tgz"; + sha1 = "4d283d8bfe4cbc7006de6b6d25a3c26f00e3ee6d"; }) ]; buildInputs = @@ -2091,7 +2129,7 @@ by-spec."color-convert"."0.2.x" = self.by-version."color-convert"."0.2.1"; by-version."color-convert"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "color-convert-0.2.1"; + name = "node-color-convert-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/color-convert/-/color-convert-0.2.1.tgz"; @@ -2110,7 +2148,7 @@ by-spec."color-string"."0.1.x" = self.by-version."color-string"."0.1.2"; by-version."color-string"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "color-string-0.1.2"; + name = "node-color-string-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/color-string/-/color-string-0.1.2.tgz"; @@ -2130,7 +2168,7 @@ by-spec."colors"."0.5.x" = self.by-version."colors"."0.5.1"; by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.5.1"; + name = "node-colors-0.5.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; @@ -2149,7 +2187,7 @@ by-spec."colors"."0.6.x" = self.by-version."colors"."0.6.2"; by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.6.2"; + name = "node-colors-0.6.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; @@ -2174,7 +2212,7 @@ by-spec."colour"."*" = self.by-version."colour"."0.7.1"; by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "colour-0.7.1"; + name = "node-colour-0.7.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; @@ -2193,7 +2231,7 @@ by-spec."columnify"."0.1.2" = self.by-version."columnify"."0.1.2"; by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "columnify-0.1.2"; + name = "node-columnify-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz"; @@ -2212,7 +2250,7 @@ by-spec."combined-stream"."~0.0.4" = self.by-version."combined-stream"."0.0.4"; by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "combined-stream-0.0.4"; + name = "node-combined-stream-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz"; @@ -2232,7 +2270,7 @@ by-spec."commander"."*" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "commander-2.1.0"; + name = "node-commander-2.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; @@ -2251,7 +2289,7 @@ by-spec."commander"."0.6.1" = self.by-version."commander"."0.6.1"; by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "commander-0.6.1"; + name = "node-commander-0.6.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; @@ -2270,7 +2308,7 @@ by-spec."commander"."1.3.2" = self.by-version."commander"."1.3.2"; by-version."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "commander-1.3.2"; + name = "node-commander-1.3.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; @@ -2290,7 +2328,7 @@ by-spec."commander"."2.0.0" = self.by-version."commander"."2.0.0"; by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "commander-2.0.0"; + name = "node-commander-2.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; @@ -2315,7 +2353,7 @@ by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { - name = "config-0.4.15"; + name = "node-config-0.4.15"; src = [ (fetchurl { url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz"; @@ -2327,7 +2365,7 @@ (self.nativeDeps."config" or []); deps = [ self.by-version."js-yaml"."0.3.7" - self.by-version."coffee-script"."1.6.3" + self.by-version."coffee-script"."1.7.1" self.by-version."vows"."0.7.0" ]; peerDependencies = [ @@ -2337,7 +2375,7 @@ by-spec."config-chain"."~1.1.1" = self.by-version."config-chain"."1.1.8"; by-version."config-chain"."1.1.8" = lib.makeOverridable self.buildNodePackage { - name = "config-chain-1.1.8"; + name = "node-config-chain-1.1.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz"; @@ -2360,7 +2398,7 @@ by-spec."configstore"."~0.1.0" = self.by-version."configstore"."0.1.7"; by-version."configstore"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "configstore-0.1.7"; + name = "node-configstore-0.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/configstore/-/configstore-0.1.7.tgz"; @@ -2384,7 +2422,7 @@ by-spec."connect"."1.x" = self.by-version."connect"."1.9.2"; by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage { - name = "connect-1.9.2"; + name = "node-connect-1.9.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; @@ -2406,7 +2444,7 @@ by-spec."connect"."2.11.0" = self.by-version."connect"."2.11.0"; by-version."connect"."2.11.0" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.11.0"; + name = "node-connect-2.11.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; @@ -2439,7 +2477,7 @@ by-spec."connect"."2.12.0" = self.by-version."connect"."2.12.0"; by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.12.0"; + name = "node-connect-2.12.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz"; @@ -2473,7 +2511,7 @@ by-spec."connect"."2.3.x" = self.by-version."connect"."2.3.9"; by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.3.9"; + name = "node-connect-2.3.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; @@ -2500,7 +2538,7 @@ by-spec."connect"."2.7.5" = self.by-version."connect"."2.7.5"; by-version."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.7.5"; + name = "node-connect-2.7.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz"; @@ -2529,7 +2567,7 @@ by-spec."connect"."2.7.6" = self.by-version."connect"."2.7.6"; by-version."connect"."2.7.6" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.7.6"; + name = "node-connect-2.7.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; @@ -2562,7 +2600,7 @@ by-spec."connect-flash"."*" = self.by-version."connect-flash"."0.1.1"; by-version."connect-flash"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "connect-flash-0.1.1"; + name = "node-connect-flash-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz"; @@ -2582,7 +2620,7 @@ by-spec."connect-flash"."0.1.0" = self.by-version."connect-flash"."0.1.0"; by-version."connect-flash"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "connect-flash-0.1.0"; + name = "node-connect-flash-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; @@ -2601,7 +2639,7 @@ by-spec."connect-jade-static"."*" = self.by-version."connect-jade-static"."0.1.3"; by-version."connect-jade-static"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "connect-jade-static-0.1.3"; + name = "node-connect-jade-static-0.1.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.3.tgz"; @@ -2622,7 +2660,7 @@ by-spec."connect-mongo"."*" = self.by-version."connect-mongo"."0.4.0"; by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "connect-mongo-0.4.0"; + name = "node-connect-mongo-0.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz"; @@ -2643,7 +2681,7 @@ by-spec."connection-parse"."0.0.x" = self.by-version."connection-parse"."0.0.7"; by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "connection-parse-0.0.7"; + name = "node-connection-parse-0.0.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; @@ -2662,7 +2700,7 @@ by-spec."console-browserify"."0.1.x" = self.by-version."console-browserify"."0.1.6"; by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "console-browserify-0.1.6"; + name = "node-console-browserify-0.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz"; @@ -2681,7 +2719,7 @@ by-spec."constantinople"."~1.0.1" = self.by-version."constantinople"."1.0.2"; by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "constantinople-1.0.2"; + name = "node-constantinople-1.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz"; @@ -2692,7 +2730,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.11" + self.by-version."uglify-js"."2.4.12" ]; peerDependencies = [ ]; @@ -2703,7 +2741,7 @@ by-spec."cookie"."0.0.4" = self.by-version."cookie"."0.0.4"; by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "cookie-0.0.4"; + name = "node-cookie-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; @@ -2722,7 +2760,7 @@ by-spec."cookie"."0.0.5" = self.by-version."cookie"."0.0.5"; by-version."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "cookie-0.0.5"; + name = "node-cookie-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; @@ -2741,7 +2779,7 @@ by-spec."cookie"."0.1.0" = self.by-version."cookie"."0.1.0"; by-version."cookie"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "cookie-0.1.0"; + name = "node-cookie-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; @@ -2760,7 +2798,7 @@ by-spec."cookie-jar"."~0.2.0" = self.by-version."cookie-jar"."0.2.0"; by-version."cookie-jar"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "cookie-jar-0.2.0"; + name = "node-cookie-jar-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; @@ -2779,7 +2817,7 @@ by-spec."cookie-jar"."~0.3.0" = self.by-version."cookie-jar"."0.3.0"; by-version."cookie-jar"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "cookie-jar-0.3.0"; + name = "node-cookie-jar-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"; @@ -2798,7 +2836,7 @@ by-spec."cookie-signature"."1.0.0" = self.by-version."cookie-signature"."1.0.0"; by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "cookie-signature-1.0.0"; + name = "node-cookie-signature-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz"; @@ -2817,7 +2855,7 @@ by-spec."cookie-signature"."1.0.1" = self.by-version."cookie-signature"."1.0.1"; by-version."cookie-signature"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "cookie-signature-1.0.1"; + name = "node-cookie-signature-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; @@ -2836,7 +2874,7 @@ by-spec."cookiejar"."1.3.0" = self.by-version."cookiejar"."1.3.0"; by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "cookiejar-1.3.0"; + name = "node-cookiejar-1.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz"; @@ -2853,19 +2891,20 @@ passthru.names = [ "cookiejar" ]; }; by-spec."cookies".">= 0.2.2" = - self.by-version."cookies"."0.3.8"; - by-version."cookies"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "cookies-0.3.8"; + self.by-version."cookies"."0.4.0"; + by-version."cookies"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-cookies-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookies/-/cookies-0.3.8.tgz"; - name = "cookies-0.3.8.tgz"; - sha1 = "92fe50918f3d55aec4ae9d978bcddda2ada28ce9"; + url = "http://registry.npmjs.org/cookies/-/cookies-0.4.0.tgz"; + name = "cookies-0.4.0.tgz"; + sha1 = "c5d1f8b76217ed653135afe32bdad747c2fa9190"; }) ]; buildInputs = (self.nativeDeps."cookies" or []); deps = [ + self.by-version."keygrip"."1.0.0" ]; peerDependencies = [ ]; @@ -2874,7 +2913,7 @@ by-spec."core-util-is"."~1.0.0" = self.by-version."core-util-is"."1.0.1"; by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "core-util-is-1.0.1"; + name = "node-core-util-is-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; @@ -2891,14 +2930,14 @@ passthru.names = [ "core-util-is" ]; }; by-spec."couch-login"."~0.1.15" = - self.by-version."couch-login"."0.1.19"; - by-version."couch-login"."0.1.19" = lib.makeOverridable self.buildNodePackage { - name = "couch-login-0.1.19"; + self.by-version."couch-login"."0.1.20"; + by-version."couch-login"."0.1.20" = lib.makeOverridable self.buildNodePackage { + name = "node-couch-login-0.1.20"; src = [ (fetchurl { - url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.19.tgz"; - name = "couch-login-0.1.19.tgz"; - sha1 = "5c472f64670dfb43fc381d290629b223edb64afa"; + url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz"; + name = "couch-login-0.1.20.tgz"; + sha1 = "007c70ef80089dbae6f59eeeec37480799b39595"; }) ]; buildInputs = @@ -2911,16 +2950,16 @@ passthru.names = [ "couch-login" ]; }; by-spec."couch-login"."~0.1.18" = - self.by-version."couch-login"."0.1.19"; + self.by-version."couch-login"."0.1.20"; by-spec."coveralls"."*" = - self.by-version."coveralls"."2.6.1"; - by-version."coveralls"."2.6.1" = lib.makeOverridable self.buildNodePackage { - name = "coveralls-2.6.1"; + self.by-version."coveralls"."2.7.1"; + by-version."coveralls"."2.7.1" = lib.makeOverridable self.buildNodePackage { + name = "coveralls-2.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.6.1.tgz"; - name = "coveralls-2.6.1.tgz"; - sha1 = "0de635bba15fd48f4fc557ae9ac21309c013d2de"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.7.1.tgz"; + name = "coveralls-2.7.1.tgz"; + sha1 = "86e91436d248ca9c202504e9e022d77946eded41"; }) ]; buildInputs = @@ -2935,11 +2974,11 @@ ]; passthru.names = [ "coveralls" ]; }; - "coveralls" = self.by-version."coveralls"."2.6.1"; + "coveralls" = self.by-version."coveralls"."2.7.1"; by-spec."crc"."0.2.0" = self.by-version."crc"."0.2.0"; by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "crc-0.2.0"; + name = "node-crc-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; @@ -2958,7 +2997,7 @@ by-spec."crossroads"."~0.12.0" = self.by-version."crossroads"."0.12.0"; by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage { - name = "crossroads-0.12.0"; + name = "node-crossroads-0.12.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz"; @@ -2978,7 +3017,7 @@ by-spec."cryptiles"."0.1.x" = self.by-version."cryptiles"."0.1.3"; by-version."cryptiles"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "cryptiles-0.1.3"; + name = "node-cryptiles-0.1.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; @@ -2998,7 +3037,7 @@ by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "cryptiles-0.2.2"; + name = "node-cryptiles-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; @@ -3018,7 +3057,7 @@ by-spec."crypto"."0.0.3" = self.by-version."crypto"."0.0.3"; by-version."crypto"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "crypto-0.0.3"; + name = "node-crypto-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; @@ -3037,7 +3076,7 @@ by-spec."css"."~1.0.8" = self.by-version."css"."1.0.8"; by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage { - name = "css-1.0.8"; + name = "node-css-1.0.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz"; @@ -3058,7 +3097,7 @@ by-spec."css-parse"."1.0.4" = self.by-version."css-parse"."1.0.4"; by-version."css-parse"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "css-parse-1.0.4"; + name = "node-css-parse-1.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; @@ -3077,7 +3116,7 @@ by-spec."css-parse"."1.7.x" = self.by-version."css-parse"."1.7.0"; by-version."css-parse"."1.7.0" = lib.makeOverridable self.buildNodePackage { - name = "css-parse-1.7.0"; + name = "node-css-parse-1.7.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; @@ -3096,7 +3135,7 @@ by-spec."css-stringify"."1.0.5" = self.by-version."css-stringify"."1.0.5"; by-version."css-stringify"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "css-stringify-1.0.5"; + name = "node-css-stringify-1.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; @@ -3115,7 +3154,7 @@ by-spec."cssom"."0.2.x" = self.by-version."cssom"."0.2.5"; by-version."cssom"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "cssom-0.2.5"; + name = "node-cssom-0.2.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz"; @@ -3134,7 +3173,7 @@ by-spec."ctype"."0.5.0" = self.by-version."ctype"."0.5.0"; by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "ctype-0.5.0"; + name = "node-ctype-0.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz"; @@ -3153,7 +3192,7 @@ by-spec."ctype"."0.5.2" = self.by-version."ctype"."0.5.2"; by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "ctype-0.5.2"; + name = "node-ctype-0.5.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; @@ -3172,7 +3211,7 @@ by-spec."cycle"."1.0.x" = self.by-version."cycle"."1.0.3"; by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "cycle-1.0.3"; + name = "node-cycle-1.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; @@ -3191,7 +3230,7 @@ by-spec."dargs"."~0.1.0" = self.by-version."dargs"."0.1.0"; by-version."dargs"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "dargs-0.1.0"; + name = "node-dargs-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/dargs/-/dargs-0.1.0.tgz"; @@ -3210,7 +3249,7 @@ by-spec."dateformat"."1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3"; by-version."dateformat"."1.0.2-1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "dateformat-1.0.2-1.2.3"; + name = "node-dateformat-1.0.2-1.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; @@ -3229,7 +3268,7 @@ by-spec."dateformat"."~1.0.6" = self.by-version."dateformat"."1.0.7-1.2.3"; by-version."dateformat"."1.0.7-1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "dateformat-1.0.7-1.2.3"; + name = "node-dateformat-1.0.7-1.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz"; @@ -3248,7 +3287,7 @@ by-spec."debug"."*" = self.by-version."debug"."0.7.4"; by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.7.4"; + name = "node-debug-0.7.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; @@ -3267,7 +3306,7 @@ by-spec."debug"."0.5.0" = self.by-version."debug"."0.5.0"; by-version."debug"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.5.0"; + name = "node-debug-0.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; @@ -3283,25 +3322,8 @@ ]; passthru.names = [ "debug" ]; }; - by-spec."debug"."0.7.0" = - self.by-version."debug"."0.7.0"; - by-version."debug"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.7.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz"; - name = "debug-0.7.0.tgz"; - sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08"; - }) - ]; - buildInputs = - (self.nativeDeps."debug" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; + by-spec."debug"."0.7.4" = + self.by-version."debug"."0.7.4"; by-spec."debug".">= 0.7.3 < 1" = self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.0" = @@ -3313,7 +3335,7 @@ by-spec."debuglog"."0.0.2" = self.by-version."debuglog"."0.0.2"; by-version."debuglog"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "debuglog-0.0.2"; + name = "node-debuglog-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz"; @@ -3332,7 +3354,7 @@ by-spec."decompress"."~0.1.5" = self.by-version."decompress"."0.1.6"; by-version."decompress"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "decompress-0.1.6"; + name = "node-decompress-0.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/decompress/-/decompress-0.1.6.tgz"; @@ -3383,7 +3405,7 @@ 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 { - name = "deep-eql-0.1.3"; + name = "node-deep-eql-0.1.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; @@ -3401,14 +3423,14 @@ passthru.names = [ "deep-eql" ]; }; by-spec."deep-equal"."*" = - self.by-version."deep-equal"."0.1.2"; - by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.1.2"; + self.by-version."deep-equal"."0.2.1"; + by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-deep-equal-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; - name = "deep-equal-0.1.2.tgz"; - sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; + name = "deep-equal-0.2.1.tgz"; + sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; }) ]; buildInputs = @@ -3422,7 +3444,7 @@ by-spec."deep-equal"."0.0.0" = self.by-version."deep-equal"."0.0.0"; by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.0.0"; + name = "node-deep-equal-0.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; @@ -3439,14 +3461,14 @@ passthru.names = [ "deep-equal" ]; }; by-spec."deep-extend"."~0.2.5" = - self.by-version."deep-extend"."0.2.6"; - by-version."deep-extend"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "deep-extend-0.2.6"; + self.by-version."deep-extend"."0.2.8"; + by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "node-deep-extend-0.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.6.tgz"; - name = "deep-extend-0.2.6.tgz"; - sha1 = "1f767e02b46d88d0a4087affa4b11b1b0b804250"; + url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz"; + name = "deep-extend-0.2.8.tgz"; + sha1 = "6d2893a805286e46d8243137c32fb991b50f4299"; }) ]; buildInputs = @@ -3458,11 +3480,11 @@ passthru.names = [ "deep-extend" ]; }; by-spec."deep-extend"."~0.2.6" = - self.by-version."deep-extend"."0.2.6"; + self.by-version."deep-extend"."0.2.8"; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "delayed-stream-0.0.5"; + name = "node-delayed-stream-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; @@ -3481,7 +3503,7 @@ by-spec."di"."~0.0.1" = self.by-version."di"."0.0.1"; by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "di-0.0.1"; + name = "node-di-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz"; @@ -3500,7 +3522,7 @@ by-spec."diff"."1.0.7" = self.by-version."diff"."1.0.7"; by-version."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.7"; + name = "node-diff-1.0.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; @@ -3519,7 +3541,7 @@ by-spec."diff"."~1.0.3" = self.by-version."diff"."1.0.8"; by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.8"; + name = "node-diff-1.0.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; @@ -3542,7 +3564,7 @@ by-spec."director"."1.1.10" = self.by-version."director"."1.1.10"; by-version."director"."1.1.10" = lib.makeOverridable self.buildNodePackage { - name = "director-1.1.10"; + name = "node-director-1.1.10"; src = [ (fetchurl { url = "http://registry.npmjs.org/director/-/director-1.1.10.tgz"; @@ -3561,7 +3583,7 @@ by-spec."dkim-signer"."~0.1.0" = self.by-version."dkim-signer"."0.1.0"; by-version."dkim-signer"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "dkim-signer-0.1.0"; + name = "node-dkim-signer-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz"; @@ -3582,7 +3604,7 @@ by-spec."domelementtype"."1" = self.by-version."domelementtype"."1.1.1"; by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "domelementtype-1.1.1"; + name = "node-domelementtype-1.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz"; @@ -3601,7 +3623,7 @@ by-spec."domhandler"."2.0" = self.by-version."domhandler"."2.0.3"; by-version."domhandler"."2.0.3" = lib.makeOverridable self.buildNodePackage { - name = "domhandler-2.0.3"; + name = "node-domhandler-2.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/domhandler/-/domhandler-2.0.3.tgz"; @@ -3621,7 +3643,7 @@ by-spec."domhandler"."2.1" = self.by-version."domhandler"."2.1.0"; by-version."domhandler"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "domhandler-2.1.0"; + name = "node-domhandler-2.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz"; @@ -3641,7 +3663,7 @@ by-spec."domhandler"."2.2" = self.by-version."domhandler"."2.2.0"; by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "domhandler-2.2.0"; + name = "node-domhandler-2.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.0.tgz"; @@ -3661,7 +3683,7 @@ by-spec."domutils"."1.1" = self.by-version."domutils"."1.1.6"; by-version."domutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.1.6"; + name = "node-domutils-1.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz"; @@ -3681,7 +3703,7 @@ by-spec."domutils"."1.3" = self.by-version."domutils"."1.3.0"; by-version."domutils"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.3.0"; + name = "node-domutils-1.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; @@ -3701,7 +3723,7 @@ by-spec."download"."~0.1.6" = self.by-version."download"."0.1.10"; by-version."download"."0.1.10" = lib.makeOverridable self.buildNodePackage { - name = "download-0.1.10"; + name = "node-download-0.1.10"; src = [ (fetchurl { url = "http://registry.npmjs.org/download/-/download-0.1.10.tgz"; @@ -3716,7 +3738,7 @@ self.by-version."each-async"."0.1.1" self.by-version."mkdirp"."0.3.5" self.by-version."request"."2.31.0" - self.by-version."through2"."0.4.0" + self.by-version."through2"."0.4.1" ]; peerDependencies = [ ]; @@ -3746,7 +3768,7 @@ by-spec."dtrace-provider"."0.2.8" = self.by-version."dtrace-provider"."0.2.8"; by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "dtrace-provider-0.2.8"; + name = "node-dtrace-provider-0.2.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz"; @@ -3765,7 +3787,7 @@ 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"; + name = "node-duplexer-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; @@ -3784,7 +3806,7 @@ by-spec."each-async"."~0.1.1" = self.by-version."each-async"."0.1.1"; by-version."each-async"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "each-async-0.1.1"; + name = "node-each-async-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/each-async/-/each-async-0.1.1.tgz"; @@ -3803,7 +3825,7 @@ by-spec."editor"."0.0.5" = self.by-version."editor"."0.0.5"; by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "editor-0.0.5"; + name = "node-editor-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz"; @@ -3822,7 +3844,7 @@ by-spec."ejs"."0.8.3" = self.by-version."ejs"."0.8.3"; by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage { - name = "ejs-0.8.3"; + name = "node-ejs-0.8.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; @@ -3841,7 +3863,7 @@ by-spec."emitter-component"."0.0.6" = self.by-version."emitter-component"."0.0.6"; by-version."emitter-component"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "emitter-component-0.0.6"; + name = "node-emitter-component-0.0.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/emitter-component/-/emitter-component-0.0.6.tgz"; @@ -3860,7 +3882,7 @@ by-spec."emitter-component"."1.0.0" = self.by-version."emitter-component"."1.0.0"; by-version."emitter-component"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "emitter-component-1.0.0"; + name = "node-emitter-component-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz"; @@ -3879,7 +3901,7 @@ by-spec."encoding"."~0.1" = self.by-version."encoding"."0.1.7"; by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "encoding-0.1.7"; + name = "node-encoding-0.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/encoding/-/encoding-0.1.7.tgz"; @@ -3899,7 +3921,7 @@ by-spec."entities"."0.x" = self.by-version."entities"."0.3.0"; by-version."entities"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "entities-0.3.0"; + name = "node-entities-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/entities/-/entities-0.3.0.tgz"; @@ -3918,7 +3940,7 @@ by-spec."es5-ext"."~0.9.2" = self.by-version."es5-ext"."0.9.2"; by-version."es5-ext"."0.9.2" = lib.makeOverridable self.buildNodePackage { - name = "es5-ext-0.9.2"; + name = "node-es5-ext-0.9.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz"; @@ -3937,7 +3959,7 @@ by-spec."escape-html"."*" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "escape-html-1.0.1"; + name = "node-escape-html-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; @@ -4052,7 +4074,7 @@ by-spec."estraverse"."*" = self.by-version."estraverse"."1.5.0"; by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.5.0"; + name = "node-estraverse-1.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.0.tgz"; @@ -4071,7 +4093,7 @@ by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-0.0.4"; + name = "node-estraverse-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz"; @@ -4092,7 +4114,7 @@ by-spec."esutils"."~1.0.0" = self.by-version."esutils"."1.0.0"; by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "esutils-1.0.0"; + name = "node-esutils-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; @@ -4111,7 +4133,7 @@ by-spec."event-emitter"."~0.2.2" = self.by-version."event-emitter"."0.2.2"; by-version."event-emitter"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "event-emitter-0.2.2"; + name = "node-event-emitter-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz"; @@ -4131,7 +4153,7 @@ 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 { - name = "event-stream-0.5.3"; + name = "node-event-stream-0.5.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; @@ -4151,7 +4173,7 @@ by-spec."eventemitter2"."0.4.12" = self.by-version."eventemitter2"."0.4.12"; by-version."eventemitter2"."0.4.12" = lib.makeOverridable self.buildNodePackage { - name = "eventemitter2-0.4.12"; + name = "node-eventemitter2-0.4.12"; src = [ (fetchurl { url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz"; @@ -4170,7 +4192,7 @@ by-spec."eventemitter2"."~0.4.11" = self.by-version."eventemitter2"."0.4.13"; by-version."eventemitter2"."0.4.13" = lib.makeOverridable self.buildNodePackage { - name = "eventemitter2-0.4.13"; + name = "node-eventemitter2-0.4.13"; src = [ (fetchurl { url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz"; @@ -4191,7 +4213,7 @@ by-spec."events.node".">= 0.4.0" = self.by-version."events.node"."0.4.9"; by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage { - name = "events.node-0.4.9"; + name = "node-events.node-0.4.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; @@ -4210,7 +4232,7 @@ by-spec."everyauth"."0.4.5" = self.by-version."everyauth"."0.4.5"; by-version."everyauth"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "everyauth-0.4.5"; + name = "node-everyauth-0.4.5"; src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; @@ -4238,7 +4260,7 @@ by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "exit-0.1.2"; + name = "node-exit-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; @@ -4403,12 +4425,12 @@ }; by-spec."express"."~3.4" = self.by-version."express"."3.4.8"; - by-spec."express"."~3.4.4" = + by-spec."express"."~3.4.8" = self.by-version."express"."3.4.8"; by-spec."express-form"."*" = self.by-version."express-form"."0.10.1"; by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage { - name = "express-form-0.10.1"; + name = "node-express-form-0.10.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz"; @@ -4421,7 +4443,7 @@ deps = [ self.by-version."validator"."0.4.28" self.by-version."object-additions"."0.5.1" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" ]; peerDependencies = [ self.by-version."express"."3.4.8" @@ -4432,7 +4454,7 @@ by-spec."express-partials"."0.0.6" = self.by-version."express-partials"."0.0.6"; by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "express-partials-0.0.6"; + name = "node-express-partials-0.0.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; @@ -4451,7 +4473,7 @@ by-spec."extend"."*" = self.by-version."extend"."1.2.1"; by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "extend-1.2.1"; + name = "node-extend-1.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; @@ -4471,7 +4493,7 @@ by-spec."extract-opts"."~2.2.0" = self.by-version."extract-opts"."2.2.0"; by-version."extract-opts"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "extract-opts-2.2.0"; + name = "node-extract-opts-2.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz"; @@ -4491,7 +4513,7 @@ by-spec."extsprintf"."1.0.0" = self.by-version."extsprintf"."1.0.0"; by-version."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "extsprintf-1.0.0"; + name = "node-extsprintf-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; @@ -4510,7 +4532,7 @@ by-spec."extsprintf"."1.0.2" = self.by-version."extsprintf"."1.0.2"; by-version."extsprintf"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "extsprintf-1.0.2"; + name = "node-extsprintf-1.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; @@ -4529,7 +4551,7 @@ by-spec."eyes"."0.1.x" = self.by-version."eyes"."0.1.8"; by-version."eyes"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "eyes-0.1.8"; + name = "node-eyes-0.1.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; @@ -4550,7 +4572,7 @@ by-spec."faye-websocket"."*" = 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"; + name = "node-faye-websocket-0.7.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.2.tgz"; @@ -4571,7 +4593,7 @@ by-spec."faye-websocket"."0.7.0" = self.by-version."faye-websocket"."0.7.0"; by-version."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "faye-websocket-0.7.0"; + name = "node-faye-websocket-0.7.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; @@ -4615,14 +4637,14 @@ by-spec."fetch-bower".">=2 <3" = self.by-version."fetch-bower"."2.0.0"; by-spec."fields"."~0.1.11" = - self.by-version."fields"."0.1.11"; - by-version."fields"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "fields-0.1.11"; + self.by-version."fields"."0.1.12"; + by-version."fields"."0.1.12" = lib.makeOverridable self.buildNodePackage { + name = "node-fields-0.1.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fields/-/fields-0.1.11.tgz"; - name = "fields-0.1.11.tgz"; - sha1 = "d428e4a622c9f71d52f413fb2fde96cfdb51c520"; + url = "http://registry.npmjs.org/fields/-/fields-0.1.12.tgz"; + name = "fields-0.1.12.tgz"; + sha1 = "ded2dfe1e0aad3576aed554bfb8f65a7e7404bc1"; }) ]; buildInputs = @@ -4639,7 +4661,7 @@ by-spec."file-utils"."~0.1.1" = self.by-version."file-utils"."0.1.5"; by-version."file-utils"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "file-utils-0.1.5"; + name = "node-file-utils-0.1.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz"; @@ -4662,10 +4684,12 @@ ]; passthru.names = [ "file-utils" ]; }; + by-spec."file-utils"."~0.1.5" = + self.by-version."file-utils"."0.1.5"; by-spec."fileset"."0.1.x" = self.by-version."fileset"."0.1.5"; by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "fileset-0.1.5"; + name = "node-fileset-0.1.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz"; @@ -4686,7 +4710,7 @@ by-spec."findit".">=1.1.0 <2.0.0" = self.by-version."findit"."1.1.0"; by-version."findit"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "findit-1.1.0"; + name = "node-findit-1.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz"; @@ -4726,7 +4750,7 @@ by-spec."findup-sync"."~0.1.0" = self.by-version."findup-sync"."0.1.2"; by-version."findup-sync"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "findup-sync-0.1.2"; + name = "node-findup-sync-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz"; @@ -4775,7 +4799,7 @@ by-spec."follow-redirects"."0.0.3" = self.by-version."follow-redirects"."0.0.3"; by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "follow-redirects-0.0.3"; + name = "node-follow-redirects-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; @@ -4795,7 +4819,7 @@ by-spec."forEachAsync"."~2.2" = self.by-version."forEachAsync"."2.2.1"; by-version."forEachAsync"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "forEachAsync-2.2.1"; + name = "node-forEachAsync-2.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz"; @@ -4847,7 +4871,7 @@ by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "forever-agent-0.2.0"; + name = "node-forever-agent-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; @@ -4866,7 +4890,7 @@ by-spec."forever-agent"."~0.5.0" = self.by-version."forever-agent"."0.5.0"; by-version."forever-agent"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "forever-agent-0.5.0"; + name = "node-forever-agent-0.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz"; @@ -4885,7 +4909,7 @@ by-spec."forever-monitor"."*" = self.by-version."forever-monitor"."1.2.3"; by-version."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "forever-monitor-1.2.3"; + name = "node-forever-monitor-1.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz"; @@ -4911,7 +4935,7 @@ by-spec."forever-monitor"."1.1.0" = self.by-version."forever-monitor"."1.1.0"; by-version."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "forever-monitor-1.1.0"; + name = "node-forever-monitor-1.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz"; @@ -4935,32 +4959,10 @@ }; by-spec."forever-monitor"."1.2.3" = self.by-version."forever-monitor"."1.2.3"; - by-spec."form-data"."0.0.8" = - self.by-version."form-data"."0.0.8"; - by-version."form-data"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "form-data-0.0.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz"; - name = "form-data-0.0.8.tgz"; - sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5"; - }) - ]; - buildInputs = - (self.nativeDeps."form-data" or []); - deps = [ - self.by-version."combined-stream"."0.0.4" - self.by-version."mime"."1.2.11" - self.by-version."async"."0.2.9" - ]; - peerDependencies = [ - ]; - passthru.names = [ "form-data" ]; - }; by-spec."form-data"."~0.0.3" = self.by-version."form-data"."0.0.10"; by-version."form-data"."0.0.10" = lib.makeOverridable self.buildNodePackage { - name = "form-data-0.0.10"; + name = "node-form-data-0.0.10"; src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; @@ -4973,7 +4975,7 @@ deps = [ self.by-version."combined-stream"."0.0.4" self.by-version."mime"."1.2.11" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" ]; peerDependencies = [ ]; @@ -4982,7 +4984,7 @@ by-spec."form-data"."~0.1.0" = self.by-version."form-data"."0.1.2"; by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "form-data-0.1.2"; + name = "node-form-data-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; @@ -4995,7 +4997,7 @@ deps = [ self.by-version."combined-stream"."0.0.4" self.by-version."mime"."1.2.11" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" ]; peerDependencies = [ ]; @@ -5004,7 +5006,7 @@ by-spec."formidable"."1.0.11" = self.by-version."formidable"."1.0.11"; by-version."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.11"; + name = "node-formidable-1.0.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; @@ -5023,7 +5025,7 @@ by-spec."formidable"."1.0.13" = self.by-version."formidable"."1.0.13"; by-version."formidable"."1.0.13" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.13"; + name = "node-formidable-1.0.13"; src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz"; @@ -5042,7 +5044,7 @@ by-spec."formidable"."1.0.14" = self.by-version."formidable"."1.0.14"; by-version."formidable"."1.0.14" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.14"; + name = "node-formidable-1.0.14"; src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; @@ -5061,7 +5063,7 @@ by-spec."formidable"."1.0.9" = self.by-version."formidable"."1.0.9"; by-version."formidable"."1.0.9" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.9"; + name = "node-formidable-1.0.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz"; @@ -5082,7 +5084,7 @@ by-spec."fresh"."0.1.0" = self.by-version."fresh"."0.1.0"; by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "fresh-0.1.0"; + name = "node-fresh-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; @@ -5101,7 +5103,7 @@ by-spec."fresh"."0.2.0" = self.by-version."fresh"."0.2.0"; by-version."fresh"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "fresh-0.2.0"; + name = "node-fresh-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; @@ -5117,10 +5119,29 @@ ]; passthru.names = [ "fresh" ]; }; + by-spec."fresh"."~0.2.1" = + self.by-version."fresh"."0.2.1"; + by-version."fresh"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-fresh-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fresh/-/fresh-0.2.1.tgz"; + name = "fresh-0.2.1.tgz"; + sha1 = "13cc0b1f53fe0e6fa6a70c18d52ce3c5c56be066"; + }) + ]; + buildInputs = + (self.nativeDeps."fresh" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "fresh" ]; + }; by-spec."fs-extra"."~0.6.1" = self.by-version."fs-extra"."0.6.4"; by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage { - name = "fs-extra-0.6.4"; + name = "node-fs-extra-0.6.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; @@ -5143,7 +5164,7 @@ by-spec."fs-walk"."*" = self.by-version."fs-walk"."0.0.1"; by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "fs-walk-0.0.1"; + name = "node-fs-walk-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz"; @@ -5154,7 +5175,7 @@ buildInputs = (self.nativeDeps."fs-walk" or []); deps = [ - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" ]; peerDependencies = [ ]; @@ -5164,7 +5185,7 @@ by-spec."fs.extra".">=1.2.0 <2.0.0" = self.by-version."fs.extra"."1.2.1"; by-version."fs.extra"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "fs.extra-1.2.1"; + name = "node-fs.extra-1.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz"; @@ -5188,7 +5209,7 @@ by-spec."fstream"."0" = self.by-version."fstream"."0.1.25"; by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.25"; + name = "node-fstream-0.1.25"; src = [ (fetchurl { url = "http://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz"; @@ -5219,7 +5240,7 @@ by-spec."fstream-ignore"."~0.0.5" = self.by-version."fstream-ignore"."0.0.7"; by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "fstream-ignore-0.0.7"; + name = "node-fstream-ignore-0.0.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; @@ -5243,7 +5264,7 @@ by-spec."fstream-npm"."~0.1.6" = self.by-version."fstream-npm"."0.1.6"; by-version."fstream-npm"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "fstream-npm-0.1.6"; + name = "node-fstream-npm-0.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz"; @@ -5264,7 +5285,7 @@ by-spec."generator-angular"."*" = self.by-version."generator-angular"."0.7.1"; by-version."generator-angular"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.7.1"; + name = "node-generator-angular-0.7.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.7.1.tgz"; @@ -5289,7 +5310,7 @@ by-spec."generator-karma"."~0.6.0" = self.by-version."generator-karma"."0.6.0"; by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "generator-karma-0.6.0"; + name = "node-generator-karma-0.6.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.6.0.tgz"; @@ -5310,7 +5331,7 @@ by-spec."generator-mocha".">=0.1.0" = self.by-version."generator-mocha"."0.1.3"; by-version."generator-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "generator-mocha-0.1.3"; + name = "node-generator-mocha-0.1.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.3.tgz"; @@ -5331,7 +5352,7 @@ by-spec."generator-webapp"."*" = self.by-version."generator-webapp"."0.4.7"; by-version."generator-webapp"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "generator-webapp-0.4.7"; + name = "node-generator-webapp-0.4.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.7.tgz"; @@ -5376,7 +5397,7 @@ by-spec."getobject"."~0.1.0" = self.by-version."getobject"."0.1.0"; by-version."getobject"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "getobject-0.1.0"; + name = "node-getobject-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"; @@ -5395,7 +5416,7 @@ by-spec."github-flavored-markdown".">= 0.0.1" = self.by-version."github-flavored-markdown"."1.0.1"; by-version."github-flavored-markdown"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "github-flavored-markdown-1.0.1"; + name = "node-github-flavored-markdown-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/github-flavored-markdown/-/github-flavored-markdown-1.0.1.tgz"; @@ -5414,7 +5435,7 @@ by-spec."github-url-from-git"."1.1.1" = self.by-version."github-url-from-git"."1.1.1"; by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-git-1.1.1"; + name = "node-github-url-from-git-1.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; @@ -5435,7 +5456,7 @@ by-spec."github-url-from-username-repo"."0.0.2" = self.by-version."github-url-from-username-repo"."0.0.2"; by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-username-repo-0.0.2"; + name = "node-github-url-from-username-repo-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; @@ -5454,7 +5475,7 @@ by-spec."glob"."3" = self.by-version."glob"."3.2.8"; by-version."glob"."3.2.8" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.8"; + name = "node-glob-3.2.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.8.tgz"; @@ -5475,7 +5496,7 @@ by-spec."glob"."3.2.3" = self.by-version."glob"."3.2.3"; by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.3"; + name = "node-glob-3.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; @@ -5505,7 +5526,7 @@ by-spec."glob"."~3.1.21" = self.by-version."glob"."3.1.21"; by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.1.21"; + name = "node-glob-3.1.21"; src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; @@ -5535,7 +5556,7 @@ by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.1"; by-version."graceful-fs"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.1"; + name = "node-graceful-fs-2.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; @@ -5554,7 +5575,7 @@ by-spec."graceful-fs"."~1" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.2.3"; + name = "node-graceful-fs-1.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; @@ -5573,7 +5594,7 @@ by-spec."graceful-fs"."~1.1" = self.by-version."graceful-fs"."1.1.14"; by-version."graceful-fs"."1.1.14" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.1.14"; + name = "node-graceful-fs-1.1.14"; src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.1.14.tgz"; @@ -5598,14 +5619,14 @@ by-spec."graceful-fs"."~2.0.1" = self.by-version."graceful-fs"."2.0.1"; by-spec."gridfs-stream"."*" = - self.by-version."gridfs-stream"."0.4.0"; - by-version."gridfs-stream"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "gridfs-stream-0.4.0"; + self.by-version."gridfs-stream"."0.4.1"; + by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-gridfs-stream-0.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz"; - name = "gridfs-stream-0.4.0.tgz"; - sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a"; + url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.1.tgz"; + name = "gridfs-stream-0.4.1.tgz"; + sha1 = "1bcccb1b05b57946363b5e53fbe2bc95dd8877bb"; }) ]; buildInputs = @@ -5616,11 +5637,11 @@ ]; passthru.names = [ "gridfs-stream" ]; }; - "gridfs-stream" = self.by-version."gridfs-stream"."0.4.0"; + "gridfs-stream" = self.by-version."gridfs-stream"."0.4.1"; by-spec."growl"."1.7.x" = self.by-version."growl"."1.7.0"; by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage { - name = "growl-1.7.0"; + name = "node-growl-1.7.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz"; @@ -5639,7 +5660,7 @@ by-spec."grunt"."0.4.x" = self.by-version."grunt"."0.4.2"; by-version."grunt"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "grunt-0.4.2"; + name = "node-grunt-0.4.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt/-/grunt-0.4.2.tgz"; @@ -5682,7 +5703,7 @@ by-spec."grunt-bower-task"."*" = self.by-version."grunt-bower-task"."0.3.4"; by-version."grunt-bower-task"."0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "grunt-bower-task-0.3.4"; + name = "node-grunt-bower-task-0.3.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-bower-task/-/grunt-bower-task-0.3.4.tgz"; @@ -5706,14 +5727,14 @@ }; "grunt-bower-task" = self.by-version."grunt-bower-task"."0.3.4"; by-spec."grunt-cli"."*" = - self.by-version."grunt-cli"."0.1.11"; - by-version."grunt-cli"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "grunt-cli-0.1.11"; + self.by-version."grunt-cli"."0.1.13"; + by-version."grunt-cli"."0.1.13" = lib.makeOverridable self.buildNodePackage { + name = "grunt-cli-0.1.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.11.tgz"; - name = "grunt-cli-0.1.11.tgz"; - sha1 = "a0d785b7f8633983ecb5e6af8397feb6e39dd0a8"; + url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz"; + name = "grunt-cli-0.1.13.tgz"; + sha1 = "e9ebc4047631f5012d922770c39378133cad10f4"; }) ]; buildInputs = @@ -5727,13 +5748,13 @@ ]; passthru.names = [ "grunt-cli" ]; }; - "grunt-cli" = self.by-version."grunt-cli"."0.1.11"; + "grunt-cli" = self.by-version."grunt-cli"."0.1.13"; by-spec."grunt-cli"."~0.1.7" = - self.by-version."grunt-cli"."0.1.11"; + self.by-version."grunt-cli"."0.1.13"; by-spec."grunt-contrib-cssmin"."*" = self.by-version."grunt-contrib-cssmin"."0.7.0"; by-version."grunt-contrib-cssmin"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-cssmin-0.7.0"; + name = "node-grunt-contrib-cssmin-0.7.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.7.0.tgz"; @@ -5756,7 +5777,7 @@ by-spec."grunt-contrib-jshint"."*" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-jshint-0.8.0"; + name = "node-grunt-contrib-jshint-0.8.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.8.0.tgz"; @@ -5767,7 +5788,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.by-version."jshint"."2.4.1" + self.by-version."jshint"."2.4.3" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" @@ -5778,7 +5799,7 @@ by-spec."grunt-contrib-less"."*" = self.by-version."grunt-contrib-less"."0.9.0"; by-version."grunt-contrib-less"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-less-0.9.0"; + name = "node-grunt-contrib-less-0.9.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.9.0.tgz"; @@ -5789,7 +5810,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-less" or []); deps = [ - self.by-version."less"."1.6.1" + self.by-version."less"."1.6.2" self.by-version."grunt-lib-contrib"."0.6.1" self.by-version."chalk"."0.4.0" ]; @@ -5802,7 +5823,7 @@ by-spec."grunt-contrib-requirejs"."*" = self.by-version."grunt-contrib-requirejs"."0.4.1"; by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-requirejs-0.4.1"; + name = "node-grunt-contrib-requirejs-0.4.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.1.tgz"; @@ -5822,20 +5843,20 @@ }; "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1"; by-spec."grunt-contrib-uglify"."*" = - self.by-version."grunt-contrib-uglify"."0.3.1"; - by-version."grunt-contrib-uglify"."0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-uglify-0.3.1"; + self.by-version."grunt-contrib-uglify"."0.3.2"; + by-version."grunt-contrib-uglify"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-uglify-0.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.1.tgz"; - name = "grunt-contrib-uglify-0.3.1.tgz"; - sha1 = "6ce6836d8e8d4078ae2f2758f46d417241516f51"; + url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.2.tgz"; + name = "grunt-contrib-uglify-0.3.2.tgz"; + sha1 = "865b00ae0d11d1f5fafca3967c9b099f8929684b"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.by-version."uglify-js"."2.4.11" + self.by-version."uglify-js"."2.4.12" self.by-version."grunt-lib-contrib"."0.6.1" self.by-version."chalk"."0.4.0" ]; @@ -5844,11 +5865,11 @@ ]; passthru.names = [ "grunt-contrib-uglify" ]; }; - "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.1"; + "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.2"; by-spec."grunt-karma"."*" = self.by-version."grunt-karma"."0.7.2"; by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "grunt-karma-0.7.2"; + name = "node-grunt-karma-0.7.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.2.tgz"; @@ -5871,7 +5892,7 @@ by-spec."grunt-lib-contrib"."~0.6.0" = self.by-version."grunt-lib-contrib"."0.6.1"; by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-lib-contrib-0.6.1"; + name = "node-grunt-lib-contrib-0.6.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz"; @@ -5893,7 +5914,7 @@ by-spec."grunt-sed"."*" = self.by-version."grunt-sed"."0.1.1"; by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-sed-0.1.1"; + name = "node-grunt-sed-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz"; @@ -5904,7 +5925,7 @@ buildInputs = (self.nativeDeps."grunt-sed" or []); deps = [ - self.by-version."replace"."0.2.8" + self.by-version."replace"."0.2.9" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" @@ -5926,7 +5947,7 @@ buildInputs = (self.nativeDeps."guifi-earth" or []); deps = [ - self.by-version."coffee-script"."1.6.3" + self.by-version."coffee-script"."1.7.1" self.by-version."jade"."1.1.5" self.by-version."q"."1.0.0" self.by-version."xml2js"."0.4.1" @@ -5940,7 +5961,7 @@ by-spec."gzippo"."*" = self.by-version."gzippo"."0.2.0"; by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "gzippo-0.2.0"; + name = "node-gzippo-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz"; @@ -5951,7 +5972,7 @@ buildInputs = (self.nativeDeps."gzippo" or []); deps = [ - self.by-version."send"."0.1.4" + self.by-version."send"."0.2.0" ]; peerDependencies = [ ]; @@ -6003,14 +6024,14 @@ by-spec."handlebars"."~1.0.11" = self.by-version."handlebars"."1.0.12"; by-spec."has-color"."~0.1.0" = - self.by-version."has-color"."0.1.2"; - by-version."has-color"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "has-color-0.1.2"; + self.by-version."has-color"."0.1.3"; + by-version."has-color"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-has-color-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/has-color/-/has-color-0.1.2.tgz"; - name = "has-color-0.1.2.tgz"; - sha1 = "c4a523038912451262c745e0a663c38d948098b4"; + url = "http://registry.npmjs.org/has-color/-/has-color-0.1.3.tgz"; + name = "has-color-0.1.3.tgz"; + sha1 = "b249acb22a6b481c572eeddb28b8f346c0b242a1"; }) ]; buildInputs = @@ -6024,7 +6045,7 @@ by-spec."hasher"."~1.2.0" = self.by-version."hasher"."1.2.0"; by-version."hasher"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "hasher-1.2.0"; + name = "node-hasher-1.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; @@ -6044,7 +6065,7 @@ by-spec."hashring"."1.0.1" = self.by-version."hashring"."1.0.1"; by-version."hashring"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "hashring-1.0.1"; + name = "node-hashring-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz"; @@ -6065,7 +6086,7 @@ by-spec."hat"."*" = self.by-version."hat"."0.0.3"; by-version."hat"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "hat-0.0.3"; + name = "node-hat-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; @@ -6084,7 +6105,7 @@ by-spec."hawk"."~0.10.0" = self.by-version."hawk"."0.10.2"; by-version."hawk"."0.10.2" = lib.makeOverridable self.buildNodePackage { - name = "hawk-0.10.2"; + name = "node-hawk-0.10.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; @@ -6106,33 +6127,10 @@ }; by-spec."hawk"."~0.10.2" = self.by-version."hawk"."0.10.2"; - by-spec."hawk"."~0.13.0" = - self.by-version."hawk"."0.13.1"; - by-version."hawk"."0.13.1" = lib.makeOverridable self.buildNodePackage { - name = "hawk-0.13.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz"; - name = "hawk-0.13.1.tgz"; - sha1 = "3617958821f58311e4d7f6de291fca662b412ef4"; - }) - ]; - buildInputs = - (self.nativeDeps."hawk" or []); - deps = [ - self.by-version."hoek"."0.8.5" - self.by-version."boom"."0.4.2" - self.by-version."cryptiles"."0.2.2" - self.by-version."sntp"."0.2.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "hawk" ]; - }; by-spec."hawk"."~1.0.0" = self.by-version."hawk"."1.0.0"; by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "hawk-1.0.0"; + name = "node-hawk-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; @@ -6199,7 +6197,7 @@ by-spec."hiredis"."*" = self.by-version."hiredis"."0.1.16"; by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage { - name = "hiredis-0.1.16"; + name = "node-hiredis-0.1.16"; src = [ (fetchurl { url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz"; @@ -6219,7 +6217,7 @@ by-spec."hoek"."0.7.x" = self.by-version."hoek"."0.7.6"; by-version."hoek"."0.7.6" = lib.makeOverridable self.buildNodePackage { - name = "hoek-0.7.6"; + name = "node-hoek-0.7.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; @@ -6235,29 +6233,10 @@ ]; passthru.names = [ "hoek" ]; }; - by-spec."hoek"."0.8.x" = - self.by-version."hoek"."0.8.5"; - by-version."hoek"."0.8.5" = lib.makeOverridable self.buildNodePackage { - name = "hoek-0.8.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz"; - name = "hoek-0.8.5.tgz"; - sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f"; - }) - ]; - buildInputs = - (self.nativeDeps."hoek" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "hoek" ]; - }; by-spec."hoek"."0.9.x" = self.by-version."hoek"."0.9.1"; by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "hoek-0.9.1"; + name = "node-hoek-0.9.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; @@ -6276,7 +6255,7 @@ by-spec."hooker"."~0.2.3" = self.by-version."hooker"."0.2.3"; by-version."hooker"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "hooker-0.2.3"; + name = "node-hooker-0.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"; @@ -6295,7 +6274,7 @@ by-spec."hooks"."0.2.1" = self.by-version."hooks"."0.2.1"; by-version."hooks"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "hooks-0.2.1"; + name = "node-hooks-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; @@ -6314,7 +6293,7 @@ by-spec."htmlparser2"."3.1.4" = self.by-version."htmlparser2"."3.1.4"; by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage { - name = "htmlparser2-3.1.4"; + name = "node-htmlparser2-3.1.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.1.4.tgz"; @@ -6328,7 +6307,7 @@ self.by-version."domhandler"."2.0.3" self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.0.24" + self.by-version."readable-stream"."1.0.25" ]; peerDependencies = [ ]; @@ -6337,7 +6316,7 @@ by-spec."htmlparser2"."3.3.x" = self.by-version."htmlparser2"."3.3.0"; by-version."htmlparser2"."3.3.0" = lib.makeOverridable self.buildNodePackage { - name = "htmlparser2-3.3.0"; + name = "node-htmlparser2-3.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz"; @@ -6351,7 +6330,7 @@ self.by-version."domhandler"."2.1.0" self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.0.24" + self.by-version."readable-stream"."1.0.25" ]; peerDependencies = [ ]; @@ -6360,7 +6339,7 @@ by-spec."htmlparser2"."~3.4.0" = self.by-version."htmlparser2"."3.4.0"; by-version."htmlparser2"."3.4.0" = lib.makeOverridable self.buildNodePackage { - name = "htmlparser2-3.4.0"; + name = "node-htmlparser2-3.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz"; @@ -6383,7 +6362,7 @@ by-spec."http-auth"."2.0.7" = self.by-version."http-auth"."2.0.7"; by-version."http-auth"."2.0.7" = lib.makeOverridable self.buildNodePackage { - name = "http-auth-2.0.7"; + name = "node-http-auth-2.0.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; @@ -6450,7 +6429,7 @@ by-spec."http-signature"."0.9.11" = self.by-version."http-signature"."0.9.11"; by-version."http-signature"."0.9.11" = lib.makeOverridable self.buildNodePackage { - name = "http-signature-0.9.11"; + name = "node-http-signature-0.9.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz"; @@ -6472,7 +6451,7 @@ by-spec."http-signature"."~0.10.0" = self.by-version."http-signature"."0.10.0"; by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "http-signature-0.10.0"; + name = "node-http-signature-0.10.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; @@ -6491,12 +6470,10 @@ ]; passthru.names = [ "http-signature" ]; }; - by-spec."http-signature"."~0.9.11" = - self.by-version."http-signature"."0.9.11"; by-spec."humanize"."~0.0.9" = self.by-version."humanize"."0.0.9"; by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "humanize-0.0.9"; + name = "node-humanize-0.0.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; @@ -6515,7 +6492,7 @@ by-spec."i"."0.3.x" = self.by-version."i"."0.3.2"; by-version."i"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "i-0.3.2"; + name = "node-i-0.3.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz"; @@ -6534,7 +6511,7 @@ by-spec."i18next"."*" = self.by-version."i18next"."1.7.1"; by-version."i18next"."1.7.1" = lib.makeOverridable self.buildNodePackage { - name = "i18next-1.7.1"; + name = "node-i18next-1.7.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/i18next/-/i18next-1.7.1.tgz"; @@ -6545,7 +6522,7 @@ buildInputs = (self.nativeDeps."i18next" or []); deps = [ - self.by-version."cookies"."0.3.8" + self.by-version."cookies"."0.4.0" ]; peerDependencies = [ ]; @@ -6581,7 +6558,7 @@ by-spec."iconv-lite"."~0.2.10" = self.by-version."iconv-lite"."0.2.11"; by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage { - name = "iconv-lite-0.2.11"; + name = "node-iconv-lite-0.2.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"; @@ -6602,7 +6579,7 @@ by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "inherits-1.0.0"; + name = "node-inherits-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; @@ -6623,7 +6600,7 @@ by-spec."inherits"."2" = self.by-version."inherits"."2.0.1"; by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "inherits-2.0.1"; + name = "node-inherits-2.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; @@ -6648,7 +6625,7 @@ by-spec."ini"."1" = self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "ini-1.1.0"; + name = "node-ini-1.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; @@ -6671,7 +6648,7 @@ by-spec."init-package-json"."0.0.14" = self.by-version."init-package-json"."0.0.14"; by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-0.0.14"; + name = "node-init-package-json-0.0.14"; src = [ (fetchurl { url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz"; @@ -6695,7 +6672,7 @@ by-spec."inquirer"."~0.2.4" = self.by-version."inquirer"."0.2.5"; by-version."inquirer"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.2.5"; + name = "node-inquirer-0.2.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz"; @@ -6707,7 +6684,7 @@ (self.nativeDeps."inquirer" or []); deps = [ self.by-version."lodash"."1.2.1" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."cli-color"."0.2.3" self.by-version."mute-stream"."0.0.3" ]; @@ -6718,7 +6695,7 @@ by-spec."inquirer"."~0.3.0" = self.by-version."inquirer"."0.3.5"; by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.3.5"; + name = "node-inquirer-0.3.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.5.tgz"; @@ -6730,7 +6707,7 @@ (self.nativeDeps."inquirer" or []); deps = [ self.by-version."lodash"."1.2.1" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."cli-color"."0.2.3" self.by-version."mute-stream"."0.0.3" ]; @@ -6743,7 +6720,7 @@ by-spec."inquirer"."~0.4.0" = self.by-version."inquirer"."0.4.0"; by-version."inquirer"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.4.0"; + name = "node-inquirer-0.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.0.tgz"; @@ -6755,7 +6732,7 @@ (self.nativeDeps."inquirer" or []); deps = [ self.by-version."lodash"."2.4.1" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."cli-color"."0.2.3" self.by-version."mute-stream"."0.0.4" self.by-version."through"."2.3.4" @@ -6767,7 +6744,7 @@ by-spec."insight"."~0.3.0" = self.by-version."insight"."0.3.0"; by-version."insight"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "insight-0.3.0"; + name = "node-insight-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/insight/-/insight-0.3.0.tgz"; @@ -6781,7 +6758,7 @@ self.by-version."chalk"."0.2.1" self.by-version."request"."2.27.0" self.by-version."configstore"."0.1.7" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."lodash"."1.3.1" self.by-version."inquirer"."0.2.5" ]; @@ -6792,7 +6769,7 @@ 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"; + name = "node-intersect-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz"; @@ -6811,7 +6788,7 @@ by-spec."ironhorse"."*" = self.by-version."ironhorse"."0.0.9"; by-version."ironhorse"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "ironhorse-0.0.9"; + name = "node-ironhorse-0.0.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.9.tgz"; @@ -6826,16 +6803,16 @@ self.by-version."winston"."0.7.2" self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."express"."3.4.8" self.by-version."jade"."1.1.5" - self.by-version."passport"."0.1.18" + self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" self.by-version."js-yaml"."3.0.1" - self.by-version."mongoose"."3.8.4" - self.by-version."gridfs-stream"."0.4.0" + self.by-version."mongoose"."3.8.6" + self.by-version."gridfs-stream"."0.4.1" self.by-version."temp"."0.6.0" - self.by-version."kue"."0.6.2" + self.by-version."kue"."0.7.4" self.by-version."redis"."0.10.0" self.by-version."hiredis"."0.1.16" ]; @@ -6847,7 +6824,7 @@ by-spec."is-promise"."~1" = self.by-version."is-promise"."1.0.0"; by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "is-promise-1.0.0"; + name = "node-is-promise-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz"; @@ -6866,7 +6843,7 @@ by-spec."isbinaryfile"."~0.1.8" = self.by-version."isbinaryfile"."0.1.9"; by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "isbinaryfile-0.1.9"; + name = "node-isbinaryfile-0.1.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"; @@ -6885,14 +6862,14 @@ by-spec."isbinaryfile"."~0.1.9" = self.by-version."isbinaryfile"."0.1.9"; by-spec."isbinaryfile"."~2.0.0" = - self.by-version."isbinaryfile"."2.0.0"; - by-version."isbinaryfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "isbinaryfile-2.0.0"; + self.by-version."isbinaryfile"."2.0.1"; + by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-isbinaryfile-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.0.tgz"; - name = "isbinaryfile-2.0.0.tgz"; - sha1 = "309c09010811d04ebed7c8d026df443d565e9f26"; + url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.1.tgz"; + name = "isbinaryfile-2.0.1.tgz"; + sha1 = "b92369bfdaf616027133e077c5ba145f36699d55"; }) ]; buildInputs = @@ -6924,7 +6901,7 @@ self.by-version."nopt"."2.1.2" self.by-version."fileset"."0.1.5" self.by-version."which"."1.0.5" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."abbrev"."1.0.4" self.by-version."wordwrap"."0.0.2" self.by-version."resolve"."0.6.1" @@ -6956,7 +6933,7 @@ self.by-version."nopt"."2.1.2" self.by-version."fileset"."0.1.5" self.by-version."which"."1.0.5" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."abbrev"."1.0.4" self.by-version."wordwrap"."0.0.2" self.by-version."resolve"."0.5.1" @@ -7086,7 +7063,7 @@ by-spec."jedediah"."~0.1.0" = self.by-version."jedediah"."0.1.1"; by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "jedediah-0.1.1"; + name = "node-jedediah-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/jedediah/-/jedediah-0.1.1.tgz"; @@ -7127,7 +7104,7 @@ by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-0.3.7"; + name = "node-js-yaml-0.3.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; @@ -7230,14 +7207,14 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.4.1"; - by-version."jshint"."2.4.1" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.4.1"; + self.by-version."jshint"."2.4.3"; + by-version."jshint"."2.4.3" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.4.1.tgz"; - name = "jshint-2.4.1.tgz"; - sha1 = "833f361a56577b80816b64f18434cce3b3942591"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.4.3.tgz"; + name = "jshint-2.4.3.tgz"; + sha1 = "1beb074b4d9f817773bb5aa16882fd67164c216a"; }) ]; buildInputs = @@ -7254,13 +7231,13 @@ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.4.1"; + "jshint" = self.by-version."jshint"."2.4.3"; by-spec."jshint"."~2.4.0" = - self.by-version."jshint"."2.4.1"; + self.by-version."jshint"."2.4.3"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "json-schema-0.2.2"; + name = "node-json-schema-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; @@ -7279,7 +7256,7 @@ by-spec."json-stringify-safe"."~3.0.0" = self.by-version."json-stringify-safe"."3.0.0"; by-version."json-stringify-safe"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "json-stringify-safe-3.0.0"; + name = "node-json-stringify-safe-3.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; @@ -7295,29 +7272,10 @@ ]; passthru.names = [ "json-stringify-safe" ]; }; - by-spec."json-stringify-safe"."~4.0.0" = - self.by-version."json-stringify-safe"."4.0.0"; - by-version."json-stringify-safe"."4.0.0" = lib.makeOverridable self.buildNodePackage { - name = "json-stringify-safe-4.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz"; - name = "json-stringify-safe-4.0.0.tgz"; - sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54"; - }) - ]; - buildInputs = - (self.nativeDeps."json-stringify-safe" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "json-stringify-safe" ]; - }; by-spec."json-stringify-safe"."~5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "json-stringify-safe-5.0.0"; + name = "node-json-stringify-safe-5.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; @@ -7336,7 +7294,7 @@ by-spec."jsonfile"."~1.0.1" = self.by-version."jsonfile"."1.0.1"; by-version."jsonfile"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "jsonfile-1.0.1"; + name = "node-jsonfile-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; @@ -7375,7 +7333,7 @@ by-spec."jsprim"."0.3.0" = self.by-version."jsprim"."0.3.0"; by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "jsprim-0.3.0"; + name = "node-jsprim-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; @@ -7397,7 +7355,7 @@ by-spec."junk"."~0.2.0" = self.by-version."junk"."0.2.2"; by-version."junk"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "junk-0.2.2"; + name = "node-junk-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/junk/-/junk-0.2.2.tgz"; @@ -7462,7 +7420,7 @@ by-spec."karma-chrome-launcher"."*" = self.by-version."karma-chrome-launcher"."0.1.2"; by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "karma-chrome-launcher-0.1.2"; + name = "node-karma-chrome-launcher-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.2.tgz"; @@ -7481,14 +7439,14 @@ }; "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2"; by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.1.4"; - by-version."karma-coverage"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "karma-coverage-0.1.4"; + self.by-version."karma-coverage"."0.1.5"; + by-version."karma-coverage"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-coverage-0.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.4.tgz"; - name = "karma-coverage-0.1.4.tgz"; - sha1 = "53766bad4dc2aa26dcc1be95ded7809be8032d8e"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.5.tgz"; + name = "karma-coverage-0.1.5.tgz"; + sha1 = "a4dcbe87d4a7765456ca64218b5f0601018e1371"; }) ]; buildInputs = @@ -7503,11 +7461,11 @@ ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.1.4"; + "karma-coverage" = self.by-version."karma-coverage"."0.1.5"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.1"; by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "karma-junit-reporter-0.2.1"; + name = "node-karma-junit-reporter-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.1.tgz"; @@ -7529,7 +7487,7 @@ by-spec."karma-mocha"."*" = self.by-version."karma-mocha"."0.1.1"; by-version."karma-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "karma-mocha-0.1.1"; + name = "node-karma-mocha-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.1.tgz"; @@ -7543,7 +7501,7 @@ ]; peerDependencies = [ self.by-version."karma"."0.11.13" - self.by-version."mocha"."1.17.0" + self.by-version."mocha"."1.17.1" ]; passthru.names = [ "karma-mocha" ]; }; @@ -7551,7 +7509,7 @@ by-spec."karma-requirejs"."*" = self.by-version."karma-requirejs"."0.2.1"; by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "karma-requirejs-0.2.1"; + name = "node-karma-requirejs-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz"; @@ -7573,7 +7531,7 @@ by-spec."karma-sauce-launcher"."*" = self.by-version."karma-sauce-launcher"."0.2.0"; by-version."karma-sauce-launcher"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "karma-sauce-launcher-0.2.0"; + name = "node-karma-sauce-launcher-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.0.tgz"; @@ -7584,7 +7542,7 @@ buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.2.8" + self.by-version."wd"."0.2.10" self.by-version."sauce-connect-launcher"."0.2.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" @@ -7595,22 +7553,22 @@ passthru.names = [ "karma-sauce-launcher" ]; }; "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.0"; - by-spec."keen.io"."0.0.3" = - self.by-version."keen.io"."0.0.3"; - by-version."keen.io"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "keen.io-0.0.3"; + by-spec."keen.io"."~0.0.4" = + self.by-version."keen.io"."0.0.4"; + by-version."keen.io"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-keen.io-0.0.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.3.tgz"; - name = "keen.io-0.0.3.tgz"; - sha1 = "2d6ae2baa6d24b618f378b2a44413e1283fbcb63"; + url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.4.tgz"; + name = "keen.io-0.0.4.tgz"; + sha1 = "041caa79371a6bec51288e222f3bb2e05c7e6b25"; }) ]; buildInputs = (self.nativeDeps."keen.io" or []); deps = [ self.by-version."superagent"."0.13.0" - self.by-version."underscore"."1.4.4" + self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; @@ -7619,7 +7577,7 @@ by-spec."keep-alive-agent"."0.0.1" = self.by-version."keep-alive-agent"."0.0.1"; by-version."keep-alive-agent"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "keep-alive-agent-0.0.1"; + name = "node-keep-alive-agent-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; @@ -7638,7 +7596,7 @@ by-spec."kerberos"."0.0.3" = self.by-version."kerberos"."0.0.3"; by-version."kerberos"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "kerberos-0.0.3"; + name = "node-kerberos-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz"; @@ -7657,7 +7615,7 @@ by-spec."kew"."~0.1.7" = self.by-version."kew"."0.1.7"; by-version."kew"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "kew-0.1.7"; + name = "node-kew-0.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; @@ -7673,10 +7631,29 @@ ]; passthru.names = [ "kew" ]; }; + by-spec."keygrip"."~1.0.0" = + self.by-version."keygrip"."1.0.0"; + by-version."keygrip"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-keygrip-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.0.tgz"; + name = "keygrip-1.0.0.tgz"; + sha1 = "b771120e8e697b8692b76866a84cdff3912fc379"; + }) + ]; + buildInputs = + (self.nativeDeps."keygrip" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "keygrip" ]; + }; by-spec."keypress"."0.1.x" = self.by-version."keypress"."0.1.0"; by-version."keypress"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "keypress-0.1.0"; + name = "node-keypress-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; @@ -7694,10 +7671,29 @@ }; by-spec."keypress"."~0.1.0" = self.by-version."keypress"."0.1.0"; + by-spec."knockout"."~3.0.0" = + self.by-version."knockout"."3.0.0"; + by-version."knockout"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-knockout-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/knockout/-/knockout-3.0.0.tgz"; + name = "knockout-3.0.0.tgz"; + sha1 = "fd8d43ee446237cde7df650f5c7dbcf68ae49a80"; + }) + ]; + buildInputs = + (self.nativeDeps."knockout" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "knockout" ]; + }; by-spec."knox"."*" = self.by-version."knox"."0.8.8"; by-version."knox"."0.8.8" = lib.makeOverridable self.buildNodePackage { - name = "knox-0.8.8"; + name = "node-knox-0.8.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz"; @@ -7719,35 +7715,35 @@ }; "knox" = self.by-version."knox"."0.8.8"; by-spec."kue"."*" = - self.by-version."kue"."0.6.2"; - by-version."kue"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "kue-0.6.2"; + self.by-version."kue"."0.7.4"; + by-version."kue"."0.7.4" = lib.makeOverridable self.buildNodePackage { + name = "node-kue-0.7.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/kue/-/kue-0.6.2.tgz"; - name = "kue-0.6.2.tgz"; - sha1 = "9a6a95081842cf4ee3da5c61770bc23616a943f2"; + url = "http://registry.npmjs.org/kue/-/kue-0.7.4.tgz"; + name = "kue-0.7.4.tgz"; + sha1 = "bb3315580bbf4ec8663ce4203aec92e560a044ef"; }) ]; buildInputs = (self.nativeDeps."kue" or []); deps = [ - self.by-version."redis"."0.7.2" + self.by-version."redis"."0.10.0" self.by-version."express"."3.1.2" self.by-version."jade"."0.26.3" self.by-version."stylus"."0.27.2" self.by-version."nib"."0.5.0" - self.by-version."reds"."0.1.4" + self.by-version."reds"."0.2.4" ]; peerDependencies = [ ]; passthru.names = [ "kue" ]; }; - "kue" = self.by-version."kue"."0.6.2"; + "kue" = self.by-version."kue"."0.7.4"; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { - name = "lazy-1.0.11"; + name = "node-lazy-1.0.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; @@ -7763,10 +7759,30 @@ ]; passthru.names = [ "lazy" ]; }; + by-spec."lazystream"."~0.1.0" = + self.by-version."lazystream"."0.1.0"; + by-version."lazystream"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-lazystream-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"; + name = "lazystream-0.1.0.tgz"; + sha1 = "1b25d63c772a4c20f0a5ed0a9d77f484b6e16920"; + }) + ]; + buildInputs = + (self.nativeDeps."lazystream" or []); + deps = [ + self.by-version."readable-stream"."1.0.25" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lazystream" ]; + }; by-spec."lcov-parse"."0.0.4" = self.by-version."lcov-parse"."0.0.4"; by-version."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "lcov-parse-0.0.4"; + name = "node-lcov-parse-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.4.tgz"; @@ -7804,14 +7820,14 @@ }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; by-spec."less"."~1.6.0" = - self.by-version."less"."1.6.1"; - by-version."less"."1.6.1" = lib.makeOverridable self.buildNodePackage { - name = "less-1.6.1"; + self.by-version."less"."1.6.2"; + by-version."less"."1.6.2" = lib.makeOverridable self.buildNodePackage { + name = "less-1.6.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.6.1.tgz"; - name = "less-1.6.1.tgz"; - sha1 = "54e5e8d7b4fc43a14f8a32aaf0bae2d45ac287ca"; + url = "http://registry.npmjs.org/less/-/less-1.6.2.tgz"; + name = "less-1.6.2.tgz"; + sha1 = "86556e6ab8f9af4d8b853db16c5f262e94fc98a0"; }) ]; buildInputs = @@ -7830,7 +7846,7 @@ by-spec."libxmljs"."~0.8.1" = self.by-version."libxmljs"."0.8.1"; by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "libxmljs-0.8.1"; + name = "node-libxmljs-0.8.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.8.1.tgz"; @@ -7848,14 +7864,14 @@ passthru.names = [ "libxmljs" ]; }; by-spec."libyaml"."*" = - self.by-version."libyaml"."0.2.2"; - by-version."libyaml"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "libyaml-0.2.2"; + self.by-version."libyaml"."0.2.3"; + by-version."libyaml"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-libyaml-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.2.tgz"; - name = "libyaml-0.2.2.tgz"; - sha1 = "a22d5f699911b6b622d6dc323fb62320c877c9c8"; + url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.3.tgz"; + name = "libyaml-0.2.3.tgz"; + sha1 = "c07e7fefcad6e09218ebf9ff814bbd520172add6"; }) ]; buildInputs = @@ -7866,11 +7882,11 @@ ]; passthru.names = [ "libyaml" ]; }; - "libyaml" = self.by-version."libyaml"."0.2.2"; + "libyaml" = self.by-version."libyaml"."0.2.3"; by-spec."lockfile"."~0.4.0" = self.by-version."lockfile"."0.4.2"; by-version."lockfile"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "lockfile-0.4.2"; + name = "node-lockfile-0.4.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz"; @@ -7889,7 +7905,7 @@ by-spec."lodash"."~0.10.0" = self.by-version."lodash"."0.10.0"; by-version."lodash"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "lodash-0.10.0"; + name = "node-lodash-0.10.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-0.10.0.tgz"; @@ -7908,7 +7924,7 @@ by-spec."lodash"."~0.9.2" = self.by-version."lodash"."0.9.2"; by-version."lodash"."0.9.2" = lib.makeOverridable self.buildNodePackage { - name = "lodash-0.9.2"; + name = "node-lodash-0.9.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"; @@ -7927,7 +7943,7 @@ by-spec."lodash"."~1.0.1" = self.by-version."lodash"."1.0.1"; by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash-1.0.1"; + name = "node-lodash-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"; @@ -7946,7 +7962,7 @@ by-spec."lodash"."~1.2.1" = self.by-version."lodash"."1.2.1"; by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash-1.2.1"; + name = "node-lodash-1.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.2.1.tgz"; @@ -7965,7 +7981,7 @@ by-spec."lodash"."~1.3.0" = self.by-version."lodash"."1.3.1"; by-version."lodash"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash-1.3.1"; + name = "node-lodash-1.3.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; @@ -7986,7 +8002,7 @@ by-spec."lodash"."~2.1.0" = self.by-version."lodash"."2.1.0"; by-version."lodash"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "lodash-2.1.0"; + name = "node-lodash-2.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"; @@ -8005,7 +8021,7 @@ by-spec."lodash"."~2.2.1" = self.by-version."lodash"."2.2.1"; by-version."lodash"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash-2.2.1"; + name = "node-lodash-2.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz"; @@ -8021,29 +8037,10 @@ ]; passthru.names = [ "lodash" ]; }; - by-spec."lodash"."~2.3.0" = - self.by-version."lodash"."2.3.0"; - by-version."lodash"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "lodash-2.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-2.3.0.tgz"; - name = "lodash-2.3.0.tgz"; - sha1 = "dfbdac99cf87a59a022c474730570d8716c267dd"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash" ]; - }; by-spec."lodash"."~2.4.1" = self.by-version."lodash"."2.4.1"; by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash-2.4.1"; + name = "node-lodash-2.4.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"; @@ -8059,10 +8056,131 @@ ]; passthru.names = [ "lodash" ]; }; + by-spec."lodash._isnative"."~2.4.1" = + self.by-version."lodash._isnative"."2.4.1"; + by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash._isnative-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"; + name = "lodash._isnative-2.4.1.tgz"; + sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash._isnative" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash._isnative" ]; + }; + by-spec."lodash._objecttypes"."~2.4.1" = + self.by-version."lodash._objecttypes"."2.4.1"; + by-version."lodash._objecttypes"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash._objecttypes-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"; + name = "lodash._objecttypes-2.4.1.tgz"; + sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash._objecttypes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash._objecttypes" ]; + }; + by-spec."lodash._shimkeys"."~2.4.1" = + self.by-version."lodash._shimkeys"."2.4.1"; + by-version."lodash._shimkeys"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash._shimkeys-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"; + name = "lodash._shimkeys-2.4.1.tgz"; + sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash._shimkeys" or []); + deps = [ + self.by-version."lodash._objecttypes"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash._shimkeys" ]; + }; + 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 { + name = "node-lodash.defaults-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz"; + name = "lodash.defaults-2.4.1.tgz"; + sha1 = "a7e8885f05e68851144b6e12a8f3678026bc4c54"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.defaults" or []); + deps = [ + self.by-version."lodash.keys"."2.4.1" + self.by-version."lodash._objecttypes"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash.defaults" ]; + }; + 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 { + name = "node-lodash.isobject-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"; + name = "lodash.isobject-2.4.1.tgz"; + sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.isobject" or []); + deps = [ + self.by-version."lodash._objecttypes"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash.isobject" ]; + }; + by-spec."lodash.keys"."~2.4.1" = + self.by-version."lodash.keys"."2.4.1"; + by-version."lodash.keys"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash.keys-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz"; + name = "lodash.keys-2.4.1.tgz"; + sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.keys" or []); + deps = [ + self.by-version."lodash._isnative"."2.4.1" + self.by-version."lodash.isobject"."2.4.1" + self.by-version."lodash._shimkeys"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash.keys" ]; + }; by-spec."log-driver"."1.2.1" = self.by-version."log-driver"."1.2.1"; by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "log-driver-1.2.1"; + name = "node-log-driver-1.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.1.tgz"; @@ -8081,7 +8199,7 @@ by-spec."log4js"."~0.6.3" = self.by-version."log4js"."0.6.9"; by-version."log4js"."0.6.9" = lib.makeOverridable self.buildNodePackage { - name = "log4js-0.6.9"; + name = "node-log4js-0.6.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/log4js/-/log4js-0.6.9.tgz"; @@ -8094,7 +8212,7 @@ deps = [ self.by-version."async"."0.1.15" self.by-version."semver"."1.1.4" - self.by-version."readable-stream"."1.0.24" + self.by-version."readable-stream"."1.0.25" ]; peerDependencies = [ ]; @@ -8103,7 +8221,7 @@ by-spec."long"."*" = self.by-version."long"."1.1.2"; by-version."long"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "long-1.1.2"; + name = "node-long-1.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz"; @@ -8122,7 +8240,7 @@ by-spec."longjohn"."~0.2.2" = self.by-version."longjohn"."0.2.2"; by-version."longjohn"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "longjohn-0.2.2"; + name = "node-longjohn-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.2.tgz"; @@ -8141,7 +8259,7 @@ by-spec."lru-cache"."2" = self.by-version."lru-cache"."2.5.0"; by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.5.0"; + name = "node-lru-cache-2.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; @@ -8160,7 +8278,7 @@ by-spec."lru-cache"."2.2.0" = self.by-version."lru-cache"."2.2.0"; by-version."lru-cache"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.2.0"; + name = "node-lru-cache-2.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; @@ -8179,7 +8297,7 @@ by-spec."lru-cache"."2.2.x" = self.by-version."lru-cache"."2.2.4"; by-version."lru-cache"."2.2.4" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.2.4"; + name = "node-lru-cache-2.2.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; @@ -8198,7 +8316,7 @@ by-spec."lru-cache"."2.3.0" = self.by-version."lru-cache"."2.3.0"; by-version."lru-cache"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.3.0"; + name = "node-lru-cache-2.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz"; @@ -8217,7 +8335,7 @@ by-spec."lru-cache"."~1.0.2" = self.by-version."lru-cache"."1.0.6"; by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-1.0.6"; + name = "node-lru-cache-1.0.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz"; @@ -8236,7 +8354,7 @@ 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"; + name = "node-lru-cache-2.3.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; @@ -8254,15 +8372,34 @@ }; by-spec."lru-cache"."~2.5.0" = self.by-version."lru-cache"."2.5.0"; - by-spec."mailcomposer".">= 0.1.27" = - self.by-version."mailcomposer"."0.2.7"; - by-version."mailcomposer"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "mailcomposer-0.2.7"; + by-spec."lsmod"."0.0.2" = + self.by-version."lsmod"."0.0.2"; + by-version."lsmod"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-lsmod-0.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.7.tgz"; - name = "mailcomposer-0.2.7.tgz"; - sha1 = "173ba58e9bca0e4c43ca25f44f2dfecf16ef98aa"; + url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.2.tgz"; + name = "lsmod-0.0.2.tgz"; + sha1 = "ebfe765bbfcbe85006eb315862445158b7baf613"; + }) + ]; + buildInputs = + (self.nativeDeps."lsmod" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lsmod" ]; + }; + by-spec."mailcomposer".">= 0.1.27" = + self.by-version."mailcomposer"."0.2.8"; + by-version."mailcomposer"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "node-mailcomposer-0.2.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.8.tgz"; + name = "mailcomposer-0.2.8.tgz"; + sha1 = "bcb4d84aea08ea6f4c007f927c0ad214986370cc"; }) ]; buildInputs = @@ -8308,7 +8445,7 @@ by-spec."memoizee"."~0.2.5" = self.by-version."memoizee"."0.2.6"; by-version."memoizee"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "memoizee-0.2.6"; + name = "node-memoizee-0.2.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz"; @@ -8330,7 +8467,7 @@ by-spec."merge-descriptors"."0.0.1" = self.by-version."merge-descriptors"."0.0.1"; by-version."merge-descriptors"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "merge-descriptors-0.0.1"; + name = "node-merge-descriptors-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.1.tgz"; @@ -8349,7 +8486,7 @@ by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "methods-0.0.1"; + name = "node-methods-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; @@ -8368,7 +8505,7 @@ by-spec."methods"."0.1.0" = self.by-version."methods"."0.1.0"; by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "methods-0.1.0"; + name = "node-methods-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; @@ -8387,7 +8524,7 @@ by-spec."mime"."*" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; + name = "node-mime-1.2.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; @@ -8406,7 +8543,7 @@ by-spec."mime"."1.2.4" = self.by-version."mime"."1.2.4"; by-version."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.4"; + name = "node-mime-1.2.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; @@ -8425,7 +8562,7 @@ by-spec."mime"."1.2.5" = self.by-version."mime"."1.2.5"; by-version."mime"."1.2.5" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.5"; + name = "node-mime-1.2.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; @@ -8444,7 +8581,7 @@ by-spec."mime"."1.2.6" = self.by-version."mime"."1.2.6"; by-version."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.6"; + name = "node-mime-1.2.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; @@ -8463,7 +8600,7 @@ by-spec."mime"."1.2.9" = self.by-version."mime"."1.2.9"; by-version."mime"."1.2.9" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.9"; + name = "node-mime-1.2.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; @@ -8494,7 +8631,7 @@ by-spec."mimelib"."~0.2.14" = self.by-version."mimelib"."0.2.14"; by-version."mimelib"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "mimelib-0.2.14"; + name = "node-mimelib-0.2.14"; src = [ (fetchurl { url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; @@ -8515,7 +8652,7 @@ by-spec."minimatch"."0" = self.by-version."minimatch"."0.2.14"; by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.14"; + name = "node-minimatch-0.2.14"; src = [ (fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; @@ -8536,7 +8673,7 @@ by-spec."minimatch"."0.0.x" = self.by-version."minimatch"."0.0.5"; by-version."minimatch"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.0.5"; + name = "node-minimatch-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; @@ -8576,7 +8713,7 @@ by-spec."minimist"."~0.0.1" = self.by-version."minimist"."0.0.5"; by-version."minimist"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.0.5"; + name = "node-minimist-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz"; @@ -8595,7 +8732,7 @@ by-spec."ministyle"."~0.1.3" = self.by-version."ministyle"."0.1.3"; by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "ministyle-0.1.3"; + name = "node-ministyle-0.1.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz"; @@ -8614,7 +8751,7 @@ by-spec."miniwrite"."~0.1.3" = self.by-version."miniwrite"."0.1.3"; by-version."miniwrite"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "miniwrite-0.1.3"; + name = "node-miniwrite-0.1.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz"; @@ -8634,7 +8771,7 @@ by-spec."mkdirp"."*" = self.by-version."mkdirp"."0.3.5"; by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; + name = "node-mkdirp-0.3.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; @@ -8658,7 +8795,7 @@ by-spec."mkdirp"."0.3.0" = self.by-version."mkdirp"."0.3.0"; by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.0"; + name = "node-mkdirp-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; @@ -8689,7 +8826,7 @@ 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"; + name = "node-mkpath-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; @@ -8706,14 +8843,14 @@ passthru.names = [ "mkpath" ]; }; by-spec."mocha"."*" = - self.by-version."mocha"."1.17.0"; - by-version."mocha"."1.17.0" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.17.0"; + self.by-version."mocha"."1.17.1"; + by-version."mocha"."1.17.1" = lib.makeOverridable self.buildNodePackage { + name = "mocha-1.17.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.17.0.tgz"; - name = "mocha-1.17.0.tgz"; - sha1 = "583d12a9f21775b6d37d104ac7db05d557fa5d50"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.17.1.tgz"; + name = "mocha-1.17.1.tgz"; + sha1 = "7f7671d68526d074b7bae660c9099f87e0ea1ccb"; }) ]; buildInputs = @@ -8731,11 +8868,11 @@ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.17.0"; + "mocha" = self.by-version."mocha"."1.17.1"; by-spec."mocha-unfunk-reporter"."*" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "mocha-unfunk-reporter-0.4.0"; + name = "node-mocha-unfunk-reporter-0.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz"; @@ -8759,7 +8896,7 @@ by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "moment-2.1.0"; + name = "node-moment-2.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; @@ -8778,7 +8915,7 @@ by-spec."moment"."~2.4.0" = self.by-version."moment"."2.4.0"; by-version."moment"."2.4.0" = lib.makeOverridable self.buildNodePackage { - name = "moment-2.4.0"; + name = "node-moment-2.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz"; @@ -8794,15 +8931,34 @@ ]; passthru.names = [ "moment" ]; }; - by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.0-rc4"; - by-version."mongodb"."1.4.0-rc4" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.4.0-rc4"; + by-spec."moment"."~2.5.0" = + self.by-version."moment"."2.5.1"; + by-version."moment"."2.5.1" = lib.makeOverridable self.buildNodePackage { + name = "node-moment-2.5.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc4.tgz"; - name = "mongodb-1.4.0-rc4.tgz"; - sha1 = "0d17168ec9b4e51a13300d4528478273b632aec5"; + url = "http://registry.npmjs.org/moment/-/moment-2.5.1.tgz"; + name = "moment-2.5.1.tgz"; + sha1 = "7146a3900533064ca799d5e792f4e480ee0e82bc"; + }) + ]; + buildInputs = + (self.nativeDeps."moment" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "moment" ]; + }; + by-spec."mongodb"."*" = + self.by-version."mongodb"."1.4.0-rc5"; + by-version."mongodb"."1.4.0-rc5" = lib.makeOverridable self.buildNodePackage { + name = "node-mongodb-1.4.0-rc5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc5.tgz"; + name = "mongodb-1.4.0-rc5.tgz"; + sha1 = "4be74a98df5f2f0e1eba6d868498d710f4c264ae"; }) ]; buildInputs = @@ -8815,11 +8971,11 @@ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.0-rc4"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc5"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.2.14"; + name = "node-mongodb-1.2.14"; src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; @@ -8839,7 +8995,7 @@ by-spec."mongodb"."1.3.19" = self.by-version."mongodb"."1.3.19"; by-version."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.19"; + name = "node-mongodb-1.3.19"; src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; @@ -8860,7 +9016,7 @@ by-spec."mongodb"."1.3.23" = self.by-version."mongodb"."1.3.23"; by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.23"; + name = "node-mongodb-1.3.23"; src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz"; @@ -8881,14 +9037,14 @@ by-spec."mongodb"."1.3.x" = self.by-version."mongodb"."1.3.23"; by-spec."mongoose"."*" = - self.by-version."mongoose"."3.8.4"; - by-version."mongoose"."3.8.4" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.8.4"; + self.by-version."mongoose"."3.8.6"; + by-version."mongoose"."3.8.6" = lib.makeOverridable self.buildNodePackage { + name = "node-mongoose-3.8.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.4.tgz"; - name = "mongoose-3.8.4.tgz"; - sha1 = "7ad48944d16213eb16c14ec5fbd25cf90d8c586c"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.6.tgz"; + name = "mongoose-3.8.6.tgz"; + sha1 = "c8a282d3c74915864b6ed1e01884388c6e91d146"; }) ]; buildInputs = @@ -8902,7 +9058,7 @@ self.by-version."mpromise"."0.4.3" self.by-version."mpath"."0.1.1" self.by-version."regexp-clone"."0.0.1" - self.by-version."mquery"."0.4.1" + self.by-version."mquery"."0.5.2" ]; peerDependencies = [ ]; @@ -8911,7 +9067,7 @@ by-spec."mongoose"."3.6.7" = self.by-version."mongoose"."3.6.7"; by-version."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.6.7"; + name = "node-mongoose-3.6.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; @@ -8937,7 +9093,7 @@ by-spec."mongoose"."3.6.x" = self.by-version."mongoose"."3.6.20"; by-version."mongoose"."3.6.20" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.6.20"; + name = "node-mongoose-3.6.20"; src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz"; @@ -8965,7 +9121,7 @@ by-spec."mongoose-lifecycle"."1.0.0" = self.by-version."mongoose-lifecycle"."1.0.0"; by-version."mongoose-lifecycle"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-lifecycle-1.0.0"; + name = "node-mongoose-lifecycle-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz"; @@ -8984,7 +9140,7 @@ by-spec."mongoose-schema-extend"."*" = self.by-version."mongoose-schema-extend"."0.1.7"; by-version."mongoose-schema-extend"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-schema-extend-0.1.7"; + name = "node-mongoose-schema-extend-0.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz"; @@ -9005,7 +9161,7 @@ by-spec."monocle"."1.1.50" = self.by-version."monocle"."1.1.50"; by-version."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage { - name = "monocle-1.1.50"; + name = "node-monocle-1.1.50"; src = [ (fetchurl { url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz"; @@ -9025,7 +9181,7 @@ by-spec."monocle"."1.1.51" = self.by-version."monocle"."1.1.51"; by-version."monocle"."1.1.51" = lib.makeOverridable self.buildNodePackage { - name = "monocle-1.1.51"; + name = "node-monocle-1.1.51"; src = [ (fetchurl { url = "http://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz"; @@ -9045,7 +9201,7 @@ by-spec."mout"."~0.6.0" = self.by-version."mout"."0.6.0"; by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "mout-0.6.0"; + name = "node-mout-0.6.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/mout/-/mout-0.6.0.tgz"; @@ -9064,7 +9220,7 @@ by-spec."mout"."~0.7.0" = self.by-version."mout"."0.7.1"; by-version."mout"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "mout-0.7.1"; + name = "node-mout-0.7.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/mout/-/mout-0.7.1.tgz"; @@ -9083,7 +9239,7 @@ by-spec."mpath"."0.1.1" = self.by-version."mpath"."0.1.1"; by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "mpath-0.1.1"; + name = "node-mpath-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; @@ -9102,7 +9258,7 @@ by-spec."mpromise"."0.2.1" = self.by-version."mpromise"."0.2.1"; by-version."mpromise"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "mpromise-0.2.1"; + name = "node-mpromise-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; @@ -9122,7 +9278,7 @@ by-spec."mpromise"."0.4.3" = self.by-version."mpromise"."0.4.3"; by-version."mpromise"."0.4.3" = lib.makeOverridable self.buildNodePackage { - name = "mpromise-0.4.3"; + name = "node-mpromise-0.4.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz"; @@ -9138,23 +9294,22 @@ ]; passthru.names = [ "mpromise" ]; }; - by-spec."mquery"."0.4.1" = - self.by-version."mquery"."0.4.1"; - by-version."mquery"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "mquery-0.4.1"; + by-spec."mquery"."0.5.2" = + self.by-version."mquery"."0.5.2"; + by-version."mquery"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-mquery-0.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mquery/-/mquery-0.4.1.tgz"; - name = "mquery-0.4.1.tgz"; - sha1 = "c4626dd29203f3991abe9ddba88781256ad42fdf"; + url = "http://registry.npmjs.org/mquery/-/mquery-0.5.2.tgz"; + name = "mquery-0.5.2.tgz"; + sha1 = "3b844d772af24e370c52e6eca1ddbb87af8b5a71"; }) ]; buildInputs = (self.nativeDeps."mquery" or []); deps = [ self.by-version."sliced"."0.0.5" - self.by-version."debug"."0.7.0" - self.by-version."mongodb"."1.3.19" + self.by-version."debug"."0.7.4" self.by-version."regexp-clone"."0.0.1" ]; peerDependencies = [ @@ -9164,7 +9319,7 @@ by-spec."ms"."0.1.0" = self.by-version."ms"."0.1.0"; by-version."ms"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "ms-0.1.0"; + name = "node-ms-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; @@ -9202,7 +9357,7 @@ by-spec."multiparty"."2.2.0" = self.by-version."multiparty"."2.2.0"; by-version."multiparty"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "multiparty-2.2.0"; + name = "node-multiparty-2.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; @@ -9223,7 +9378,7 @@ by-spec."muri"."0.3.1" = self.by-version."muri"."0.3.1"; by-version."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "muri-0.3.1"; + name = "node-muri-0.3.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; @@ -9242,7 +9397,7 @@ by-spec."mute-stream"."0.0.3" = self.by-version."mute-stream"."0.0.3"; by-version."mute-stream"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "mute-stream-0.0.3"; + name = "node-mute-stream-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz"; @@ -9261,7 +9416,7 @@ 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"; + name = "node-mute-stream-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; @@ -9282,7 +9437,7 @@ by-spec."mv"."0.0.5" = self.by-version."mv"."0.0.5"; by-version."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "mv-0.0.5"; + name = "node-mv-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz"; @@ -9301,7 +9456,7 @@ by-spec."nan"."~0.3.0" = self.by-version."nan"."0.3.2"; by-version."nan"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "nan-0.3.2"; + name = "node-nan-0.3.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; @@ -9320,7 +9475,7 @@ by-spec."nan"."~0.6.0" = self.by-version."nan"."0.6.0"; by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "nan-0.6.0"; + name = "node-nan-0.6.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz"; @@ -9336,15 +9491,15 @@ ]; passthru.names = [ "nan" ]; }; - by-spec."natural"."0.0.69" = - self.by-version."natural"."0.0.69"; - by-version."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage { - name = "natural-0.0.69"; + by-spec."natural"."0.1.17" = + self.by-version."natural"."0.1.17"; + by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage { + name = "node-natural-0.1.17"; src = [ (fetchurl { - url = "http://registry.npmjs.org/natural/-/natural-0.0.69.tgz"; - name = "natural-0.0.69.tgz"; - sha1 = "60d9ce23797a54ec211600eb721cc66779b954d3"; + url = "http://registry.npmjs.org/natural/-/natural-0.1.17.tgz"; + name = "natural-0.1.17.tgz"; + sha1 = "0ff654cd30aeb2aa298ab0580e6f7ea9f40954e0"; }) ]; buildInputs = @@ -9361,7 +9516,7 @@ by-spec."nconf"."*" = self.by-version."nconf"."0.6.9"; by-version."nconf"."0.6.9" = lib.makeOverridable self.buildNodePackage { - name = "nconf-0.6.9"; + name = "node-nconf-0.6.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; @@ -9430,7 +9585,7 @@ by-spec."negotiator"."0.2.5" = self.by-version."negotiator"."0.2.5"; by-version."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "negotiator-0.2.5"; + name = "node-negotiator-0.2.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz"; @@ -9449,7 +9604,7 @@ by-spec."negotiator"."0.3.0" = self.by-version."negotiator"."0.3.0"; by-version."negotiator"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "negotiator-0.3.0"; + name = "node-negotiator-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; @@ -9468,7 +9623,7 @@ by-spec."net-ping"."1.1.7" = self.by-version."net-ping"."1.1.7"; by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage { - name = "net-ping-1.1.7"; + name = "node-net-ping-1.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz"; @@ -9488,7 +9643,7 @@ by-spec."next-tick"."0.1.x" = self.by-version."next-tick"."0.1.0"; by-version."next-tick"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "next-tick-0.1.0"; + name = "node-next-tick-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/next-tick/-/next-tick-0.1.0.tgz"; @@ -9507,7 +9662,7 @@ by-spec."nib"."0.5.0" = self.by-version."nib"."0.5.0"; by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "nib-0.5.0"; + name = "node-nib-0.5.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz"; @@ -9524,14 +9679,14 @@ passthru.names = [ "nib" ]; }; by-spec."nijs"."*" = - self.by-version."nijs"."0.0.12"; - by-version."nijs"."0.0.12" = lib.makeOverridable self.buildNodePackage { - name = "nijs-0.0.12"; + self.by-version."nijs"."0.0.13"; + by-version."nijs"."0.0.13" = lib.makeOverridable self.buildNodePackage { + name = "nijs-0.0.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nijs/-/nijs-0.0.12.tgz"; - name = "nijs-0.0.12.tgz"; - sha1 = "23bb40746b409e8556f9a4fe97ca314410a685df"; + url = "http://registry.npmjs.org/nijs/-/nijs-0.0.13.tgz"; + name = "nijs-0.0.13.tgz"; + sha1 = "31396055a3cc19ed5b7438c8e6811b9a20f27cfc"; }) ]; buildInputs = @@ -9543,11 +9698,11 @@ ]; passthru.names = [ "nijs" ]; }; - "nijs" = self.by-version."nijs"."0.0.12"; + "nijs" = self.by-version."nijs"."0.0.13"; by-spec."node-appc"."0.2.0" = self.by-version."node-appc"."0.2.0"; by-version."node-appc"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-appc-0.2.0"; + name = "node-node-appc-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.0.tgz"; @@ -9559,7 +9714,7 @@ (self.nativeDeps."node-appc" or []); deps = [ self.by-version."adm-zip"."0.4.3" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."colors"."0.6.2" self.by-version."diff"."1.0.8" self.by-version."dox"."0.4.4" @@ -9572,7 +9727,7 @@ self.by-version."temp"."0.6.0" self.by-version."wrench"."1.5.6" self.by-version."uglify-js"."2.3.6" - self.by-version."xmldom"."0.1.18" + self.by-version."xmldom"."0.1.19" ]; peerDependencies = [ ]; @@ -9581,7 +9736,7 @@ by-spec."node-expat"."*" = self.by-version."node-expat"."2.1.4"; by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-expat-2.1.4"; + name = "node-node-expat-2.1.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz"; @@ -9635,14 +9790,14 @@ by-spec."node-gyp"."~0.12.2" = self.by-version."node-gyp"."0.12.2"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.0-1"; - by-version."node-inspector"."0.7.0-1" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.0-1"; + self.by-version."node-inspector"."0.7.0-2"; + by-version."node-inspector"."0.7.0-2" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.0-2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-1.tgz"; - name = "node-inspector-0.7.0-1.tgz"; - sha1 = "13964415403ee7642fd7554f87c2c7a51af64090"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-2.tgz"; + name = "node-inspector-0.7.0-2.tgz"; + sha1 = "e26d3c5ee74fe99fc5c8b2adb5634dac0ca86e81"; }) ]; buildInputs = @@ -9650,7 +9805,7 @@ deps = [ self.by-version."socket.io"."0.9.16" self.by-version."express"."3.4.8" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."glob"."3.2.8" self.by-version."rc"."0.3.3" self.by-version."strong-data-uri"."0.1.1" @@ -9660,11 +9815,11 @@ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.0-1"; + "node-inspector" = self.by-version."node-inspector"."0.7.0-2"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.0.10"; by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage { - name = "node-protobuf-1.0.10"; + name = "node-node-protobuf-1.0.10"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.10.tgz"; @@ -9684,7 +9839,7 @@ by-spec."node-swt".">=0.1.1" = self.by-version."node-swt"."0.1.1"; by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-swt-0.1.1"; + name = "node-node-swt-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; @@ -9703,7 +9858,7 @@ by-spec."node-syslog"."1.1.7" = self.by-version."node-syslog"."1.1.7"; by-version."node-syslog"."1.1.7" = lib.makeOverridable self.buildNodePackage { - name = "node-syslog-1.1.7"; + name = "node-node-syslog-1.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz"; @@ -9722,7 +9877,7 @@ by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = self.by-version."node-uptime"."3.2.0"; by-version."node-uptime"."3.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-uptime-3.2.0"; + name = "node-node-uptime-3.2.0"; src = [ (fetchurl { url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7"; @@ -9756,7 +9911,7 @@ by-spec."node-uuid"."*" = self.by-version."node-uuid"."1.4.1"; by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.1"; + name = "node-node-uuid-1.4.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; @@ -9776,7 +9931,7 @@ by-spec."node-uuid"."1.3.3" = self.by-version."node-uuid"."1.3.3"; by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.3.3"; + name = "node-node-uuid-1.3.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; @@ -9795,7 +9950,7 @@ by-spec."node-uuid"."1.4.0" = self.by-version."node-uuid"."1.4.0"; by-version."node-uuid"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.0"; + name = "node-node-uuid-1.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"; @@ -9820,7 +9975,7 @@ by-spec."node-wsfederation".">=0.1.1" = self.by-version."node-wsfederation"."0.1.1"; by-version."node-wsfederation"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-wsfederation-0.1.1"; + name = "node-node-wsfederation-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; @@ -9840,7 +9995,7 @@ by-spec."node.extend"."1.0.0" = self.by-version."node.extend"."1.0.0"; by-version."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node.extend-1.0.0"; + name = "node-node.extend-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; @@ -9870,8 +10025,8 @@ buildInputs = (self.nativeDeps."nodemailer" or []); deps = [ - self.by-version."mailcomposer"."0.2.7" - self.by-version."simplesmtp"."0.3.18" + self.by-version."mailcomposer"."0.2.8" + self.by-version."simplesmtp"."0.3.20" self.by-version."optimist"."0.6.0" ]; peerDependencies = [ @@ -9879,14 +10034,14 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.0.13"; - by-version."nodemon"."1.0.13" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.0.13"; + self.by-version."nodemon"."1.0.14"; + by-version."nodemon"."1.0.14" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.0.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.13.tgz"; - name = "nodemon-1.0.13.tgz"; - sha1 = "7ff62ddf0ba03b572fbc22901b33d53531034410"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.14.tgz"; + name = "nodemon-1.0.14.tgz"; + sha1 = "415499efd9262b6a76cbf37385876c3343f4f0c6"; }) ]; buildInputs = @@ -9899,11 +10054,11 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.0.13"; + "nodemon" = self.by-version."nodemon"."1.0.14"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { - name = "nomnom-1.6.2"; + name = "node-nomnom-1.6.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; @@ -9969,9 +10124,9 @@ name = "nopt-1.0.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress"; name = "nopt-1.0.10.tgz"; - sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad"; }) ]; buildInputs = @@ -9992,7 +10147,7 @@ by-spec."normalize-package-data"."~0.2.7" = self.by-version."normalize-package-data"."0.2.8"; by-version."normalize-package-data"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "normalize-package-data-0.2.8"; + name = "node-normalize-package-data-0.2.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.8.tgz"; @@ -10012,14 +10167,14 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.3.24"; - by-version."npm"."1.3.24" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.24"; + self.by-version."npm"."1.3.26"; + by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.26"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.24.tgz"; - name = "npm-1.3.24.tgz"; - sha1 = "d68273a343562aa969320a218f528930356d99de"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz"; + name = "npm-1.3.26.tgz"; + sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d"; }) ]; buildInputs = @@ -10048,7 +10203,7 @@ self.by-version."chownr"."0.0.1" self.by-version."npmlog"."0.0.6" self.by-version."ansi"."0.2.1" - self.by-version."npm-registry-client"."0.3.3" + self.by-version."npm-registry-client"."0.3.5" self.by-version."read-package-json"."1.1.6" self.by-version."read-installed"."0.2.5" self.by-version."glob"."3.2.8" @@ -10077,13 +10232,11 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.3.24"; - by-spec."npm"."~1.3.14" = - self.by-version."npm"."1.3.24"; + "npm" = self.by-version."npm"."1.3.26"; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.2.27"; + name = "node-npm-registry-client-0.2.27"; src = [ (fetchurl { url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; @@ -10102,7 +10255,7 @@ self.by-version."mkdirp"."0.3.5" self.by-version."rimraf"."2.2.6" self.by-version."retry"."0.6.0" - self.by-version."couch-login"."0.1.19" + self.by-version."couch-login"."0.1.20" self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ @@ -10110,14 +10263,14 @@ passthru.names = [ "npm-registry-client" ]; }; by-spec."npm-registry-client"."~0.3.3" = - self.by-version."npm-registry-client"."0.3.3"; - by-version."npm-registry-client"."0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.3.3"; + self.by-version."npm-registry-client"."0.3.5"; + by-version."npm-registry-client"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-registry-client-0.3.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.3.tgz"; - name = "npm-registry-client-0.3.3.tgz"; - sha1 = "da08bb681fb24aa5c988ca71f8c10f27f09daf4a"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.5.tgz"; + name = "npm-registry-client-0.3.5.tgz"; + sha1 = "98ba1ac851a3939a3fb9917c28fa8da522dc635f"; }) ]; buildInputs = @@ -10131,17 +10284,19 @@ self.by-version."mkdirp"."0.3.5" self.by-version."rimraf"."2.2.6" self.by-version."retry"."0.6.0" - self.by-version."couch-login"."0.1.19" + self.by-version."couch-login"."0.1.20" self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; + by-spec."npm-registry-client"."~0.3.5" = + self.by-version."npm-registry-client"."0.3.5"; by-spec."npm-user-validate"."0.0.3" = self.by-version."npm-user-validate"."0.0.3"; by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "npm-user-validate-0.0.3"; + name = "node-npm-user-validate-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"; @@ -10158,14 +10313,14 @@ passthru.names = [ "npm-user-validate" ]; }; by-spec."npm2nix"."*" = - self.by-version."npm2nix"."5.4.2"; - by-version."npm2nix"."5.4.2" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.4.2"; + self.by-version."npm2nix"."5.5.0"; + by-version."npm2nix"."5.5.0" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.2.tgz"; - name = "npm2nix-5.4.2.tgz"; - sha1 = "03184775d310c75117c82303eecb50f6b26f93d0"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.5.0.tgz"; + name = "npm2nix-5.5.0.tgz"; + sha1 = "79729928cc4d2f4e765797491eeb4ced2b1d9e9e"; }) ]; buildInputs = @@ -10184,11 +10339,11 @@ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.by-version."npm2nix"."5.4.2"; + "npm2nix" = self.by-version."npm2nix"."5.5.0"; by-spec."npmconf"."0.0.24" = self.by-version."npmconf"."0.0.24"; by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.0.24"; + name = "node-npmconf-0.0.24"; src = [ (fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz"; @@ -10215,7 +10370,7 @@ by-spec."npmconf"."0.1.1" = self.by-version."npmconf"."0.1.1"; by-version."npmconf"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.1"; + name = "node-npmconf-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; @@ -10242,7 +10397,7 @@ by-spec."npmconf"."~0.1.12" = self.by-version."npmconf"."0.1.12"; by-version."npmconf"."0.1.12" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.12"; + name = "node-npmconf-0.1.12"; src = [ (fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.12.tgz"; @@ -10271,7 +10426,7 @@ by-spec."npmlog"."*" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "npmlog-0.0.6"; + name = "node-npmlog-0.0.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz"; @@ -10295,7 +10450,7 @@ by-spec."nssocket"."~0.5.1" = self.by-version."nssocket"."0.5.1"; by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "nssocket-0.5.1"; + name = "node-nssocket-0.5.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz"; @@ -10316,7 +10471,7 @@ by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" = self.by-version."oauth"."0.9.11"; by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage { - name = "oauth-0.9.11"; + name = "node-oauth-0.9.11"; src = [ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; @@ -10335,7 +10490,7 @@ by-spec."oauth-sign"."~0.2.0" = self.by-version."oauth-sign"."0.2.0"; by-version."oauth-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "oauth-sign-0.2.0"; + name = "node-oauth-sign-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; @@ -10354,7 +10509,7 @@ by-spec."oauth-sign"."~0.3.0" = self.by-version."oauth-sign"."0.3.0"; by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "oauth-sign-0.3.0"; + name = "node-oauth-sign-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; @@ -10373,7 +10528,7 @@ by-spec."object-additions".">= 0.5.0" = self.by-version."object-additions"."0.5.1"; by-version."object-additions"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "object-additions-0.5.1"; + name = "node-object-additions-0.5.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz"; @@ -10392,7 +10547,7 @@ 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 { - name = "object-keys-0.4.0"; + name = "node-object-keys-0.4.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; @@ -10411,7 +10566,7 @@ by-spec."once"."1.1.1" = self.by-version."once"."1.1.1"; by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "once-1.1.1"; + name = "node-once-1.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; @@ -10432,7 +10587,7 @@ by-spec."once"."~1.3.0" = self.by-version."once"."1.3.0"; by-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "once-1.3.0"; + name = "node-once-1.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz"; @@ -10451,7 +10606,7 @@ by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "open-0.0.2"; + name = "node-open-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz"; @@ -10470,7 +10625,7 @@ by-spec."open"."0.0.4" = self.by-version."open"."0.0.4"; by-version."open"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "open-0.0.4"; + name = "node-open-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz"; @@ -10510,7 +10665,7 @@ by-spec."openid".">=0.2.0" = self.by-version."openid"."0.5.5"; by-version."openid"."0.5.5" = lib.makeOverridable self.buildNodePackage { - name = "openid-0.5.5"; + name = "node-openid-0.5.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/openid/-/openid-0.5.5.tgz"; @@ -10529,7 +10684,7 @@ by-spec."optimist"."*" = self.by-version."optimist"."0.6.0"; by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.6.0"; + name = "node-optimist-0.6.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; @@ -10551,7 +10706,7 @@ by-spec."optimist"."0.2" = self.by-version."optimist"."0.2.8"; by-version."optimist"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.2.8"; + name = "node-optimist-0.2.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; @@ -10571,7 +10726,7 @@ by-spec."optimist"."0.3.x" = self.by-version."optimist"."0.3.7"; by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.3.7"; + name = "node-optimist-0.3.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; @@ -10603,7 +10758,7 @@ 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"; + name = "node-options-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; @@ -10622,7 +10777,7 @@ by-spec."optjs"."*" = self.by-version."optjs"."3.2.1-boom"; by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage { - name = "optjs-3.2.1-boom"; + name = "node-optjs-3.2.1-boom"; src = [ (fetchurl { url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz"; @@ -10641,7 +10796,7 @@ by-spec."optparse"."*" = self.by-version."optparse"."1.0.5"; by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "optparse-1.0.5"; + name = "node-optparse-1.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; @@ -10663,7 +10818,7 @@ by-spec."osenv"."0" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "osenv-0.0.3"; + name = "node-osenv-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; @@ -10684,7 +10839,7 @@ by-spec."owl-deepcopy"."*" = self.by-version."owl-deepcopy"."0.0.2"; by-version."owl-deepcopy"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "owl-deepcopy-0.0.2"; + name = "node-owl-deepcopy-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz"; @@ -10706,7 +10861,7 @@ by-spec."p-throttler"."~0.0.1" = self.by-version."p-throttler"."0.0.1"; by-version."p-throttler"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "p-throttler-0.0.1"; + name = "node-p-throttler-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.0.1.tgz"; @@ -10724,9 +10879,31 @@ passthru.names = [ "p-throttler" ]; }; by-spec."passport"."*" = + self.by-version."passport"."0.2.0"; + by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-passport-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/passport/-/passport-0.2.0.tgz"; + name = "passport-0.2.0.tgz"; + sha1 = "ae5ebc5611300d51fdc44032c7ca442a548dbca5"; + }) + ]; + buildInputs = + (self.nativeDeps."passport" or []); + deps = [ + self.by-version."passport-strategy"."1.0.0" + self.by-version."pause"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "passport" ]; + }; + "passport" = self.by-version."passport"."0.2.0"; + by-spec."passport"."~0.1.1" = self.by-version."passport"."0.1.18"; by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "passport-0.1.18"; + name = "node-passport-0.1.18"; src = [ (fetchurl { url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz"; @@ -10744,36 +10921,14 @@ ]; passthru.names = [ "passport" ]; }; - "passport" = self.by-version."passport"."0.1.18"; - by-spec."passport"."0.1.17" = - self.by-version."passport"."0.1.17"; - by-version."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage { - name = "passport-0.1.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; - name = "passport-0.1.17.tgz"; - sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; - }) - ]; - buildInputs = - (self.nativeDeps."passport" or []); - deps = [ - self.by-version."pkginfo"."0.2.3" - self.by-version."pause"."0.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "passport" ]; - }; - by-spec."passport"."~0.1.1" = + by-spec."passport"."~0.1.18" = self.by-version."passport"."0.1.18"; by-spec."passport"."~0.1.3" = self.by-version."passport"."0.1.18"; by-spec."passport-http"."*" = self.by-version."passport-http"."0.2.2"; by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "passport-http-0.2.2"; + name = "node-passport-http-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz"; @@ -10795,7 +10950,7 @@ by-spec."passport-local"."*" = self.by-version."passport-local"."0.1.6"; by-version."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "passport-local-0.1.6"; + name = "node-passport-local-0.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz"; @@ -10816,10 +10971,29 @@ "passport-local" = self.by-version."passport-local"."0.1.6"; by-spec."passport-local"."0.1.6" = self.by-version."passport-local"."0.1.6"; + by-spec."passport-strategy"."1.x.x" = + self.by-version."passport-strategy"."1.0.0"; + by-version."passport-strategy"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-passport-strategy-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; + name = "passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + }) + ]; + buildInputs = + (self.nativeDeps."passport-strategy" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "passport-strategy" ]; + }; by-spec."path-is-inside"."~1.0.0" = self.by-version."path-is-inside"."1.0.0"; by-version."path-is-inside"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "path-is-inside-1.0.0"; + name = "node-path-is-inside-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.0.tgz"; @@ -10838,7 +11012,7 @@ by-spec."pause"."0.0.1" = self.by-version."pause"."0.0.1"; by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "pause-0.0.1"; + name = "node-pause-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; @@ -10855,14 +11029,14 @@ passthru.names = [ "pause" ]; }; by-spec."phantomjs"."~1.9.1-2" = - self.by-version."phantomjs"."1.9.2-6"; - by-version."phantomjs"."1.9.2-6" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.2-6"; + self.by-version."phantomjs"."1.9.7-1"; + by-version."phantomjs"."1.9.7-1" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.7-1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-6.tgz"; - name = "phantomjs-1.9.2-6.tgz"; - sha1 = "71db87e5275489570560a744dbaa649c2f9da0a0"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-1.tgz"; + name = "phantomjs-1.9.7-1.tgz"; + sha1 = "57a191c908de74d27ac4948bd66100ae88222f47"; }) ]; buildInputs = @@ -10883,7 +11057,7 @@ by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "pkginfo-0.2.3"; + name = "node-pkginfo-0.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; @@ -10902,7 +11076,7 @@ by-spec."pkginfo"."0.3.0" = self.by-version."pkginfo"."0.3.0"; by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "pkginfo-0.3.0"; + name = "node-pkginfo-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; @@ -10925,7 +11099,7 @@ by-spec."plist-native"."*" = self.by-version."plist-native"."0.2.2"; by-version."plist-native"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "plist-native-0.2.2"; + name = "node-plist-native-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.2.tgz"; @@ -10946,7 +11120,7 @@ by-spec."policyfile"."0.0.4" = self.by-version."policyfile"."0.0.4"; by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "policyfile-0.0.4"; + name = "node-policyfile-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; @@ -10965,7 +11139,7 @@ by-spec."posix"."*" = self.by-version."posix"."1.0.3"; by-version."posix"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "posix-1.0.3"; + name = "node-posix-1.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/posix/-/posix-1.0.3.tgz"; @@ -10985,7 +11159,7 @@ by-spec."posix-getopt"."1.0.0" = self.by-version."posix-getopt"."1.0.0"; by-version."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "posix-getopt-1.0.0"; + name = "node-posix-getopt-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz"; @@ -11004,7 +11178,7 @@ by-spec."promise"."~2.0" = self.by-version."promise"."2.0.0"; by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "promise-2.0.0"; + name = "node-promise-2.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; @@ -11024,7 +11198,7 @@ by-spec."prompt"."0.2.11" = self.by-version."prompt"."0.2.11"; by-version."prompt"."0.2.11" = lib.makeOverridable self.buildNodePackage { - name = "prompt-0.2.11"; + name = "node-prompt-0.2.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz"; @@ -11048,7 +11222,7 @@ 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"; + name = "node-promptly-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz"; @@ -11068,7 +11242,7 @@ by-spec."promzard"."~0.2.0" = self.by-version."promzard"."0.2.1"; by-version."promzard"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "promzard-0.2.1"; + name = "node-promzard-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/promzard/-/promzard-0.2.1.tgz"; @@ -11088,7 +11262,7 @@ by-spec."proto-list"."~1.2.1" = self.by-version."proto-list"."1.2.2"; by-version."proto-list"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "proto-list-1.2.2"; + name = "node-proto-list-1.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz"; @@ -11128,7 +11302,7 @@ by-spec."ps-tree"."0.0.x" = self.by-version."ps-tree"."0.0.3"; by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "ps-tree-0.0.3"; + name = "node-ps-tree-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; @@ -11148,7 +11322,7 @@ by-spec."punycode".">=0.2.0" = self.by-version."punycode"."1.2.3"; by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "punycode-1.2.3"; + name = "node-punycode-1.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz"; @@ -11169,7 +11343,7 @@ by-spec."q".">= 0.0.1" = self.by-version."q"."1.0.0"; by-version."q"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "q-1.0.0"; + name = "node-q-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/q/-/q-1.0.0.tgz"; @@ -11188,7 +11362,7 @@ 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"; + name = "node-q-0.9.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; @@ -11208,10 +11382,12 @@ 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.0" = + self.by-version."q"."1.0.0"; by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.4.2"; + name = "node-qs-0.4.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; @@ -11232,7 +11408,7 @@ by-spec."qs"."0.5.1" = self.by-version."qs"."0.5.1"; by-version."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.5.1"; + name = "node-qs-0.5.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; @@ -11251,7 +11427,7 @@ by-spec."qs"."0.5.2" = self.by-version."qs"."0.5.2"; by-version."qs"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.5.2"; + name = "node-qs-0.5.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.2.tgz"; @@ -11270,7 +11446,7 @@ by-spec."qs"."0.5.5" = self.by-version."qs"."0.5.5"; by-version."qs"."0.5.5" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.5.5"; + name = "node-qs-0.5.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz"; @@ -11289,7 +11465,7 @@ by-spec."qs"."0.6.5" = self.by-version."qs"."0.6.5"; by-version."qs"."0.6.5" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.6.5"; + name = "node-qs-0.6.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; @@ -11308,7 +11484,7 @@ by-spec."qs"."0.6.6" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.6.6"; + name = "node-qs-0.6.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; @@ -11329,7 +11505,7 @@ by-spec."qs"."~0.5.0" = self.by-version."qs"."0.5.6"; by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.5.6"; + name = "node-qs-0.5.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; @@ -11352,7 +11528,7 @@ by-spec."rai"."~0.1" = self.by-version."rai"."0.1.9"; by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "rai-0.1.9"; + name = "node-rai-0.1.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz"; @@ -11371,7 +11547,7 @@ by-spec."range-parser"."0.0.4" = self.by-version."range-parser"."0.0.4"; by-version."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "range-parser-0.0.4"; + name = "node-range-parser-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; @@ -11387,22 +11563,43 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."raven"."~0.6.0" = - self.by-version."raven"."0.6.0"; - by-version."raven"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "raven-0.6.0"; + by-spec."range-parser"."~1.0.0" = + self.by-version."range-parser"."1.0.0"; + by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-range-parser-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/raven/-/raven-0.6.0.tgz"; - name = "raven-0.6.0.tgz"; - sha1 = "440aa58143e95760cb7b73b7b23b3429ca9b5576"; + url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz"; + name = "range-parser-1.0.0.tgz"; + sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0"; + }) + ]; + buildInputs = + (self.nativeDeps."range-parser" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "range-parser" ]; + }; + by-spec."raven"."~0.6.0" = + self.by-version."raven"."0.6.1"; + by-version."raven"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "node-raven-0.6.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raven/-/raven-0.6.1.tgz"; + name = "raven-0.6.1.tgz"; + sha1 = "2c307e90295517ce2d45354b0c2d905311f66a5d"; }) ]; buildInputs = (self.nativeDeps."raven" or []); deps = [ - self.by-version."node-uuid"."1.4.0" - self.by-version."raw-stacktrace"."1.0.0" + self.by-version."node-uuid"."1.4.1" + self.by-version."stack-trace"."0.0.7" + self.by-version."lsmod"."0.0.2" + self.by-version."cookie"."0.1.0" ]; peerDependencies = [ ]; @@ -11411,7 +11608,7 @@ by-spec."raw-body"."0.0.3" = self.by-version."raw-body"."0.0.3"; by-version."raw-body"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "raw-body-0.0.3"; + name = "node-raw-body-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; @@ -11430,7 +11627,7 @@ by-spec."raw-body"."1.1.2" = self.by-version."raw-body"."1.1.2"; by-version."raw-body"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "raw-body-1.1.2"; + name = "node-raw-body-1.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz"; @@ -11450,7 +11647,7 @@ by-spec."raw-socket"."*" = self.by-version."raw-socket"."1.2.2"; by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "raw-socket-1.2.2"; + name = "node-raw-socket-1.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz"; @@ -11466,31 +11663,10 @@ ]; passthru.names = [ "raw-socket" ]; }; - by-spec."raw-stacktrace"."1.0.0" = - self.by-version."raw-stacktrace"."1.0.0"; - by-version."raw-stacktrace"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "raw-stacktrace-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/raw-stacktrace/-/raw-stacktrace-1.0.0.tgz"; - name = "raw-stacktrace-1.0.0.tgz"; - sha1 = "f308881f17667785a9acd7c8fbd442e1b2acf1db"; - }) - ]; - buildInputs = - (self.nativeDeps."raw-stacktrace" or []); - deps = [ - self.by-version."traceback"."0.3.0" - self.by-version."underscore"."1.5.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "raw-stacktrace" ]; - }; by-spec."rbytes"."*" = self.by-version."rbytes"."1.0.0"; by-version."rbytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "rbytes-1.0.0"; + name = "node-rbytes-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/rbytes/-/rbytes-1.0.0.tgz"; @@ -11522,19 +11698,19 @@ (self.nativeDeps."rc" or []); deps = [ self.by-version."optimist"."0.3.7" - self.by-version."deep-extend"."0.2.6" + self.by-version."deep-extend"."0.2.8" self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.1" = + by-spec."rc"."~0.3.2" = self.by-version."rc"."0.3.3"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "read-1.0.5"; + name = "node-read-1.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; @@ -11560,7 +11736,7 @@ by-spec."read-installed"."0.2.2" = self.by-version."read-installed"."0.2.2"; by-version."read-installed"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "read-installed-0.2.2"; + name = "node-read-installed-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz"; @@ -11583,7 +11759,7 @@ by-spec."read-installed"."~0.2.2" = self.by-version."read-installed"."0.2.5"; by-version."read-installed"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "read-installed-0.2.5"; + name = "node-read-installed-0.2.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz"; @@ -11606,7 +11782,7 @@ by-spec."read-package-json"."1" = self.by-version."read-package-json"."1.1.6"; by-version."read-package-json"."1.1.6" = lib.makeOverridable self.buildNodePackage { - name = "read-package-json-1.1.6"; + name = "node-read-package-json-1.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.6.tgz"; @@ -11629,19 +11805,20 @@ by-spec."read-package-json"."~1.1.6" = self.by-version."read-package-json"."1.1.6"; by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.24"; - by-version."readable-stream"."1.0.24" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.24"; + self.by-version."readable-stream"."1.0.25"; + by-version."readable-stream"."1.0.25" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.0.25"; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.24.tgz"; - name = "readable-stream-1.0.24.tgz"; - sha1 = "b5659d5772cd06992dffe5a3bee2eec480f1c2fe"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.25.tgz"; + name = "readable-stream-1.0.25.tgz"; + sha1 = "df19f64e6f74fd37ecf9d3ab8dbf1e2d11c9a045"; }) ]; buildInputs = (self.nativeDeps."readable-stream" or []); deps = [ + self.by-version."string_decoder"."0.10.25" ]; peerDependencies = [ ]; @@ -11650,18 +11827,19 @@ by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.10"; by-version."readable-stream"."1.1.10" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.1.10"; + name = "node-readable-stream-1.1.10"; src = [ (fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.10.tgz"; name = "readable-stream-1.1.10.tgz"; - sha1 = "c616cbc30aa586724b7401c37de33b0b5c0c6429"; + sha1 = "d4dc2e5319e9c90d1e71c69390ef62cd90827f65"; }) ]; buildInputs = (self.nativeDeps."readable-stream" or []); deps = [ self.by-version."core-util-is"."1.0.1" + self.by-version."string_decoder"."0.10.25" self.by-version."debuglog"."0.0.2" ]; peerDependencies = [ @@ -11669,9 +11847,11 @@ passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."~1.0.17" = - self.by-version."readable-stream"."1.0.24"; + self.by-version."readable-stream"."1.0.25"; by-spec."readable-stream"."~1.0.2" = - self.by-version."readable-stream"."1.0.24"; + self.by-version."readable-stream"."1.0.25"; + by-spec."readable-stream"."~1.0.24" = + self.by-version."readable-stream"."1.0.25"; by-spec."readable-stream"."~1.1.8" = self.by-version."readable-stream"."1.1.10"; by-spec."readable-stream"."~1.1.9" = @@ -11679,7 +11859,7 @@ by-spec."readdirp"."~0.2.3" = self.by-version."readdirp"."0.2.5"; by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "readdirp-0.2.5"; + name = "node-readdirp-0.2.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz"; @@ -11699,7 +11879,7 @@ by-spec."redeyed"."~0.4.0" = self.by-version."redeyed"."0.4.2"; by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "redeyed-0.4.2"; + name = "node-redeyed-0.4.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz"; @@ -11719,7 +11899,7 @@ by-spec."redis"."*" = self.by-version."redis"."0.10.0"; by-version."redis"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.10.0"; + name = "node-redis-0.10.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.10.0.tgz"; @@ -11739,7 +11919,7 @@ by-spec."redis"."0.7.2" = self.by-version."redis"."0.7.2"; by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.7.2"; + name = "node-redis-0.7.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz"; @@ -11759,7 +11939,7 @@ by-spec."redis"."0.7.3" = self.by-version."redis"."0.7.3"; by-version."redis"."0.7.3" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.7.3"; + name = "node-redis-0.7.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; @@ -11778,7 +11958,7 @@ by-spec."redis"."0.8.x" = self.by-version."redis"."0.8.6"; by-version."redis"."0.8.6" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.8.6"; + name = "node-redis-0.8.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz"; @@ -11794,24 +11974,24 @@ ]; passthru.names = [ "redis" ]; }; - by-spec."redis".">= 0.6.6" = + by-spec."redis"."~0.10.0" = self.by-version."redis"."0.10.0"; - by-spec."reds"."0.1.4" = - self.by-version."reds"."0.1.4"; - by-version."reds"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "reds-0.1.4"; + by-spec."reds"."~0.2.4" = + self.by-version."reds"."0.2.4"; + by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-reds-0.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/reds/-/reds-0.1.4.tgz"; - name = "reds-0.1.4.tgz"; - sha1 = "a97819180c30f6ecd01cad03cecb574eaabb4bee"; + url = "http://registry.npmjs.org/reds/-/reds-0.2.4.tgz"; + name = "reds-0.2.4.tgz"; + sha1 = "a82dcaaa52319635bc6eee3ef9c1ac074411de3c"; }) ]; buildInputs = (self.nativeDeps."reds" or []); deps = [ - self.by-version."natural"."0.0.69" - self.by-version."redis"."0.10.0" + self.by-version."natural"."0.1.17" + self.by-version."redis"."0.7.2" ]; peerDependencies = [ ]; @@ -11820,7 +12000,7 @@ by-spec."reduce-component"."1.0.1" = self.by-version."reduce-component"."1.0.1"; by-version."reduce-component"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "reduce-component-1.0.1"; + name = "node-reduce-component-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; @@ -11839,7 +12019,7 @@ by-spec."regexp-clone"."0.0.1" = self.by-version."regexp-clone"."0.0.1"; by-version."regexp-clone"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "regexp-clone-0.0.1"; + name = "node-regexp-clone-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz"; @@ -11856,14 +12036,14 @@ passthru.names = [ "regexp-clone" ]; }; by-spec."replace"."~0.2.4" = - self.by-version."replace"."0.2.8"; - by-version."replace"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "replace-0.2.8"; + self.by-version."replace"."0.2.9"; + by-version."replace"."0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "replace-0.2.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/replace/-/replace-0.2.8.tgz"; - name = "replace-0.2.8.tgz"; - sha1 = "05fadc9800bf0e91459c229e867bdd9eac1a6d3d"; + url = "http://registry.npmjs.org/replace/-/replace-0.2.9.tgz"; + name = "replace-0.2.9.tgz"; + sha1 = "64428de4451717e8cc34965d2d133dd86dace404"; }) ]; buildInputs = @@ -11880,7 +12060,7 @@ by-spec."request"."2" = self.by-version."request"."2.33.0"; by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.33.0"; + name = "node-request-2.33.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; @@ -11915,7 +12095,7 @@ by-spec."request"."2.16.2" = self.by-version."request"."2.16.2"; by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { - name = "request-2.16.2"; + name = "node-request-2.16.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.16.2.tgz"; @@ -11945,7 +12125,7 @@ by-spec."request"."2.16.x" = self.by-version."request"."2.16.6"; by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage { - name = "request-2.16.6"; + name = "node-request-2.16.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; @@ -11975,7 +12155,7 @@ by-spec."request"."2.9.x" = self.by-version."request"."2.9.203"; by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage { - name = "request-2.9.203"; + name = "node-request-2.9.203"; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; @@ -11995,41 +12175,10 @@ self.by-version."request"."2.33.0"; by-spec."request"."~2" = self.by-version."request"."2.33.0"; - by-spec."request"."~2.21.0" = - self.by-version."request"."2.21.0"; - by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.21.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.21.0.tgz"; - name = "request-2.21.0.tgz"; - sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."4.0.0" - self.by-version."forever-agent"."0.5.0" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.9.11" - self.by-version."hawk"."0.13.1" - self.by-version."aws-sign"."0.3.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."cookie-jar"."0.3.0" - self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" - self.by-version."form-data"."0.0.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; by-spec."request"."~2.25.0" = self.by-version."request"."2.25.0"; by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.25.0"; + name = "node-request-2.25.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; @@ -12060,7 +12209,7 @@ by-spec."request"."~2.27.0" = self.by-version."request"."2.27.0"; by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.27.0"; + name = "node-request-2.27.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; @@ -12091,7 +12240,7 @@ by-spec."request"."~2.30.0" = self.by-version."request"."2.30.0"; by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.30.0"; + name = "node-request-2.30.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; @@ -12122,7 +12271,7 @@ by-spec."request"."~2.31.0" = self.by-version."request"."2.31.0"; by-version."request"."2.31.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.31.0"; + name = "node-request-2.31.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.31.0.tgz"; @@ -12150,10 +12299,12 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."~2.33.0" = + self.by-version."request"."2.33.0"; by-spec."request-progress"."~0.3.0" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "request-progress-0.3.1"; + name = "node-request-progress-0.3.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; @@ -12173,7 +12324,7 @@ 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"; + name = "node-request-replay-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz"; @@ -12214,7 +12365,7 @@ by-spec."resolve"."0.5.x" = self.by-version."resolve"."0.5.1"; by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "resolve-0.5.1"; + name = "node-resolve-0.5.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.5.1.tgz"; @@ -12233,7 +12384,7 @@ by-spec."resolve"."0.6.x" = self.by-version."resolve"."0.6.1"; by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "resolve-0.6.1"; + name = "node-resolve-0.6.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.6.1.tgz"; @@ -12252,7 +12403,7 @@ by-spec."resolve"."~0.3.1" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "resolve-0.3.1"; + name = "node-resolve-0.3.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz"; @@ -12305,14 +12456,14 @@ passthru.names = [ "restify" ]; }; by-spec."rethinkdb"."*" = - self.by-version."rethinkdb"."1.11.0-3"; - by-version."rethinkdb"."1.11.0-3" = lib.makeOverridable self.buildNodePackage { - name = "rethinkdb-1.11.0-3"; + self.by-version."rethinkdb"."1.11.0-4"; + by-version."rethinkdb"."1.11.0-4" = lib.makeOverridable self.buildNodePackage { + name = "node-rethinkdb-1.11.0-4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-3.tgz"; - name = "rethinkdb-1.11.0-3.tgz"; - sha1 = "6db00acf53b6fa75b0183b01fa2d7cb24f027881"; + url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-4.tgz"; + name = "rethinkdb-1.11.0-4.tgz"; + sha1 = "11a4f32cf7cd98d895016448641b9af6a1b575e9"; }) ]; buildInputs = @@ -12324,11 +12475,11 @@ ]; passthru.names = [ "rethinkdb" ]; }; - "rethinkdb" = self.by-version."rethinkdb"."1.11.0-3"; + "rethinkdb" = self.by-version."rethinkdb"."1.11.0-4"; by-spec."retry"."0.6.0" = self.by-version."retry"."0.6.0"; by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "retry-0.6.0"; + name = "node-retry-0.6.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; @@ -12349,7 +12500,7 @@ by-spec."revalidator"."0.1.x" = self.by-version."revalidator"."0.1.6"; by-version."revalidator"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "revalidator-0.1.6"; + name = "node-revalidator-0.1.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.6.tgz"; @@ -12368,7 +12519,7 @@ by-spec."rimraf"."1.x.x" = self.by-version."rimraf"."1.0.9"; by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-1.0.9"; + name = "node-rimraf-1.0.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz"; @@ -12410,7 +12561,7 @@ by-spec."rimraf"."~2.0.2" = self.by-version."rimraf"."2.0.3"; by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.0.3"; + name = "node-rimraf-2.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.0.3.tgz"; @@ -12432,7 +12583,7 @@ by-spec."rimraf"."~2.1.4" = self.by-version."rimraf"."2.1.4"; by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.1.4"; + name = "node-rimraf-2.1.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; @@ -12456,20 +12607,20 @@ by-spec."rimraf"."~2.2.5" = self.by-version."rimraf"."2.2.6"; by-spec."s3http"."*" = - self.by-version."s3http"."0.0.4"; - by-version."s3http"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "s3http-0.0.4"; + self.by-version."s3http"."0.0.5"; + by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "s3http-0.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/s3http/-/s3http-0.0.4.tgz"; - name = "s3http-0.0.4.tgz"; - sha1 = "e7cc4b7e9f9bacaa7ee3a5af81917fd0ca8ce8da"; + url = "http://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz"; + name = "s3http-0.0.5.tgz"; + sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }) ]; buildInputs = (self.nativeDeps."s3http" or []); deps = [ - self.by-version."aws-sdk"."1.17.3" + self.by-version."aws-sdk"."1.18.0" self.by-version."commander"."2.0.0" self.by-version."http-auth"."2.0.7" self.by-version."express"."3.4.4" @@ -12482,11 +12633,11 @@ ]; passthru.names = [ "s3http" ]; }; - "s3http" = self.by-version."s3http"."0.0.4"; + "s3http" = self.by-version."s3http"."0.0.5"; by-spec."sauce-connect-launcher"."~0.2.2" = self.by-version."sauce-connect-launcher"."0.2.2"; by-version."sauce-connect-launcher"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "sauce-connect-launcher-0.2.2"; + name = "node-sauce-connect-launcher-0.2.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.2.2.tgz"; @@ -12498,7 +12649,7 @@ (self.nativeDeps."sauce-connect-launcher" or []); deps = [ self.by-version."lodash"."1.3.1" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."adm-zip"."0.4.3" ]; peerDependencies = [ @@ -12508,7 +12659,7 @@ by-spec."saucelabs"."~0.1.0" = self.by-version."saucelabs"."0.1.1"; by-version."saucelabs"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "saucelabs-0.1.1"; + name = "node-saucelabs-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"; @@ -12527,7 +12678,7 @@ by-spec."sax"."0.5.x" = self.by-version."sax"."0.5.8"; by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.5.8"; + name = "node-sax-0.5.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; @@ -12546,7 +12697,7 @@ by-spec."sax".">=0.4.2" = self.by-version."sax"."0.6.0"; by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.6.0"; + name = "node-sax-0.6.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/sax/-/sax-0.6.0.tgz"; @@ -12565,7 +12716,7 @@ by-spec."selenium-webdriver"."*" = self.by-version."selenium-webdriver"."2.39.0"; by-version."selenium-webdriver"."2.39.0" = lib.makeOverridable self.buildNodePackage { - name = "selenium-webdriver-2.39.0"; + name = "node-selenium-webdriver-2.39.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.39.0.tgz"; @@ -12695,14 +12846,14 @@ by-spec."semver"."~2.2.1" = self.by-version."semver"."2.2.1"; by-spec."send"."*" = - self.by-version."send"."0.1.4"; - by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "send-0.1.4"; + self.by-version."send"."0.2.0"; + by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-send-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz"; - name = "send-0.1.4.tgz"; - sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; + url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz"; + name = "send-0.2.0.tgz"; + sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58"; }) ]; buildInputs = @@ -12710,8 +12861,8 @@ deps = [ self.by-version."debug"."0.7.4" self.by-version."mime"."1.2.11" - self.by-version."fresh"."0.2.0" - self.by-version."range-parser"."0.0.4" + self.by-version."fresh"."0.2.1" + self.by-version."range-parser"."1.0.0" ]; peerDependencies = [ ]; @@ -12720,7 +12871,7 @@ by-spec."send"."0.0.3" = self.by-version."send"."0.0.3"; by-version."send"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "send-0.0.3"; + name = "node-send-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz"; @@ -12743,7 +12894,7 @@ by-spec."send"."0.1.0" = self.by-version."send"."0.1.0"; by-version."send"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "send-0.1.0"; + name = "node-send-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz"; @@ -12765,10 +12916,31 @@ }; by-spec."send"."0.1.4" = self.by-version."send"."0.1.4"; + by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-send-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz"; + name = "send-0.1.4.tgz"; + sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; + }) + ]; + buildInputs = + (self.nativeDeps."send" or []); + deps = [ + self.by-version."debug"."0.7.4" + self.by-version."mime"."1.2.11" + self.by-version."fresh"."0.2.0" + self.by-version."range-parser"."0.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "send" ]; + }; by-spec."sequence"."*" = self.by-version."sequence"."3.0.0"; by-version."sequence"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "sequence-3.0.0"; + name = "node-sequence-3.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/sequence/-/sequence-3.0.0.tgz"; @@ -12787,7 +12959,7 @@ by-spec."sequence"."2.x" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "sequence-2.2.1"; + name = "node-sequence-2.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; @@ -12806,7 +12978,7 @@ by-spec."sha"."~1.2.1" = self.by-version."sha"."1.2.3"; by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "sha-1.2.3"; + name = "node-sha-1.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz"; @@ -12818,7 +12990,7 @@ (self.nativeDeps."sha" or []); deps = [ self.by-version."graceful-fs"."2.0.1" - self.by-version."readable-stream"."1.0.24" + self.by-version."readable-stream"."1.0.25" ]; peerDependencies = [ ]; @@ -12865,14 +13037,14 @@ passthru.names = [ "shelljs" ]; }; by-spec."should"."*" = - self.by-version."should"."3.0.1"; - by-version."should"."3.0.1" = lib.makeOverridable self.buildNodePackage { - name = "should-3.0.1"; + self.by-version."should"."3.1.2"; + by-version."should"."3.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-should-3.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-3.0.1.tgz"; - name = "should-3.0.1.tgz"; - sha1 = "b30fff8968b4701e2ea499de91d9b0ea4d37623e"; + url = "http://registry.npmjs.org/should/-/should-3.1.2.tgz"; + name = "should-3.1.2.tgz"; + sha1 = "4bc206253d736c2fb902153477982c2b2e988c02"; }) ]; buildInputs = @@ -12883,11 +13055,11 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."3.0.1"; + "should" = self.by-version."should"."3.1.2"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "sigmund-1.0.0"; + name = "node-sigmund-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; @@ -12906,7 +13078,7 @@ by-spec."signals"."<2.0" = self.by-version."signals"."1.0.0"; by-version."signals"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "signals-1.0.0"; + name = "node-signals-1.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; @@ -12929,7 +13101,7 @@ by-spec."simple-lru-cache"."0.0.x" = self.by-version."simple-lru-cache"."0.0.1"; by-version."simple-lru-cache"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "simple-lru-cache-0.0.1"; + name = "node-simple-lru-cache-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz"; @@ -12946,14 +13118,14 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.18"; - by-version."simplesmtp"."0.3.18" = lib.makeOverridable self.buildNodePackage { - name = "simplesmtp-0.3.18"; + self.by-version."simplesmtp"."0.3.20"; + by-version."simplesmtp"."0.3.20" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.20"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.18.tgz"; - name = "simplesmtp-0.3.18.tgz"; - sha1 = "54493d7d5b59b23b061b981655be8d001167a978"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.20.tgz"; + name = "simplesmtp-0.3.20.tgz"; + sha1 = "9de032acd3f4dfee69aed80ea9843b09419bd001"; }) ]; buildInputs = @@ -12969,7 +13141,7 @@ by-spec."sliced"."0.0.3" = self.by-version."sliced"."0.0.3"; by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "sliced-0.0.3"; + name = "node-sliced-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; @@ -12988,7 +13160,7 @@ by-spec."sliced"."0.0.4" = self.by-version."sliced"."0.0.4"; by-version."sliced"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "sliced-0.0.4"; + name = "node-sliced-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; @@ -13007,7 +13179,7 @@ by-spec."sliced"."0.0.5" = self.by-version."sliced"."0.0.5"; by-version."sliced"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "sliced-0.0.5"; + name = "node-sliced-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz"; @@ -13026,7 +13198,7 @@ by-spec."slide"."~1.1.3" = self.by-version."slide"."1.1.5"; by-version."slide"."1.1.5" = lib.makeOverridable self.buildNodePackage { - name = "slide-1.1.5"; + name = "node-slide-1.1.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz"; @@ -13045,14 +13217,14 @@ by-spec."slide"."~1.1.5" = self.by-version."slide"."1.1.5"; by-spec."smartdc"."*" = - self.by-version."smartdc"."7.1.2"; - by-version."smartdc"."7.1.2" = lib.makeOverridable self.buildNodePackage { - name = "smartdc-7.1.2"; + self.by-version."smartdc"."7.2.0"; + by-version."smartdc"."7.2.0" = lib.makeOverridable self.buildNodePackage { + name = "smartdc-7.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.2.tgz"; - name = "smartdc-7.1.2.tgz"; - sha1 = "11228af972ed5014d3798202ecc370e02f007872"; + url = "http://registry.npmjs.org/smartdc/-/smartdc-7.2.0.tgz"; + name = "smartdc-7.2.0.tgz"; + sha1 = "2b4f9375f2c709061e96440976767774d5e4fe86"; }) ]; buildInputs = @@ -13070,11 +13242,11 @@ ]; passthru.names = [ "smartdc" ]; }; - "smartdc" = self.by-version."smartdc"."7.1.2"; + "smartdc" = self.by-version."smartdc"."7.2.0"; by-spec."smartdc-auth"."1.0.1" = self.by-version."smartdc-auth"."1.0.1"; by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "smartdc-auth-1.0.1"; + name = "node-smartdc-auth-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz"; @@ -13098,7 +13270,7 @@ by-spec."sntp"."0.1.x" = self.by-version."sntp"."0.1.4"; by-version."sntp"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "sntp-0.1.4"; + name = "node-sntp-0.1.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; @@ -13118,7 +13290,7 @@ by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "sntp-0.2.4"; + name = "node-sntp-0.2.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; @@ -13138,7 +13310,7 @@ by-spec."socket.io"."0.9.14" = self.by-version."socket.io"."0.9.14"; by-version."socket.io"."0.9.14" = lib.makeOverridable self.buildNodePackage { - name = "socket.io-0.9.14"; + name = "node-socket.io-0.9.14"; src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; @@ -13161,7 +13333,7 @@ by-spec."socket.io"."0.9.16" = self.by-version."socket.io"."0.9.16"; by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage { - name = "socket.io-0.9.16"; + name = "node-socket.io-0.9.16"; src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; @@ -13188,7 +13360,7 @@ by-spec."socket.io-client"."0.9.11" = self.by-version."socket.io-client"."0.9.11"; by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage { - name = "socket.io-client-0.9.11"; + name = "node-socket.io-client-0.9.11"; src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz"; @@ -13211,7 +13383,7 @@ by-spec."socket.io-client"."0.9.16" = self.by-version."socket.io-client"."0.9.16"; by-version."socket.io-client"."0.9.16" = lib.makeOverridable self.buildNodePackage { - name = "socket.io-client-0.9.16"; + name = "node-socket.io-client-0.9.16"; src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; @@ -13234,7 +13406,7 @@ by-spec."sockjs"."*" = self.by-version."sockjs"."0.3.8"; by-version."sockjs"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "sockjs-0.3.8"; + name = "node-sockjs-0.3.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz"; @@ -13256,7 +13428,7 @@ by-spec."source-map"."*" = self.by-version."source-map"."0.1.31"; by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.31"; + name = "node-source-map-0.1.31"; src = [ (fetchurl { url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; @@ -13287,7 +13459,7 @@ by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { - name = "spdy-1.7.1"; + name = "node-spdy-1.7.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz"; @@ -13306,7 +13478,7 @@ by-spec."sprintf"."~0.1.2" = self.by-version."sprintf"."0.1.3"; by-version."sprintf"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "sprintf-0.1.3"; + name = "node-sprintf-0.1.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.3.tgz"; @@ -13345,15 +13517,15 @@ ]; passthru.names = [ "ssh-agent" ]; }; - by-spec."ssh2"."~0.2.14" = - self.by-version."ssh2"."0.2.16"; - by-version."ssh2"."0.2.16" = lib.makeOverridable self.buildNodePackage { - name = "ssh2-0.2.16"; + by-spec."ssh2"."~0.2.16" = + self.by-version."ssh2"."0.2.17"; + by-version."ssh2"."0.2.17" = lib.makeOverridable self.buildNodePackage { + name = "node-ssh2-0.2.17"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.16.tgz"; - name = "ssh2-0.2.16.tgz"; - sha1 = "f0e2fe7f4e3223c74ddd430dac82506ed3d747c7"; + url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.17.tgz"; + name = "ssh2-0.2.17.tgz"; + sha1 = "ce7773e4c7c4f78a8ab19227dcc3afae0b149291"; }) ]; buildInputs = @@ -13366,10 +13538,10 @@ ]; passthru.names = [ "ssh2" ]; }; - by-spec."stack-trace"."0.0.x" = + by-spec."stack-trace"."0.0.7" = self.by-version."stack-trace"."0.0.7"; by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "stack-trace-0.0.7"; + name = "node-stack-trace-0.0.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz"; @@ -13385,6 +13557,25 @@ ]; passthru.names = [ "stack-trace" ]; }; + by-spec."stack-trace"."0.0.x" = + self.by-version."stack-trace"."0.0.8"; + by-version."stack-trace"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "node-stack-trace-0.0.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.8.tgz"; + name = "stack-trace-0.0.8.tgz"; + sha1 = "8a9c30543ed9697f77739c67b053d8b030d86f3e"; + }) + ]; + buildInputs = + (self.nativeDeps."stack-trace" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "stack-trace" ]; + }; by-spec."statsd"."*" = self.by-version."statsd"."0.7.0"; by-version."statsd"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -13411,7 +13602,7 @@ 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"; + name = "node-stream-combiner-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; @@ -13431,7 +13622,7 @@ by-spec."stream-counter"."~0.1.0" = self.by-version."stream-counter"."0.1.0"; by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "stream-counter-0.1.0"; + name = "node-stream-counter-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz"; @@ -13442,7 +13633,7 @@ buildInputs = (self.nativeDeps."stream-counter" or []); deps = [ - self.by-version."readable-stream"."1.0.24" + self.by-version."readable-stream"."1.0.25" ]; peerDependencies = [ ]; @@ -13451,7 +13642,7 @@ by-spec."stream-counter"."~0.2.0" = self.by-version."stream-counter"."0.2.0"; by-version."stream-counter"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "stream-counter-0.2.0"; + name = "node-stream-counter-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; @@ -13471,7 +13662,7 @@ by-spec."stream-splitter-transform"."*" = self.by-version."stream-splitter-transform"."0.0.4"; by-version."stream-splitter-transform"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "stream-splitter-transform-0.0.4"; + name = "node-stream-splitter-transform-0.0.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz"; @@ -13492,7 +13683,7 @@ by-spec."streamsearch"."0.1.2" = self.by-version."streamsearch"."0.1.2"; by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "streamsearch-0.1.2"; + name = "node-streamsearch-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; @@ -13511,7 +13702,7 @@ by-spec."string"."1.6.1" = self.by-version."string"."1.6.1"; by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage { - name = "string-1.6.1"; + name = "node-string-1.6.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz"; @@ -13527,15 +13718,34 @@ ]; passthru.names = [ "string" ]; }; - by-spec."stringify-object"."~0.1.4" = - self.by-version."stringify-object"."0.1.7"; - by-version."stringify-object"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "stringify-object-0.1.7"; + by-spec."string_decoder"."~0.10.x" = + self.by-version."string_decoder"."0.10.25"; + by-version."string_decoder"."0.10.25" = lib.makeOverridable self.buildNodePackage { + name = "node-string_decoder-0.10.25"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.7.tgz"; - name = "stringify-object-0.1.7.tgz"; - sha1 = "bb54d1ceed118b428c1256742b40a53f03599581"; + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25.tgz"; + name = "string_decoder-0.10.25.tgz"; + sha1 = "668c9da4f8efbdc937a4a6b6bf1cfbec4e9a82e2"; + }) + ]; + buildInputs = + (self.nativeDeps."string_decoder" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "string_decoder" ]; + }; + by-spec."stringify-object"."~0.1.4" = + self.by-version."stringify-object"."0.1.8"; + by-version."stringify-object"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "node-stringify-object-0.1.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz"; + name = "stringify-object-0.1.8.tgz"; + sha1 = "463348f38fdcd4fec1c011084c24a59ac653c1ee"; }) ]; buildInputs = @@ -13568,7 +13778,7 @@ by-spec."strong-data-uri"."~0.1.0" = self.by-version."strong-data-uri"."0.1.1"; by-version."strong-data-uri"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "strong-data-uri-0.1.1"; + name = "node-strong-data-uri-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz"; @@ -13586,14 +13796,14 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.42.1"; - by-version."stylus"."0.42.1" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.42.1"; + self.by-version."stylus"."0.42.2"; + by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.42.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.42.1.tgz"; - name = "stylus-0.42.1.tgz"; - sha1 = "8e5bfec922e8d0037748cd05281d53ca602b6e4f"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.42.2.tgz"; + name = "stylus-0.42.2.tgz"; + sha1 = "bed29107803129bed1983efc4c7e33f4fd34fee7"; }) ]; buildInputs = @@ -13609,7 +13819,7 @@ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.42.1"; + "stylus" = self.by-version."stylus"."0.42.2"; by-spec."stylus"."0.27.2" = self.by-version."stylus"."0.27.2"; by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { @@ -13635,7 +13845,7 @@ by-spec."sudo-block"."~0.2.0" = self.by-version."sudo-block"."0.2.1"; by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "sudo-block-0.2.1"; + name = "node-sudo-block-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.2.1.tgz"; @@ -13655,7 +13865,7 @@ by-spec."sudo-block"."~0.3.0" = self.by-version."sudo-block"."0.3.0"; by-version."sudo-block"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "sudo-block-0.3.0"; + name = "node-sudo-block-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.3.0.tgz"; @@ -13675,7 +13885,7 @@ by-spec."superagent"."0.16.0" = self.by-version."superagent"."0.16.0"; by-version."superagent"."0.16.0" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.16.0"; + name = "node-superagent-0.16.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/superagent/-/superagent-0.16.0.tgz"; @@ -13702,7 +13912,7 @@ by-spec."superagent"."~0.13.0" = self.by-version."superagent"."0.13.0"; by-version."superagent"."0.13.0" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.13.0"; + name = "node-superagent-0.13.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/superagent/-/superagent-0.13.0.tgz"; @@ -13724,37 +13934,12 @@ ]; passthru.names = [ "superagent" ]; }; - by-spec."superagent"."~0.15.7" = - self.by-version."superagent"."0.15.7"; - by-version."superagent"."0.15.7" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.15.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.15.7.tgz"; - name = "superagent-0.15.7.tgz"; - sha1 = "095c70b8afffbc072f1458f39684d4854d6333a3"; - }) - ]; - buildInputs = - (self.nativeDeps."superagent" or []); - deps = [ - self.by-version."qs"."0.6.5" - self.by-version."formidable"."1.0.14" - self.by-version."mime"."1.2.5" - self.by-version."emitter-component"."1.0.0" - self.by-version."methods"."0.0.1" - self.by-version."cookiejar"."1.3.0" - self.by-version."debug"."0.7.4" - self.by-version."reduce-component"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "superagent" ]; - }; + by-spec."superagent"."~0.16.0" = + self.by-version."superagent"."0.16.0"; by-spec."supertest"."*" = self.by-version."supertest"."0.9.0"; by-version."supertest"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "supertest-0.9.0"; + name = "node-supertest-0.9.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/supertest/-/supertest-0.9.0.tgz"; @@ -13776,7 +13961,7 @@ by-spec."swig"."0.14.x" = self.by-version."swig"."0.14.0"; by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage { - name = "swig-0.14.0"; + name = "node-swig-0.14.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz"; @@ -13797,7 +13982,7 @@ by-spec."sylvester".">= 0.0.12" = self.by-version."sylvester"."0.0.21"; by-version."sylvester"."0.0.21" = lib.makeOverridable self.buildNodePackage { - name = "sylvester-0.0.21"; + name = "node-sylvester-0.0.21"; src = [ (fetchurl { url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; @@ -13818,7 +14003,7 @@ by-spec."tar"."*" = self.by-version."tar"."0.1.19"; by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.19"; + name = "node-tar-0.1.19"; src = [ (fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz"; @@ -13843,7 +14028,7 @@ by-spec."tar"."0.1.17" = self.by-version."tar"."0.1.17"; by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.17"; + name = "node-tar-0.1.17"; src = [ (fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; @@ -13871,7 +14056,7 @@ by-spec."temp"."*" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "temp-0.6.0"; + name = "node-temp-0.6.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; @@ -13897,7 +14082,7 @@ by-spec."tempfile"."~0.1.2" = self.by-version."tempfile"."0.1.2"; by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "tempfile-0.1.2"; + name = "node-tempfile-0.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/tempfile/-/tempfile-0.1.2.tgz"; @@ -13917,7 +14102,7 @@ by-spec."text-table"."~0.1.1" = self.by-version."text-table"."0.1.1"; by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "text-table-0.1.1"; + name = "node-text-table-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/text-table/-/text-table-0.1.1.tgz"; @@ -13936,7 +14121,7 @@ by-spec."text-table"."~0.2.0" = self.by-version."text-table"."0.2.0"; by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "text-table-0.2.0"; + name = "node-text-table-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; @@ -13955,7 +14140,7 @@ by-spec."throttleit"."~0.0.2" = self.by-version."throttleit"."0.0.2"; by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "throttleit-0.0.2"; + name = "node-throttleit-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; @@ -13974,7 +14159,7 @@ by-spec."through"."~2.3.4" = self.by-version."through"."2.3.4"; by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage { - name = "through-2.3.4"; + name = "node-through-2.3.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz"; @@ -13991,20 +14176,20 @@ passthru.names = [ "through" ]; }; by-spec."through2"."~0.4.0" = - self.by-version."through2"."0.4.0"; - by-version."through2"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "through2-0.4.0"; + self.by-version."through2"."0.4.1"; + by-version."through2"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-through2-0.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/through2/-/through2-0.4.0.tgz"; - name = "through2-0.4.0.tgz"; - sha1 = "4c9a96e385ef082a86cce5b915ef512119bc5225"; + url = "http://registry.npmjs.org/through2/-/through2-0.4.1.tgz"; + name = "through2-0.4.1.tgz"; + sha1 = "afd849c65af513c2541a98a7cfbcfec3a15a9686"; }) ]; buildInputs = (self.nativeDeps."through2" or []); deps = [ - self.by-version."readable-stream"."1.0.24" + self.by-version."readable-stream"."1.0.25" self.by-version."xtend"."2.1.2" ]; peerDependencies = [ @@ -14014,7 +14199,7 @@ by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "timespan-2.3.0"; + name = "node-timespan-2.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; @@ -14033,7 +14218,7 @@ by-spec."timezone"."*" = self.by-version."timezone"."0.0.23"; by-version."timezone"."0.0.23" = lib.makeOverridable self.buildNodePackage { - name = "timezone-0.0.23"; + name = "node-timezone-0.0.23"; src = [ (fetchurl { url = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz"; @@ -14053,7 +14238,7 @@ by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "tinycolor-0.0.1"; + name = "node-tinycolor-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; @@ -14083,9 +14268,9 @@ buildInputs = (self.nativeDeps."titanium" or []); deps = [ - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."colors"."0.6.2" - self.by-version."fields"."0.1.11" + self.by-version."fields"."0.1.12" self.by-version."humanize"."0.0.9" self.by-version."jade"."0.35.0" self.by-version."longjohn"."0.2.2" @@ -14107,7 +14292,7 @@ by-spec."tmp"."~0.0.20" = self.by-version."tmp"."0.0.23"; by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage { - name = "tmp-0.0.23"; + name = "node-tmp-0.0.23"; src = [ (fetchurl { url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz"; @@ -14126,7 +14311,7 @@ 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"; + name = "node-touch-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz"; @@ -14146,7 +14331,7 @@ 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 { - name = "tough-cookie-0.12.1"; + name = "node-tough-cookie-0.12.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; @@ -14166,7 +14351,7 @@ by-spec."tough-cookie"."~0.9.15" = self.by-version."tough-cookie"."0.9.15"; by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { - name = "tough-cookie-0.9.15"; + name = "node-tough-cookie-0.9.15"; src = [ (fetchurl { url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; @@ -14183,29 +14368,10 @@ ]; passthru.names = [ "tough-cookie" ]; }; - by-spec."traceback".">=0.3.0 && < 0.4" = - self.by-version."traceback"."0.3.0"; - by-version."traceback"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "traceback-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/traceback/-/traceback-0.3.0.tgz"; - name = "traceback-0.3.0.tgz"; - sha1 = "4e147f07cd332fbd0330ba510b942a5c9256a0ab"; - }) - ]; - buildInputs = - (self.nativeDeps."traceback" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "traceback" ]; - }; by-spec."transformers"."2.1.0" = self.by-version."transformers"."2.1.0"; by-version."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "transformers-2.1.0"; + name = "node-transformers-2.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; @@ -14227,7 +14393,7 @@ 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"; + name = "node-traverse-0.3.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; @@ -14246,7 +14412,7 @@ by-spec."truncate"."~1.0.2" = self.by-version."truncate"."1.0.2"; by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "truncate-1.0.2"; + name = "node-truncate-1.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/truncate/-/truncate-1.0.2.tgz"; @@ -14265,7 +14431,7 @@ by-spec."tunnel-agent"."~0.2.0" = self.by-version."tunnel-agent"."0.2.0"; by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "tunnel-agent-0.2.0"; + name = "node-tunnel-agent-0.2.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; @@ -14284,7 +14450,7 @@ by-spec."tunnel-agent"."~0.3.0" = self.by-version."tunnel-agent"."0.3.0"; by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "tunnel-agent-0.3.0"; + name = "node-tunnel-agent-0.3.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; @@ -14303,7 +14469,7 @@ by-spec."type-detect"."0.1.1" = self.by-version."type-detect"."0.1.1"; by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "type-detect-0.1.1"; + name = "node-type-detect-0.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; @@ -14322,7 +14488,7 @@ by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { - name = "typechecker-2.0.8"; + name = "node-typechecker-2.0.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz"; @@ -14371,7 +14537,7 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = [ - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."source-map"."0.1.31" self.by-version."optimist"."0.3.7" self.by-version."uglify-to-browserify"."1.0.1" @@ -14415,7 +14581,7 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = [ - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."source-map"."0.1.31" self.by-version."optimist"."0.3.7" ]; @@ -14426,20 +14592,20 @@ by-spec."uglify-js"."~2.3.6" = self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.11"; - by-version."uglify-js"."2.4.11" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.11"; + self.by-version."uglify-js"."2.4.12"; + by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.11.tgz"; - name = "uglify-js-2.4.11.tgz"; - sha1 = "ff2c824be664b715c1054e890b4b9027ed45b5c5"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz"; + name = "uglify-js-2.4.12.tgz"; + sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8"; }) ]; buildInputs = (self.nativeDeps."uglify-js" or []); deps = [ - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."source-map"."0.1.31" self.by-version."optimist"."0.3.7" self.by-version."uglify-to-browserify"."1.0.1" @@ -14451,7 +14617,7 @@ by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.1"; by-version."uglify-to-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "uglify-to-browserify-1.0.1"; + name = "node-uglify-to-browserify-1.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.1.tgz"; @@ -14470,7 +14636,7 @@ by-spec."uid-number"."0" = self.by-version."uid-number"."0.0.3"; by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "uid-number-0.0.3"; + name = "node-uid-number-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; @@ -14489,7 +14655,7 @@ by-spec."uid2"."0.0.3" = self.by-version."uid2"."0.0.3"; by-version."uid2"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "uid2-0.0.3"; + name = "node-uid2-0.0.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; @@ -14508,7 +14674,7 @@ by-spec."underscore"."*" = self.by-version."underscore"."1.5.2"; by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.2"; + name = "node-underscore-1.5.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; @@ -14528,7 +14694,7 @@ by-spec."underscore"."1.4.x" = self.by-version."underscore"."1.4.4"; by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.4.4"; + name = "node-underscore-1.4.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; @@ -14546,6 +14712,8 @@ }; by-spec."underscore".">=1.1.7" = self.by-version."underscore"."1.5.2"; + by-spec."underscore".">=1.3.1" = + self.by-version."underscore"."1.5.2"; by-spec."underscore".">=1.4.3" = self.by-version."underscore"."1.5.2"; by-spec."underscore".">=1.5.x" = @@ -14563,7 +14731,7 @@ by-spec."underscore.string"."~2.2.1" = self.by-version."underscore.string"."2.2.1"; by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "underscore.string-2.2.1"; + name = "node-underscore.string-2.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"; @@ -14582,7 +14750,7 @@ by-spec."underscore.string"."~2.3.1" = self.by-version."underscore.string"."2.3.3"; by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage { - name = "underscore.string-2.3.3"; + name = "node-underscore.string-2.3.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; @@ -14603,7 +14771,7 @@ by-spec."unfunk-diff"."~0.0.1" = self.by-version."unfunk-diff"."0.0.2"; by-version."unfunk-diff"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "unfunk-diff-0.0.2"; + name = "node-unfunk-diff-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz"; @@ -14623,33 +14791,32 @@ passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.6.0"; - by-version."ungit"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.6.0"; + self.by-version."ungit"."0.6.1"; + by-version."ungit"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.6.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.6.0.tgz"; - name = "ungit-0.6.0.tgz"; - sha1 = "fffc26cafc5d138bc6b3585fef3f15744f5f3d31"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.6.1.tgz"; + name = "ungit-0.6.1.tgz"; + sha1 = "7fc1527eb183acf65eb72752b9c54324184d6fff"; }) ]; buildInputs = (self.nativeDeps."ungit" or []); deps = [ self.by-version."express"."3.4.8" - self.by-version."superagent"."0.15.7" - self.by-version."lodash"."2.3.0" + self.by-version."superagent"."0.16.0" + self.by-version."lodash"."2.4.1" self.by-version."temp"."0.6.0" self.by-version."socket.io"."0.9.16" - self.by-version."moment"."2.4.0" + self.by-version."moment"."2.5.1" self.by-version."async"."0.2.9" - self.by-version."ssh2"."0.2.16" + self.by-version."ssh2"."0.2.17" self.by-version."rc"."0.3.3" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" - self.by-version."passport"."0.1.17" + self.by-version."passport"."0.1.18" self.by-version."passport-local"."0.1.6" - self.by-version."npm"."1.3.24" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" @@ -14658,21 +14825,25 @@ self.by-version."signals"."1.0.0" self.by-version."hasher"."1.2.0" self.by-version."blueimp-md5"."1.1.0" - self.by-version."color"."0.4.4" - self.by-version."keen.io"."0.0.3" + self.by-version."color"."0.5.0" + self.by-version."keen.io"."0.0.4" self.by-version."getmac"."1.0.6" - self.by-version."deep-extend"."0.2.6" - self.by-version."raven"."0.6.0" + self.by-version."deep-extend"."0.2.8" + self.by-version."raven"."0.6.1" + self.by-version."knockout"."3.0.0" + self.by-version."npm-registry-client"."0.3.5" + self.by-version."npmconf"."0.1.12" + self.by-version."mkdirp"."0.3.5" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.6.0"; + "ungit" = self.by-version."ungit"."0.6.1"; by-spec."update-notifier"."~0.1.3" = self.by-version."update-notifier"."0.1.7"; by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "update-notifier-0.1.7"; + name = "node-update-notifier-0.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.7.tgz"; @@ -14697,7 +14868,7 @@ by-spec."useragent"."~2.0.4" = self.by-version."useragent"."2.0.7"; by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage { - name = "useragent-2.0.7"; + name = "node-useragent-2.0.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz"; @@ -14717,7 +14888,7 @@ by-spec."util"."0.10.2" = self.by-version."util"."0.10.2"; by-version."util"."0.10.2" = lib.makeOverridable self.buildNodePackage { - name = "util-0.10.2"; + name = "node-util-0.10.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/util/-/util-0.10.2.tgz"; @@ -14737,7 +14908,7 @@ by-spec."util"."0.4.9" = self.by-version."util"."0.4.9"; by-version."util"."0.4.9" = lib.makeOverridable self.buildNodePackage { - name = "util-0.4.9"; + name = "node-util-0.4.9"; src = [ (fetchurl { url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz"; @@ -14757,7 +14928,7 @@ by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "utile-0.1.7"; + name = "node-utile-0.1.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; @@ -14769,7 +14940,7 @@ (self.nativeDeps."utile" or []); deps = [ self.by-version."async"."0.1.22" - self.by-version."deep-equal"."0.1.2" + self.by-version."deep-equal"."0.2.1" self.by-version."i"."0.3.2" self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.2.7" @@ -14782,7 +14953,7 @@ by-spec."utile"."0.2.1" = self.by-version."utile"."0.2.1"; by-version."utile"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "utile-0.2.1"; + name = "node-utile-0.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; @@ -14793,8 +14964,8 @@ buildInputs = (self.nativeDeps."utile" or []); deps = [ - self.by-version."async"."0.2.9" - self.by-version."deep-equal"."0.1.2" + self.by-version."async"."0.2.10" + self.by-version."deep-equal"."0.2.1" self.by-version."i"."0.3.2" self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.4.2" @@ -14813,7 +14984,7 @@ by-spec."uuid"."1.4.1" = self.by-version."uuid"."1.4.1"; by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "uuid-1.4.1"; + name = "node-uuid-1.4.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/uuid/-/uuid-1.4.1.tgz"; @@ -14834,7 +15005,7 @@ by-spec."validator"."0.4.x" = self.by-version."validator"."0.4.28"; by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage { - name = "validator-0.4.28"; + name = "node-validator-0.4.28"; src = [ (fetchurl { url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; @@ -14853,7 +15024,7 @@ by-spec."vargs"."~0.1.0" = self.by-version."vargs"."0.1.0"; by-version."vargs"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "vargs-0.1.0"; + name = "node-vargs-0.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"; @@ -14872,7 +15043,7 @@ by-spec."vasync"."1.3.3" = self.by-version."vasync"."1.3.3"; by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage { - name = "vasync-1.3.3"; + name = "node-vasync-1.3.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz"; @@ -14893,7 +15064,7 @@ by-spec."verror"."1.1.0" = self.by-version."verror"."1.1.0"; by-version."verror"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "verror-1.1.0"; + name = "node-verror-1.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz"; @@ -14913,7 +15084,7 @@ by-spec."verror"."1.3.3" = self.by-version."verror"."1.3.3"; by-version."verror"."1.3.3" = lib.makeOverridable self.buildNodePackage { - name = "verror-1.3.3"; + name = "node-verror-1.3.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz"; @@ -14933,7 +15104,7 @@ by-spec."verror"."1.3.6" = self.by-version."verror"."1.3.6"; by-version."verror"."1.3.6" = lib.makeOverridable self.buildNodePackage { - name = "verror-1.3.6"; + name = "node-verror-1.3.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; @@ -14953,7 +15124,7 @@ by-spec."view-helpers"."*" = self.by-version."view-helpers"."0.1.4"; by-version."view-helpers"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "view-helpers-0.1.4"; + name = "node-view-helpers-0.1.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.4.tgz"; @@ -14992,9 +15163,30 @@ passthru.names = [ "vows" ]; }; by-spec."walk"."*" = + self.by-version."walk"."2.3.1"; + by-version."walk"."2.3.1" = lib.makeOverridable self.buildNodePackage { + name = "node-walk-2.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/walk/-/walk-2.3.1.tgz"; + name = "walk-2.3.1.tgz"; + sha1 = "015e0ef7a636ac43185661a9673d459572a44050"; + }) + ]; + buildInputs = + (self.nativeDeps."walk" or []); + deps = [ + self.by-version."forEachAsync"."2.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "walk" ]; + }; + "walk" = self.by-version."walk"."2.3.1"; + by-spec."walk"."~2.2.1" = self.by-version."walk"."2.2.1"; by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "walk-2.2.1"; + name = "node-walk-2.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz"; @@ -15011,13 +15203,10 @@ ]; passthru.names = [ "walk" ]; }; - "walk" = self.by-version."walk"."2.2.1"; - by-spec."walk"."~2.2.1" = - self.by-version."walk"."2.2.1"; by-spec."watch"."0.5.x" = self.by-version."watch"."0.5.1"; by-version."watch"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "watch-0.5.1"; + name = "node-watch-0.5.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz"; @@ -15036,7 +15225,7 @@ by-spec."watch"."~0.8.0" = self.by-version."watch"."0.8.0"; by-version."watch"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "watch-0.8.0"; + name = "node-watch-0.8.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/watch/-/watch-0.8.0.tgz"; @@ -15053,25 +15242,25 @@ passthru.names = [ "watch" ]; }; by-spec."wd"."~0.2.8" = - self.by-version."wd"."0.2.8"; - by-version."wd"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.2.8"; + self.by-version."wd"."0.2.10"; + by-version."wd"."0.2.10" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.2.8.tgz"; - name = "wd-0.2.8.tgz"; - sha1 = "397ccb8058e72af3ae6e7c485f4368f4fb514631"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.10.tgz"; + name = "wd-0.2.10.tgz"; + sha1 = "c4ac58eff5f32cc8e79e8f272a4c365c4240a68e"; }) ]; buildInputs = (self.nativeDeps."wd" or []); deps = [ - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."vargs"."0.1.0" - self.by-version."q"."0.9.7" - self.by-version."request"."2.21.0" - self.by-version."archiver"."0.4.10" - self.by-version."lodash"."1.3.1" + self.by-version."q"."1.0.0" + self.by-version."request"."2.33.0" + self.by-version."archiver"."0.5.2" + self.by-version."lodash"."2.4.1" self.by-version."underscore.string"."2.3.3" ]; peerDependencies = [ @@ -15096,7 +15285,7 @@ self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" self.by-version."npmconf"."0.1.12" - self.by-version."phantomjs"."1.9.2-6" + self.by-version."phantomjs"."1.9.7-1" self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" ]; @@ -15108,7 +15297,7 @@ by-spec."websocket-driver".">=0.3.0" = self.by-version."websocket-driver"."0.3.2"; by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.3.2"; + name = "node-websocket-driver-0.3.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.2.tgz"; @@ -15129,7 +15318,7 @@ by-spec."when"."~2.2.1" = self.by-version."when"."2.2.1"; by-version."when"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "when-2.2.1"; + name = "node-when-2.2.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/when/-/when-2.2.1.tgz"; @@ -15194,7 +15383,7 @@ by-spec."winston"."*" = self.by-version."winston"."0.7.2"; by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "winston-0.7.2"; + name = "node-winston-0.7.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; @@ -15205,13 +15394,13 @@ buildInputs = (self.nativeDeps."winston" or []); deps = [ - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."colors"."0.6.2" self.by-version."cycle"."1.0.3" self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.3.0" self.by-version."request"."2.16.6" - self.by-version."stack-trace"."0.0.7" + self.by-version."stack-trace"."0.0.8" ]; peerDependencies = [ ]; @@ -15221,7 +15410,7 @@ by-spec."winston"."0.6.2" = self.by-version."winston"."0.6.2"; by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "winston-0.6.2"; + name = "node-winston-0.6.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; @@ -15238,7 +15427,7 @@ self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.2.3" self.by-version."request"."2.9.203" - self.by-version."stack-trace"."0.0.7" + self.by-version."stack-trace"."0.0.8" ]; peerDependencies = [ ]; @@ -15253,7 +15442,7 @@ by-spec."wiredep"."~0.4.2" = self.by-version."wiredep"."0.4.2"; by-version."wiredep"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "wiredep-0.4.2"; + name = "node-wiredep-0.4.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/wiredep/-/wiredep-0.4.2.tgz"; @@ -15274,7 +15463,7 @@ by-spec."with"."~1.1.0" = self.by-version."with"."1.1.1"; by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "with-1.1.1"; + name = "node-with-1.1.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz"; @@ -15294,7 +15483,7 @@ by-spec."with"."~2.0.0" = self.by-version."with"."2.0.0"; by-version."with"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "with-2.0.0"; + name = "node-with-2.0.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz"; @@ -15314,7 +15503,7 @@ by-spec."wordwrap"."0.0.x" = self.by-version."wordwrap"."0.0.2"; by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "wordwrap-0.0.2"; + name = "node-wordwrap-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; @@ -15337,7 +15526,7 @@ by-spec."wrench"."~1.4.3" = self.by-version."wrench"."1.4.4"; by-version."wrench"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "wrench-1.4.4"; + name = "node-wrench-1.4.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/wrench/-/wrench-1.4.4.tgz"; @@ -15356,7 +15545,7 @@ by-spec."wrench"."~1.5.0" = self.by-version."wrench"."1.5.6"; by-version."wrench"."1.5.6" = lib.makeOverridable self.buildNodePackage { - name = "wrench-1.5.6"; + name = "node-wrench-1.5.6"; src = [ (fetchurl { url = "http://registry.npmjs.org/wrench/-/wrench-1.5.6.tgz"; @@ -15400,7 +15589,7 @@ by-spec."wu"."*" = self.by-version."wu"."0.1.8"; by-version."wu"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "wu-0.1.8"; + name = "node-wu-0.1.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/wu/-/wu-0.1.8.tgz"; @@ -15420,7 +15609,7 @@ by-spec."x509"."*" = self.by-version."x509"."0.0.7"; by-version."x509"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "x509-0.0.7"; + name = "node-x509-0.0.7"; src = [ (fetchurl { url = "http://registry.npmjs.org/x509/-/x509-0.0.7.tgz"; @@ -15440,7 +15629,7 @@ by-spec."xml2js"."0.2.4" = self.by-version."xml2js"."0.2.4"; by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "xml2js-0.2.4"; + name = "node-xml2js-0.2.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz"; @@ -15460,7 +15649,7 @@ by-spec."xml2js"."0.2.x" = self.by-version."xml2js"."0.2.8"; by-version."xml2js"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "xml2js-0.2.8"; + name = "node-xml2js-0.2.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; @@ -15480,7 +15669,7 @@ by-spec."xml2js".">= 0.0.1" = self.by-version."xml2js"."0.4.1"; by-version."xml2js"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "xml2js-0.4.1"; + name = "node-xml2js-0.4.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.1.tgz"; @@ -15503,7 +15692,7 @@ by-spec."xmlbuilder"."0.4.2" = self.by-version."xmlbuilder"."0.4.2"; by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-0.4.2"; + name = "node-xmlbuilder-0.4.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; @@ -15522,7 +15711,7 @@ by-spec."xmlbuilder".">=0.4.2" = self.by-version."xmlbuilder"."2.1.0"; by-version."xmlbuilder"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-2.1.0"; + name = "node-xmlbuilder-2.1.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.1.0.tgz"; @@ -15540,14 +15729,14 @@ passthru.names = [ "xmlbuilder" ]; }; by-spec."xmldom"."~0.1.16" = - self.by-version."xmldom"."0.1.18"; - by-version."xmldom"."0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "xmldom-0.1.18"; + self.by-version."xmldom"."0.1.19"; + by-version."xmldom"."0.1.19" = lib.makeOverridable self.buildNodePackage { + name = "node-xmldom-0.1.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.18.tgz"; - name = "xmldom-0.1.18.tgz"; - sha1 = "cb0ca87d81106ea4e75f632c9fff044d9cd3394a"; + url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; + name = "xmldom-0.1.19.tgz"; + sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; }) ]; buildInputs = @@ -15561,7 +15750,7 @@ by-spec."xmlhttprequest"."1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { - name = "xmlhttprequest-1.4.2"; + name = "node-xmlhttprequest-1.4.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; @@ -15580,7 +15769,7 @@ by-spec."xoauth2"."~0.1" = self.by-version."xoauth2"."0.1.8"; by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "xoauth2-0.1.8"; + name = "node-xoauth2-0.1.8"; src = [ (fetchurl { url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; @@ -15599,7 +15788,7 @@ by-spec."xtend"."~2.1.1" = self.by-version."xtend"."2.1.2"; by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage { - name = "xtend-2.1.2"; + name = "node-xtend-2.1.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; @@ -15619,7 +15808,7 @@ by-spec."yaml"."0.2.3" = self.by-version."yaml"."0.2.3"; by-version."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "yaml-0.2.3"; + name = "node-yaml-0.2.3"; src = [ (fetchurl { url = "http://registry.npmjs.org/yaml/-/yaml-0.2.3.tgz"; @@ -15638,7 +15827,7 @@ by-spec."yeoman-generator"."~0.13.0" = self.by-version."yeoman-generator"."0.13.4"; by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.13.4"; + name = "node-yeoman-generator-0.13.4"; src = [ (fetchurl { url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; @@ -15662,7 +15851,7 @@ self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."inquirer"."0.3.5" self.by-version."iconv-lite"."0.2.11" self.by-version."shelljs"."0.1.4" @@ -15677,7 +15866,7 @@ by-spec."yeoman-generator"."~0.14.0" = self.by-version."yeoman-generator"."0.14.2"; by-version."yeoman-generator"."0.14.2" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.14.2"; + name = "node-yeoman-generator-0.14.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.2.tgz"; @@ -15699,7 +15888,7 @@ self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."inquirer"."0.3.5" self.by-version."iconv-lite"."0.2.11" self.by-version."shelljs"."0.2.6" @@ -15717,7 +15906,7 @@ by-spec."yeoman-generator"."~0.16.0" = self.by-version."yeoman-generator"."0.16.0"; by-version."yeoman-generator"."0.16.0" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.16.0"; + name = "node-yeoman-generator-0.16.0"; src = [ (fetchurl { url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz"; @@ -15737,9 +15926,9 @@ self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.8" self.by-version."debug"."0.7.4" - self.by-version."isbinaryfile"."2.0.0" + self.by-version."isbinaryfile"."2.0.1" self.by-version."dargs"."0.1.0" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."inquirer"."0.4.0" self.by-version."iconv-lite"."0.2.11" self.by-version."shelljs"."0.2.6" @@ -15775,14 +15964,14 @@ self.by-version."update-notifier"."0.1.7" self.by-version."insight"."0.3.0" self.by-version."sudo-block"."0.3.0" - self.by-version."async"."0.2.9" + self.by-version."async"."0.2.10" self.by-version."open"."0.0.4" self.by-version."chalk"."0.4.0" self.by-version."findup"."0.1.3" self.by-version."shelljs"."0.2.6" ]; peerDependencies = [ - self.by-version."grunt-cli"."0.1.11" + self.by-version."grunt-cli"."0.1.13" self.by-version."bower"."1.2.8" ]; passthru.names = [ "yo" ]; @@ -15795,7 +15984,7 @@ by-spec."zeparser"."0.0.5" = self.by-version."zeparser"."0.0.5"; by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "zeparser-0.0.5"; + name = "node-zeparser-0.0.5"; src = [ (fetchurl { url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; @@ -15811,10 +16000,31 @@ ]; passthru.names = [ "zeparser" ]; }; + by-spec."zip-stream"."~0.1.0" = + self.by-version."zip-stream"."0.1.3"; + by-version."zip-stream"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-zip-stream-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.3.tgz"; + name = "zip-stream-0.1.3.tgz"; + sha1 = "06d8787133ab397ab60ef6ee688d76dd5fb10de1"; + }) + ]; + buildInputs = + (self.nativeDeps."zip-stream" or []); + deps = [ + self.by-version."readable-stream"."1.1.10" + self.by-version."lodash.defaults"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "zip-stream" ]; + }; by-spec."zlib-browserify"."0.0.1" = self.by-version."zlib-browserify"."0.0.1"; by-version."zlib-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "zlib-browserify-0.0.1"; + name = "node-zlib-browserify-0.0.1"; src = [ (fetchurl { url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.1.tgz"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9e609af514b..0041d7dbd58 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3712,10 +3712,10 @@ let self = _self // overrides; _self = with self; { }; GraphViz = buildPerlPackage rec { - name = "GraphViz-2.04"; + name = "GraphViz-2.15"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz"; - sha256 = "1gxpajd49pb9w9ka7nq5477my8snp3myrgiarnk6hj922jpn62xd"; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; + sha256 = "0ngm90vd1ymrm2c9k4dbgzpbip501gklll32l9jsj8j00x845iz2"; }; # XXX: It'd be nicer it `GraphViz.pm' could record the path to graphviz.