From 84a94ff0064cacbfba55e5f2eb59461f68235e97 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Apr 2014 17:46:12 -0500 Subject: [PATCH 001/424] network-interfaces: Add an option for specifying search to resolv.conf --- nixos/modules/tasks/network-interfaces.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9cc8b154324f..991f9f261450 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -183,6 +183,15 @@ in ''; }; + networking.search = mkOption { + default = []; + example = [ "example.com" "local.domain" ]; + type = types.listOf types.str; + description = '' + The list of search paths used when resolving domain names. + ''; + }; + networking.domain = mkOption { default = ""; example = "home"; @@ -424,6 +433,7 @@ in ${optionalString (cfg.nameservers != [] && cfg.domain != "") '' domain ${cfg.domain} ''} + ${optionalString (cfg.search != []) ("search " + concatStringsSep " " cfg.search)} ${flip concatMapStrings cfg.nameservers (ns: '' nameserver ${ns} '')} From cd1b48bc3541a800f49ca154b475796f4241dc3f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 25 Apr 2014 01:56:36 +0200 Subject: [PATCH 002/424] nixos: Add zram swap module This allows you to use the Linux kernel's built-in compressed memory as swap space functionality. It is recommended to enable only for kernel 3.14 (which is when zram came out of the staging drivers area) or higher. --- nixos/modules/config/zram.nix | 138 ++++++++++++++++++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 139 insertions(+) create mode 100644 nixos/modules/config/zram.nix diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix new file mode 100644 index 000000000000..22b74847f871 --- /dev/null +++ b/nixos/modules/config/zram.nix @@ -0,0 +1,138 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.zramSwap; + + devices = map (nr: "zram${toString nr}") (range 0 (cfg.numDevices - 1)); + + modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; + +in + +{ + + ###### interface + + options = { + + zramSwap = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable in-memory compressed swap space provided by the zram kernel + module. It is recommended to enable only for kernel 3.14 or higher. + ''; + }; + + numDevices = mkOption { + default = 4; + type = types.int; + description = '' + Number of zram swap devices to create. It should be equal to the + number of CPU cores your system has. + ''; + }; + + memoryPercent = mkOption { + default = 50; + type = types.int; + description = '' + Maximum amount of memory that can be used by the zram swap devices + (as a percentage of your total memory). Defaults to 1/2 of your total + RAM. + ''; + }; + + priority = mkOption { + default = 5; + type = types.int; + description = '' + Priority of the zram swap devices. It should be a number higher than + the priority of your disk-based swap devices (so that the system will + fill the zram swap devices before falling back to disk swap). + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isModule "ZRAM") + ]; + + # Disabling this for the moment, as it would create and mkswap devices twice, + # once in stage 2 boot, and again when the zram-reloader service starts. + # boot.kernelModules = [ "zram" ]; + + boot.extraModprobeConfig = '' + options zram num_devices=${toString cfg.numDevices} + ''; + + services.udev.extraRules = '' + KERNEL=="zram[0-9]*", ENV{SYSTEMD_WANTS}="zram-init-%k.service", TAG+="systemd" + ''; + + systemd.services = + let + createZramInitService = dev: + nameValuePair "zram-init-${dev}" { + description = "Init swap on zram-based device ${dev}"; + bindsTo = [ "dev-${dev}.swap" ]; + after = [ "dev-${dev}.device" "zram-reloader.service" ]; + requires = [ "dev-${dev}.device" "zram-reloader.service" ]; + before = [ "dev-${dev}.swap" ]; + requiredBy = [ "dev-${dev}.swap" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStop = "${pkgs.stdenv.shell} -c 'echo 1 > /sys/class/block/${dev}/reset'"; + }; + script = '' + set -u + set -o pipefail + + PATH=${pkgs.procps}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin + + # Calculate memory to use for zram + totalmem=$(free | grep -e "^Mem:" | sed -e 's/^Mem: *//' -e 's/ *.*//') + mem=$(((totalmem * ${toString cfg.memoryPercent} / 100 / ${toString cfg.numDevices}) * 1024)) + + echo $mem > /sys/class/block/${dev}/disksize + ${pkgs.utillinux}/sbin/mkswap /dev/${dev} + ''; + restartIfChanged = false; + }; + in listToAttrs ((map createZramInitService devices) ++ [(nameValuePair "zram-reloader" + { + description = "Reload zram kernel module when number of devices changes"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStartPre = "${modprobe} -r zram"; + ExecStart = "${modprobe} zram"; + ExecStop = "${modprobe} -r zram"; + }; + restartTriggers = [ cfg.numDevices ]; + restartIfChanged = true; + })]); + + swapDevices = + let + useZramSwap = dev: + { + device = "/dev/${dev}"; + priority = cfg.priority; + }; + in map useZramSwap devices; + + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f98b621111fd..2b6bbdc75720 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -20,6 +20,7 @@ ./config/timezone.nix ./config/unix-odbc-drivers.nix ./config/users-groups.nix + ./config/zram.nix ./hardware/all-firmware.nix ./hardware/cpu/intel-microcode.nix ./hardware/cpu/amd-microcode.nix From e2e77950f3f1ca560fbffe4351b98a9e75c4c685 Mon Sep 17 00:00:00 2001 From: Maxim Ivanov Date: Tue, 6 May 2014 22:41:49 +0100 Subject: [PATCH 003/424] Scatter output hook This hook allows to scatter files in $out to multiple outputs. For "bin" and "doc" outputs there are prefefined default masks, but they can be overriden by setting files_, for example: files_bin = [ "/bin/*" "/lib/libexec/" ]; To make an effect hook must be specified in buildInputs. --- .../setup-hooks/scatter_output.sh | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/build-support/setup-hooks/scatter_output.sh diff --git a/pkgs/build-support/setup-hooks/scatter_output.sh b/pkgs/build-support/setup-hooks/scatter_output.sh new file mode 100644 index 000000000000..79118392094d --- /dev/null +++ b/pkgs/build-support/setup-hooks/scatter_output.sh @@ -0,0 +1,56 @@ +preFixupPhases+=" scatter_files" +preDistPhases+=" propagate_bin_input" + +SCATTER_BIN_DEFAULT=${SCATTER_BIN_DEFAULT:-"/lib/*.so* /bin/*"} +SCATTER_DOC_DEFAULT=${SCATTER_DOC_DEFAULT:-"/share/man/* /share/doc/*"} + + +scatter_files() { + save_nullglob=$(shopt -p nullglob) + for o in $outputs; do + [[ "$o" == "out" ]] && continue + v=files_${o} + + #if files_'output' isn't set in derivative, use defualts for some + [[ ${!v} ]] || { + case $o in + bin) + v=SCATTER_BIN_DEFAULT + ;; + doc) + v=SCATTER_DOC_DEFAULT + ;; + *) + continue + ;; + esac + } + + # prepend each path with $out + paths=$out${!v// \// $out/} + shopt -s nullglob + for f in $paths; do + shopt -u nullglob + dist=${!o}${f#$out} + mkdir -p $(dirname $dist) + cp -pr $f $dist + # remove source, not forgetting to clean empty dirs + rm -r $f + rmdir --ignore-fail-on-non-empty $(dirname $f) + done + find ${!o} -type f -exec /bin/sh -c 'patchelf --set-rpath $(patchelf --print-rpath {} 2>/dev/null):'${!o}'/lib {} 2>/dev/null && patchelf --shrink-rpath {}' \; + done + eval $save_nullglob +} + +propagate_bin_input() { + if [[ -n ${bin:-} ]]; then + mkdir -p $out/nix-support + echo $bin >> $out/nix-support/propagated-native-build-inputs + fi + + if [[ -n ${bin:-} && -n ${doc:-} ]]; then + mkdir -p $bin/nix-support + echo $doc >> $bin/nix-support/propagated-user-env-packages + fi +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc38595d3903..5a74ba45e911 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -278,6 +278,8 @@ let dotnetfx = dotnetfx40; }; + scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh; + vsenv = callPackage ../build-support/vsenv { vs = vs90wrapper; }; From 9e685556f2b544c88e95ddf703bbe04002283007 Mon Sep 17 00:00:00 2001 From: Maxim Ivanov Date: Tue, 6 May 2014 22:42:21 +0100 Subject: [PATCH 004/424] make use of new extractRuntimeHook --- pkgs/development/libraries/libmsgpack/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index 26dc6be8382c..ab9dbd48ea4e 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, ruby }: +{ stdenv, fetchurl, autoconf, automake, libtool, ruby, scatterOutputHook }: stdenv.mkDerivation rec { version = "0.5.8"; @@ -9,17 +9,18 @@ stdenv.mkDerivation rec { sha256 = "1h6k9kdbfavmw3by5kk3raszwa64hn9k8yw9rdhvl5m8g2lks89k"; }; + nativeBuildInputs = [ scatterOutputHook ]; buildInputs = [ autoconf automake libtool ruby ]; - outputs = [ "out" "lib" ]; + outputs = [ "out" "bin" ]; - preConfigure = "./bootstrap"; - - postInstall = '' - mkdir -p $lib/lib - mv $out/lib/*.so.* $lib/lib/ + preConfigure = '' + sed -i s,glibtoolize,libtoolize, ./bootstrap + ./bootstrap ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; homepage = http://msgpack.org; From b4be4e5270b04c68be612d6c2f22a2f72107ca50 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 14 May 2014 11:31:37 +1000 Subject: [PATCH 005/424] pycrypto: fix build on darwin --- pkgs/development/python-modules/pycrypto/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index 5da727a08db1..3cf877259ec5 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -11,9 +11,12 @@ buildPythonPackage rec { buildInputs = [ gmp ]; + # error: AF_UNIX path too long + doCheck = !stdenv.isDarwin; + meta = { homepage = "http://www.pycrypto.org/"; description = "Python Cryptography Toolkit"; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } From 1e752993db06f7c3498cb14f0b0c875c87329152 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 14 May 2014 11:31:43 +1000 Subject: [PATCH 006/424] weechat: fix build on darwin --- pkgs/applications/networking/irc/weechat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b47018e0d970..7a6428fb285d 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { # then. patches = [ ./fix-gnutls-32.diff ]; + NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7"; + postInstall = '' wrapProgram "$out/bin/weechat" \ --prefix PYTHONPATH : "$PYTHONPATH" \ @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; + platforms = stdenv.lib.platforms.unix; }; } From fa7a3d47204aa163ee93529a194cca33b70a8d3b Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 14 May 2014 14:44:28 +1000 Subject: [PATCH 007/424] pythonPackages.pync: add expression --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e51bc9e9440c..c3a99a8f7469 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9173,4 +9173,33 @@ rec { }; }; + pync = buildPythonPackage rec { + version = "1.4"; + baseName = "pync"; + name = "${baseName}-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/${baseName}/${name}.tar.gz"; + md5 = "5cc79077f386a17b539f1e51c05a3650"; + }; + + buildInputs = [ pkgs.coreutils ]; + + propagatedBuildInputs = [ dateutil ]; + + preInstall = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.rubyLibs.terminal_notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py + ''; + + meta = with stdenv.lib; { + description = "Python Wrapper for Mac OS 10.8 Notification Center"; + homepage = https://pypi.python.org/pypi/pync/1.4; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = [ maintainers.lovek323 ]; + }; + }; + + + }); in pythonPackages From 1c1ce3868b1436fa34d529c77d55cebff71d372e Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 14 May 2014 14:46:39 +1000 Subject: [PATCH 008/424] weechat: support notification_center.py script --- .../networking/irc/weechat/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 7a6428fb285d..78b497364a5e 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper - cacert cmake - ]; + cacert cmake ] + ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; # This patch is based on # weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes @@ -27,9 +27,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7"; postInstall = '' - wrapProgram "$out/bin/weechat" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" + NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" + '' + '' + wrapProgram "$out/bin/weechat" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" ''; meta = { From 1048dbc33c399dbcc22b75eeca446add8c75f7d3 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 15 May 2014 08:26:24 +1000 Subject: [PATCH 009/424] weechatDevel: update to latest --- .../networking/irc/weechat/devel.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index cf52838b78cc..7adfbb0f8e0e 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,33 +3,39 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "6f64ee699ba46c90b55d3b99c60e4807819e2b7b"; + rev = "85b8e0d82bf99ca2c55a87482ee40b3043df14db"; version = "0.4.4-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; - url = "git://github.com/weechat/weechat.git"; - sha256 = "1w58gir48kxvscf6njy3kmfxbjlnsf2byw3g3w6r47zjkgyxcf1z"; + url = "git://github.com/weechat/weechat.git"; + sha256 = "0kzsar7gmw2sgkdzcspg65prii8skpaqxvdyvas2a29dr07j2gnl"; }; buildInputs = [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper - cacert cmake - ]; + cacert cmake ] + ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; + + NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7"; postInstall = '' - wrapProgram "$out/bin/weechat" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" + NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" + '' + '' + wrapProgram "$out/bin/weechat" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" ''; meta = { - homepage = http://www.weechat.org/; + homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ]; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; + platforms = stdenv.lib.platforms.unix; }; } From 4debe3c9276d03a0edc16aa41095053af955cd33 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 15 May 2014 08:27:40 +1000 Subject: [PATCH 010/424] weechat: do not hard code python prefix --- pkgs/applications/networking/irc/weechat/default.nix | 2 +- pkgs/applications/networking/irc/weechat/devel.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 78b497364a5e..5e5cf8d9002f 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # then. patches = [ ./fix-gnutls-32.diff ]; - NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7"; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; postInstall = '' NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index 7adfbb0f8e0e..b858203b0f8c 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cacert cmake ] ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; - NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7"; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; postInstall = '' NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" From 71b923fa74c4f04abb3e60cf252867b62edeb26a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 17 May 2014 12:10:07 +0200 Subject: [PATCH 011/424] systemd: fix python support --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 522907e2aee2..3445c3cd2dd3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -2,13 +2,13 @@ , xz, pam, acl, cryptsetup, libuuid, m4, utillinux , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl , kexectools, libmicrohttpd, linuxHeaders -, python ? null, pythonSupport ? false +, pythonPackages ? null, pythonSupport ? false , autoreconfHook }: assert stdenv.isLinux; -assert pythonSupport -> python != null; +assert pythonSupport -> pythonPackages != null; stdenv.mkDerivation rec { version = "212"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl libmicrohttpd linuxHeaders autoreconfHook - ] ++ stdenv.lib.optional pythonSupport python; + ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml]; configureFlags = [ "--localstatedir=/var" From 0ebc2e75f130048e6e4aad99cce5ff467412f3cf Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Wed, 21 May 2014 09:36:29 +0200 Subject: [PATCH 012/424] ansible: add package --- pkgs/tools/system/ansible/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/system/ansible/default.nix diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix new file mode 100644 index 000000000000..4d12801b87ad --- /dev/null +++ b/pkgs/tools/system/ansible/default.nix @@ -0,0 +1,27 @@ +{ stdenv, pythonPackages, fetchurl, python }: + +pythonPackages.buildPythonPackage rec { + name = "ansible-1.6.1"; + namePrefix = ""; + + src = fetchurl { + url = "https://github.com/ansible/ansible/archive/v1.6.1.tar.gz"; + sha256 = "1iz1q2h0zll4qsxk0pndc59knasw663kv53sm21q57qz7lf30q9z"; + }; + + prePatch = '' + sed -i "s,\/usr\/share\/ansible\/,$out/share/ansible," lib/ansible/constants.py + ''; + + doCheck = false; + + pythonPath = with pythonPackages; [ + paramiko jinja2 pyyaml httplib2 + ]; + + meta = { + homepage = "http://www.ansible.com"; + description = "Ansible simple automation tool"; + license = "GPLv3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70cab717c169..cdabeae8420a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11046,5 +11046,7 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; + ansible = callPackage ../tools/system/ansible { }; + }; in self; in pkgs From 92d8001c255f6ab98365d0e60be4f13f6b014a7a Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Wed, 21 May 2014 09:41:48 +0200 Subject: [PATCH 013/424] ansible: Add maintainer --- lib/maintainers.nix | 1 + pkgs/tools/system/ansible/default.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 80d0bed23dce..f49d8485ad10 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -98,4 +98,5 @@ zef = "Zef Hemel "; zimbatm = "zimbatm "; zoomulator = "Kim Simmons "; + joamaki = "Jussi Maki "; } diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 4d12801b87ad..31d8bf40f51c 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -22,6 +22,8 @@ pythonPackages.buildPythonPackage rec { meta = { homepage = "http://www.ansible.com"; description = "Ansible simple automation tool"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.joamaki ]; + platforms = stdenv.lib.platforms.linux; # Only tested on Linux }; } From 75cb4857180b2afbcee7e12273ad87928c4d4395 Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Wed, 21 May 2014 14:46:37 +0200 Subject: [PATCH 014/424] ansible: conventions, fix module execution --- lib/maintainers.nix | 3 +- .../python-modules/generic/default.nix | 3 +- pkgs/tools/system/ansible/default.nix | 28 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f49d8485ad10..2af2e65a0d58 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,6 +43,7 @@ iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; + joamaki = "Jussi Maki "; jwiegley = "John Wiegley "; kkallio = "Karn Kallio "; ktosiek = "Tomasz Kontusz "; @@ -98,5 +99,5 @@ zef = "Zef Hemel "; zimbatm = "zimbatm "; zoomulator = "Kim Simmons "; - joamaki = "Jussi Maki "; + } diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 9dedd3ceae73..59b18d772cf4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -135,8 +135,7 @@ python.stdenv.mkDerivation (attrs // { runHook postInstall ''; - postFixup = - '' + postFixup = attrs.postFixup or '' wrapPythonPrograms # If a user installs a Python package, they probably also wants its diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 31d8bf40f51c..241bd75fd292 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,11 +1,12 @@ -{ stdenv, pythonPackages, fetchurl, python }: +{ stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - name = "ansible-1.6.1"; + version = "1.6.1"; + name = "ansible-${version}"; namePrefix = ""; - + src = fetchurl { - url = "https://github.com/ansible/ansible/archive/v1.6.1.tar.gz"; + url = "https://github.com/ansible/ansible/archive/v${version}.tar.gz"; sha256 = "1iz1q2h0zll4qsxk0pndc59knasw663kv53sm21q57qz7lf30q9z"; }; @@ -14,16 +15,23 @@ pythonPackages.buildPythonPackage rec { ''; doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = true; - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ paramiko jinja2 pyyaml httplib2 ]; - meta = { + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + meta = with stdenv.lib; { homepage = "http://www.ansible.com"; - description = "Ansible simple automation tool"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.joamaki ]; - platforms = stdenv.lib.platforms.linux; # Only tested on Linux + description = "A simple automation tool"; + license = licenses.gpl3; + maintainers = [ maintainers.joamaki ]; + platforms = platforms.linux; # Only tested on Linux }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdabeae8420a..5d2249ff3338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3647,6 +3647,8 @@ let ### DEVELOPMENT / TOOLS + ansible = callPackage ../tools/system/ansible { }; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3 = callPackage ../development/tools/parsing/antlr { }; @@ -11046,7 +11048,5 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; - ansible = callPackage ../tools/system/ansible { }; - }; in self; in pkgs From 128636ff242a7eee77cf0b6c640f184e0a2b0a1a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 23 May 2014 10:18:03 +0200 Subject: [PATCH 015/424] Added an option to configure sensitivity and speed of trackpoints. --- nixos/modules/module-list.nix | 1 + nixos/modules/tasks/trackpoint.nix | 66 ++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 nixos/modules/tasks/trackpoint.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f98b621111fd..a7f121bc7c2b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -317,6 +317,7 @@ ./tasks/network-interfaces.nix ./tasks/scsi-link-power-management.nix ./tasks/swraid.nix + ./tasks/trackpoint.nix ./testing/service-runner.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix new file mode 100644 index 000000000000..4be2c3eb4c47 --- /dev/null +++ b/nixos/modules/tasks/trackpoint.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + + options = { + + hardware.trackpoint = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable sensitivity and speed configuration for trackpoints. + ''; + }; + + sensitivity = mkOption { + default = 128; + example = 255; + type = types.int; + description = '' + Configure the trackpoint sensitivity. By default, the kernel + configures 128. + ''; + }; + + speed = mkOption { + default = 97; + example = 255; + type = types.int; + description = '' + Configure the trackpoint sensitivity. By default, the kernel + configures 97. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf config.hardware.trackpoint.enable { + + jobs.trackpoint = + { description = "Initialize trackpoint"; + + startOn = "started udev"; + + task = true; + + script = '' + echo -n ${toString config.hardware.trackpoint.sensitivity} \ + > /sys/devices/platform/i8042/serio1/sensitivity + echo -n ${toString config.hardware.trackpoint.speed} \ + > /sys/devices/platform/i8042/serio1/speed + ''; + }; + + }; + +} From 9ebb53c0e3b0bb391ff03cbc5a85ba80af494035 Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Mon, 26 May 2014 10:29:17 +0200 Subject: [PATCH 016/424] ansible: add boto as dependency for s3 module --- pkgs/tools/system/ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 241bd75fd292..7d96092a3ceb 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonPackage rec { dontPatchShebangs = true; propagatedBuildInputs = with pythonPackages; [ - paramiko jinja2 pyyaml httplib2 + paramiko jinja2 pyyaml httplib2 boto ]; postFixup = '' From e7d5e1cdbc4844e0d9b491ad86a8440314f6b73f Mon Sep 17 00:00:00 2001 From: Maxim Ivanov Date: Mon, 26 May 2014 14:48:39 +0100 Subject: [PATCH 017/424] Don't hardcode shell, use $SHELL instead --- pkgs/build-support/setup-hooks/scatter_output.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/scatter_output.sh b/pkgs/build-support/setup-hooks/scatter_output.sh index 79118392094d..f2a501c55e4f 100644 --- a/pkgs/build-support/setup-hooks/scatter_output.sh +++ b/pkgs/build-support/setup-hooks/scatter_output.sh @@ -38,7 +38,7 @@ scatter_files() { rm -r $f rmdir --ignore-fail-on-non-empty $(dirname $f) done - find ${!o} -type f -exec /bin/sh -c 'patchelf --set-rpath $(patchelf --print-rpath {} 2>/dev/null):'${!o}'/lib {} 2>/dev/null && patchelf --shrink-rpath {}' \; + find ${!o} -type f -exec $SHELL -c 'patchelf --set-rpath $(patchelf --print-rpath {} 2>/dev/null):'${!o}'/lib {} 2>/dev/null && patchelf --shrink-rpath {}' \; done eval $save_nullglob } From 400333b9f8e695719704ad2075137d45a6b37cda Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 27 May 2014 02:24:12 -0400 Subject: [PATCH 018/424] Add haskell/monad-unify Signed-off-by: Ricky Elrod --- .../libraries/haskell/monad-unify/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/monad-unify/default.nix diff --git a/pkgs/development/libraries/haskell/monad-unify/default.nix b/pkgs/development/libraries/haskell/monad-unify/default.nix new file mode 100644 index 000000000000..7ee1f8c87040 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-unify/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl, unorderedContainers }: + +cabal.mkDerivation (self: { + pname = "monad-unify"; + version = "0.2.2"; + sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp"; + buildDepends = [ mtl unorderedContainers ]; + meta = { + description = "Generic first-order unification"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 216037e74cdf..11f0278c20f8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1442,6 +1442,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in monadsTf = callPackage ../development/libraries/haskell/monads-tf {}; + monadUnify = callPackage ../development/libraries/haskell/monad-unify {}; + monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {}; monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {}; From 8228ca04799ab9a6757d29faca45c16d208e125d Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 27 May 2014 02:27:25 -0400 Subject: [PATCH 019/424] Add haskell/pattern-arrows Signed-off-by: Ricky Elrod --- .../libraries/haskell/pattern-arrows/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pattern-arrows/default.nix diff --git a/pkgs/development/libraries/haskell/pattern-arrows/default.nix b/pkgs/development/libraries/haskell/pattern-arrows/default.nix new file mode 100644 index 000000000000..a73432fe62bb --- /dev/null +++ b/pkgs/development/libraries/haskell/pattern-arrows/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "pattern-arrows"; + version = "0.0.2"; + sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg"; + buildDepends = [ mtl ]; + meta = { + homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html"; + description = "Arrows for Pretty Printing"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 11f0278c20f8..ff22b7a9f25f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1627,6 +1627,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pathtype = callPackage ../development/libraries/haskell/pathtype {}; + patternArrows = callPackage ../development/libraries/haskell/pattern-arrows {}; + pbkdf = callPackage ../development/libraries/haskell/pbkdf {}; pcap = callPackage ../development/libraries/haskell/pcap {}; From 03b54bcd5575237f86e92a58c5fd970fcda6ff39 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 27 May 2014 03:07:05 -0400 Subject: [PATCH 020/424] Add haskell/purescript :D Signed-off-by: Ricky Elrod --- .../libraries/haskell/purescript/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/haskell/purescript/default.nix diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix new file mode 100644 index 000000000000..bbf380f3e73c --- /dev/null +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -0,0 +1,24 @@ +{ cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec +, patternArrows, time, transformers, unorderedContainers +, utf8String, xdgBasedir +}: + +cabal.mkDerivation (self: { + pname = "purescript"; + version = "0.5.2.1"; + sha256 = "1dr34capgjlyjsaghsv11zz6ph5l0y8dz0q398f0f3hplcal3f58"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + cmdtheline filepath haskeline monadUnify mtl parsec patternArrows + time transformers unorderedContainers utf8String xdgBasedir + ]; + # The example don't seem to get packaged in the release. + doCheck = false; + meta = { + homepage = "http://www.purescript.org/"; + description = "PureScript Programming Language Compiler"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ff22b7a9f25f..a5a94e5a101d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1752,6 +1752,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {}; + purescript = callPackage ../development/libraries/haskell/purescript {}; + pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {}; QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; From 27e2e4132bc00531a8477463e0b12e13c78bce16 Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Sun, 1 Jun 2014 15:13:04 +0200 Subject: [PATCH 021/424] Add HaXe 3.1.3 --- pkgs/development/compilers/haxe/default.nix | 22 ++++++++++----------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index b2d69f2ea7d7..3173b8922612 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,30 +1,28 @@ -{ stdenv, fetchsvn, ocaml, zlib, neko }: +{ stdenv, fetchgit, ocaml, zlib, neko }: stdenv.mkDerivation { - name = "haxe-3.00"; + name = "haxe-3.1.3"; buildInputs = [ocaml zlib neko]; - src = fetchsvn { - url = "http://haxe.googlecode.com/svn/trunk"; - sha256 = "0hg8qailhgrcdk7r4k9kmwfl9d9ds0vy0l7wbv5wdrrc34qzifm4"; - rev = 6706; + src = fetchgit { + url = "https://github.com/HaxeFoundation/haxe.git"; + sha256 = "1p4yja6flv2r04q9lcrjxia3f3fsmhi3d88s0lz0nf0r4m61bjz0"; + fetchSubmodules = true; + + # Tag 3.1.3 + rev = "7be30670b2f1f9b6082499c8fb9e23c0a6df6c28"; }; prePatch = '' sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml ''; - postBuild = '' - find std/tools -name '*.n' -delete - rm -f std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib - ''; - buildFlags = [ "all" "tools" ]; installPhase = '' install -vd "$out/bin" "$out/lib/haxe/std" - install -vt "$out/bin" haxe haxelib haxedoc + install -vt "$out/bin" haxe haxelib cp -vr std "$out/lib/haxe" ''; From 9b080f87e417a388bca8fc9826765491ec1c826c Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 15 May 2014 08:30:25 +1000 Subject: [PATCH 022/424] weechat: fix pythonpath --- .../networking/irc/weechat/default.nix | 2 +- pkgs/applications/networking/irc/weechat/devel.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 5e5cf8d9002f..954651d79e95 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { '' + '' wrapProgram "$out/bin/weechat" \ --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" + --prefix PYTHONPATH : "$NIX_PYTHONPATH" ''; meta = { diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index b858203b0f8c..25cc8dd76603 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,14 +3,14 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "85b8e0d82bf99ca2c55a87482ee40b3043df14db"; - version = "0.4.4-rev${rev}"; + rev = "70d2b0ad8eb7854932d24c007a05b8627f751205"; + version = "1.0-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; - url = "git://github.com/weechat/weechat.git"; - sha256 = "0kzsar7gmw2sgkdzcspg65prii8skpaqxvdyvas2a29dr07j2gnl"; + url = "git://github.com/weechat/weechat.git"; + sha256 = "1k7kcrq46anq87r14sq3vrhij8acn6id7zxyhn0qnjj2wqgrjp5i"; }; buildInputs = @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; postInstall = '' - NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" + NIX_PYTHON_PATH="$out/lib/${python.libPrefix}/site-packages" '' + stdenv.lib.optionalString stdenv.isDarwin '' - NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" + NIX_PYTHON_PATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" '' + '' wrapProgram "$out/bin/weechat" \ --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" + --prefix PYTHONPATH : "$NIX_PYTHONPATH" ''; meta = { From 58ade1d1db6b175ca9ff0d3b09e7f093ac3980f8 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 5 May 2014 10:21:16 +1000 Subject: [PATCH 023/424] sup: update to 0.18.0 --- .../networking/mailreaders/sup/default.nix | 42 +++++++++++-------- pkgs/top-level/all-packages.nix | 10 ++++- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index 70aeb0009814..8efda554d732 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,32 +1,40 @@ -{ stdenv, fetchgit, ruby, rake, rubygems, makeWrapper, ncursesw_sup +{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup , xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile -, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }: +, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which +, bundler, git }: stdenv.mkDerivation rec { - version = "20140312"; + version = "0.18.0"; name = "sup-${version}"; - + meta = { - homepage = http://supmua.org; description = "A curses threads-with-tags style email client"; + homepage = http://supmua.org; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; }; dontStrip = true; - src = fetchgit { - url = git://github.com/sup-heliotrope/sup.git; - rev = "0cad7b308237c07b8a46149908b2ad4806ac3d1d"; - sha256 = "83534b6ad9fb6aa883d630c927e3a71bd09a646e3254b4eb0cc7a09f69a525bc"; + src = fetchurl { + url = "https://github.com/sup-heliotrope/sup/archive/release-${version}.tar.gz"; + sha256 = "1dhg0i2v0ddhwi32ih5lc56x00kbaikd2wdplgzlshq0nljr9xy0"; }; buildInputs = - [ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_ruby - libiconvOrEmpty ]; + [ rake ruby rubygems makeWrapper gpgme ncursesw_sup xapian_ruby + libiconvOrEmpty git ]; - buildPhase = "rake gem"; + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + buildPhase = '' + # the builder uses git to get a listing of the files + git init >/dev/null + git add . + git commit -m "message" >/dev/null + gem build sup.gemspec + ''; installPhase = '' export HOME=$TMP/home; mkdir -pv "$HOME" @@ -50,13 +58,13 @@ stdenv.mkDerivation rec { # Don't install some dependencies -- we have already installed # the dependencies but gem doesn't acknowledge this gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ - --bindir "$out/bin" --no-rdoc --no-ri pkg/sup-999.gem \ - --ignore-dependencies + --bindir "$out/bin" --no-rdoc --no-ri sup-${version}.gem \ + --ignore-dependencies >/dev/null # specify ruby interpreter explicitly sed -i '1 s|^.*$|#!${ruby}/bin/ruby|' bin/sup-sync-back-maildir - cp bin/sup-sync-back-maildir "$out"/bin + cp bin/sup-sync-back-maildir "$out/bin" for prog in $out/bin/*; do wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" --prefix PATH : "${gnupg}/bin:${which}/bin" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7841daa056..7f98d23a8e5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8891,11 +8891,19 @@ let inherit gettext highline iconv locale lockfile rmail_sup text trollop unicode xapian_ruby which; + # See https://github.com/NixOS/nixpkgs/issues/1804 and + # https://github.com/NixOS/nixpkgs/issues/2146 + bundler = pkgs.lib.overrideDerivation pkgs.rubyLibs.bundler ( + oldAttrs: { + dontPatchShebangs = 1; + } + ); + chronic = chronic_0_9_1; gpgme = ruby_gpgme; mime_types = mime_types_1_25; ncursesw_sup = ruby_ncursesw_sup; - rake = rake_10_1_0; + rake = rubyLibs.rake_10_1_0; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { }; From 29b1a9d2959cc2c1af679a1d1307ba1c3c8274cf Mon Sep 17 00:00:00 2001 From: letac Date: Mon, 2 Jun 2014 16:30:10 +0200 Subject: [PATCH 024/424] raco pkg install ... is not throwing ssl error anymore --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 586c0a0acb9a..8c6778a6bc67 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cairo, file, pango, glib, gtk , which, libtool, makeWrapper, libjpeg, libpng -, fontconfig, liberation_ttf, sqlite } : +, fontconfig, liberation_ttf, sqlite, openssl } : stdenv.mkDerivation rec { pname = "racket"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; # Various racket executables do run-time searches for these. - ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib"; + ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib:${openssl}/lib"; buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ]; From f412b73f4931943e7a948d7eb1ef7044b3f46e8b Mon Sep 17 00:00:00 2001 From: letac Date: Mon, 2 Jun 2014 19:36:08 +0200 Subject: [PATCH 025/424] Upgrade rocket to 6.0.1 --- pkgs/development/interpreters/racket/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8c6778a6bc67..469ef118310a 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "racket"; - version = "5.3.6"; + version = "6.0.1"; name = "${pname}-${version}"; src = fetchurl { - url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz"; - sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z"; + url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + sha256 = "e2bc0d4d0fcdfc3327a58c931f203c07a06d4724703f9708ba2e4c8ea0f9694d"; }; # Various racket executables do run-time searches for these. From 833b4276e8fa553fb921c6c91252b7d98ead6375 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Tue, 3 Jun 2014 21:55:32 -0600 Subject: [PATCH 026/424] Working on adding typespeed. --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b35e55d47f..6b0988207f66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1599,6 +1599,8 @@ let nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; + nitrogen = callPackage ../tools/X11/nitrogen {}; + nlopt = callPackage ../development/libraries/nlopt {}; npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; @@ -10089,6 +10091,8 @@ let trigger = callPackage ../games/trigger { }; + typespeed = callPackage ../games/typespeed { }; + ufoai = callPackage ../games/ufoai { }; ultimatestunts = callPackage ../games/ultimatestunts { }; From fc235a48a0820edf05d1c7f47eac8af451c0ecfb Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Wed, 4 Jun 2014 16:01:26 +0800 Subject: [PATCH 027/424] Update haskell-aeson-qq to version 0.7.0 --- pkgs/development/libraries/haskell/aeson-qq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix index fb53dd902579..1da43428f127 100644 --- a/pkgs/development/libraries/haskell/aeson-qq/default.nix +++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "aeson-qq"; - version = "0.6.1"; - sha256 = "164nqk1qfb8a9c95yv5hg0zgcjcg49vrra2wi00h325bgpq6wa5n"; + version = "0.7.0"; + sha256 = "1sq34pnwiyf5lngqph4m463ijr185akzbrdi3i40zmqlrymssv3c"; buildDepends = [ aeson haskellSrcMeta parsec text vector ]; testDepends = [ aeson hspec ]; meta = { homepage = "http://github.com/zalora/aeson-qq"; - description = "Json Quasiquatation for Haskell"; + description = "JSON quasiquoter for Haskell"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; From 12f06b3cc3f57a18cb285fd2274292faa6eb038d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 10 May 2014 18:37:58 +0200 Subject: [PATCH 028/424] fcgiwrap: new package Simple server for running CGI applications over FastCGI https://nginx.localdomain.pl/wiki/FcgiWrap --- nixos/modules/module-list.nix | 1 + .../modules/services/web-servers/fcgiwrap.nix | 49 +++++++++++++++++++ pkgs/servers/fcgiwrap/default.nix | 21 ++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 73 insertions(+) create mode 100644 nixos/modules/services/web-servers/fcgiwrap.nix create mode 100644 pkgs/servers/fcgiwrap/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c1b55cb5550e..7fa705a5ae37 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -255,6 +255,7 @@ ./services/ttys/agetty.nix ./services/ttys/kmscon.nix ./services/web-servers/apache-httpd/default.nix + ./services/web-servers/fcgiwrap.nix ./services/web-servers/jboss/default.nix ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/cgit.nix diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix new file mode 100644 index 000000000000..7e91e7b60eef --- /dev/null +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fcgiwrap; + +in { + + options = { + services.fcgiwrap = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable fcgiwrap, a server for running CGI applications over FastCGI."; + }; + + preforkProcesses = mkOption { + type = types.int; + default = 1; + description = "Number of processes to prefork."; + }; + + bindSocket = mkOption { + type = types.string; + default = "unix:/run/fcgiwrap.sock"; + description = '' + Socket to bind to. Valid socket URLs are: + unix:/path/to/socket for Unix sockets + tcp:dot.ted.qu.ad:port for IPv4 sockets + tcp6:[ipv6_addr]:port for IPv6 sockets + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.fcgiwrap = { + after = [ "nss-user-lookup.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} -s ${cfg.bindSocket}"; + }; + }; + + }; +} diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix new file mode 100644 index 000000000000..84deebcb8f5b --- /dev/null +++ b/pkgs/servers/fcgiwrap/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: + +stdenv.mkDerivation rec { + name = "fcgiwrap-${version}"; + version = "1.1.0"; + + src = fetchurl { + url = "http://github.com/gnosek/fcgiwrap/archive/${version}.tar.gz"; + sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac"; + }; + + configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + + buildInputs = [ autoreconfHook systemd fcgi pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://nginx.localdomain.pl/wiki/FcgiWrap; + description = "Simple server for running CGI applications over FastCGI"; + maintainers = with maintainers; [ lethalman ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ede5259f1ba4..5080ca81db26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6602,6 +6602,8 @@ let elasticmq = callPackage ../servers/elasticmq { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; + felix = callPackage ../servers/felix { }; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; From 77abe5e4641701f1b7213575ba93cca1ac60d309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 3 Jun 2014 14:25:21 +0200 Subject: [PATCH 029/424] libav: update 0.8.11 -> .12, 9.12 -> .13, introduce 10.1 --- pkgs/development/libraries/libav/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index a6b552613ccf..b21f530478a3 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,8 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_9 = libavFun "9.12" "1wm0nf12c1p138y54jh71mvbpikrpk43zc9m2qhpjm9pgnagizk0"; - libav_0_8 = libavFun "0.8.11" "0nhm0mzz2aj78sgmw9xf20a1mlgig78cv1nyhx4zrq7nvgqf8d2r"; + libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr"; + libav_9 = libavFun "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g"; + libav_10 = libavFun "10.1" "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5080ca81db26..27dc28348f51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4928,9 +4928,9 @@ let libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; - libav = libav_9; + libav = libav_10; libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_9 libav_0_8; + inherit (libav_all) libav_0_8 libav_9 libav_10; libavc1394 = callPackage ../development/libraries/libavc1394 { }; From bc53b9ec4c331d11229007054e39abb9e8160c2e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 4 Jun 2014 14:28:08 +0200 Subject: [PATCH 030/424] opengrok: new package Source code search and cross reference engine http://opengrok.github.io/OpenGrok/ --- .../tools/misc/opengrok/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/opengrok/default.nix diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix new file mode 100644 index 000000000000..8f77b3d7283a --- /dev/null +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, jre, ctags, makeWrapper, coreutils, git }: + +stdenv.mkDerivation rec { + name = "opengrok-0.12.1"; + + src = fetchurl { + url = "http://java.net/projects/opengrok/downloads/download/${name}.tar.gz"; + sha256 = "0ihaqgf1z2gsjmy2q96m0s07dpnh92j3ss3myiqjdsh9957fwg79"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + ensureDir $out + cp -a * $out/ + substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname + wrapProgram $out/bin/OpenGrok \ + --prefix PATH : "${ctags}/bin:${git}/bin" \ + --set JAVA_HOME "${jre}" \ + --set OPENGROK_TOMCAT_BASE "/var/tomcat" + ''; + + meta = with stdenv.lib; { + description = "Source code search and cross reference engine"; + homepage = http://opengrok.github.io/OpenGrok/; + license = licenses.cddl; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27dc28348f51..54ee84c65f84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3978,6 +3978,8 @@ let omake = callPackage ../development/tools/ocaml/omake { }; omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; + opengrok = callPackage ../development/tools/misc/opengrok { }; + openocd = callPackage ../development/tools/misc/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { }; From 6306d81e8a9524930ce7e8f28021150c8fb97c03 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 4 Jun 2014 09:47:00 -0400 Subject: [PATCH 031/424] ncdc: update to 1.19.1 for security fixes --- pkgs/applications/networking/p2p/ncdc/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 794f6fe43087..5f7ad92f7cc6 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: -stdenv.mkDerivation rec { +let + version = "1.19.1"; +in +stdenv.mkDerivation { name = "ncdc-${version}"; - version = "1.19"; src = fetchurl { - url = "http://dev.yorhel.nl/download/ncdc-1.19.tar.gz"; - sha256 = "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2"; + url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; + sha256 = "0iwx4b3x207sw11qqjfynpwnhryhixjzbgcy9l9zfisa8f0k7cm6"; }; buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ]; meta = { - description = "modern and lightweight direct connect client with a friendly ncurses interface"; + description = "Modern and lightweight direct connect client with a friendly ncurses interface"; homepage = http://dev.yorhel.nl/ncdc; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; # arbitrary From 638132b64cc6de3bfde9dccc79c4f64292a378dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Jun 2014 16:18:04 +0200 Subject: [PATCH 032/424] mailutils: disable tests --- pkgs/tools/networking/mailutils/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 3ac82e51bf8b..0453567c449b 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { gnutls mysql guile texinfo gnum4 ] ++ stdenv.lib.optional doCheck dejagnu; - doCheck = true; + # Tests fail since gcc 4.8 + doCheck = false; meta = { description = "GNU Mailutils is a rich and powerful protocol-independent mail framework"; @@ -51,8 +52,5 @@ stdenv.mkDerivation rec { # Some of the dependencies fail to build on {cyg,dar}win. platforms = stdenv.lib.platforms.gnu; - - # Tests fail since gcc 4.8 - broken = true; }; } From 73169b3a37e1875a3124f578591ddb33f7413f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Jun 2014 14:11:21 +0200 Subject: [PATCH 033/424] python: 2.7.6 -> 2.7.7 --- .../python/2.7/CVE-2014-1912.patch | 57 ------------------- .../interpreters/python/2.7/default.nix | 8 +-- 2 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch diff --git a/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch b/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch deleted file mode 100644 index 95399bf76073..000000000000 --- a/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch +++ /dev/null @@ -1,57 +0,0 @@ -# Edited from Mercurial patch: deleted the NEWS hunk, since it didn't apply cleanly. -# It added the following line to NEWS: -# - Issue #20246: Fix buffer overflow in socket.recvfrom_into. - -# HG changeset patch -# User Benjamin Peterson -# Date 1389671978 18000 -# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9 -# Parent 2631d33ee7fbd5f0288931ef37872218d511d2e8 -complain when nbytes > buflen to fix possible buffer overflow (closes #20246) - -diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py ---- a/Lib/test/test_socket.py -+++ b/Lib/test/test_socket.py -@@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest): - - _testRecvFromIntoMemoryview = _testRecvFromIntoArray - -+ def testRecvFromIntoSmallBuffer(self): -+ # See issue #20246. -+ buf = bytearray(8) -+ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) -+ -+ def _testRecvFromIntoSmallBuffer(self): -+ with test_support.check_py3k_warnings(): -+ buf = buffer(MSG*2048) -+ self.serv_conn.send(buf) -+ - - TIPC_STYPE = 2000 - TIPC_LOWER = 200 -diff --git a/Misc/ACKS b/Misc/ACKS ---- a/Misc/ACKS -+++ b/Misc/ACKS -@@ -979,6 +979,7 @@ Eric V. Smith - Christopher Smith - Gregory P. Smith - Roy Smith -+Ryan Smith-Roberts - Rafal Smotrzyk - Dirk Soede - Paul Sokolovsky -diff --git a/Misc/NEWS b/Misc/NEWS ---- a/Modules/socketmodule.c -+++ b/Modules/socketmodule.c -@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s - if (recvlen == 0) { - /* If nbytes was not specified, use the buffer's length */ - recvlen = buflen; -+ } else if (recvlen > buflen) { -+ PyErr_SetString(PyExc_ValueError, -+ "nbytes is greater than the length of the buffer"); -+ goto error; - } - - readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr); - diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index eeadc3c8cc7f..fc91e5a44937 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.6"; + version = "${majorVersion}.7"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz"; + sha256 = "0y6s12rdi89k24p8zarhy9fqmyy459yg0d125c7cac4v136y70r9"; }; patches = @@ -28,10 +28,6 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch - - # See http://bugs.python.org/issue20246 - # This will be fixed in 2.7.7. - ./CVE-2014-1912.patch ]; postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' From f0fc148e5ac62026aa330ac3fe865ad494f1b66b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 4 Jun 2014 16:48:40 +0200 Subject: [PATCH 034/424] openttd: Bump to 1.4.1. --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 7e2b4221d523..09a7761326a6 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0m89pr7m7xg71q1j3869dfrbhv88g90cw9zn0jlpg8crsj4wnnyq"; + sha256 = "0gkmf2jj1rab81y10dp8cirr90kv9dpr3ww4wb06j8cvgapy7b0z"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; From 3ee3a5d387123d8ed39a04571d593986b0c9cb42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jun 2014 16:55:35 +0200 Subject: [PATCH 035/424] maude: update full-maude to version 2.6.1h --- pkgs/development/interpreters/maude/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 877d6b79e53b..65badeae1dde 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper, unzip }: +{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }: stdenv.mkDerivation rec { name = "maude-2.6"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { }; fullMaude = fetchurl { - url = "http://maude.lcc.uma.es/FullMaude/FM261e/full-maude.maude.zip"; - sha256 = "0g0chfrzc7923sh17zdy731wpsgnwz7rxci0jqqmrphlshwzqm2h"; + url = "https://full-maude.googlecode.com/git/full-maude261h.maude"; + sha256 = "0xx8bfn6arsa75m5vhp5lmpazgfw230ssq33h9vifswlvzzc81ha"; }; buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done mkdir -p $out/share/maude - ${unzip}/bin/unzip ${fullMaude} -d $out/share/maude + cp ${fullMaude} -d $out/share/maude/full-maude.maude ''; meta = { From 853f2ca9d589f5bec52df1adb70b642ff45f9a45 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 4 Jun 2014 19:52:34 +0000 Subject: [PATCH 036/424] Update shake to 0.13.1 --- pkgs/development/libraries/haskell/shake/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 58325a1afe0f..a2b8cc24e65d 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.12"; - sha256 = "060bvbhk84zagghalg5nh5g17vj8z2kv0qb8vibcq58ahfayj655"; + version = "0.13.1"; + sha256 = "00dvf1ydfgpnkv09fywsvyn0sphjwdrqhvkc21axj580ykbqxrn7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { binary deepseq filepath hashable QuickCheck random time transformers unorderedContainers utf8String ]; + doCheck = !self.stdenv.isDarwin; meta = { homepage = "https://github.com/ndmitchell/shake"; description = "Build system library, like Make, but more accurate dependencies"; From 86b7cf8bb4105da6660fedac8833cf71b6405a13 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 26 May 2014 20:31:53 +0200 Subject: [PATCH 037/424] Added llpp, a mupdf based pdf pager written in ocaml. Updated lablgl to 1.05 and mupdf to 1.4. Added myself as maintainer for lablgl. --- pkgs/applications/misc/llpp/default.nix | 75 +++++++++++++++++++ pkgs/applications/misc/mupdf/default.nix | 11 +-- .../lablgl/Makefile.config.patch | 52 +------------ .../ocaml-modules/lablgl/default.nix | 9 +-- pkgs/top-level/all-packages.nix | 2 + 5 files changed, 84 insertions(+), 65 deletions(-) create mode 100644 pkgs/applications/misc/llpp/default.nix diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix new file mode 100644 index 000000000000..81ca87af7076 --- /dev/null +++ b/pkgs/applications/misc/llpp/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchgit, ocaml, mupdf, lablgl, mesa +, libX11, libXext, gtk3, freetype, zlib, openjpeg +, jbig2dec, libjpeg, ncurses }: + +stdenv.mkDerivation { + name = "llpp-2014-05-26"; + + src = fetchgit { + url = "git://repo.or.cz/llpp.git"; + rev = "902143de64d86b5714b3a59d2cc7085083b87249"; + sha256 = "038xl4gbvm57na2lz1fw36sf43zaxq407zi2d53985vc33677j9s"; + }; + + buildInputs = [ ocaml mupdf lablgl mesa libX11 libXext gtk3 + freetype jbig2dec libjpeg openjpeg zlib ncurses ]; + + # The build phase was extracted from buildall.sh, because that script + # fetched the dependencies on its own. + buildPhase = '' + ccopt="-O" + ccopt="$ccopt -I ${jbig2dec}/include" + ccopt="$ccopt -I ${libjpeg}/include" + ccopt="$ccopt -I ${freetype}/include" + ccopt="$ccopt -I ${openjpeg}/include" + ccopt="$ccopt -I ${zlib}/include" + ccopt="$ccopt -I ${mupdf}/include" + ccopt="$ccopt -include ${freetype}/include/ft2build.h" + ccopt="$ccopt -D_GNU_SOURCE" + + cclib="$cclib -lmupdf" + cclib="$cclib -lz -ljpeg -lopenjp2 -ljbig2dec -lfreetype -lpthread" + cclib="$cclib -lX11" + cclib="$cclib -lfreetype" + + comp=ocamlc.opt + cmsuf=cmo + + sh mkhelp.sh keystoml.ml KEYS > help.ml + + $comp -c -o link.o -ccopt "$ccopt" link.c + $comp -c -o help.$cmsuf help.ml + $comp -c -o utils.$cmsuf utils.ml + $comp -c -o wsi.cmi wsi.mli + $comp -c -o wsi.$cmsuf wsi.ml + $comp -c -o parser.$cmsuf parser.ml + $comp -c -o main.$cmsuf -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl main.ml + + $comp -custom -o llpp \ + -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl \ + str.cma unix.cma lablgl.cma \ + link.o \ + -cclib "$cclib" \ + help.cmo \ + utils.cmo \ + parser.cmo \ + wsi.cmo \ + main.cmo + ''; + + # Binary fails with 'No bytecode file specified.' if stripped. + dontStrip = true; + + installPhase = '' + install -d $out/bin + install llpp llppac $out/bin + ''; + + meta = { + homepage = http://repo.or.cz/w/llpp.git; + description = "A MuPDF based PDF pager written in OCaml"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.pSub ]; + license = "GPL"; + }; +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 81bd9e1e97e9..ec19944b972b 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,20 +1,13 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg , libX11, libXext }: stdenv.mkDerivation rec { - name = "mupdf-1.3"; + name = "mupdf-1.4"; src = fetchurl { url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; - sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b"; + sha256 = "08pc6fv42sb9k9dzjs8ph32nixzrzmr08yxh7arkpsdm42asp2q1"; }; - patches = [(fetchpatch { - name = "CVE-2014-2013.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;" - + "h=60dabde18d7fe12b19da8b509bdfee9cc886aafc"; - sha256 = "0p721f3g2djz9fy6rcgj83c20f5k257wg2d0yvvmp02m7sp06l0g"; - })]; - buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; enableParallelBuilding = true; diff --git a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch index c896978f57ea..3d880c00947e 100644 --- a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch +++ b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch @@ -41,7 +41,7 @@ diff -Naur lablGL.ori/Makefile.config lablGL/Makefile.config + +##### Uncomment these for windows +#TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib -+#GLLIBS = opengl32.lib glu32.lib ++#GLLIBS = opengl32.lib glu32.lib +#TOOLCHAIN = msvc +#XA = .lib +#XB = .bat @@ -65,53 +65,3 @@ diff -Naur lablGL.ori/Makefile.config lablGL/Makefile.config + +# C Compiler options +#COPTS = -c -O -diff -Naur lablGL.ori/META lablGL/META ---- lablGL.ori/META 1970-01-01 01:00:00.000000000 +0100 -+++ lablGL/META 2013-06-02 22:00:59.000000000 +0200 -@@ -0,0 +1,21 @@ -+description = "Bindings for OpenGL graphics engines" -+version = "1.04-1" -+archive(byte) = "lablgl.cma" -+archive(native) = "lablgl.cmxa" -+ -+#package "togl" ( -+# description = "OpenGL widget for labltk" -+# version = "1.01" -+# requires = "lablgl, labltk" -+# archive(byte) = "togl.cma" -+# archive(native) = "togl.cmxa" -+#) -+ -+package "glut" ( -+ description = "Platform-independent OpenGL window" -+ version = "1.01" -+ requires = "lablgl" -+ archive(byte) = "lablglut.cma" -+ archive(native) = "lablglut.cmxa" -+) -+ -diff -Naur lablGL.ori/META~ lablGL/META~ ---- lablGL.ori/META~ 1970-01-01 01:00:00.000000000 +0100 -+++ lablGL/META~ 2013-06-02 21:59:17.000000000 +0200 -@@ -0,0 +1,21 @@ -+description = "Bindings for OpenGL graphics engines" -+version = "1.04-1" -+archive(byte) = "lablgl.cma" -+archive(native) = "lablgl.cmxa" -+ -+#package "togl" ( -+# description = "OpenGL widget for labltk" -+# version = "1.01" -+# requires = "lablGL, labltk" -+# archive(byte) = "togl.cma" -+# archive(native) = "togl.cmxa" -+#) -+ -+package "glut" ( -+ description = "Platform-independent OpenGL window" -+ version = "1.01" -+ requires = "lablGL" -+ archive(byte) = "lablglut.cma" -+ archive(native) = "lablglut.cmxa" -+) -+ diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index a739e4a7146b..8fd07ee06912 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -3,15 +3,15 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgl"; - version = "1.04-1"; + version = "1.05"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-20120306.tar.gz"; - sha256 = "1w5di2n38h7fkrf668zphnramygwl7ybjhrmww3pi9jcf9apa09r"; + url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; + sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; buildInputs = [ocaml findlib lablgtk mesa freeglut ]; @@ -29,7 +29,6 @@ stdenv.mkDerivation { createFindlibDestdir = true; - #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "lib libopt glut glutopt"; postInstall = '' @@ -40,6 +39,6 @@ stdenv.mkDerivation { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; license = "GnuGPLV2"; -# maintainers = [ stdenv.lib.maintainers.roconnor ]; + maintainers = [ stdenv.lib.maintainers.psub ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b35e55d47f..99355334b012 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8830,6 +8830,8 @@ let bison = bison2; }; + llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; }; + lmms = callPackage ../applications/audio/lmms { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; From 4eeb0f10fb57203f020502835130fb982bc7af48 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 5 Jun 2014 01:16:50 +0100 Subject: [PATCH 038/424] erlangR16: updated to R16B03-1 - couchdb: using erlangR16 (fails to build with R17) - rename erlang attr names to use only major version in attr name --- .../interpreters/erlang/{R14B04.nix => R14.nix} | 0 .../interpreters/erlang/{R15B03.nix => R15.nix} | 0 .../interpreters/erlang/{R16B02.nix => R16.nix} | 4 ++-- pkgs/servers/nosql/riak/1.3.1.nix | 4 ++-- pkgs/top-level/all-packages.nix | 13 +++++++------ 5 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/development/interpreters/erlang/{R14B04.nix => R14.nix} (100%) rename pkgs/development/interpreters/erlang/{R15B03.nix => R15.nix} (100%) rename pkgs/development/interpreters/erlang/{R16B02.nix => R16.nix} (95%) diff --git a/pkgs/development/interpreters/erlang/R14B04.nix b/pkgs/development/interpreters/erlang/R14.nix similarity index 100% rename from pkgs/development/interpreters/erlang/R14B04.nix rename to pkgs/development/interpreters/erlang/R14.nix diff --git a/pkgs/development/interpreters/erlang/R15B03.nix b/pkgs/development/interpreters/erlang/R15.nix similarity index 100% rename from pkgs/development/interpreters/erlang/R15B03.nix rename to pkgs/development/interpreters/erlang/R15.nix diff --git a/pkgs/development/interpreters/erlang/R16B02.nix b/pkgs/development/interpreters/erlang/R16.nix similarity index 95% rename from pkgs/development/interpreters/erlang/R16B02.nix rename to pkgs/development/interpreters/erlang/R16.nix index 7dc71ed65461..eaf991ff5637 100644 --- a/pkgs/development/interpreters/erlang/R16B02.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version; - version = "R16B02"; + version = "R16B03-1"; src = fetchurl { url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a"; + sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; }; buildInputs = diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index ccac6e331fdc..96315c52f6bf 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, erlangR15B03 }: +{ stdenv, fetchurl, unzip, erlangR15}: let srcs = { @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "riak-1.3.1"; - buildInputs = [unzip erlangR15B03]; + buildInputs = [unzip erlangR15]; src = srcs.riak; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54ee84c65f84..24d977d51489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3381,9 +3381,9 @@ let clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; - erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; - erlangR16B02 = callPackage ../development/interpreters/erlang/R16B02.nix { }; + erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { }; + erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { }; + erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; erlang = erlangR17; @@ -6568,6 +6568,7 @@ let spidermonkey = spidermonkey_185; python = python27; sphinx = python27Packages.sphinx; + erlang = erlangR16; }; dico = callPackage ../servers/dico { }; @@ -6599,7 +6600,7 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; ejabberd = callPackage ../servers/xmpp/ejabberd { - erlang = erlangR16B02; + erlang = erlangR16; }; elasticmq = callPackage ../servers/elasticmq { }; @@ -9684,8 +9685,8 @@ let winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { - erlang = erlangR14B04; - esdl = esdl.override { erlang = erlangR14B04; }; + erlang = erlangR14; + esdl = esdl.override { erlang = erlangR14; }; }; wmname = callPackage ../applications/misc/wmname { }; From 3a0b265af9195b01629a6962820f335d2a6fd629 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 4 Jun 2014 22:23:39 -0500 Subject: [PATCH 039/424] kernel: 3.14.4 -> 3.14.5 (close #2831) --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index e513fa2e3cd6..465a04837ecc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.4"; + version = "3.14.5"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "05yp192pbjng92rpvq3fd4mhjc96iylwf6xb7as5lscwg660m1b5"; + sha256 = "0x38fyj86hrw7ns14m4kdpscqlj7ig889mxzvwsbhrsk0khllvyn"; }; features.iwlwifi = true; From 7553a476f598e0bbf175453cef722b71a57672b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:36:39 +0200 Subject: [PATCH 040/424] simple-build-tool: update to version 0.13.5 --- .../tools/build-managers/simple-build-tool/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix index 8f01486cfe72..b54f894d8eb4 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.0"; + version = "0.13.5"; src = fetchurl { url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; - sha256 = "04s49v5mw4kwz1rmvbf07kq51i2m0lcv60c9i5y524gjj518pk1w"; + sha256 = "05zvb3j7xxswpz7fz2nwbl4dwfdf0cyx5xzjis5fyi2dbzmfdrmp"; }; phases = [ "installPhase" ]; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { chmod +x $out/bin/sbt ''; - meta = { + meta = { homepage = http://www.scala-sbt.org/; license = stdenv.lib.licenses.bsd3; description = "A build tool for Scala, Java and more"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - }; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + }; } From 246edc3df2ade0701aabc53e41d6c8c85f51ac24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jun 2014 12:54:37 +0200 Subject: [PATCH 041/424] linux: Update to 3.12.21 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 6e94f2432c0f..82f31bf4f984 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.20"; + version = "3.12.21"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "15pjvlqbbyif8s8mcpb7wf20fvbczhfp65mn6fd609j1p79nvqb9"; + sha256 = "1pr4gr48bgxz28h790b2w41b1fc41xffz3drflsnz5736pisrhg7"; }; features.iwlwifi = true; From 1da6a7d4a915e48934fbaa27fe01db1211d00df7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jun 2014 13:04:18 +0200 Subject: [PATCH 042/424] Remove illegal meta.src attributes --- .../audio/ladspa-plugins/ladspah.nix | 33 +++++++------------ .../networking/p2p/ldcpp/default.nix | 1 - pkgs/development/compilers/qi/default.nix | 1 - pkgs/games/construo/default.nix | 1 - pkgs/games/orbit/default.nix | 1 - pkgs/servers/dict/dictd-db.nix | 1 - pkgs/servers/xmpp/openfire/default.nix | 1 - pkgs/tools/filesystems/relfs/default.nix | 1 - 8 files changed, 11 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 30ba34af16c5..8c4d8a8c1ed5 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -1,28 +1,17 @@ -{ stdenv, fetchurl, builderDefs }: +{ runCommand, fetchurl }: + +let -let src = fetchurl { url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt; sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; }; + in - let localDefs = builderDefs.passthru.function { - buildInputs = []; - inherit src; - }; - in with localDefs; -let - copyFile = fullDepEntry (" - mkdir -p \$out/include - cp ${src} \$out/include/ladspa.h - ") [minInit defEnsureDir]; -in -stdenv.mkDerivation { - name = "ladspa.h"; - builder = writeScript "ladspa.h-builder" - (textClosure localDefs [copyFile]); - meta = { - description = "LADSPA format audio plugins"; - inherit src; - }; -} + +runCommand "ladspa.h" + { meta.description = "LADSPA format audio plugins"; } + '' + mkdir -p $out/include + cp ${src} $out/include/ladspa.h + '' diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 1b601992aa6f..6f282b30fa14 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { [doScons doForceShare doPropagate]); meta = { description = "Linux DC++ - Direct Connect client"; - inherit src; }; } diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix index ae0172558549..ecb022d942a9 100644 --- a/pkgs/development/compilers/qi/default.nix +++ b/pkgs/development/compilers/qi/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { (textClosure localDefs [allBuild doForceShare doPropagate]); meta = { description = "Qi - next generation on top of Common Lisp"; - inherit src; }; } diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 4de74bde5a11..57d055ed3d3d 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { (textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "Construo masses and springs simulation"; - inherit src; }; } diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index 9769e6f5d670..de4c84f010cd 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { [ customBuild doForceShare doPropagate]); meta = { description = "Orbit space flight simulator"; - inherit src; }; } diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index c6c0bc73a08a..5f109c58e6e4 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { [doInstall doForceShare doPropagate]); meta = { description = "${name} dictionary for dictd"; - inherit src; }; }; # Probably a bug in some FreeDict release files, but easier to trivially diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index e5e5273783f8..736517b53f19 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { [ installPhase doForceShare doPropagate]); meta = { description = "XMPP server in Java"; - inherit src; }; } diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 56dad0c1e3dd..6d803f725318 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { (textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "A relational filesystem on top of FUSE"; - inherit src; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; }; From 463ed1bb640efcd3b3714a67e94800a6003eb320 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 5 Jun 2014 02:20:36 -0500 Subject: [PATCH 043/424] mariadb: 10.0.10 -> 10.0.11 Also, enable the TokuDB plugin, as it now builds (there were some bugs in the non-GA release that prevented that). Signed-off-by: Austin Seipp --- pkgs/servers/sql/mariadb/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a6105c128906..d0f7f5ef3e52 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }: stdenv.mkDerivation rec { - name = "mariadb-10.0.10"; + name = "mariadb-${version}"; + version = "10.0.11"; src = fetchurl { - url = "https://fossies.org/linux/misc/${name}.tar.gz"; - md5 = "14ce22b8197d4eae88d237776d47220f"; + url = "https://fossies.org/linux/misc/${name}.tar.gz"; + sha256 = "1p8h06kns30rlbnzw9ddmihs7r3jhp8xlrl4r6h5d107wkcw86v3"; }; buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ]; - cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DWITHOUT_TOKUDB=1" "-DINSTALL_SCRIPTDIR=bin" ]; + cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; enableParallelBuilding = true; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { description = "An enhanced, drop-in replacement for MySQL"; homepage = https://mariadb.org/; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice ]; platforms = stdenv.lib.platforms.all; }; } From b43421221ff3ea7069de175845be80075f31d2a8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 5 Jun 2014 06:06:19 -0500 Subject: [PATCH 044/424] kernel/grsec: updates; add mainline package for brave souls Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- .../os-specific/linux/kernel/linux-testing.nix | 17 +++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 10 ++++++++++ 6 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-testing.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index de8fa4f5413e..ac2ba6113868 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.40"; + version = "3.10.41"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0a56hh47a9x8mg1rxlckfnrjcphwz9hraxj2fgran95vb33hsq5a"; + sha256 = "0rpz2nxay0a4573dnnb8szq3ly3bhjd6wrz5z6iw3kpj19crs0r1"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 1ff3b48676fc..d5fd820cac0b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.58"; + version = "3.2.59"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1mszzixiv4k61m241dl2n5s8rca26l6hc40v23lha814nrahjkn1"; + sha256 = "0a62nmn90k3g48m8g3y27q6a0qwa3k2s6synss7378kdi4f938i4"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 63d0d4904024..165baf0a17f4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.90"; + version = "3.4.91"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0kh4y1sbsjm3awplfsd0i59rz7wc1dj23mcs5rwwhc0p7i8w4r75"; + sha256 = "003l9i14m5ci2232wl68nxbgi0ipkzq00yfgxfp9cmh2sipxy1dk"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix new file mode 100644 index 000000000000..d58610a38cda --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.15-rc8"; + extraMeta.branch = "3.15"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; + sha256 = ""; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a4ebc689b2fc..c0cca64967c4 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,24 +60,24 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.2.58"; - revision = "201405112002"; + { kversion = "3.2.59"; + revision = "201406042136"; branch = "stable"; - sha256 = "107jbgl1lz6blrk5rxm10jjhbywav9s56bs7zfs3m1618bff7p7v"; + sha256 = "01frz80n7zl3yyl11d1i517n0rw8ivb46cl0swp3zgjx29adwc8s"; }; grsecurity_vserver = grsecPatch - { kversion = "3.2.58"; - revision = "vs2.3.2.16-201405112004"; + { kversion = "3.2.59"; + revision = "vs2.3.2.16-201406042138"; branch = "vserver"; - sha256 = "0xi7c1q0qsvdvs9vw3iclfz8ykjf56cc9wds6419z1lcgcaykb9w"; + sha256 = "1vlmcf2fshxvhsparmvwlbn3gpccc8zjc341sjwsmyc3i8csmysr"; }; grsecurity_unstable = grsecPatch - { kversion = "3.14.4"; - revision = "201405141623"; + { kversion = "3.14.5"; + revision = "201406021708"; branch = "test"; - sha256 = "0k9f3n1hxxqa2l10mjk7hy7w9p0mmiqv6s6cbiji2hyvakm5s7p4"; + sha256 = "002sbbcmvg6wa41a1q8vgf3zcjakns72dc885b6jml0v396hb5c6"; }; grsec_fix_path = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24d977d51489..dc21997dbf1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7196,6 +7196,15 @@ let ]; }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + /* grsec configuration We build several flavors of 'default' grsec kernels. These are @@ -7339,6 +7348,7 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); + linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors # Stable kernels From 906aa9ccb1cf34cde003634b6eca1ded5bc703d1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jun 2014 13:10:35 +0200 Subject: [PATCH 045/424] Make pseudo-filesystems show up as "tmpfs" etc. rather than "none" in df --- nixos/modules/system/boot/stage-1-init.sh | 8 ++++---- nixos/modules/system/boot/stage-2-init.sh | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 15586e68e7e5..7adb932aba7f 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -60,12 +60,12 @@ touch /etc/fstab # to shut up mount touch /etc/mtab # to shut up mke2fs touch /etc/initrd-release mkdir -p /proc -mount -t proc none /proc +mount -t proc proc /proc mkdir -p /sys -mount -t sysfs none /sys -mount -t devtmpfs -o "size=@devSize@" none /dev +mount -t sysfs sysfs /sys +mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev mkdir -p /run -mount -t tmpfs -o "mode=0755,size=@runSize@" none /run +mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run # Process the kernel command line. diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index ab414e29eb2f..eff2fb583bab 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -36,9 +36,9 @@ mount -n -o remount,rw / # stage 1, we need to do that here. if [ ! -e /proc/1 ]; then mkdir -m 0755 -p /proc - mount -n -t proc none /proc + mount -n -t proc proc /proc mkdir -m 0755 -p /dev - mount -t devtmpfs none /dev + mount -t devtmpfs devtmpfs /dev fi @@ -82,9 +82,9 @@ done # More special file systems, initialise required directories. mkdir -m 0755 /dev/shm -mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" none /dev/shm +mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm mkdir -m 0755 -p /dev/pts -[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default +[ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default mkdir -m 01777 -p /tmp mkdir -m 0755 -p /var /var/log /var/lib /var/db mkdir -m 0755 -p /nix/var @@ -114,7 +114,7 @@ rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots if ! mountpoint -q /run; then rm -rf /run mkdir -m 0755 -p /run - mount -t tmpfs -o "mode=0755,size=@runSize@" none /run + mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run fi # Create a ramfs on /run/keys to hold secrets that shouldn't be @@ -122,7 +122,7 @@ fi if ! mountpoint -q /run/keys; then rm -rf /run/keys mkdir /run/keys - mount -t ramfs none /run/keys + mount -t ramfs ramfs /run/keys chown 0:96 /run/keys chmod 0750 /run/keys fi @@ -153,7 +153,7 @@ fi # Create /var/setuid-wrappers as a tmpfs. rm -rf /var/setuid-wrappers mkdir -m 0755 -p /var/setuid-wrappers -mount -t tmpfs -o "mode=0755" none /var/setuid-wrappers +mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers # Run the script that performs all configuration activation that does From 15f092d7a7088ef1fadb059f305685da045fd979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 5 Jun 2014 14:32:11 +0200 Subject: [PATCH 046/424] openssl: 1.0.1g -> 1.0.1h CVE-2014-0224 CVE-2014-0221 CVE-2014-0195 CVE-2014-0198 CVE-2010-5298 CVE-2014-3470 --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 7217c876bfd9..93f7cbe1a1f4 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1g"; + name = "openssl-1.0.1h"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -43,7 +43,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "0a70qdqccg16nw4bbawa6pjvzn05vfp5wkwg6jl0grch7f683jsk"; + sha256 = "14yhsgag5as7nhxnw7f0vklwjwa3pmn1i15nmp3f4qxa6sc8l74x"; }; patches = patchesCross false; From 1fc21bd6a99197007804f3981a85201149280b3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:58:57 +0200 Subject: [PATCH 047/424] emacs-scala-mode: package version 2 --- .../scala-mode/{default.nix => v1.nix} | 0 .../editors/emacs-modes/scala-mode/v2.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) rename pkgs/applications/editors/emacs-modes/scala-mode/{default.nix => v1.nix} (100%) create mode 100644 pkgs/applications/editors/emacs-modes/scala-mode/v2.nix diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/scala-mode/default.nix rename to pkgs/applications/editors/emacs-modes/scala-mode/v1.nix diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix new file mode 100644 index 000000000000..13d3f4b00d1f --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, emacs, unzip }: + +stdenv.mkDerivation { + + name = "scala-mode2-2014-06-05"; + + src = fetchurl { + url = "https://github.com/hvesalai/scala-mode2/archive/af2dc30226c890ff7d49d727450f8006b90781df.zip"; + sha256 = "1jj08li9lfg5291jzj170wa3cmyf3g2a0j80cy5307l0mdawp9vx"; + }; + + buildInputs = [ unzip emacs ]; + + installPhase = '' + mkdir -p "$out/share/emacs/site-lisp" + cp -v *.el *.elc "$out/share/emacs/site-lisp/" + ''; + + meta = { + homepage = "https://github.com/hvesalai/scala-mode2"; + description = "An Emacs mode for editing Scala code"; + license = "permissive"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc21997dbf1b..c8f713b31854 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8343,7 +8343,8 @@ let rudel = callPackage ../applications/editors/emacs-modes/rudel { }; - scalaMode = callPackage ../applications/editors/emacs-modes/scala-mode { }; + scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; + scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; From 80a60810ca7e59360e8babf47c4d967f108c1e46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 13:01:33 +0200 Subject: [PATCH 048/424] emacs-sbt-mode: add initial version --- .../editors/emacs-modes/sbt-mode/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/sbt-mode/default.nix diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix new file mode 100644 index 000000000000..092026aca88a --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, emacs, unzip }: + +stdenv.mkDerivation { + + name = "sbt-mode-2014-06-05"; + + src = fetchurl { + url = "https://github.com/hvesalai/sbt-mode/archive/676f22d9658989de401d299ed0250db9b911574d.zip"; + sha256 = "0b8qrr3yp48ggl757d3a6bz633mbf4zxqpcwsh47b1ckiwa3nb2h"; + }; + + buildInputs = [ unzip emacs ]; + + installPhase = '' + mkdir -p "$out/share/emacs/site-lisp" + cp -v *.el *.elc "$out/share/emacs/site-lisp/" + ''; + + meta = { + homepage = "https://github.com/hvesalai/scala-mode2"; + description = "An Emacs mode for editing Scala code"; + license = "permissive"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8f713b31854..ce0f7593f2cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8343,6 +8343,8 @@ let rudel = callPackage ../applications/editors/emacs-modes/rudel { }; + sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; + scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; From b8af23e4b756f50612695bd5db35eb5e54743ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 5 Jun 2014 17:47:39 +0200 Subject: [PATCH 049/424] python-pygments: update 1.5 -> 1.6 Bug fixes, some new features and lots of new lexers. Full changelog: http://pygments.org/docs/changelog/#version-1-6 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf0eea9c2fb9..f3f75ea0f90b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5507,11 +5507,11 @@ rec { }; pygments = buildPythonPackage rec { - name = "Pygments-1.5"; + name = "Pygments-1.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - md5 = "ef997066cc9ee7a47d01fb4f3da0b5ff"; + md5 = "a18feedf6ffd0b0cc8c8b0fbdb2027b1"; }; meta = { From 10b9ce53a3839990eb2ca3a2feb646ed8d4f1a2d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 6 Jun 2014 03:44:28 +0200 Subject: [PATCH 050/424] livestreamer: 1.8.0 -> 1.8.2; fix up dependencies --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3f75ea0f90b..fd63228ca5d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4637,17 +4637,17 @@ rec { }; }; - livestreamer = if isPy34 then null else (buildPythonPackage { - #version = "1.8.0"; - name = "livestreamer-1.8.0"; + livestreamer = if isPy34 then null else (buildPythonPackage rec { + version = "1.8.2"; + name = "livestreamer-${version}"; src = fetchurl { - url = "https://github.com/chrippa/livestreamer/archive/v1.8.0.tar.gz"; - sha256 = "0fzpznbnhzrqawxdljvyml5251wbr3nifdrvnmh2b8vz356js4l8"; + url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz"; + sha256 = "130h97qdb7qx8xg0gz54p5a6cb2zbffi5hsi305xf0ah9nf4rbrc"; }; buildInputs = [ pkgs.makeWrapper ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests pkgs.rtmpdump pycrypto ]; postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin ''; From 1dae8bd2bfb870e662335f9d992bbbd4e7d18007 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Fri, 6 Jun 2014 02:50:54 -0400 Subject: [PATCH 051/424] Add holy-project to nixpkgs. Patch is required until the next version is pushed to hackage. --- .../haskell/holy-project/default.nix | 30 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/haskell/holy-project/default.nix diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix new file mode 100644 index 000000000000..4e751d9c003f --- /dev/null +++ b/pkgs/development/libraries/haskell/holy-project/default.nix @@ -0,0 +1,30 @@ +{ cabal, aeson, ansiTerminal, Cabal, filepath, hastache +, httpConduit, HUnit, lens, QuickCheck, random, smallcheck, split +, syb, tasty, tastyHunit, tastyQuickcheck, tastySmallcheck, text +, time +, fetchpatch}: + +cabal.mkDerivation (self: { + pname = "holy-project"; + version = "0.1.1.0"; + sha256 = "1dsyhgjcp54199zfazzzwsggxpj2dsbzfb64v6l3jz7qaapxnj9i"; + isLibrary = true; + isExecutable = true; + patches = [ (fetchpatch { url = "https://github.com/yogsototh/holy-project/pull/3.patch"; sha256 = "1ndyhfrsvn94zxzyq1w4504gz91yfv33375933qmz3wdfkc3rqf0"; }) ]; + buildDepends = [ + aeson ansiTerminal Cabal filepath hastache httpConduit HUnit lens + QuickCheck random smallcheck split syb tasty tastyHunit + tastyQuickcheck tastySmallcheck text time + ]; + testDepends = [ + Cabal HUnit QuickCheck smallcheck tasty tastyHunit tastyQuickcheck + tastySmallcheck + ]; + meta = { + homepage = "http://github.com/yogsototh/holy-project"; + description = "Start your Haskell project with cabal, git and tests"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be1571bc9023..46e7f279e055 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1174,6 +1174,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in httpTypes = callPackage ../development/libraries/haskell/http-types {}; + holyProject = callPackage ../development/libraries/haskell/holy-project {}; + HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; From f6d03359b3810dca112e1190eeec7f18a3bab247 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 5 Jun 2014 18:38:38 +0200 Subject: [PATCH 052/424] Only overwrite container-configuration when --config is specified. Fixes #2834. --- nixos/modules/virtualisation/nixos-container.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index 718630fe8b9b..5083abd84489 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -31,7 +31,7 @@ EOF } my $ensureUniqueName = 0; -my $extraConfig = ""; +my $extraConfig; GetOptions( "help" => sub { showHelp() }, @@ -190,7 +190,7 @@ elsif ($action eq "update") { # FIXME: may want to be more careful about clobbering the existing # configuration.nix. - writeNixOSConfig $nixosConfigFile if defined $extraConfig; + writeNixOSConfig $nixosConfigFile if (defined $extraConfig && $extraConfig ne ""); system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", "", From 77a937beec87c704014e54b0f0164c2593236f7c Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 6 Jun 2014 11:57:54 +0200 Subject: [PATCH 053/424] elixir: Bump to 1.13.3. --- pkgs/development/interpreters/elixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index c558063be3a2..00fe490d494a 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }: let - version = "0.13.2"; + version = "0.13.3"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "13mflf35lj2vbv32s5n982x7k5k55dsn9mx9rf3vkqgfsy7zx4ds"; + sha256 = "17nb8qfyjc67g62x10l2gq0z1501xa4wry906br0w2rm8bf4j8rf"; }; buildInputs = [ erlang rebar makeWrapper ]; From 94c2661503ca65d149570900e326079c97153808 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 6 Jun 2014 14:03:10 +0200 Subject: [PATCH 054/424] tomcat: fix service to be a daemon, and run tomcat in script rather than preStart --- nixos/modules/services/web-servers/tomcat.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index b5eee8f8be8f..1de3d40165e9 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -119,6 +119,8 @@ in startOn = "started network-interfaces"; stopOn = "stopping network-interfaces"; + daemonType = "daemon"; + preStart = '' # Create the base directory @@ -327,10 +329,12 @@ in done '' else ""} - - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' ''; + script = '' + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' + ''; + postStop = '' echo "Stopping tomcat..." From 57eaced234574a70eefb7b802305c9c7c4da094b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 14:08:23 +0200 Subject: [PATCH 055/424] spamassassin: download from any Apache mirror --- pkgs/servers/mail/spamassassin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 03e579bda209..ea69d036f958 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -16,7 +16,7 @@ buildPerlPackage rec { name = "SpamAssassin-3.4.0"; src = fetchurl { - url = "http://apache.imsam.info/spamassassin/source/Mail-${name}.tar.bz2"; + url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2"; sha256 = "0527rv6m5qd41l756fqh9q7sm9m2xfhhy2jchlhbmd39x6x3jfsm"; }; From 82d4f431edf59bd337cbfc8a2e0d7f697f24991f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 6 Jun 2014 15:11:16 +0200 Subject: [PATCH 056/424] haskell-th-lift-instances: update 0.1.2 -> 0.1.3 --- .../libraries/haskell/th-lift-instances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix index 27eb090443b6..32354eabd4a6 100644 --- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix +++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-lift-instances"; - version = "0.1.2"; - sha256 = "0xfz7jnhqxqxd6ijn6vpd0nay38kj862ylsb71xqi35137g5zl9w"; + version = "0.1.3"; + sha256 = "0snqgcdkskwvrsw239j3xq84mwnf5x79kfsn495kprdc6yh3qdkx"; buildDepends = [ text thLift vector ]; testDepends = [ doctest filepath QuickCheck text vector ]; meta = { From 98dfd124561f66029982d3426538cc6d2000a2e4 Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Fri, 6 Jun 2014 16:06:53 +0300 Subject: [PATCH 057/424] php: import apc 3.1.13 --- pkgs/top-level/php-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7ee050314049..8a01151bd77f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -40,4 +40,12 @@ let self = with self; { sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd"; }; }; + + apc = buildPecl rec { + name = "apc-3.1.13"; + src = pkgs.fetchurl { + url = "http://pecl.php.net/get/${name}.tgz"; + sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; + }; + }; }; in self From 1859dbc4a2a7c927375fef34d0176f66ee51e556 Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Fri, 6 Jun 2014 16:40:02 +0300 Subject: [PATCH 058/424] sysdig: update to 0.1.83 --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1f9abe97f75f..10a1d88f2347 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version="0.1.82"; + version="0.1.83"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256="0yjxsdjbkp5dihg5xhkyl3lg64dl40a0b5cvcai8gz74w2955mnk"; + sha256="0d4fw6vba78hqy8plhcq8lkdcxy1fizrr5aiszdsap7cvd0gls6r"; }; buildInputs = [ cmake zlib luajit From cc160a196a5d870e3301d0ed3d6187c048fe82c9 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 5 Jun 2014 15:12:30 +0100 Subject: [PATCH 059/424] couchdb service: adding customizable config file which is writable by couchdb --- nixos/modules/services/databases/couchdb.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 5088c7416810..e1fe6be6f6a3 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -126,6 +126,16 @@ in { Extra configuration. Overrides any other cofiguration. ''; }; + + configFile = mkOption { + type = types.string; + default = "/var/lib/couchdb/couchdb.ini"; + description = '' + Custom configuration file. File needs to be readable and writable + from couchdb user/group. + ''; + }; + }; }; @@ -146,11 +156,13 @@ in { mkdir -p `dirname ${cfg.logFile}`; mkdir -p ${cfg.databaseDir}; mkdir -p ${cfg.viewIndexDir}; + touch ${cfg.configFile} if [ "$(id -u)" = 0 ]; then - chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}` + chown ${cfg.user}:${cfg.group} ${cfg.uriFile} chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} + chown ${cfg.user}:${cfg.group} ${cfg.configFile} fi ''; @@ -158,7 +170,7 @@ in { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig}"; + ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}"; }; }; From 66ddb1c3229e5e85b0596bca6a4d730b3247cd76 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 5 Jun 2014 18:43:26 +0200 Subject: [PATCH 060/424] Add system.replaceRuntimeDependencies to quickly replace system dependencies --- nixos/modules/system/activation/top-level.nix | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index b739ef693ce9..62999dceee39 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -95,7 +95,7 @@ let # kernel, systemd units, init scripts, etc.) as well as a script # `switch-to-configuration' that activates the configuration and # makes it bootable. - system = showWarnings ( + baseSystem = showWarnings ( if [] == failed then pkgs.stdenv.mkDerivation { name = "nixos-${config.system.nixosVersion}"; preferLocalBuild = true; @@ -118,6 +118,10 @@ let perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); + # Replace runtime dependencies + system = fold ({ oldDependency, newDependency }: drv: + pkgs.replaceDependency { inherit oldDependency newDependency drv; } + ) baseSystem config.system.replaceRuntimeDependencies; in @@ -184,6 +188,33 @@ in ''; }; + system.replaceRuntimeDependencies = mkOption { + default = []; + example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { ... }; }) ]"; + type = types.listOf (types.submodule ( + { options, ... }: { + options.original = mkOption { + type = types.package; + description = "The original package to override."; + }; + + options.replacement = mkOption { + type = types.package; + description = "The replacement package."; + }; + }) + ); + apply = map ({ original, replacement, ... }: { + oldDependency = original; + newDependency = replacement; + }); + description = '' + List of packages to override without doing a full rebuild. + The original derivation and replacement derivation must have the same + name length, and ideally should have close-to-identical directory layout. + ''; + }; + }; From af479a67b7c11350bafa65b3f3441640a32f033c Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 6 Jun 2014 18:06:03 -0400 Subject: [PATCH 061/424] Fix xpwn on Darwin and other case-insensitive file systems --- pkgs/development/mobile/xpwn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index b248107141f5..049595c49a5a 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { }; preConfigure = '' + rm BUILD # otherwise `mkdir build` fails on case insensitive file systems sed -r -i \ -e 's/(install.*TARGET.*DESTINATION )\.\)/\1bin)/' \ -e 's!(install.*(FILE|DIR).*DESTINATION )([^)]*)!\1share/xpwn/\3!' \ From 17368bdf8ed8eaa84941e4c79721f3d0e862f118 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 6 Jun 2014 23:01:04 -0500 Subject: [PATCH 062/424] arcanist: update Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 58957a82752a..9cc8e7c7f6bd 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,8 +3,8 @@ let libphutil = fetchgit { url = "git://github.com/facebook/libphutil.git"; - rev = "c4cb6d99c4a5903079350f85fcc71895c0a0ea14"; - sha256 = "a7293aac4fdcfbaead09ee3e6ffb54c5d100b07905b4006194067411061ff994"; + rev = "7e75bf271c669b61eb6e6e2ea312a36e64b80a4a"; + sha256 = "ffb7ee8141b925889e9bbc945d2f38f12d1489148b9c9b7eaeadd7524d254a78"; }; arcanist = fetchgit { url = "git://github.com/facebook/arcanist.git"; @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20140530"; + version = "20140606"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper ]; From 8c0b63162b203c7903b5e8d7a428d62dc09fa80a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 6 Jun 2014 23:09:47 -0500 Subject: [PATCH 063/424] compcert: 2.2 -> 2.3pl2 Signed-off-by: Austin Seipp --- pkgs/development/compilers/compcert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index c4af878ba760..f5e66b8ac10b 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "2.2"; + version = "2.3pl2"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "0zhqx9mixlsycckl6wq6yrd795byj1jz7m4njcgfv29cx33j1nrk"; + sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8"; }; buildInputs = [ coq ocaml ]; From 80f3e943b1a94461e1abbcf9bad4766aedbb95a5 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 6 Jun 2014 23:14:54 -0500 Subject: [PATCH 064/424] dd-agent: 4.2.1 -> 4.3.1 Signed-off-by: Austin Seipp --- pkgs/tools/networking/dd-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 1674d01af8fc..8ff45e733fb9 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -2,14 +2,14 @@ , makeWrapper }: stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.3.1"; name = "dd-agent-${version}"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-agent"; rev = version; - sha256 = "06f9nkvnpfzs2nw75cac2y9wnp2bay4sg94zz0wjm8886rigjjjm"; + sha256 = "0z6b1s30fyd9ldahizrjwcxx7c7dd74xsqy19j3qykrb25j9cvmn"; }; buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ]; From 36e6eda5fc21e655b172a3c8a445930bafb64e73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jun 2014 12:28:54 +0200 Subject: [PATCH 065/424] r-modules: set meta.hydraPlatforms for all R packages --- pkgs/development/r-modules/cran-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 52bde8019922..2c48adc558b7 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -49,6 +49,7 @@ let }; propagatedBuildInputs = depends; meta.homepage = "http://cran.r-project.org/web/packages/${name}/"; + meta.hydraPlatforms = R.meta.hydraPlatforms; }; in From 905081c0291bc18fb8754fa6a80bf75e1ea7f0c9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 7 Jun 2014 12:45:33 +0200 Subject: [PATCH 066/424] Add github atom, a hackable text editor for the 21st Century --- pkgs/applications/editors/atom/default.nix | 68 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 72 insertions(+) create mode 100644 pkgs/applications/editors/atom/default.nix diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix new file mode 100644 index 000000000000..725b4520e699 --- /dev/null +++ b/pkgs/applications/editors/atom/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib +, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs +}: + +let + atomEnv = buildEnv { + name = "env-atom"; + paths = [ + stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss + xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst + xlibs.libXcomposite xlibs.libXi xlibs.libXfixes + ]; + }; +in stdenv.mkDerivation rec { + name = "atom-${version}"; + version = "0.99.0"; + + src = fetchurl { + url = https://github.com/hotice/webupd8/raw/master/atom-linux64-0.99.0~git20140525.tar.xz; + sha256 = "55c2415c96e1182ae1517751cbea1db64e9962683b384cfe5e182aec10aebecd"; + name = "${name}.tar.xz"; + }; + + iconsrc = fetchurl { + url = https://raw.githubusercontent.com/atom/atom/master/resources/atom.png; + sha256 = "66dc0b432eed7bcd738b7c1b194e539178a83d427c78f103041981f2b840e030"; + }; + + desktopItem = makeDesktopItem { + name = "atom"; + exec = "atom"; + icon = iconsrc; + comment = "A hackable text editor for the 21st Century"; + desktopName = "Atom"; + genericName = "Text editor"; + categories = "Development;TextEditor"; + }; + + buildInputs = [ atomEnv makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + ensureDir $out/share/atom + ensureDir $out/bin + tar -C $out/share/atom -xvf $src + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/share/atom/atom + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node + makeWrapper $out/share/atom/atom $out/bin/atom \ + --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" + + # Create a desktop item. + mkdir -p "$out/share/applications" + cp "${desktopItem}"/share/applications/* "$out/share/applications/" + ''; + + meta = with stdenv.lib; { + description = "A hackable text editor for the 21st Century"; + homepage = https://atom.io/; + license = [ licenses.mit ]; + maintainers = [ maintainers.offline ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce0f7593f2cb..5a1953446cf1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7940,6 +7940,10 @@ let arora = callPackage ../applications/networking/browsers/arora { }; + atom = callPackage ../applications/editors/atom { + gconf = gnome.GConf; + }; + aseprite = callPackage ../applications/editors/aseprite { giflib = giflib_4_1; }; From 4dd5496bd427f29cffc295ad00ba47476cba303c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 7 Jun 2014 07:11:50 -0500 Subject: [PATCH 067/424] arcanist: build xhpast for 'arc liberate' Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 9cc8e7c7f6bd..02fe572edabd 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, php, makeWrapper }: +{ stdenv, fetchgit, php, flex, makeWrapper }: let libphutil = fetchgit { @@ -17,17 +17,23 @@ stdenv.mkDerivation rec { version = "20140606"; src = [ arcanist libphutil ]; - buildInputs = [ php makeWrapper ]; + buildInputs = [ php makeWrapper flex ]; unpackPhase = "true"; - buildPhase = "true"; + buildPhase = '' + ORIG=`pwd` + chmod +w -R ${libphutil} + cd ${libphutil}/support/xhpast + ls + make clean all install + cd $ORIG + ''; installPhase = '' mkdir -p $out/bin $out/libexec cp -R ${libphutil} $out/libexec/libphutil cp -R ${arcanist} $out/libexec/arcanist ln -s $out/libexec/arcanist/bin/arc $out/bin - wrapProgram $out/bin/arc \ --prefix PATH : "${php}/bin" ''; From 0b62bef7f1174afd1f21aff2643a8c6b9fe0b4c4 Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Sat, 7 Jun 2014 14:58:41 +0200 Subject: [PATCH 068/424] sabnzbd: fixed typo in url and updated to 0.7.17 --- pkgs/servers/sabnzbd/builder.sh | 2 +- pkgs/servers/sabnzbd/default.nix | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh index c263500cde45..c0408f89009d 100644 --- a/pkgs/servers/sabnzbd/builder.sh +++ b/pkgs/servers/sabnzbd/builder.sh @@ -9,7 +9,7 @@ echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd chmod +x $out/bin/sabnzbd for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate)" \ + wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \ --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" done diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index ace96fbed637..09c0de9c74f1 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,15 +1,16 @@ -{stdenv, fetchurl, python, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}: +{stdenv, fetchurl, python, pythonPackages, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}: -stdenv.mkDerivation { - name = "sabnzbd-0.4.12"; +stdenv.mkDerivation rec { + name = "sabnzbd-0.7.17"; src = fetchurl { - url = mirro://sourceforge/sabnzbdplus/SABnzbd-0.4.12-src.tar.gz; - sha256 = "35ce4172688925ef608fba433ff676357dab7d2abdc1cf83112a1c99682fdd32"; + url = mirror://sourceforge/sabnzbdplus/SABnzbd-0.7.17-src.tar.gz; + sha256 = "02gbh3q3qnbwy4xn1hw4i4fyw4j5nkrqy4ak46mxwqgip9ym20d5"; }; - buildInputs = [makeWrapper python cheetahTemplate]; + buildInputs = [makeWrapper python sqlite3 cheetahTemplate]; inherit stdenv python cheetahTemplate par2cmdline unzip unrar; + inherit (pythonPackages) sqlite3; builder = ./builder.sh; From c841db2aff47b54f0e7449dcca1f9bd019f6c812 Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Sat, 7 Jun 2014 15:00:19 +0200 Subject: [PATCH 069/424] whitespace --- pkgs/servers/sabnzbd/builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh index c0408f89009d..3a5c8adb421e 100644 --- a/pkgs/servers/sabnzbd/builder.sh +++ b/pkgs/servers/sabnzbd/builder.sh @@ -9,8 +9,8 @@ echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd chmod +x $out/bin/sabnzbd for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \ - --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" + wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \ + --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" done echo $out From 91b2021782a0b956163db9b051758a12d1d632ae Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 7 Jun 2014 14:51:50 +0200 Subject: [PATCH 070/424] feh: Set the default theme explicitly to 'feh' feh uses argv[0] to set the default theme, because feh is wrapped this will be .feh-wrapper. This makes it hard to use the configuration on multiple systems and can be confusion. Therefore the theme is explicity set to 'feh'. --- pkgs/applications/graphics/feh/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 47a528175490..b05946b4f824 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin" + wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin" \ + --add-flags '--theme=feh' ''; meta = { From b40ce8a1f1a2170a53772a26e77044f377fdc06a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 7 Jun 2014 14:45:45 +0200 Subject: [PATCH 071/424] Update feh from 2.11 to 2.12. The relevant source code of giblib was imported into feh, therefore giblib is no longer a dependency. --- pkgs/applications/graphics/feh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index b05946b4f824..d23f42fdbf99 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,15 +1,15 @@ -{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng, giblib +{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng , libXinerama, curl }: stdenv.mkDerivation rec { - name = "feh-2.11"; + name = "feh-2.12"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1y41ixsp5nhvb29hhiyh8g1g28lc0kki619skgxcv5iisc93dk4x"; + sha256 = "0ckhidmsms2l5jycp0qf71jzmb3bpbhjq3bcgfpvfvszah7pmq30"; }; - buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ]; + buildInputs = [makeWrapper x11 imlib2 libjpeg libpng libXinerama curl]; preBuild = '' makeFlags="PREFIX=$out" From 393923a8697e7ce7da0cd434a1025102fb9aa47c Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Fri, 30 May 2014 14:29:31 +0200 Subject: [PATCH 072/424] graphite-web: Fix webapp content path --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd63228ca5d0..bb8e426fc454 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8919,7 +8919,7 @@ rec { preConfigure = '' substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo' - substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join(WEBAPP_DIR, 'webapp', 'content')" + substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" cp webapp/graphite/manage.py bin/manage-graphite.py substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings' ''; From 72cd8ce56c49086d350b2059de5392b4c8a7186e Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 6 Jun 2014 17:45:22 -0400 Subject: [PATCH 073/424] add MacVim --- pkgs/applications/editors/vim/macvim.nix | 92 ++++++++++++ pkgs/applications/editors/vim/macvim.patch | 159 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 253 insertions(+) create mode 100644 pkgs/applications/editors/vim/macvim.nix create mode 100644 pkgs/applications/editors/vim/macvim.patch diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix new file mode 100644 index 000000000000..25a8e5fe9fab --- /dev/null +++ b/pkgs/applications/editors/vim/macvim.nix @@ -0,0 +1,92 @@ +{ stdenv, stdenvAdapters, gccApple, fetchFromGitHub, ncurses, gettext, + pkgconfig, cscope, python, ruby, tcl, perl, luajit +}: + +let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation; +in mkDerivation rec { + name = "macvim-${version}"; + + version = "7.4-73"; + + src = fetchFromGitHub { + owner = "b4winckler"; + repo = "macvim"; + rev = "snapshot-73"; + sha256 = "0zv82y2wz8b482khkgbl08cnxq3pv5bm37c71wgfa0fzy3h12gcj"; + }; + + enableParallelBuilding = true; + + buildInputs = [ + gettext ncurses pkgconfig luajit ruby tcl perl python + ]; + + patches = [ ./macvim.patch ]; + + postPatch = '' + substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out" + + # Don't create custom icons. + substituteInPlace src/MacVim/icons/Makefile --replace '$(MAKE) -C makeicns' "" + substituteInPlace src/MacVim/icons/make_icons.py --replace "dont_create = False" "dont_create = True" + + # Full path to xcodebuild + substituteInPlace src/Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" + ''; + + configureFlags = [ + #"--enable-cscope" # TODO: cscope doesn't build on Darwin yet + "--enable-fail-if-missing" + "--with-features=huge" + "--enable-gui=macvim" + "--enable-multibyte" + "--enable-nls" + "--enable-luainterp=dynamic" + "--enable-pythoninterp=dynamic" + "--enable-perlinterp=dynamic" + "--enable-rubyinterp=dynamic" + "--enable-tclinterp=yes" + "--with-luajit" + "--with-lua-prefix=${luajit}" + "--with-ruby-command=${ruby}/bin/ruby" + "--with-tclsh=${tcl}/bin/tclsh" + "--with-tlib=ncurses" + "--with-compiledby=Nix" + ]; + + preConfigure = '' + DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer + configureFlagsArray+=( + "--with-developer-dir=$DEV_DIR" + ) + ''; + + postInstall = '' + cp -r src/MacVim/build/Release/MacVim.app $out + + rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} + + cp src/MacVim/mvim $out/bin + cp src/vimtutor $out/bin + + for prog in "vimdiff" "vi" "vim" "ex" "rvim" "rview" "view"; do + ln -s $out/bin/mvim $out/bin/$prog + done + + # Fix rpaths + exe="$out/MacVim.app/Contents/MacOS/Vim" + libperl=$(dirname $(find ${perl} -name "libperl.dylib")) + install_name_tool -add_rpath ${luajit}/lib $exe + install_name_tool -add_rpath ${tcl}/lib $exe + install_name_tool -add_rpath ${python}/lib $exe + install_name_tool -add_rpath $libperl $exe + install_name_tool -add_rpath ${ruby}/lib $exe + ''; + + meta = with stdenv.lib; { + description = "Vim - the text editor - for Mac OS X"; + homepage = https://github.com/b4winckler/macvim; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch new file mode 100644 index 000000000000..c721bbe149a3 --- /dev/null +++ b/pkgs/applications/editors/vim/macvim.patch @@ -0,0 +1,159 @@ +diff --git a/src/vimtutor b/src/vimtutor +index 70d9ec7..b565a1a 100755 +--- a/src/vimtutor ++++ b/src/vimtutor +@@ -16,7 +16,7 @@ seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" + if test "$1" = "-g"; then + # Try to use the GUI version of Vim if possible, it will fall back + # on Vim if Gvim is not installed. +- seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" ++ seq="mvim gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" + shift + fi + + +diff --git a/src/auto/configure b/src/auto/configure +index bc9f074..9b9125e 100755 +--- a/src/auto/configure ++++ b/src/auto/configure +@@ -2252,7 +2252,7 @@ rm -f conftest.val + as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int +-cat >auto/config.log <<_ACEOF ++cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +@@ -2262,7 +2262,7 @@ generated by GNU Autoconf 2.69. Invocation command line was + $ $0 $@ + + _ACEOF +-exec 5>>auto/config.log ++exec 5>>config.log + { + cat <<_ASUNAME + ## --------- ## +@@ -5377,10 +5377,7 @@ $as_echo "no" >&6; } + fi + + if test "X$vi_cv_path_mzscheme_pfx" != "X"; then +- if test "x$MACOSX" = "xyes"; then +- MZSCHEME_LIBS="-framework Racket" +- MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" +- elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then ++ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then + MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a" + MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" + elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then +@@ -5716,23 +5713,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } + fi + + if test "x$MACOSX" = "xyes"; then +- dir=/System/Library/Perl +- darwindir=$dir/darwin +- if test -d $darwindir; then +- PERL=/usr/bin/perl +- else +- dir=/System/Library/Perl/5.8.1 +- darwindir=$dir/darwin-thread-multi-2level +- if test -d $darwindir; then +- PERL=/usr/bin/perl +- fi +- fi +- if test -n "$PERL"; then +- PERL_DIR="$dir" +- PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE" +- PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a" +- PERL_LIBS="-L$darwindir/CORE -lperl" +- fi + PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` + PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` + fi +@@ -5926,10 +5906,6 @@ __: + eof + eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" +- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ +- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then +- vi_cv_path_python_plibs="-framework Python" +- else + if test "${vi_cv_var_python_version}" = "1.4"; then + vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" + else +@@ -5937,7 +5913,6 @@ eof + fi + vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" + vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` +- fi + + fi + +@@ -6004,13 +5979,6 @@ rm -f core conftest.err conftest.$ac_objext \ + $as_echo "no" >&6; } + fi + +- if test -n "$MACSDK"; then +- PYTHON_CFLAGS= +- PYTHON_LIBS=-framework Python +- PYTHON_CONFDIR= +- PYTHON_GETPATH_CFLAGS= +- fi +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 + $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } + cflags_save=$CFLAGS +@@ -6853,11 +6821,7 @@ $as_echo "$tclver - OK" >&6; }; + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 + $as_echo_n "checking for location of Tcl include... " >&6; } +- if test "x$MACOSX" != "xyes"; then + tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" +- else +- tclinc="/System/Library/Frameworks/Tcl.framework/Headers" +- fi + TCL_INC= + for try in $tclinc; do + if test -f "$try/tcl.h"; then +@@ -6875,12 +6839,8 @@ $as_echo "" >&6; } + if test -z "$SKIP_TCL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 + $as_echo_n "checking for location of tclConfig.sh script... " >&6; } +- if test "x$MACOSX" != "xyes"; then + tclcnf=`echo $tclinc | sed s/include/lib/g` + tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" +- else +- tclcnf="/System/Library/Frameworks/Tcl.framework" +- fi + for try in $tclcnf; do + if test -f $try/tclConfig.sh; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 +@@ -7050,10 +7010,6 @@ $as_echo "$rubyhdrdir" >&6; } + if test -f "$rubylibdir/$librubya"; then + librubyarg="$librubyarg" + RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" +- elif test -d "/System/Library/Frameworks/Ruby.framework"; then +- RUBY_LIBS="-framework Ruby" +- RUBY_CFLAGS="-DRUBY_VERSION=$rubyversion" +- librubyarg= + fi + + if test "X$librubyarg" != "X"; then +@@ -14061,7 +14017,7 @@ fi + + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-exec 5>>auto/config.log ++exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +@@ -14653,7 +14609,7 @@ if test "$no_create" != yes; then + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false +- exec 5>>auto/config.log ++ exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ede5259f1ba4..ad3eefec8593 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9586,6 +9586,8 @@ let vim = callPackage ../applications/editors/vim { }; + macvim = callPackage ../applications/editors/vim/macvim.nix { }; + vimWrapper = wrapVim vim; vimHugeX = vim_configurable; From a91a4e9db20611920728982975282670598bd719 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 7 Jun 2014 21:04:16 +0200 Subject: [PATCH 074/424] yi: improve expression Disable Haddock docs so that it actually builds (bug in GHC 7.6.3), make pango optional (OSX people often complain), tell the binary where to find various libraries needed at runtime (currently it could not find even its own library). --- pkgs/applications/editors/yi/yi.nix | 38 +++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index 96e4a06965c1..e689bdff4f69 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -5,6 +5,12 @@ , split, tasty, tastyHunit, tastyQuickcheck, time, transformersBase , uniplate, unixCompat, unorderedContainers, utf8String, vty , xdgBasedir +, withPango ? true + +# User may need extra dependencies for their configuration file so we +# want to specify it here to have them available when wrapping the +# produced binary. +, extraDepends ? [ ] }: cabal.mkDerivation (self: { @@ -15,21 +21,43 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ binary Cabal cautiousFile concreteTyperep dataDefault derive Diff - dlist dyre filepath fingertree glib gtk hashable hint lens mtl - pango parsec pointedlist QuickCheck random regexBase regexTdfa safe + dlist dyre filepath fingertree hashable hint lens mtl + parsec pointedlist QuickCheck random regexBase regexTdfa safe split time transformersBase uniplate unixCompat unorderedContainers utf8String vty xdgBasedir - ]; + ] ++ (if withPango then [ pango gtk glib ] else [ ]) ++ extraDepends; testDepends = [ filepath HUnit QuickCheck tasty tastyHunit tastyQuickcheck ]; buildTools = [ alex ]; - configureFlags = "-fpango"; + configureFlags = if withPango then "-fpango" else "-f-pango"; doCheck = false; + + # https://ghc.haskell.org/trac/ghc/ticket/9170 + noHaddock = self.ghc.version == "7.6.3"; + + # Allows Yi to find the libraries it needs at runtime. + postInstall = '' + mv $out/bin/yi $out/bin/.yi-wrapped + cat - > $out/bin/yi < Date: Sat, 7 Jun 2014 12:15:54 +0000 Subject: [PATCH 075/424] haskell-fuzzcheck: new expression --- .../libraries/haskell/fuzzcheck/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/fuzzcheck/default.nix diff --git a/pkgs/development/libraries/haskell/fuzzcheck/default.nix b/pkgs/development/libraries/haskell/fuzzcheck/default.nix new file mode 100644 index 000000000000..a1da7f8ebbf0 --- /dev/null +++ b/pkgs/development/libraries/haskell/fuzzcheck/default.nix @@ -0,0 +1,19 @@ +{ cabal, hspec, hspecExpectations, HUnit, liftedBase, monadControl +, QuickCheck, random, transformers +}: + +cabal.mkDerivation (self: { + pname = "fuzzcheck"; + version = "0.1.1"; + sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc"; + buildDepends = [ + liftedBase monadControl QuickCheck random transformers + ]; + testDepends = [ hspec hspecExpectations HUnit QuickCheck ]; + meta = { + homepage = "https://github.com/fpco/fuzzcheck"; + description = "A simple checker for stress testing monadic code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b10da90afcef..a6688f3ee919 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -800,6 +800,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in freetype2 = callPackage ../development/libraries/haskell/freetype2 {}; + fuzzcheck = callPackage ../development/libraries/haskell/fuzzcheck {}; + gamma = callPackage ../development/libraries/haskell/gamma {}; geniplate = callPackage ../development/libraries/haskell/geniplate {}; From 10d1fd04576b212814eb66fb94689aaad0bc9dd4 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 12:16:20 +0000 Subject: [PATCH 076/424] crafty: simplify expression --- pkgs/games/crafty/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 65cdd14539bd..e0eb49b53cb8 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, unzip, fullVariant }: +{ stdenv, fetchurl, unzip, fullVariant ? false }: stdenv.mkDerivation rec { - name = "crafty-23.4"; + name = "crafty-${version}"; + version = "23.4"; src = fetchurl { - url = http://www.craftychess.com/crafty-23.4.zip; + url = "http://www.craftychess.com/crafty-${version}.zip"; sha256 = "0rhf4pfxcwj8hqd7bqj98fpdd80v6ss1jnc9kgwx2fw4ksdi37pl"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5285ccf73e5..e785945815dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9952,7 +9952,7 @@ let crack_attack = callPackage ../games/crack-attack { }; - crafty = callPackage ../games/crafty { fullVariant = false; }; + crafty = callPackage ../games/crafty { }; craftyFull = appendToName "full" (crafty.override { fullVariant = true; }); crrcsim = callPackage ../games/crrcsim {}; From b896b498272694bef766ce6d4ec30295f680cb81 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 12:16:31 +0000 Subject: [PATCH 077/424] libdrm: allow to build on any unix --- pkgs/development/libraries/libdrm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index c895f141850f..69d09fe9fae4 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From e5e9171578e15d76bff4c1fb29d931633b79e85a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 12:16:41 +0000 Subject: [PATCH 078/424] hoogle-local: minor changes for consistency --- pkgs/development/libraries/haskell/hoogle/local.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index 337cd4c8154a..9f56d028c590 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -38,13 +38,13 @@ cabal.mkDerivation (self: rec { sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc"; isLibrary = true; isExecutable = true; - buildInputs = [ self.ghc Cabal parallel perl wget rehoo ] - ++ self.extraBuildInputs ++ packages; + buildInputs = [self.ghc Cabal] ++ self.extraBuildInputs + ++ [ parallel perl wget rehoo ] ++ packages; buildDepends = [ aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random resourcet safe shake tagsoup text time transformers uniplate vector - vectorAlgorithms wai warp parallel perl wget rehoo + vectorAlgorithms wai warp ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; @@ -112,6 +112,6 @@ cabal.mkDerivation (self: rec { description = "Haskell API Search"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ self.stdenv.lib.maintainers.jwiegley ]; }; }) From c06613a3af177777b68dfebe74cd019b48e4dcb8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 20:18:27 +0000 Subject: [PATCH 079/424] macvim: move the .app bundle to $out/Applications --- pkgs/applications/editors/vim/macvim.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 25a8e5fe9fab..52567d5d31b7 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -24,7 +24,7 @@ in mkDerivation rec { patches = [ ./macvim.patch ]; postPatch = '' - substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out" + substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out/Applications" # Don't create custom icons. substituteInPlace src/MacVim/icons/Makefile --replace '$(MAKE) -C makeicns' "" @@ -62,7 +62,7 @@ in mkDerivation rec { ''; postInstall = '' - cp -r src/MacVim/build/Release/MacVim.app $out + cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} @@ -74,7 +74,7 @@ in mkDerivation rec { done # Fix rpaths - exe="$out/MacVim.app/Contents/MacOS/Vim" + exe="$out/Applications/MacVim.app/Contents/MacOS/Vim" libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe From 6a3a9589e2fa15a4a3064a7cd923f6c1cb5e7cd3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 20:22:58 +0000 Subject: [PATCH 080/424] macvim: add missing call to ensureDir --- pkgs/applications/editors/vim/macvim.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 52567d5d31b7..e48cb2590f9c 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -62,6 +62,7 @@ in mkDerivation rec { ''; postInstall = '' + ensureDir $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} From 6c3cc8bb9553f92697957da644908bd73fe556c8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 7 Jun 2014 22:28:56 +0200 Subject: [PATCH 081/424] PPSSPP: add platforms --- pkgs/misc/emulators/ppsspp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index db5e42e37eac..975de0f52701 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -29,5 +29,6 @@ in stdenv.mkDerivation { description = "A PSP emulator, the Qt4 version."; license = licenses.gpl2Plus; maintainers = [ maintainers.fuuzetsu ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; }; } \ No newline at end of file From 34495b67ce252fd4b6d0a2584cba832242c2c0e9 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 16:38:41 -0500 Subject: [PATCH 082/424] haskell-data-checked: new expression --- .../libraries/haskell/data-checked/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/data-checked/default.nix diff --git a/pkgs/development/libraries/haskell/data-checked/default.nix b/pkgs/development/libraries/haskell/data-checked/default.nix new file mode 100644 index 000000000000..429f9da92bf3 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-checked/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "data-checked"; + version = "0.3"; + sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/mvv/data-checked"; + description = "Type-indexed runtime-checked properties"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a6688f3ee919..fd35dfb215f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -564,6 +564,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dateCache = callPackage ../development/libraries/haskell/date-cache {}; + dataChecked = callPackage ../development/libraries/haskell/data-checked {}; + datetime = callPackage ../development/libraries/haskell/datetime {}; DAV = callPackage ../development/libraries/haskell/DAV {}; From 476a3d818fba2d50c169af5ab4775be2b7e64c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 7 Jun 2014 23:40:58 +0200 Subject: [PATCH 083/424] nixos/graphite-service: fix filename typo It's "aggregation" with two 'g's. Fixes this: carbon-cache[9363]: [console] /nix/store/drxq4jj92sjk3cjik2l4hnsndbray3i4-graphite-config/storage-aggregation.conf not found, ignoring. --- nixos/modules/services/monitoring/graphite.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index d543d15b34e1..3a5b13d6d40b 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -12,7 +12,7 @@ let name = "graphite-config"; paths = lists.filter (el: el != null) [ (writeTextOrNull "carbon.conf" cfg.carbon.config) - (writeTextOrNull "storage-agregation.conf" cfg.carbon.storageAggregation) + (writeTextOrNull "storage-aggregation.conf" cfg.carbon.storageAggregation) (writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas) (writeTextOrNull "blacklist.conf" cfg.carbon.blacklist) (writeTextOrNull "whitelist.conf" cfg.carbon.whitelist) From a0efad6861275258862f093ba890c2a235eb7527 Mon Sep 17 00:00:00 2001 From: Sterling Stein Date: Sat, 7 Jun 2014 15:08:57 -0700 Subject: [PATCH 084/424] fceux: Add package for a NES emulator. --- pkgs/misc/emulators/fceux/default.nix | 34 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/misc/emulators/fceux/default.nix diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix new file mode 100644 index 000000000000..48860f17aaf2 --- /dev/null +++ b/pkgs/misc/emulators/fceux/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, scons, zlib, SDL, lua5, pkgconfig}: + +stdenv.mkDerivation { + name = "fceux-2.2.2"; + + src = fetchurl { + url = mirror://sourceforge/fceultra/Source%20Code/2.2.2%20src/fceux-2.2.2.src.tar.gz; + sha256 = "1qg5bygla8ka30b7wqvq6dv84xc7pq0jspffh2jz75d1njyi2kc0"; + }; + + buildInputs = [ + scons zlib SDL lua5 pkgconfig + ]; + + phases = "unpackPhase buildPhase"; + + # sed allows scons to find libraries in nix. + # mkdir is a hack to make scons succeed. It still doesn't + # actually put the files in there due to a bug in the SConstruct file. + # OPENGL doesn't work because fceux dlopens the library. + buildPhase = '' + sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct + export CC="gcc" + export CXX="g++" + mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps" + scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false SYSTEM_LUA=false install + ''; + + meta = { + description = "A Nintendo Entertainment System (NES) Emulator"; + license = stdenv.lib.licenses.gpl2; + homepage = http://www.fceux.com/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e785945815dc..2e157b01d9f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10784,6 +10784,8 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; + fceux = callPackage ../misc/emulators/fceux { }; + foldingathome = callPackage ../misc/foldingathome { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; From c6261157f812eff0cdecc7cba3ee29be9224c4eb Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 8 Jun 2014 05:35:26 +0000 Subject: [PATCH 085/424] prooftree: new expression 0.12 --- .../science/logic/prooftree/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/science/logic/prooftree/default.nix diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix new file mode 100644 index 000000000000..caaf4a94a1ed --- /dev/null +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: + +stdenv.mkDerivation (rec { + name = "prooftree-${version}"; + version = "0.12"; + + src = fetchurl { + url = "http://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; + sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; + }; + + buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + + dontAddPrefix = true; + configureFlags = [ "--prefix" "$(out)" ]; + + meta = { + description = "Prooftree is a program for proof-tree visualization"; + longDescription = '' + Prooftree is a program for proof-tree visualization during interactive + proof development in a theorem prover. It is currently being developed + for Coq and Proof General. Prooftree helps against getting lost between + different subgoals in interactive proof development. It clearly shows + where the current subgoal comes from and thus helps in developing the + right plan for solving it. + + Prooftree uses different colors for the already proven subgoals, the + current branch in the proof and the still open subgoals. Sequent texts + are not displayed in the proof tree itself, but they are shown as a + tool-tip when the mouse rests over a sequent symbol. Long proof commands + are abbreviated in the tree display, but show up in full length as + tool-tip. Both, sequents and proof commands, can be shown in the display + below the tree (on single click) or in a separate window (on double or + shift-click). + ''; + homepage = http://askra.de/software/prooftree; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.jwiegley ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e785945815dc..311ee6ec5fa7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10617,6 +10617,11 @@ let picosat = callPackage ../applications/science/logic/picosat {}; + prooftree = callPackage ../applications/science/logic/prooftree { + inherit (ocamlPackages) findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + prover9 = callPackage ../applications/science/logic/prover9 { }; satallax = callPackage ../applications/science/logic/satallax {}; From d91eacd7200214de1349a1738fabe18bd0289c8d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 7 Jun 2014 19:10:31 -0500 Subject: [PATCH 086/424] kernel: 3.14.5 -> 3.14.6 (close #2868) --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 465a04837ecc..8675c529bde7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.5"; + version = "3.14.6"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0x38fyj86hrw7ns14m4kdpscqlj7ig889mxzvwsbhrsk0khllvyn"; + sha256 = "1wk3zdka9n49ixl2s7djavbk0b2nd0772gbmiaxi9mljah9inlhw"; }; features.iwlwifi = true; From 25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Jun 2014 12:20:47 +0400 Subject: [PATCH 087/424] Use the libav version compatible with our gstreamer version --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 311ee6ec5fa7..3e9a517d89b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4635,7 +4635,9 @@ let gperftools = callPackage ../development/libraries/gperftools { }; - gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { }); + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { + callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_9; }); + }); gst_all = { inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; From e18b59540cd68d03f9e4d2d976f4ccb7e76778fd Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 8 Jun 2014 04:18:25 -0500 Subject: [PATCH 088/424] haskell-bytes: new expression --- .../libraries/haskell/bytes/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/bytes/default.nix diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix new file mode 100644 index 000000000000..cb647f2cb162 --- /dev/null +++ b/pkgs/development/libraries/haskell/bytes/default.nix @@ -0,0 +1,19 @@ +{ cabal, binary, cereal, doctest, filepath, mtl, text, time +, transformers, transformersCompat, void +}: + +cabal.mkDerivation (self: { + pname = "bytes"; + version = "0.14.0.2"; + sha256 = "1bdradf5lq1kgiri64zd8cvcw2fxwbwv0apznl8vxyqlx406v3rn"; + buildDepends = [ + binary cereal mtl text time transformers transformersCompat void + ]; + testDepends = [ doctest filepath ]; + meta = { + homepage = "http://github.com/analytics/bytes"; + description = "Sharing code for serialization between binary and cereal"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fd35dfb215f6..db364b9a58d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -301,6 +301,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in byteorder = callPackage ../development/libraries/haskell/byteorder {}; + bytes = callPackage ../development/libraries/haskell/bytes {}; + bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {}; bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {}; From edd472983853eecda67e0b59cddd0b5a8737feb9 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 8 Jun 2014 04:28:11 -0500 Subject: [PATCH 089/424] crafty: specify the support platforms --- pkgs/games/crafty/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index e0eb49b53cb8..54deae2ecfe1 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -661,6 +661,7 @@ stdenv.mkDerivation rec { homepage = http://www.craftychess.com/; description = "Crafty is a free, open-source computer chess program developed by Dr. Robert M. Hyatt"; license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.jwiegley ]; }; } From 0195628118064039030b38c948b51b3a59e5ac3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 8 Jun 2014 15:59:35 +0200 Subject: [PATCH 090/424] nixos/statsd-service: fix 'graphitePort' default value graphitePort must point to the port that carbon-cache listens on, not the graphite webUI port. With this change I finally got data from statsd to graphite. --- nixos/modules/services/monitoring/statsd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 05950639c1e0..74f3deb4c290 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -69,8 +69,8 @@ in }; graphitePort = mkOption { - description = "Port of Graphite server"; - default = config.services.graphite.web.port; + description = "Port of Graphite server (i.e. carbon-cache)."; + default = 2003; type = types.uniq types.int; }; From 7a88839b90463f30f5f9dbf0c32067cd04a9992b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 8 Jun 2014 19:39:34 +0200 Subject: [PATCH 091/424] spring: fix runtime dependency on udev --- pkgs/games/spring/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index f9d380d9cd52..539be06bf7fa 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper -, jdk ? null, python ? null +, jdk ? null, python ? null, systemd , withAI ? true # support for AI Interfaces and Skirmish AIs }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper - docbook_xsl_ns ] + docbook_xsl_ns systemd ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/spring" \ - --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib" ''; meta = with stdenv.lib; { From e26b5600e2dae3a8a3197d4e45339b2e619f677c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 8 Jun 2014 19:39:46 +0200 Subject: [PATCH 092/424] springlobby: 0.186 -> 0.195 --- pkgs/games/spring/springlobby.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index b5c8ef0154c2..35fdbc0a19e2 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "springlobby-${version}"; - version = "0.186"; + version = "0.195"; src = fetchurl { url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "0pj7v85gl76hxvfhcypxsayk8lnnhgjn2irawgx49p80wsivl64k"; + sha256 = "0hxxm97c74rvm78vlfn2byn0zjlrhankxdrs2hz73rdq6451h10b"; }; buildInputs = [ From e1a0d45d0046cc01388b98ab88cfe39b2f38fb88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 8 Jun 2014 19:55:38 +0200 Subject: [PATCH 093/424] openra: runtime dependency on systemd --- pkgs/games/openra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index ec9d4ad39802..638d494131f2 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, mono, makeWrapper -, SDL2, freetype, openal +, SDL2, freetype, openal, systemd }: let @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { ''; postInstall = with stdenv.lib; let - runtime = makeLibraryPath [ SDL2 freetype openal ]; + runtime = makeLibraryPath [ SDL2 freetype openal systemd ]; in '' wrapProgram $out/bin/openra \ --prefix PATH : "${mono}/bin" \ From 74bc6252a3dfd5aa1b24d518a1a54e9410e68ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 8 Jun 2014 22:10:53 +0200 Subject: [PATCH 094/424] pypy: 2.2.1 -> 2.3.1 --- pkgs/development/interpreters/pypy/2.2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix index 427e06eca13d..b2b4157dcf6e 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.2"; + majorVersion = "2.3"; version = "${majorVersion}.1"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; @@ -16,8 +16,8 @@ let inherit majorVersion version; src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; - sha256 = "0pq36n6bap96smpacx8gvgl8yvi9r7ddl4mlpsi5cdj4gqc4a815"; + url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; + sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] From ab29b6527f8339068838416c5d75fc8f28933512 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 5 Jun 2014 15:51:43 -0500 Subject: [PATCH 095/424] nixos-iso: Use a simpler disk label When formatting a nixos usb using my windows machine I noticed that the disk labeling using periods was not compatible with my linux kernel / udev recognition. When labeling a volume NIXOS_14.10 under Windows, it would show up as NIXOS_14_10 on NixOS. This meant that /dev/root would never come up at boot time, preventing the livecd from starting. This patch works around this issue by eliminating any special characters other than underscores. The previous versioning didn't seem all that useful, especially when consdering there are many different version of the year.month named iso. --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index eb7c4026857b..4d87c20559d6 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 lib; # ISO naming. isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso"; - isoImage.volumeID = substring 0 11 "NIXOS_${config.system.nixosVersion}"; + isoImage.volumeID = substring 0 11 "NIXOS_ISO"; # Make the installer more likely to succeed in low memory # environments. The kernel's overcommit heustistics bite us From 4b144de36774b4e740948ec2cbc61677b2fb7456 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Jun 2014 00:53:25 +0400 Subject: [PATCH 096/424] Allow to keep visudo. Useful for checking sudoers syntax --- pkgs/tools/security/sudo/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 6d82744e1f9f..6ed94da10ba0 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, pam, groff }: +{ stdenv, fetchurl, coreutils, pam, groff, keepVisudo ? false }: stdenv.mkDerivation rec { name = "sudo-1.8.9p4"; @@ -32,8 +32,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - # ‘visudo’ does not make sense on NixOS. - rm $out/sbin/visudo $out/share/man/man8/visudo.8 + # ‘visudo’ does not make sense on NixOS - except for checking sudoers + # file syntax + rm ${if keepVisudo then "" else "$out/sbin/visudo"} \ + $out/share/man/man8/visudo.8 rm $out/share/doc/sudo/ChangeLog ''; From e68a5b265a96134243a1572f43dfc4ff75dd082b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Jun 2014 00:54:13 +0400 Subject: [PATCH 097/424] Enable checking sudoers syntax. Fixes #2850, probably. --- nixos/modules/security/sudo.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 6cfeac0d7dc8..cce1e785563b 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -81,10 +81,13 @@ in security.pam.services.sudo = { sshAgentAuth = true; }; environment.etc = singleton - { source = pkgs.writeText "sudoers-in" cfg.configFile; + { source = + pkgs.runCommand "sudoers" + {src = pkgs.writeText "sudoers-in" cfg.configFile; } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) - #"${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out"; + "${pkgs.sudo.override {keepVisudo = true;}}/sbin/visudo -f $src -c && + cp $src $out"; target = "sudoers"; mode = "0440"; }; From c2fb8b1364b292dc26949c9a577fc893491a1493 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Jun 2014 01:11:03 +0400 Subject: [PATCH 098/424] Addnig a package to copy nix-prefetch-* to bin/. Hopefully fixes #1130 --- .../nix-prefetch-tools/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/build-support/nix-prefetch-tools/default.nix diff --git a/pkgs/build-support/nix-prefetch-tools/default.nix b/pkgs/build-support/nix-prefetch-tools/default.nix new file mode 100644 index 000000000000..de47b23925f0 --- /dev/null +++ b/pkgs/build-support/nix-prefetch-tools/default.nix @@ -0,0 +1,28 @@ +{stdenv}: +stdenv.mkDerivation { + name = "nix-prefetch-tools"; + src = ""; + srcRoot="."; + prePhases = "undefUnpack"; + undefUnpack = '' + unpackPhase () { :; }; + ''; + installPhase = '' + mkdir -p $out/bin + cp ${../fetchbzr/nix-prefetch-bzr} $out/bin + cp ${../fetchcvs/nix-prefetch-cvs} $out/bin + cp ${../fetchgit/nix-prefetch-git} $out/bin + cp ${../fetchhg/nix-prefetch-hg} $out/bin + cp ${../fetchsvn/nix-prefetch-svn} $out/bin + chmod a+x $out/bin/* + ''; + meta = { + description = '' + A package to include all the NixPkgs prefetchers + ''; + maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = with stdenv.lib.platforms; unix; + # Quicker to build than to download, I hope + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30baddfb24ca..29a77a9e7fa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10868,6 +10868,8 @@ let nixops = callPackage ../tools/package-management/nixops { }; + nix-prefetch-tools = callPackage ../build-support/nix-prefetch-tools {}; + nix-repl = callPackage ../tools/package-management/nix-repl { }; nut = callPackage ../applications/misc/nut { }; From 8bb2313915dcf5dff9cf2fcf5b0acaee6adf30bd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 8 Jun 2014 15:07:54 -0500 Subject: [PATCH 099/424] kernel: Add 3.15 --- pkgs/os-specific/linux/kernel/linux-3.15.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-3.15.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix new file mode 100644 index 000000000000..69721292b5b0 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.15"; + extraMeta.branch = "3.15"; + modDirVersion = "3.15.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "153pn0zjzgi3ls4gy12n900ayskpq0yncn0vra5glh20ps3px4n3"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30baddfb24ca..aa9e7c102a53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7198,6 +7198,15 @@ let ]; }; + linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7337,8 +7346,8 @@ let linuxPackages = linuxPackages_3_12; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_14; - linuxPackages_latest = pkgs.linuxPackages_3_14; + linux_latest = pkgs.linux_3_15; + linuxPackages_latest = pkgs.linuxPackages_3_15; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -7350,6 +7359,7 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); + linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors From 5a8457d25e5093e0a145db11349272fcdc1cab60 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sun, 8 Jun 2014 17:37:28 -0600 Subject: [PATCH 100/424] Oops, got nitrogen and typespeed branches mixed up. --- pkgs/tools/X11/nitrogen/default.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/tools/X11/nitrogen/default.nix diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix deleted file mode 100644 index e9e6587179af..000000000000 --- a/pkgs/tools/X11/nitrogen/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig }: - -stdenv.mkDerivation rec { - name = "nitrogen-1.5.2"; - - src = fetchurl { - url = "http://projects.l3ib.org/nitrogen/files/nitrogen-1.5.2.tar.gz"; - sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2"; - }; - - meta = { - description = "A background browser and setter for X windows"; - homepage = http://projects.l3ib.org/nitrogen/; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ac66ede5b6e..20864b95628b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1609,8 +1609,6 @@ let nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; - nitrogen = callPackage ../tools/X11/nitrogen {}; - nlopt = callPackage ../development/libraries/nlopt {}; npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; From 150f6f9ee6734dc9534d022766670b0ee046d952 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sun, 8 Jun 2014 17:40:16 -0600 Subject: [PATCH 101/424] Removed unneeded builder.sh. --- pkgs/games/typespeed/builder.sh | 2 -- pkgs/games/typespeed/default.nix | 1 - 2 files changed, 3 deletions(-) delete mode 100644 pkgs/games/typespeed/builder.sh diff --git a/pkgs/games/typespeed/builder.sh b/pkgs/games/typespeed/builder.sh deleted file mode 100644 index 273fc55c7552..000000000000 --- a/pkgs/games/typespeed/builder.sh +++ /dev/null @@ -1,2 +0,0 @@ -source $stdenv/setup -genericBuild diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 8acb4de62b46..edb91e164fec 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "typespeed-0.6.5"; - builder = ./builder.sh; buildInputs = [ ncurses ]; configureFlags = "--with-highscoredir=/tmp"; src = fetchurl { From 666478789fb31c342fa34715fdb24f3ac4740dcb Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sun, 8 Jun 2014 23:19:52 -0400 Subject: [PATCH 102/424] hdevtools compiles --- pkgs/development/tools/haskell/hdevtools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix index da5eb778803b..9565478d11b6 100644 --- a/pkgs/development/tools/haskell/hdevtools/default.nix +++ b/pkgs/development/tools/haskell/hdevtools/default.nix @@ -1,4 +1,4 @@ -{ cabal, cmdargs, ghcPaths, network, syb, time }: +{ cabal, cmdargs, ghcPaths, network, syb, time, fetchpatch }: cabal.mkDerivation (self: { pname = "hdevtools"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7"; isLibrary = false; isExecutable = true; + patches = [ (fetchpatch { url = "https://github.com/bitc/hdevtools/pull/28.patch"; sha256 = "1rlv5zskg4ns9ba791x72gycxrr52lhy8x164q38gpq600gh5n40"; }) ]; buildDepends = [ cmdargs ghcPaths network syb time ]; meta = { homepage = "https://github.com/bitc/hdevtools/"; From cd4041b9059e85c073dc7854762044f4a7a1b0b4 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sun, 8 Jun 2014 23:44:11 -0400 Subject: [PATCH 103/424] Add MFlow and dependencies --- .../libraries/haskell/MFlow/default.nix | 23 +++++++++++++++++++ .../haskell/RefSerialize/default.nix | 14 +++++++++++ .../libraries/haskell/TCache/default.nix | 14 +++++++++++ .../libraries/haskell/Workflow/default.nix | 19 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++++++ 5 files changed, 78 insertions(+) create mode 100644 pkgs/development/libraries/haskell/MFlow/default.nix create mode 100644 pkgs/development/libraries/haskell/RefSerialize/default.nix create mode 100644 pkgs/development/libraries/haskell/TCache/default.nix create mode 100644 pkgs/development/libraries/haskell/Workflow/default.nix diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix new file mode 100644 index 000000000000..def50e8e7dbd --- /dev/null +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -0,0 +1,23 @@ +{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession +, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes, monadloc +, mtl, parsec, random, RefSerialize, stm, TCache, text, time +, transformers, utf8String, vector, wai, warp, warpTls, Workflow +}: + +cabal.mkDerivation (self: { + pname = "MFlow"; + version = "0.4.5.4"; + sha256 = "1ih9ni14xmqvcfvayjkggmpmw3s9yzp17gf4xzygldmjcs35j4n3"; + buildDepends = [ + blazeHtml blazeMarkup caseInsensitive clientsession conduit + conduitExtra cpphs extensibleExceptions httpTypes monadloc mtl parsec + random RefSerialize stm TCache text time transformers utf8String + vector wai warp warpTls Workflow + ]; + meta = { + description = "stateful, RESTful web framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/RefSerialize/default.nix b/pkgs/development/libraries/haskell/RefSerialize/default.nix new file mode 100644 index 000000000000..a16ce1332ed2 --- /dev/null +++ b/pkgs/development/libraries/haskell/RefSerialize/default.nix @@ -0,0 +1,14 @@ +{ cabal, binary, hashtables, stringsearch }: + +cabal.mkDerivation (self: { + pname = "RefSerialize"; + version = "0.3.1.3"; + sha256 = "0qrca0jismpvjy7i4xx19ljrj72gqcmwqg47a51ykncsvci0fjrm"; + buildDepends = [ binary hashtables stringsearch ]; + meta = { + description = "Write to and read from ByteStrings maintaining internal memory references"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/TCache/default.nix b/pkgs/development/libraries/haskell/TCache/default.nix new file mode 100644 index 000000000000..cec80a16d300 --- /dev/null +++ b/pkgs/development/libraries/haskell/TCache/default.nix @@ -0,0 +1,14 @@ +{ cabal, hashtables, mtl, RefSerialize, stm, text }: + +cabal.mkDerivation (self: { + pname = "TCache"; + version = "0.12.0"; + sha256 = "0marslz5jg66r3i2d0yjjrj11bpywpadcxs5k4j6782iczxybd7s"; + buildDepends = [ hashtables mtl RefSerialize stm text ]; + meta = { + description = "A Transactional cache with user-defined persistence"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/Workflow/default.nix b/pkgs/development/libraries/haskell/Workflow/default.nix new file mode 100644 index 000000000000..20a304386814 --- /dev/null +++ b/pkgs/development/libraries/haskell/Workflow/default.nix @@ -0,0 +1,19 @@ +{ cabal, binary, exceptions, extensibleExceptions, mtl +, RefSerialize, stm, TCache, vector +}: + +cabal.mkDerivation (self: { + pname = "Workflow"; + version = "0.8.1"; + sha256 = "0z23g68gcbbn43i78cql4is9js3m4z16rm2x8s57f73n0hx7f00l"; + buildDepends = [ + binary exceptions extensibleExceptions mtl RefSerialize stm TCache + vector + ]; + meta = { + description = "Workflow patterns over a monad for thread state logging & recovery"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index db364b9a58d8..9765dc29c3b3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1399,6 +1399,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {}; + MFlow = callPackage ../development/libraries/haskell/MFlow {}; + midi = callPackage ../development/libraries/haskell/midi {}; mime = callPackage ../development/libraries/haskell/mime {}; @@ -1837,6 +1839,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in reflection = callPackage ../development/libraries/haskell/reflection {}; + RefSerialize = callPackage ../development/libraries/haskell/RefSerialize {}; + regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {}; regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; @@ -2157,6 +2161,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tastyTh = callPackage ../development/libraries/haskell/tasty-th {}; + TCache = callPackage ../development/libraries/haskell/TCache {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; temporary = callPackage ../development/libraries/haskell/temporary {}; @@ -2443,6 +2449,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in word8 = callPackage ../development/libraries/haskell/word8 {}; + Workflow = callPackage ../development/libraries/haskell/Workflow {}; + wreq = callPackage ../development/libraries/haskell/wreq {}; wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; From 54ba3c7ff4855a1e82dc4cede94c9fc5979d8f88 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sun, 8 Jun 2014 22:44:06 -0600 Subject: [PATCH 104/424] Fixed problem with worddir and ruledir path. --- pkgs/games/typespeed/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index edb91e164fec..1282dec2a8fd 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -3,9 +3,12 @@ stdenv.mkDerivation { name = "typespeed-0.6.5"; buildInputs = [ ncurses ]; - configureFlags = "--with-highscoredir=/tmp"; src = fetchurl { url = http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz; sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961"; }; + + patches = [ ./typespeed-config-in-home.patch ]; + + configureFlags = "--datadir=\${out}/share/"; } From 9d04c9021b0b8da15e5a77981721c43886cc9438 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sun, 8 Jun 2014 22:46:02 -0600 Subject: [PATCH 105/424] Oops, forgot to add patch. --- .../typespeed/typespeed-config-in-home.patch | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 pkgs/games/typespeed/typespeed-config-in-home.patch diff --git a/pkgs/games/typespeed/typespeed-config-in-home.patch b/pkgs/games/typespeed/typespeed-config-in-home.patch new file mode 100644 index 000000000000..52d9338775b0 --- /dev/null +++ b/pkgs/games/typespeed/typespeed-config-in-home.patch @@ -0,0 +1,159 @@ +diff --git a/src/file.c b/src/file.c +index d1d1982..dc679a2 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -125,6 +125,8 @@ int hcompar(const void *, const void *); + int loadscores(char *); + static int parseline(char *, char **, char **); + void readconfig(void); ++void mkconfig(char *filename); ++void mkscore(char *filename); + static void readfile(char *, int); + static void setoptions(char *, char *, int); + +@@ -1071,7 +1073,10 @@ parseline(char *line, char **option, char **value) + * let's drop it completely. + */ + if ((p = strchr(line, '\n')) == NULL) ++ { ++ printf("yes, we died here\n"); + return 1; ++ } + *p = '\0'; + if ((p = strchr(line, '\r')) != NULL) + *p = '\0'; +@@ -1125,7 +1130,7 @@ void + readconfig(void) + { + char *envhome; +- char userhigh[MAXPATHLEN], userconf[MAXPATHLEN]; ++ char userhigh[MAXPATHLEN], userconf[MAXPATHLEN], confdir[MAXPATHLEN]; + struct stat sb; + + if (xsnprintf(ruledir, sizeof(ruledir), "%s", RULEDIR)) { +@@ -1140,18 +1145,33 @@ readconfig(void) + readfile(CONFIGFILE, 1); + + if ((envhome = getenv("HOME")) == NULL) +- return; ++ xerr(1, "readconfig: environment variable HOME not set"); + + if (xsnprintf(userconf, sizeof(userconf), "%s/.typespeed/config", +- envhome)) +- return; ++ envhome)) ++ xerr(1, "readconfig: string error"); ++ if (xsnprintf(userhigh, sizeof(userhigh), "%s/.typespeed/score", ++ envhome)) ++ xerr(1, "readconfig: string error"); + + if (stat(userconf, &sb) || (sb.st_mode & S_IFMT) != S_IFREG) +- return; +- +- if (xsnprintf(userhigh, sizeof(userhigh), "%s/.typespeed/score", +- envhome)) +- return; ++ { ++ if (xsnprintf(confdir, sizeof(confdir), "%s/.typespeed", ++ envhome)) ++ xerr(1, "readconfig: string error"); ++ if(stat(confdir, &sb) == -1) ++ if(mkdir(confdir, S_IRWXU | S_IRWXG | S_IRWXO)) ++ xerr(1, "readconfig: could not create config directory %s", ++ confdir); ++ /* create the user configuration with default values */ ++ mkconfig(userconf); ++ } ++ /* check for the high score file */ ++ if (stat(userhigh, &sb) || (sb.st_mode & S_IFMT) != S_IFREG) ++ { ++ /* create a blank high score file */ ++ mkscore(userhigh); ++ } + + /* + * Open a user writable high score. +@@ -1159,14 +1179,48 @@ readconfig(void) + * file. Protect system-wide high score file with group + * write permissions: privileged gid already dropped. + */ +- if (close(hfd) == -1) +- xerr(1, "readconfig: close"); +- if ((hfd = open(userhigh, O_RDWR, 0)) == -1) ++ if ((hfd = open(userhigh, O_RDWR)) == -1) + xerr(1, "readconfig: open: %s", userhigh); + + readfile(userconf, 1); + } + ++#define DEFAULT_CONFIG "cheat = no\n" \ ++ "highorder = score cps tcps\n" \ ++ "ruledir = " RULEDIR "\n" \ ++ "worddir = " WORDDIR "\n" ++ ++/* ++ * Create the user configuration, with default values, at the given path. ++ */ ++void ++mkconfig(char *filename) ++{ ++ int cfd; ++ ++ if((cfd = open(filename, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO)) == -1) ++ xerr(1, "mkconfig: open: %s", filename); ++ if(write(cfd, DEFAULT_CONFIG, sizeof(DEFAULT_CONFIG)/sizeof(DEFAULT_CONFIG[0]) - 1) == -1) ++ xerr(1, "mkconfig: write: %s", filename); ++ if(close(cfd) == -1) ++ xerr(1, "mkconfig: close: %s", filename); ++} ++ ++/* ++ * Create the user high score file, which is just a blank file. ++ */ ++void ++mkscore(char *filename) ++{ ++ int sfd; ++ if((sfd = open(filename, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO)) == -1) ++ xerr(1, "mkscore: open: %s", filename); ++ if(write(sfd, "", 0) == -1) ++ xerr(1, "mkconfig: write: %s", filename); ++ if(close(sfd) == -1) ++ xerr(1, "mkconfig: close: %s", filename); ++} ++ + /* + * Function used to open configuration and game rule files and to + * set options with function setoptions. +diff --git a/src/typespeed.c b/src/typespeed.c +index 7ac5ee2..77e9acb 100644 +--- a/src/typespeed.c ++++ b/src/typespeed.c +@@ -319,8 +319,13 @@ main(int argc, char **argv) + progname++; + + /* just open high score file while being setgid games */ +- if ((hfd = open(HIGHFILE, O_RDWR, 0)) == -1) +- xerr(1, "main: open: %s", HIGHFILE); ++ /* ++ * For NixOS, a global high score file doesn't make sense, so we just comment ++ * this out. A high score file in the user's home directory will be opened ++ * later in readconfig(). ++ */ ++/* if ((hfd = open(HIGHFILE, O_RDWR, 0)) == -1) ++ xerr(1, "main: open: %s", HIGHFILE); */ + + #ifndef WIN32 + /* drop privileges */ +@@ -348,9 +353,9 @@ main(int argc, char **argv) + #endif /* WIN32 */ + + /* check file descriptors for consistency */ +- if (hfd == STDIN_FILENO || hfd == STDOUT_FILENO || ++/* if (hfd == STDIN_FILENO || hfd == STDOUT_FILENO || + hfd == STDERR_FILENO) +- exit(1); ++ exit(1); */ + if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO) || + !isatty(STDERR_FILENO)) + xerrx(1, "not fully connected to a terminal"); From 0806afad5a8466653cb8fb9b304d9faf5d143f91 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sun, 8 Jun 2014 23:19:06 -0600 Subject: [PATCH 106/424] Added metadata for typespeed. --- pkgs/games/typespeed/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 1282dec2a8fd..57fd8f7dfc52 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -11,4 +11,10 @@ stdenv.mkDerivation { patches = [ ./typespeed-config-in-home.patch ]; configureFlags = "--datadir=\${out}/share/"; + + meta = { + description = "A curses based typing game."; + homepage = http://typespeed.sourceforge.net/; + license = "GLPv2"; + }; } From b690f36d6f92c47303b80f9c887ac79923be4f1c Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sun, 8 Jun 2014 23:43:28 -0600 Subject: [PATCH 107/424] Oops, removed a printf debug line we don't need. --- pkgs/games/typespeed/default.nix | 2 +- .../typespeed/typespeed-config-in-home.patch | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 57fd8f7dfc52..24ace16adc7a 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { description = "A curses based typing game."; homepage = http://typespeed.sourceforge.net/; - license = "GLPv2"; + license = "GPLv2"; }; } diff --git a/pkgs/games/typespeed/typespeed-config-in-home.patch b/pkgs/games/typespeed/typespeed-config-in-home.patch index 52d9338775b0..fe313a4392ed 100644 --- a/pkgs/games/typespeed/typespeed-config-in-home.patch +++ b/pkgs/games/typespeed/typespeed-config-in-home.patch @@ -1,5 +1,5 @@ diff --git a/src/file.c b/src/file.c -index d1d1982..dc679a2 100644 +index d1d1982..1655f6f 100644 --- a/src/file.c +++ b/src/file.c @@ -125,6 +125,8 @@ int hcompar(const void *, const void *); @@ -11,18 +11,7 @@ index d1d1982..dc679a2 100644 static void readfile(char *, int); static void setoptions(char *, char *, int); -@@ -1071,7 +1073,10 @@ parseline(char *line, char **option, char **value) - * let's drop it completely. - */ - if ((p = strchr(line, '\n')) == NULL) -+ { -+ printf("yes, we died here\n"); - return 1; -+ } - *p = '\0'; - if ((p = strchr(line, '\r')) != NULL) - *p = '\0'; -@@ -1125,7 +1130,7 @@ void +@@ -1125,7 +1127,7 @@ void readconfig(void) { char *envhome; @@ -31,7 +20,7 @@ index d1d1982..dc679a2 100644 struct stat sb; if (xsnprintf(ruledir, sizeof(ruledir), "%s", RULEDIR)) { -@@ -1140,18 +1145,33 @@ readconfig(void) +@@ -1140,18 +1142,33 @@ readconfig(void) readfile(CONFIGFILE, 1); if ((envhome = getenv("HOME")) == NULL) @@ -73,7 +62,7 @@ index d1d1982..dc679a2 100644 /* * Open a user writable high score. -@@ -1159,14 +1179,48 @@ readconfig(void) +@@ -1159,14 +1176,48 @@ readconfig(void) * file. Protect system-wide high score file with group * write permissions: privileged gid already dropped. */ From 8e2556bd7fcc77583ded78e8e2d4db65cbf9f414 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sun, 8 Jun 2014 23:47:59 -0600 Subject: [PATCH 108/424] Added auntie as a maintainer, and set license properly. --- lib/maintainers.nix | 1 + pkgs/games/typespeed/default.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8a98cb146513..a0aae2f3b592 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -17,6 +17,7 @@ arobyn = "Alexei Robyn "; astsmtl = "Alexander Tsamutali "; aszlig = "aszlig "; + auntie = "Jonathan Glines "; bbenoist = "Baptist BENOIST "; bennofs = "Benno Fünfstück "; berdario = "Dario Bertini "; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 24ace16adc7a..169c74621d73 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { meta = { description = "A curses based typing game."; homepage = http://typespeed.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.auntie ]; }; } From 8155e5d11916e56d5fcaa88534cb6461a9c1f042 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 8 Jun 2014 07:49:27 -0500 Subject: [PATCH 109/424] compcert: fix build by adding menhir dependency Signed-off-by: Austin Seipp --- pkgs/development/compilers/compcert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index f5e66b8ac10b..859c55662dc6 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ocaml, gcc }: +{ stdenv, fetchurl, coq, ocaml, ocamlPackages, gcc }: stdenv.mkDerivation rec { name = "compcert-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8"; }; - buildInputs = [ coq ocaml ]; + buildInputs = [ coq ocaml ocamlPackages.menhir ]; enableParallelBuilding = true; configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ ia32-linux"; From 3f6197cafe32cad4f2254be0197ceda5a841f387 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 9 Jun 2014 01:25:20 -0500 Subject: [PATCH 110/424] arcanist: Fix this because how did it work Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 02fe572edabd..a8e779347d80 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -22,16 +22,16 @@ stdenv.mkDerivation rec { unpackPhase = "true"; buildPhase = '' ORIG=`pwd` - chmod +w -R ${libphutil} - cd ${libphutil}/support/xhpast - ls + cp -R ${libphutil} libphutil + cp -R ${arcanist} arcanist + cd libphutil/support/xhpast make clean all install cd $ORIG ''; installPhase = '' mkdir -p $out/bin $out/libexec - cp -R ${libphutil} $out/libexec/libphutil - cp -R ${arcanist} $out/libexec/arcanist + cp -R libphutil $out/libexec/libphutil + cp -R arcanist $out/libexec/arcanist ln -s $out/libexec/arcanist/bin/arc $out/bin wrapProgram $out/bin/arc \ From 678def6d30cebdc93fafb3f086c30a1877f0baee Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 9 Jun 2014 01:29:53 -0500 Subject: [PATCH 111/424] Fix again, thx to @CodeBlock Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index a8e779347d80..e55faaa1e632 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ORIG=`pwd` cp -R ${libphutil} libphutil cp -R ${arcanist} arcanist + chmod +w -R libphutil arcanist cd libphutil/support/xhpast make clean all install cd $ORIG From 8c144969879ef1e1560331fc20c8d9c78fd5426a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:18 +0200 Subject: [PATCH 112/424] haskell-git-annex: update to version 5.20140529 --- .../git-and-tools/git-annex/default.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 191b24304bfe..24f993b88124 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,37 +1,37 @@ { cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable , caseInsensitive, clientsession, cryptoApi, cryptohash, curl , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance -, extensibleExceptions, fdoNotify, feed, filepath, git, gnupg1 -, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient +, exceptions, extensibleExceptions, fdoNotify, feed, filepath, git +, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient , httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH -, MonadCatchIOTransformers, monadControl, mtl, network -, networkConduit, networkInfo, networkMulticast -, networkProtocolXmpp, openssh, optparseApplicative, perl -, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem -, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck -, tastyRerun, text, time, transformers, unixCompat, utf8String -, uuid, wai, waiLogger, warp, warpTls, which, xmlTypes, yesod -, yesodCore, yesodDefault, yesodForm, yesodStatic +, monadControl, mtl, network, networkConduit, networkInfo +, networkMulticast, networkProtocolXmpp, openssh +, optparseApplicative, perl, QuickCheck, random, regexTdfa, rsync +, SafeSemaphore, securemem, SHA, shakespeare, stm, tasty +, tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers +, unixCompat, utf8String, uuid, wai, waiLogger, warp, warpTls +, which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm +, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140517"; - sha256 = "150xf6664rfdljswc270m2pqvia4sywph4rrrbky6izy6a0vq680"; + version = "5.20140529"; + sha256 = "18fb0gb38wcdbdz2rlg5vn99gfi1c8hflgcpz96lx4rg2pl8jpf8"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter byteable caseInsensitive clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus - dlist dns editDistance extensibleExceptions fdoNotify feed filepath - gnutls hamlet hinotify hS3 hslogger HTTP httpClient httpConduit - httpTypes IfElse json liftedBase MissingH MonadCatchIOTransformers - monadControl mtl network networkConduit networkInfo - networkMulticast networkProtocolXmpp optparseApplicative QuickCheck - random regexTdfa SafeSemaphore securemem SHA shakespeare stm tasty - tastyHunit tastyQuickcheck tastyRerun text time transformers - unixCompat utf8String uuid wai waiLogger warp warpTls xmlTypes - yesod yesodCore yesodDefault yesodForm yesodStatic + dlist dns editDistance exceptions extensibleExceptions fdoNotify + feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient + httpConduit httpTypes IfElse json liftedBase MissingH monadControl + mtl network networkConduit networkInfo networkMulticast + networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa + SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit + tastyQuickcheck tastyRerun text time transformers unixCompat + utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore + yesodDefault yesodForm yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fS3 From 9528d4caf3b28163c80f736e5d0740abf0f19a82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:25 +0200 Subject: [PATCH 113/424] haskell-SVGFonts: update to version 1.4.0.3 --- pkgs/development/libraries/haskell/SVGFonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix index 509efd61968b..e617190b7619 100644 --- a/pkgs/development/libraries/haskell/SVGFonts/default.nix +++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "SVGFonts"; - version = "1.4.0.2"; - sha256 = "1a1f0jdz36zpj1196zv5qwg35rm4ra0b4z5spr1m3696292nj8ph"; + version = "1.4.0.3"; + sha256 = "0jkjcf27xqjzv9lny7j181kcma26wngrq3vzw2sp2hwkdcjryyin"; buildDepends = [ attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec split text tuple vector vectorSpace xml From 3bae0ae4f65e087c3f47370cc56c8104c39696e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:27 +0200 Subject: [PATCH 114/424] haskell-Shellac: update to version 0.9.5.2 --- pkgs/development/libraries/haskell/Shellac/Shellac.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix index d896eab923d9..e6f3caac45b9 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "Shellac"; - version = "0.9.5.1"; - sha256 = "19fpbh5ijy9xc3rhl9qwyan8jfnz9nsqvnsjxb7kkb7l2bpz4qfp"; + version = "0.9.5.2"; + sha256 = "1js9la0hziqsmb56q9kzfycda2sw3xm4kv2y5q2h3zlw5gzc5xli"; buildDepends = [ mtl ]; meta = { - homepage = "http://www.cs.princeton.edu/~rdockins/shellac/home/"; + homepage = "http://rwd.rdockins.name/shellac/home/"; description = "A framework for creating shell envinronments"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From cd5b26ab9d085d00b2d4227a69adc488fe2b320b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:29 +0200 Subject: [PATCH 115/424] haskell-active: update to version 0.1.0.16 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index b9488bbcf613..01441a39ce79 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.14"; - sha256 = "0ibigflx3krmf7gw0zqmqx73rw1p62cwjyl26rxbj5vzbl3bdb4g"; + version = "0.1.0.16"; + sha256 = "0x4z9n0avk9pr9v64vfmbbpxx2n6cl32d8sw8y2w61345s2z628k"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace From ba7e1f1b6eaf3cc3298869939f16dd9c02795f0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:32 +0200 Subject: [PATCH 116/424] haskell-attoparsec-enumerator: update to version 0.3.3 --- .../libraries/haskell/attoparsec-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix index cf40601d0447..98f8f426ba38 100644 --- a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-enumerator"; - version = "0.3.2"; - sha256 = "1jrrdhzqjfb78bhnjpy0j0qywqd2j67an41pcn8y6331nzmzsrl8"; + version = "0.3.3"; + sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w"; buildDepends = [ attoparsec enumerator text ]; meta = { homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; From 5cdcc65be16297424c6c65e3ec9345466f6c18a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:34 +0200 Subject: [PATCH 117/424] haskell-cassava: update to version 0.4.1.0 --- pkgs/development/libraries/haskell/cassava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix index 604cd9b3ed61..745969058f0b 100644 --- a/pkgs/development/libraries/haskell/cassava/default.nix +++ b/pkgs/development/libraries/haskell/cassava/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cassava"; - version = "0.4.0.0"; - sha256 = "0w3npv3403n9rl9nmn8ngp04js28bvsb5c4js17sy1gqgsakqdrl"; + version = "0.4.1.0"; + sha256 = "0whky3mavmprr8cgnzlg2ich99w09bdlks8rg6z9m1x86q66ivw2"; buildDepends = [ attoparsec blazeBuilder deepseq text unorderedContainers vector ]; From eb33887bda68947b546f4555a9c7c013a61d3bcb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:36 +0200 Subject: [PATCH 118/424] haskell-concurrent-extra: update to version 0.7.0.8 --- .../libraries/haskell/concurrent-extra/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index 5fe73a339648..29520fddd0ca 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -1,15 +1,15 @@ -{ cabal, baseUnicodeSymbols, HUnit, stm, testFramework -, testFrameworkHunit, unboundedDelays +{ cabal, async, baseUnicodeSymbols, HUnit, random, stm +, testFramework, testFrameworkHunit, unboundedDelays }: cabal.mkDerivation (self: { pname = "concurrent-extra"; - version = "0.7.0.7"; - sha256 = "1736y8am24x29qq1016f2dvb6adavl1h46bsjfwnkw40a9djd5cr"; + version = "0.7.0.8"; + sha256 = "0q6n7wlakvnvfrjr3zmxbn9i0dxq96071j565vffp0r5abxkn83q"; buildDepends = [ baseUnicodeSymbols stm unboundedDelays ]; testDepends = [ - baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit - unboundedDelays + async baseUnicodeSymbols HUnit random stm testFramework + testFrameworkHunit unboundedDelays ]; meta = { homepage = "https://github.com/basvandijk/concurrent-extra"; From 82a37144a91b140ba0c82e01f6a2b7f13f59c252 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:38 +0200 Subject: [PATCH 119/424] haskell-conduit-extra: update to version 1.1.0.4 --- pkgs/development/libraries/haskell/conduit-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index eb07ffc480f5..084f9f38ca28 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.0.3"; - sha256 = "117lirx05pgpmys6dlknkcni3znrvqyhmj6djqxnqbjcn3ynhqdk"; + version = "1.1.0.4"; + sha256 = "0l1cv65p8nvvb9qgcj87a682wh9xim0rbk2xzhdkd0r123csb118"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet streamingCommons text transformers From 53e2945e3c40ec56309369337fab7c33b424186e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:40 +0200 Subject: [PATCH 120/424] haskell-conduit: update to version 1.1.4 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 94423cc41eff..48422e602b2d 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.1.3"; - sha256 = "14fc7v00zmrcwba2rdnh7c6sx0rv5mmbwlgq5p8p7nlald1dcr6z"; + version = "1.1.4"; + sha256 = "1fw55rmmhznkpbblc7gqy463lza7fi9yr0n27g38afdfql8mz5mm"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void From b10b94b53419ea53d28f90d702502330d2774b4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:42 +0200 Subject: [PATCH 121/424] haskell-cryptohash: update to version 0.11.5 --- .../libraries/haskell/cryptohash/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index cefa8fbbdf8e..894d317336d2 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,15 +1,14 @@ -{ cabal, byteable, HUnit, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 +{ cabal, byteable, HUnit, QuickCheck, tasty, tastyHunit +, tastyQuickcheck }: cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.11.4"; - sha256 = "1laakkc1xzp2bmai0sfi86784wharqbyanlp1d1f1q6nj318by3y"; + version = "0.11.5"; + sha256 = "0vxnwnjch2r9d54q5f5bfz60npjc7s7x6a5233md7fa756822b9d"; buildDepends = [ byteable ]; testDepends = [ - byteable HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 + byteable HUnit QuickCheck tasty tastyHunit tastyQuickcheck ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptohash"; From 54a78f4e211dfc8bdb8bef7ef4db47369a77efa7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:44 +0200 Subject: [PATCH 122/424] haskell-diagrams-cairo: update to version 1.2 --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index bd09b67196b6..33e27cd9ff85 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -1,16 +1,16 @@ { cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib , filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative -, split, statestack, time, vector +, pango, split, statestack, time, transformers, vector }: cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.1.0.2"; - sha256 = "0y36cx89rlbmj470a6g11wlzkwzznjkjmkcpm7dzbxvfxw4pp70z"; + version = "1.2"; + sha256 = "0vzjp1i5hk971r7f55gpdl0jibrjg9j4ny7p408kb8zl2ynlxv6l"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath - hashable JuicyPixels lens mtl optparseApplicative split statestack - time vector + hashable JuicyPixels lens mtl optparseApplicative pango split + statestack time transformers vector ]; meta = { homepage = "http://projects.haskell.org/diagrams"; From c4e8694a24dae425538f8ab382cb29407fa2b7f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:47 +0200 Subject: [PATCH 123/424] haskell-diagrams-contrib: update to version 1.1.2 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 4cbe8b7c1938..a433284ef7a6 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.1.5"; - sha256 = "1165qq5pzj3vr8f6545hpa5ri8jy43r1ydmimzy7xg9iynjgxass"; + version = "1.1.2"; + sha256 = "1gljmzlhc6vck5lcsq9lhf2k4dik5pp62k85y2kkxgq0mxnmqf0g"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec From 951296da65d3fe32faf3539c26047f4790dae9cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:49 +0200 Subject: [PATCH 124/424] haskell-diagrams-core: update to version 1.2 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 8c6a87b7e05b..dbbc3c030b58 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.1.0.3"; - sha256 = "0kl4bc5mvly227rzalzy9q6ki321drcdfsjqriv3ac70qmcfqyma"; + version = "1.2"; + sha256 = "0qlkick9ppwaignh179w65gmiq5as1nsi1ymficdw1p0jldi5f51"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From cc3dc36517a6571977246e234171ba3d59affa52 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:51 +0200 Subject: [PATCH 125/424] haskell-diagrams: update to version 1.2 --- pkgs/development/libraries/haskell/diagrams/diagrams.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 6159270379e2..5f94e2922a12 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "diagrams"; - version = "1.1.0.1"; - sha256 = "0cxmrikcxgnrki9z8i33z7fbjpkx0vw849zj1cbq1zh8ry8xhhvg"; + version = "1.2"; + sha256 = "17j7hyd86h9msc8ni19agb0yhixga76q9kh4i109iyiyqizdnfhg"; buildDepends = [ diagramsContrib diagramsCore diagramsLib diagramsSvg ]; From 412ae6b48ab31ce30e07959dd5cad65289e1b75d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:53 +0200 Subject: [PATCH 126/424] haskell-diagrams-lib: update to version 1.2 --- .../libraries/haskell/diagrams/lib.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 775553bc2a45..26470c215152 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -1,17 +1,18 @@ -{ cabal, active, colour, dataDefaultClass, diagramsCore, filepath -, fingertree, hashable, intervals, lens, MemoTrie, monoidExtras -, optparseApplicative, safe, semigroups, tagged, vectorSpace -, vectorSpacePoints +{ cabal, active, colour, dataDefaultClass, diagramsCore, dualTree +, filepath, fingertree, hashable, intervals, JuicyPixels, lens +, MemoTrie, monoidExtras, optparseApplicative, safe, semigroups +, tagged, vectorSpace, vectorSpacePoints }: cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.1.0.7"; - sha256 = "0ad5105aa2ds0hrx0184jhvzw1mw5l659hx745rsyl8wyi5yrcy7"; + version = "1.2"; + sha256 = "1gdc2k1dmqfv6pcznzngfv0gqsm7pd7ga65xjmd0rzyl8nqk4k3n"; buildDepends = [ - active colour dataDefaultClass diagramsCore filepath fingertree - hashable intervals lens MemoTrie monoidExtras optparseApplicative - safe semigroups tagged vectorSpace vectorSpacePoints + active colour dataDefaultClass diagramsCore dualTree filepath + fingertree hashable intervals JuicyPixels lens MemoTrie + monoidExtras optparseApplicative safe semigroups tagged vectorSpace + vectorSpacePoints ]; jailbreak = true; meta = { From 684bbb66c9b9e554ec487d876bdd29521f7c86f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:55 +0200 Subject: [PATCH 127/424] haskell-diagrams-postscript: update to version 1.1 --- pkgs/development/libraries/haskell/diagrams/postscript.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 55e2c975b0eb..29dbafb890fd 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.0.2.4"; - sha256 = "0vjzvjyrbmnjgl8ln58a44nhh4abq5q2c6fvlpxpfhxh2ligsmas"; + version = "1.1"; + sha256 = "0l077libp6h8ka9ygkmajvzdymndlhx60nb5f6jaqvp7yx80hz3m"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace From 322a9328980db0b23cc48452f0538730cc162d11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:57 +0200 Subject: [PATCH 128/424] haskell-diagrams-svg: update to version 1.1 --- .../libraries/haskell/diagrams/svg.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 663a6287c623..dbc148abaeea 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -1,15 +1,16 @@ -{ cabal, blazeMarkup, blazeSvg, colour, diagramsCore, diagramsLib -, filepath, hashable, lens, monoidExtras, mtl, split, time -, vectorSpace +{ cabal, base64Bytestring, blazeMarkup, blazeSvg, colour +, diagramsCore, diagramsLib, filepath, hashable, JuicyPixels, lens +, monoidExtras, mtl, split, time, vectorSpace }: cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.0.2.1"; - sha256 = "1qm4vk67knl4bpp84kwm95blshf7slarpl620m8irslsq3yag507"; + version = "1.1"; + sha256 = "0b34rh35pay4x8dg0i06xvr3d865hbxzj2x77jly9l1j7sa1qaj1"; buildDepends = [ - blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath - hashable lens monoidExtras mtl split time vectorSpace + base64Bytestring blazeMarkup blazeSvg colour diagramsCore + diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl + split time vectorSpace ]; jailbreak = true; meta = { From bb7641619b59b987567e6110463a22008bfd8c67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:34:59 +0200 Subject: [PATCH 129/424] haskell-dns: update to version 1.3.0 --- .../libraries/haskell/dns/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index badc718f32bf..d563348c371a 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -1,19 +1,18 @@ -{ cabal, attoparsec, attoparsecConduit, binary, blazeBuilder -, conduit, conduitExtra, doctest, hspec, iproute, mtl, network -, random, resourcet +{ cabal, attoparsec, binary, blazeBuilder, conduit, conduitExtra +, doctest, hspec, iproute, mtl, network, random, resourcet }: cabal.mkDerivation (self: { pname = "dns"; - version = "1.2.3"; - sha256 = "0h03zh75yzrx08p99ll123qd9a7a2ccj9gad1f8y3340dz3pa7ld"; + version = "1.3.0"; + sha256 = "1zd639d69ha3g1yz7ssvwarwiwyi975ps4i5y8vrarcq2jnnsb6n"; buildDepends = [ - attoparsec attoparsecConduit binary blazeBuilder conduit - conduitExtra iproute mtl network random resourcet + attoparsec binary blazeBuilder conduit conduitExtra iproute mtl + network random resourcet ]; testDepends = [ - attoparsec attoparsecConduit binary blazeBuilder conduit - conduitExtra doctest hspec iproute mtl network random resourcet + attoparsec binary blazeBuilder conduit conduitExtra doctest hspec + iproute mtl network random resourcet ]; testTarget = "spec"; meta = { From 6108f65cde9326141f6d6e9887d5eac2e9a8e12f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:01 +0200 Subject: [PATCH 130/424] haskell-dual-tree: update to version 0.2.0.4 --- pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 120fac409f02..2f47a96b8534 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.2.0.3"; - sha256 = "17l0jjxi8lj17hbn73wg252gdpbnp81aay7xlmx42g99pj377bmb"; + version = "0.2.0.4"; + sha256 = "0visavx0zqgmcjcq07vfhk6dn867269w2gxa8nvc79gya56c6wdp"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { From d95c25dbc00f7c59cb73be1904fa7d82ecf4d456 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:03 +0200 Subject: [PATCH 131/424] haskell-either: update to version 4.3.0.1 --- .../development/libraries/haskell/either/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index 75e29603e5e7..e7bbb47a47f0 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,14 +1,14 @@ -{ cabal, monadControl, MonadRandom, mtl, semigroupoids, semigroups -, transformers, transformersBase +{ cabal, exceptions, free, monadControl, MonadRandom, mtl +, semigroupoids, semigroups, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "either"; - version = "4.1.2"; - sha256 = "1c2dp22al9qq2w1xks5s3n8dcan9wpashvn24i4g8avs8yfrr5v4"; + version = "4.3.0.1"; + sha256 = "1ib6288gxzqfm2y198dzhhq588mlwqxm07pcrj4h66g1mcy54q1f"; buildDepends = [ - monadControl MonadRandom mtl semigroupoids semigroups transformers - transformersBase + exceptions free monadControl MonadRandom mtl semigroupoids + semigroups transformers transformersBase ]; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6"; meta = { From f06269c9dc117636faa4796e9454fb3c3f932522 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:05 +0200 Subject: [PATCH 132/424] haskell-enclosed-exceptions: update to version 1.0.0.2 --- .../libraries/haskell/enclosed-exceptions/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix index 113c454d6db1..5def0b895f04 100644 --- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix +++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix @@ -1,16 +1,17 @@ { cabal, async, deepseq, hspec, liftedBase, monadControl -, QuickCheck, transformers +, QuickCheck, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "enclosed-exceptions"; - version = "1.0.0.1"; - sha256 = "0imq5kp45yfkhkz51ld869pf9hnlkbh92nk0aig1z8cc6akjnjw0"; + version = "1.0.0.2"; + sha256 = "1jbgqqavkhz2x5br17bdhv17rcmyi7a5mxplakhgyyg73wkjq04h"; buildDepends = [ - async deepseq liftedBase monadControl transformers + async deepseq liftedBase monadControl transformers transformersBase ]; testDepends = [ async deepseq hspec liftedBase monadControl QuickCheck transformers + transformersBase ]; meta = { homepage = "https://github.com/jcristovao/enclosed-exceptions"; From a9ee3e1b16c44f62b6458ebcc279b323cbf3c171 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:07 +0200 Subject: [PATCH 133/424] haskell-encoding: update to version 0.7.0.1 --- pkgs/development/libraries/haskell/encoding/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix index 030e2da8364a..d9f8710f7c51 100644 --- a/pkgs/development/libraries/haskell/encoding/default.nix +++ b/pkgs/development/libraries/haskell/encoding/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "encoding"; - version = "0.7"; - sha256 = "1h6yki4d3912sr8nsk1cff2pdvzw8ys6xnzi97b5ay1f8i28bmi5"; + version = "0.7.0.1"; + sha256 = "18s6cfcjwjx5dja14rf35rx71cbpr8ylg4x29ffx2blsk8ib9zxh"; buildDepends = [ binary extensibleExceptions HaXml mtl regexCompat ]; From 33f2613c4c8f97f2a2d0ac1beb0c56c5749ba348 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:10 +0200 Subject: [PATCH 134/424] haskell-entropy: update to version 0.3 --- pkgs/development/libraries/haskell/entropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index f2154ddddf7b..c92fc584aaf6 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "entropy"; - version = "0.2.2.4"; - sha256 = "1cjmpb0rh1ib4j9mwmf1irn401vmjawxkshxdmmb4643rmcgx1gm"; + version = "0.3"; + sha256 = "0b1yx7409xw8jz2rj8695xscjnw4p7y80niq9cbkqrmnqbqnwj2q"; meta = { homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; From d1b20968786c1f8a9c9287b2dc0b131026e906e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:12 +0200 Subject: [PATCH 135/424] haskell-exception-mtl: update to version 0.3.0.4 --- pkgs/development/libraries/haskell/exception-mtl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index 2c64598d1d01..5799a94334e3 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "exception-mtl"; - version = "0.3.0.3"; - sha256 = "1mmkp16c5ixknhm69a2zjrs9q0dd5ragmljnjjd6lxpakdlw64ww"; + version = "0.3.0.4"; + sha256 = "16airfs3z1qmx42qww22m21fryr8210m7ji5rgkl2amjvj4lllvc"; buildDepends = [ exceptionTransformers mtl transformers ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; From 5d3457539189801e8b2252dd07e227bbb57c9250 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:14 +0200 Subject: [PATCH 136/424] haskell-extensible-effects: update to version 1.7.1 --- .../libraries/haskell/extensible-effects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index ba511f0b6a25..eb52756ce3b4 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "extensible-effects"; - version = "1.6.0"; - sha256 = "08g2py6iywwpsr09v6hfhq6ihjp1yq3aibz8jlqhsmagjjjxgfsq"; + version = "1.7.1"; + sha256 = "1i7bmyga63svnky03f5xvz63795pjsqp3x7rn9amj55yj11fmp05"; buildDepends = [ transformers transformersBase ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit From 4ac91314ccf9da0a3417d3411ea1d4b52c9045bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:16 +0200 Subject: [PATCH 137/424] haskell-force-layout: update to version 0.3.0.4 --- pkgs/development/libraries/haskell/force-layout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index a336c2a7e2bb..40a610f2b11d 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.3"; - sha256 = "0xix9syfiya5wx0iwzs7sp3ksqyp15vjlpir71x8md8v0hkrnh5a"; + version = "0.3.0.4"; + sha256 = "1zgqcz9b86qax1hyl32a1giapvn2wpnb4gcfn8czkcr0m7c2iwdg"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; From ce1c5de10807bef81ace6d39d9145668b448e1ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:18 +0200 Subject: [PATCH 138/424] haskell-free: update to version 4.9 --- pkgs/development/libraries/haskell/free/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index 9d84bf874353..b445bf494488 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "free"; - version = "4.7.1"; - sha256 = "14qvc153g7n8fkl2giyyya8l7fs4limgnm18hdw5dpj841kwxgzm"; + version = "4.9"; + sha256 = "01pa9ax9i4pkh9a5achndx5s7sxvhnk6rm57g8rzav79hzsr4cnx"; buildDepends = [ bifunctors comonad distributive mtl preludeExtras profunctors semigroupoids semigroups transformers From e221343937e3366f60b7f92c561ff5c289d8a519 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:20 +0200 Subject: [PATCH 139/424] haskell-haskell-packages: update to version 0.2.4 --- .../libraries/haskell/haskell-packages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 4081e246a34c..168c6babb3d9 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.3.4"; - sha256 = "0qj5n1yc481n5c8gi5dgk22pxj58gf7z30621spr7gwlv001sk1y"; + version = "0.2.4"; + sha256 = "1ygpa2k0hyx2xwny33kr0h847zvvsp4z1pwqrd92sf7vzpyz5nch"; buildDepends = [ aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl optparseApplicative tagged From cfe39f293fea6649791bae95c399a836aeb3341e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:23 +0200 Subject: [PATCH 140/424] haskell-heist: update to version 0.13.1.2 --- pkgs/development/libraries/haskell/heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index faf5212a7942..77128310d523 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.1"; - sha256 = "0v9c5hhybn617nmjswqkjrf7bjb5073achfi05ivw1gblbvsj0ir"; + version = "0.13.1.2"; + sha256 = "0c80lf00n3iv55mw4p61bjx14gildvxnvfdaa755ghkg1wcd59s5"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time From 3e5cf9c4dcbc57badd9bb813b5f9c3ddd8a2a2da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:25 +0200 Subject: [PATCH 141/424] haskell-highlighting-kate: update to version 0.5.8.2 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 0f984c50e5f4..6418c7f03267 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.8.1"; - sha256 = "10hbsra6ifjj765shf6x4c8kgb5bmv3zcgya3lcswvwa9xn78h9p"; + version = "0.5.8.2"; + sha256 = "1c85yfzi3ri3j1fmqvd4pc4pp95jpm62a2nbbibpybl2h88dsjsb"; isLibrary = true; isExecutable = true; buildDepends = [ From 3ce206a7f0048555e8be6f9934acd4546cd09390 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:27 +0200 Subject: [PATCH 142/424] haskell-hoauth2: update to version 0.3.7 --- pkgs/development/libraries/haskell/hoauth2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix index 77e848427239..949e1bdfc590 100644 --- a/pkgs/development/libraries/haskell/hoauth2/default.nix +++ b/pkgs/development/libraries/haskell/hoauth2/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hoauth2"; - version = "0.3.6.1"; - sha256 = "0nfh77fxyl8vbdnrrp28hsl1zhxhmg8mjn0gfvc2i3w5rd6j0lda"; + version = "0.3.7"; + sha256 = "0v43hr7vw2iikhx2bldkb0fa5j95msgn7s7k09vkxz3qwqh9maz7"; buildDepends = [ aeson bytestringShow conduit httpConduit httpTypes monadControl mtl random resourcet text transformers From 186f86b3c746176ac9bde7248f62e38c15da0e0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:29 +0200 Subject: [PATCH 143/424] haskell-io-streams: update to version 1.1.4.5 --- pkgs/development/libraries/haskell/io-streams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index 4813771cb53c..1fc49e1c068d 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.1.4.4"; - sha256 = "07kmmjn1bsjzfi27fk6fx56pchks866qwrxkyvwihfvd96wgqggd"; + version = "1.1.4.5"; + sha256 = "1w76p9hb83x2fjlldcnbk3zddaph4cccka2g13b1rcjssqgnbk8h"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings From 2dacb6ed0e6e68ce471597aadb59ea90e8c16be9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:31 +0200 Subject: [PATCH 144/424] haskell-kan-extensions: update to version 4.0.3 --- pkgs/development/libraries/haskell/kan-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index d4b5c5752e08..fae884b29226 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "kan-extensions"; - version = "4.0.2"; - sha256 = "05invi86i2a115jdy2nzdkc0i6g170j0xcxycw2z2qjigvjsaizi"; + version = "4.0.3"; + sha256 = "05zqlxm6i66d996jcpjhnmij28a4zwc0l0nc9cyxamfwmyd9754b"; buildDepends = [ adjunctions comonad contravariant distributive free mtl pointed semigroupoids speculation transformers From 3aba64bd86327bdbdd6d45ab5c554a31a587daab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:33 +0200 Subject: [PATCH 145/424] haskell-keys: update to version 3.10.1 --- pkgs/development/libraries/haskell/keys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix index 570c88b1fbd6..d97066e57c76 100644 --- a/pkgs/development/libraries/haskell/keys/default.nix +++ b/pkgs/development/libraries/haskell/keys/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "keys"; - version = "3.10"; - sha256 = "1s2xkzvaqk507wrgabpxli8g8n83arflmdhxq40f7qkvyflhhmyh"; + version = "3.10.1"; + sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n"; buildDepends = [ comonad free semigroupoids semigroups transformers ]; From a2393999ce6a78384b9756a47da9b42a4d5deee7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:36 +0200 Subject: [PATCH 146/424] haskell-language-c-inline: update to version 0.6.0.0 --- .../libraries/haskell/language-c-inline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix index 691c1e70662d..1aef92fe6789 100644 --- a/pkgs/development/libraries/haskell/language-c-inline/default.nix +++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "language-c-inline"; - version = "0.5.0.0"; - sha256 = "1cyl45bi2d38yyd1ybxippl8mv3hsl1chzn7rqm40fds97h07j2z"; + version = "0.6.0.0"; + sha256 = "08a22sr01kch365p5536fv32rxsfmdd6hkhcq1j7vhchjrsy3f6w"; buildDepends = [ filepath languageCQuote mainlandPretty ]; testDepends = [ languageCQuote ]; doCheck = false; From c7282f84a9549474443b4db08517a92b4cc4b89e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:38 +0200 Subject: [PATCH 147/424] haskell-lens: update to version 4.2 --- .../libraries/haskell/lens/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 8576ed1d8045..f6f91da7083e 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,22 +1,22 @@ -{ cabal, aeson, bifunctors, comonad, contravariant, deepseq -, distributive, doctest, exceptions, filepath, free +{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant +, deepseq, distributive, doctest, exceptions, filepath, free , 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 +, unorderedContainers, vector, void, zlib }: cabal.mkDerivation (self: { pname = "lens"; - version = "4.1.2.1"; - sha256 = "1fi6960m2rvr538mwhrxavvrj8pvjnyw3akcbgaaph5p8f214alw"; + version = "4.2"; + sha256 = "0aqhr8akb7wg270jxi1ns3mrpv42cfssi3g2kzyhkjmb39qxpp2w"; buildDepends = [ - aeson bifunctors comonad contravariant distributive exceptions - filepath free hashable mtl parallel primitive profunctors - reflection scientific semigroupoids semigroups split tagged text - transformers transformersCompat unorderedContainers utf8String + aeson attoparsec bifunctors comonad contravariant distributive + exceptions filepath free hashable mtl parallel primitive + profunctors reflection scientific semigroupoids semigroups split + tagged text transformers transformersCompat unorderedContainers vector void zlib ]; testDepends = [ From 912e33adb2576c444a63e86ab103d959c3c8fddc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:40 +0200 Subject: [PATCH 148/424] haskell-libmpd: update to version 0.8.0.4 --- pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 2c31b2efea8d..54f358547bd1 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.8.0.3"; - sha256 = "0xbbk2rg6awfz5ak20956nriifga81ndk7n58lbbf5i86380akwz"; + version = "0.8.0.4"; + sha256 = "0dk723zly9dkwpgp4157d3a559g9j0ndxfdyp85yqcsr987wplqb"; buildDepends = [ attoparsec dataDefault filepath mtl network text time utf8String ]; From e49f8f6e4b2ee0e5a0cf9ef54420ac98ab1652be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:42 +0200 Subject: [PATCH 149/424] haskell-monoid-extras: update to version 0.3.3.4 --- pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index e3be47f16a09..dc4bb6dbb661 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.3.3"; - sha256 = "0i4c2yn0kbkqi478x93r2xvl05l4r3x7nyjd47zy3r4bb38qwj89"; + version = "0.3.3.4"; + sha256 = "0jbly9zxnsm15a5d3xg7i6w1mpqi4irdc76996xm5slg8bh0cji6"; buildDepends = [ groups semigroupoids semigroups ]; jailbreak = true; meta = { From e017e4cad65ec63f9b9abd48c8056dc753b05d84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:44 +0200 Subject: [PATCH 150/424] haskell-process-conduit: update to version 1.1.0.0 --- pkgs/development/libraries/haskell/process-conduit/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix index 8ed966cd05bf..aea29a4d02bf 100644 --- a/pkgs/development/libraries/haskell/process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/process-conduit/default.nix @@ -11,8 +11,6 @@ cabal.mkDerivation (self: { text ]; testDepends = [ conduit hspec ]; - # This check is being disabled until process-conduit is updated to properly - # support conduit 1.1.x doCheck = false; meta = { homepage = "http://github.com/tanakh/process-conduit"; From 938ac2949f5fe12cfbfc13f53e8a3cb200432e79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:46 +0200 Subject: [PATCH 151/424] haskell-reducers: update to version 3.10.2.1 --- pkgs/development/libraries/haskell/reducers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix index 7d7ad6d49175..ac00a1ca5c19 100644 --- a/pkgs/development/libraries/haskell/reducers/default.nix +++ b/pkgs/development/libraries/haskell/reducers/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "reducers"; - version = "3.10.2"; - sha256 = "159srk8v6zmfprq80mx3rpqrxzgzvf7xiwm8ywfaxrqyfcwkkjmg"; + version = "3.10.2.1"; + sha256 = "1wn6q6cw9is1gan9y5n3fzjkhmpjpria4p13zp4kqxmj881067vy"; buildDepends = [ comonad fingertree hashable keys pointed semigroupoids semigroups text transformers unorderedContainers From 08910c93a9b9043fae9dede38266cd069a107a1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:48 +0200 Subject: [PATCH 152/424] haskell-scotty: update to version 0.7.3 --- pkgs/development/libraries/haskell/scotty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index cc5ae2604777..601ecfb223d4 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "scotty"; - version = "0.7.2"; - sha256 = "1y14af3qciwycgaxzx6rjan2jgfchjzs4zbxzh8p8s1d0l4gsqlb"; + version = "0.7.3"; + sha256 = "1cksnsaghcliwpbigs7fjb2qcxsnrqmjcjwndmf3vbfkn43w2prb"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit conduitExtra dataDefault httpTypes mtl regexCompat text transformers wai waiExtra warp From e4e95884f86850cd8a69d5d5cc61b9f5ce6e93f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:50 +0200 Subject: [PATCH 153/424] haskell-semigroups: update to version 0.15 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 7b68d75c9068..21cbc893e229 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.14"; - sha256 = "07jmfb3h4kz3a2ysrkhzzpfdhxglszq6qqsmg2011f0hdzm24ay7"; + version = "0.15"; + sha256 = "1fkinmjyx7r39c8hf8f6n9zgn6m7c2y7l0san43s4g2cfg8pxn5s"; buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; From 29742effa474bfd5ea4a8a0538548109ba6467ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:55 +0200 Subject: [PATCH 154/424] haskell-shelly: update to version 1.5.4 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 4549adaf43e2..a37fb044bc01 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.3.2"; - sha256 = "0ilqg7mffw8cnl3w175if74xwfij7460qqqsp6hzml7gzjdb0rky"; + version = "1.5.4"; + sha256 = "1jxw3c25n7azvfyj9vark9149sk36d01pfij6lgamhjs28mb860d"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers From 303806b1823c086ac6e6670056c4ca7cf65c7d81 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:57 +0200 Subject: [PATCH 155/424] haskell-smtps-gmail: update to version 1.2.1 --- pkgs/development/libraries/haskell/smtps-gmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix index 6361c9bd79a8..2618b77be28c 100644 --- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix +++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "smtps-gmail"; - version = "1.2.0"; - sha256 = "1gg3cglfsyfffh3b5cyrk3pnb8jg5s8s4yjzykdnfyjrdp1080xz"; + version = "1.2.1"; + sha256 = "04sancbfbbszajgb1jp613qp43qxvzz9b14c0v3sgfva7fdhaw9q"; buildDepends = [ base64Bytestring cprngAes dataDefault filepath mimeMail network stringsearch text tls From b453628e52ba729ead5e5993c62a7653da268997 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:35:59 +0200 Subject: [PATCH 156/424] haskell-snap: update to version 0.13.2.6 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 26533c8ce0ec..ecbb5da37a71 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.5"; - sha256 = "1xvwx4zg2b78fdyb2yvqd5i5g195di7rzzpn3va43vkq2lk5vcqj"; + version = "0.13.2.6"; + sha256 = "0f9m8rvciis16w211hfrablh3xzxwcqqsgvfc34j70lazj3kigs3"; isLibrary = true; isExecutable = true; buildDepends = [ From 4268d5c635d6a4556728811718b5024b39d79c76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:01 +0200 Subject: [PATCH 157/424] haskell-sqlite-simple: update to version 0.4.8.0 --- pkgs/development/libraries/haskell/sqlite-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix index d8a76210d08b..515f22834ae3 100644 --- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix +++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "sqlite-simple"; - version = "0.4.7.0"; - sha256 = "128b8n66j729g9mwndv5m3plww6av7hin7dmwsbs19v8klcaf4f5"; + version = "0.4.8.0"; + sha256 = "098d1s80wlvsp307422f79bm3a9knvgw5ni6jap62fl4rpa7fsmz"; buildDepends = [ attoparsec blazeBuilder blazeTextual directSqlite text time transformers From 7f9484967c47fa3d87a66a3f72b3c9da53124812 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:04 +0200 Subject: [PATCH 158/424] haskell-statestack: update to version 0.2.0.3 --- pkgs/development/libraries/haskell/statestack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/statestack/default.nix b/pkgs/development/libraries/haskell/statestack/default.nix index 4275c5fc4576..c073e00be17c 100644 --- a/pkgs/development/libraries/haskell/statestack/default.nix +++ b/pkgs/development/libraries/haskell/statestack/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "statestack"; - version = "0.2"; - sha256 = "0j1axjwlh270qy6nlvm0hbc8nbd1ggm7klkjv553qf1rprz4zc2d"; + version = "0.2.0.3"; + sha256 = "0w5vw8jmnwbfyma4a3ggdm9jvxf3c18kpwbvcmvr5szifaqv9sgx"; buildDepends = [ mtl transformers ]; meta = { description = "Simple State-like monad transformer with saveable and restorable state"; From 868c6a96646d6eca0a38ff21bae2b94e2d10e5f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:06 +0200 Subject: [PATCH 159/424] haskell-statistics: update to version 0.11.0.3 --- pkgs/development/libraries/haskell/statistics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 58a9c835696f..485a5fe0c304 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.11.0.1"; - sha256 = "17p4dj7wimnl5fcwxpmcmgcmwpypfkk3gzmgmx9qvxl8p38lwacc"; + version = "0.11.0.3"; + sha256 = "184lzivqjjj69pxcnr5ibxjqikypfl5nd63i44qgwdhwyvcaqdh3"; buildDepends = [ binary deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms vectorBinaryInstances From 92aa75475c3ec1a5a8823ec22d8a1fdde16b0988 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:08 +0200 Subject: [PATCH 160/424] haskell-stm-conduit: update to version 2.5.0 --- pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 201a2ea02f97..deb76355f4a7 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.4.0"; - sha256 = "03ifxr3pspwmzf0xdh7mj3q1wiz13d86w9pdhiqa6b1d1qw6rvha"; + version = "2.5.0"; + sha256 = "1pxs1ggyyjm4x06cirdcjaqzvz3964spv34fcf0q9ddhxm5kb30q"; buildDepends = [ async cereal cerealConduit conduit conduitExtra liftedAsync liftedBase monadControl monadLoops resourcet stm stmChans From fbfbaea156ad6606313fba3e392b98a4a06a7935 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:10 +0200 Subject: [PATCH 161/424] haskell-system-fileio: update to version 0.3.14 --- .../libraries/haskell/system-fileio/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index f9cf911678a6..bd0654f728a3 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -1,10 +1,14 @@ -{ cabal, systemFilepath, text, time }: +{ cabal, chell, systemFilepath, temporary, text, time, transformers +}: cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.13"; - sha256 = "12xsxcg2jk63x8aiikj5gx1an794zdfxzkx1sjnr2qyqyirk311v"; + version = "0.3.14"; + sha256 = "1x5cricx2n1wwvdad4i3q8s3gb28a129v3kkj9rn9803xh43zh29"; buildDepends = [ systemFilepath text time ]; + testDepends = [ + chell systemFilepath temporary text time transformers + ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "Consistent filesystem interaction across GHC versions"; From 4e60fd568766dea60837ec21812c2afc0ecdd383 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:12 +0200 Subject: [PATCH 162/424] haskell-system-filepath: update to version 0.4.12 --- .../libraries/haskell/system-filepath/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index fba75d7b847d..6bc7805cef6f 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -1,10 +1,11 @@ -{ cabal, deepseq, text }: +{ cabal, chell, chellQuickcheck, deepseq, QuickCheck, text }: cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.10"; - sha256 = "176g5jm1gd6lrkmhfz9qh5aqwfbpwyr30yknfcc49wl7jkfhisiq"; + version = "0.4.12"; + sha256 = "0sfralwgd5b9hfqmp20v31sq96s0v7j9g920qdj3n9i5mhslhwd2"; buildDepends = [ deepseq text ]; + testDepends = [ chell chellQuickcheck QuickCheck text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; From e8acfc5d65ef7dba1f4fa7423a54c8846f95f905 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:15 +0200 Subject: [PATCH 163/424] haskell-tasty-ant-xml: update to version 1.0.0.8 --- pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 9ad4b2de7471..2551b642fb1c 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.7"; - sha256 = "0jjh2lyr33l5mps123azszwnk0h61ar99zlqbc4h04a8vkd9x813"; + version = "1.0.0.8"; + sha256 = "0khjx3anxp63ch6wkdhqnsk5miavkq014ab30rpir97gdqw0vykm"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; From 5bf659263ef9bd117d69c9dc7884ae4700737eb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:17 +0200 Subject: [PATCH 164/424] haskell-tasty-golden: update to version 2.2.1.2 --- pkgs/development/libraries/haskell/tasty-golden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix index 159a5fd9eb89..d6d8f2d625d1 100644 --- a/pkgs/development/libraries/haskell/tasty-golden/default.nix +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-golden"; - version = "2.2.1.1"; - sha256 = "0a265l7fwc0sxzdy9b0jf8f5w4nws6pwhhaw1pa7qx3c8fm9v54i"; + version = "2.2.1.2"; + sha256 = "107c6i1abw6dsd3cx1bgiyk8dnih7i9x4bl4kw6dfnva2kjkp4d1"; buildDepends = [ deepseq filepath mtl optparseApplicative tagged tasty temporaryRc ]; From 08198d47717c53cc22b93f3099b763124ad74877 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:19 +0200 Subject: [PATCH 165/424] haskell-texmath: update to version 0.6.6.2 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 7c97f5b8e3f9..d7e60bf4aed4 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.6.1"; - sha256 = "0s6rh4frjc76g1nmwhnnpnsszrnhpi9zx478zqiln1fg0yc9fhxq"; + version = "0.6.6.2"; + sha256 = "0lwkbniw7nn19gaw5bl1fsbl5q54n111zpiwz8b49d03vmmvd3hs"; isLibrary = true; isExecutable = true; buildDepends = [ pandocTypes parsec syb xml ]; From b4a3a61285a3b5e75368b7e6dbf44a9c92943d5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:23 +0200 Subject: [PATCH 166/424] haskell-unlambda: update to version 0.1.3 --- pkgs/development/libraries/haskell/unlambda/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index a9e0def2bc70..474bb1a8b092 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -7,7 +7,6 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; - hyperlinkSource = false; meta = { description = "Unlambda interpreter"; license = "GPL"; From 145bcc77e78b62e518c27c5318d7b8f45861efce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:26 +0200 Subject: [PATCH 167/424] haskell-utf8-string: update to version 0.3.8 --- pkgs/development/libraries/haskell/utf8-string/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix index e627c77bda2b..ec946dcdbdf3 100644 --- a/pkgs/development/libraries/haskell/utf8-string/default.nix +++ b/pkgs/development/libraries/haskell/utf8-string/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "utf8-string"; - version = "0.3.7"; - sha256 = "1s59xsw1i311rpxb7arnd280pjqab5mrlfjmxbabknka8wqlnnvq"; + version = "0.3.8"; + sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0"; meta = { homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; From 7d3603ae4a7f6f121366e5753ae5a3d5002ae1f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:28 +0200 Subject: [PATCH 168/424] haskell-wai-middleware-static: update to version 0.5.0.1 --- .../libraries/haskell/wai-middleware-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index 8c0540ee1014..18b251a8aedb 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai-middleware-static"; - version = "0.5.0.0"; - sha256 = "0mvsm1ff7i2v09gchkc60r8klin1lb0w690m2kwhf9q6y7fxphdf"; + version = "0.5.0.1"; + sha256 = "1pwyy6lsvi7kaxf6x3ghy5013yq4ryjp01c4rrd4isx4jh1ynl31"; buildDepends = [ filepath httpTypes mtl text wai ]; jailbreak = true; meta = { From b23dcddd234a6fb95d038a7ee89952b49ec6eded Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:36:30 +0200 Subject: [PATCH 169/424] haskell-yesod-bin: update to version 1.2.9.4 --- .../libraries/haskell/yesod-bin/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index d722d5cd608a..3bca09f4fb6b 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.9.3"; - sha256 = "1gjcg798d7xpd8hgz8s1napgxm9dnbsks1g1s5hgx8ml5xkp2la7"; + version = "1.2.9.4"; + sha256 = "0ir77hmg3avkm4x7pgmjx3fijisncpwklg4v1glqx4vqbjjrzk5g"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -23,18 +23,6 @@ cabal.mkDerivation (self: { systemFileio systemFilepath tar text time transformers unixCompat unorderedContainers wai waiExtra warp yaml zlib ]; - - postInstall = '' - mv $out/bin/yesod $out/bin/.yesod-wrapped - cat - > $out/bin/yesod < Date: Tue, 3 Jun 2014 11:36:32 +0200 Subject: [PATCH 170/424] haskell-yst: update to version 0.4.1 --- pkgs/development/libraries/haskell/yst/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index ee9bb33cdba9..8b381bd214e4 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -1,17 +1,17 @@ { cabal, aeson, csv, filepath, HDBC, HDBCSqlite3, HStringTemplate -, pandoc, parsec, split, text, time, unorderedContainers, xhtml -, yaml +, pandoc, parsec, scientific, split, text, time +, unorderedContainers, xhtml, yaml }: cabal.mkDerivation (self: { pname = "yst"; - version = "0.4.0.1"; - sha256 = "0j260lvprgsi9qgjwji2cc25k0dzrw94h2527rwghik8baa1ha3r"; + version = "0.4.1"; + sha256 = "199awgpxn9131a7ijxvvbc4mi1yasnllbpj77k27brx00j87v3nq"; isLibrary = false; isExecutable = true; buildDepends = [ aeson csv filepath HDBC HDBCSqlite3 HStringTemplate pandoc parsec - split text time unorderedContainers xhtml yaml + scientific split text time unorderedContainers xhtml yaml ]; meta = { homepage = "http://github.com/jgm/yst"; From c9672d767f4635076ed5ee98ebd79aa9bceafd55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:38:15 +0200 Subject: [PATCH 171/424] haskell-Cabal: update to version 1.20.0.1 --- .../libraries/haskell/Cabal/{1.20.0.0.nix => 1.20.0.1.nix} | 4 ++-- pkgs/top-level/haskell-defaults.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/haskell/Cabal/{1.20.0.0.nix => 1.20.0.1.nix} (89%) diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix similarity index 89% rename from pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix rename to pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix index 0dbd2acdd92c..ee7f363318eb 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.20.0.0"; - sha256 = "1m2lp6v1959mdm9zfg6fg1xw2iv749r4rzj576lqvn66slwsjpw1"; + version = "1.20.0.1"; + sha256 = "0vcpw4rskqlg2swsxk93p77svb007qvpwlpj2ia55avpi4c3xf8m"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d803883413d8..d07544691e66 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -20,8 +20,8 @@ }; ghc782Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_0; }; - codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_1; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; }; ghc763Prefs = self : super : ghc782Prefs self super // { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9765dc29c3b3..bcead18f6218 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -324,7 +324,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; - Cabal_1_20_0_0 = callPackage ../development/libraries/haskell/Cabal/1.20.0.0.nix {}; + Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {}; Cabal = null; # core package since forever cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; @@ -2740,7 +2740,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_1; }; cabalInstall = self.cabalInstall_1_20_0_2; codex = callPackage ../development/tools/haskell/codex {}; From 66044974b4e8447bb1d78c688e798be0685a0660 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:39:11 +0200 Subject: [PATCH 172/424] haskell-QuickCheck: update to version 2.7.5 --- .../haskell/QuickCheck/{2.7.3.nix => 2.7.5.nix} | 10 +++++----- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/QuickCheck/{2.7.3.nix => 2.7.5.nix} (60%) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix similarity index 60% rename from pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix rename to pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix index fafea2eb7d10..8dff2162c2d8 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix @@ -1,14 +1,14 @@ -{ cabal, random, testFramework, tfRandom }: +{ cabal, random, testFramework, tfRandom, transformers }: cabal.mkDerivation (self: { pname = "QuickCheck"; - version = "2.7.3"; - sha256 = "196pz0b32m84ydwm4wk7m8512bmsxw7nsqpxbyfxsyi3ykq220yh"; - buildDepends = [ random tfRandom ]; + version = "2.7.5"; + sha256 = "1bak50yxf8qfwfw1f5bd2p1ynx1ndjv24yp6gd2a2a1fag34x0rb"; + buildDepends = [ random tfRandom transformers ]; testDepends = [ testFramework ]; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; meta = { - homepage = "http://code.haskell.org/QuickCheck"; + homepage = "https://github.com/nick8325/quickcheck"; description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bcead18f6218..13fa322f5672 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1789,8 +1789,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; - QuickCheck_2_7_3 = callPackage ../development/libraries/haskell/QuickCheck/2.7.3.nix {}; - QuickCheck = self.QuickCheck_2_7_3; + QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {}; + QuickCheck = self.QuickCheck_2_7_5; quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; From 1a29d1bc3ca305463e67452339f5017b441145f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:40:06 +0200 Subject: [PATCH 173/424] haskell-HTTP: update to version 4000.2.17 --- .../libraries/haskell/HTTP/{4000.2.15.nix => 4000.2.17.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/HTTP/{4000.2.15.nix => 4000.2.17.nix} (89%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix similarity index 89% rename from pkgs/development/libraries/haskell/HTTP/4000.2.15.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.17.nix index 8e51ad6d2b5b..583517260acf 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.15"; - sha256 = "1bw79hq5nzx1gab9p3d3szr0wkiv9zvf2ld9d4i48z6fnmil4qwj"; + version = "4000.2.17"; + sha256 = "1701mgf1gw00nxd70kkr86yl80qxy63rpqky2g9m2nfr6y4y5b59"; buildDepends = [ mtl network parsec ]; testDepends = [ caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 13fa322f5672..ba01ab139f58 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1024,8 +1024,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; }; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_15 = callPackage ../development/libraries/haskell/HTTP/4000.2.15.nix {}; - HTTP = self.HTTP_4000_2_15; + HTTP_4000_2_17 = callPackage ../development/libraries/haskell/HTTP/4000.2.17.nix {}; + HTTP = self.HTTP_4000_2_17; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; From 64f41867352dfb66352f7bd6868a8ab7be6063d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:41:03 +0200 Subject: [PATCH 174/424] haskell-vector: update version to 0.10.9.3 --- .../libraries/haskell/vector/{0.10.9.2.nix => 0.10.9.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/vector/{0.10.9.2.nix => 0.10.9.3.nix} (81%) diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.2.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix similarity index 81% rename from pkgs/development/libraries/haskell/vector/0.10.9.2.nix rename to pkgs/development/libraries/haskell/vector/0.10.9.3.nix index 57c924aff487..b9a7df50ba6e 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.9.2.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector"; - version = "0.10.9.2"; - sha256 = "046w4w5dr5136smfxzhzkhzcx6jgpnqrc2x5lzy4vrlxhb8za6c1"; + version = "0.10.9.3"; + sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx"; buildDepends = [ deepseq primitive ]; meta = { homepage = "https://github.com/haskell/vector"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ba01ab139f58..724dffd69efd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2378,8 +2378,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; - vector_0_10_9_2 = callPackage ../development/libraries/haskell/vector/0.10.9.2.nix {}; - vector = self.vector_0_10_9_2; + vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; + vector = self.vector_0_10_9_3; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; From 6358b1598538ca268f76b24c976089cc48b34765 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:45:18 +0200 Subject: [PATCH 175/424] haskell-mtl: update to version 2.2.1 (and delete unused versions 1.1.1.1 and 2.1.3.1) --- pkgs/development/libraries/haskell/mtl/1.1.1.1.nix | 13 ------------- .../haskell/mtl/{2.1.3.1.nix => 2.2.1.nix} | 4 ++-- pkgs/top-level/haskell-defaults.nix | 2 +- pkgs/top-level/haskell-packages.nix | 4 +--- 4 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/mtl/1.1.1.1.nix rename pkgs/development/libraries/haskell/mtl/{2.1.3.1.nix => 2.2.1.nix} (81%) diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix deleted file mode 100644 index d7e6029a4edc..000000000000 --- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "1.1.1.1"; - sha256 = "157gbrgrg0l9r72nq45dkach53yncysif4qglsaql28g37djc4x6"; - meta = { - description = "Monad transformer library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.1.nix similarity index 81% rename from pkgs/development/libraries/haskell/mtl/2.1.3.1.nix rename to pkgs/development/libraries/haskell/mtl/2.2.1.nix index e9fa49510c18..e7147b28767a 100644 --- a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix +++ b/pkgs/development/libraries/haskell/mtl/2.2.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mtl"; - version = "2.1.3.1"; - sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp"; + version = "2.2.1"; + sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa"; buildDepends = [ transformers ]; meta = { homepage = "http://github.com/ekmett/mtl"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d07544691e66..697004c02fb3 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,7 +15,7 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - mtl = self.mtl_2_1_3_1; + mtl = self.mtl_2_2_1; cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 724dffd69efd..ceeee5caeabd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1482,12 +1482,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in msgpack = callPackage ../development/libraries/haskell/msgpack {}; mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; - mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {}; mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {}; mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {}; - mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {}; - mtl_2_2_0_1 = callPackage ../development/libraries/haskell/mtl/2.2.0.1.nix {}; + mtl_2_2_1 = callPackage ../development/libraries/haskell/mtl/2.2.1.nix {}; mtl = null; # tightly coupled with 'transformers' which is a core package mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; From 3376d02e3135cc47819aab358fd91a84fa256724 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:48:52 +0200 Subject: [PATCH 176/424] haskell-text: add version 1.1.1.3 (and delete unused versions 0.11.1.13 and 0.1.1.2) --- .../libraries/haskell/text/0.11.1.13.nix | 22 ------------------- .../haskell/text/{1.1.1.2.nix => 1.1.1.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 5 ++--- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/text/0.11.1.13.nix rename pkgs/development/libraries/haskell/text/{1.1.1.2.nix => 1.1.1.3.nix} (87%) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix deleted file mode 100644 index 71d0c28e48d7..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.1.13"; - sha256 = "0lbc4yfqpydps0rd1qjymnnhp87sl9w7n1f5vd5lsixby93zjv2f"; - buildDepends = [ deepseq ]; - testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/1.1.1.2.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix similarity index 87% rename from pkgs/development/libraries/haskell/text/1.1.1.2.nix rename to pkgs/development/libraries/haskell/text/1.1.1.3.nix index 6054e3c6471a..0df511231c8f 100644 --- a/pkgs/development/libraries/haskell/text/1.1.1.2.nix +++ b/pkgs/development/libraries/haskell/text/1.1.1.3.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "1.1.1.2"; - sha256 = "11kj0pf0v24a0xg61caaqz5d8w3s8i4nbgl416xgdvrbfd39ssj8"; + version = "1.1.1.3"; + sha256 = "1yrzg449nbbzh2fb9mdmf2jjfhk2g87kr9m2ibssbsqx53p98z0c"; buildDepends = [ deepseq ]; testDepends = [ deepseq HUnit QuickCheck random testFramework testFrameworkHunit diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ceeee5caeabd..57cb164866ba 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2198,12 +2198,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; - text_1_1_1_2 = callPackage ../development/libraries/haskell/text/1.1.1.2.nix {}; - text = self.text_1_1_1_2; + text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; + text = self.text_1_1_1_3; textFormat = callPackage ../development/libraries/haskell/text-format {}; From 5190b18caa197added83d044a21c2d2371d013a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 11:51:30 +0200 Subject: [PATCH 177/424] haskell-attoparsec: update to version 0.12.0.0 --- .../libraries/haskell/attoparsec/0.12.0.0.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix new file mode 100644 index 000000000000..6fd32736c4d8 --- /dev/null +++ b/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix @@ -0,0 +1,21 @@ +{ cabal, deepseq, QuickCheck, scientific, testFramework +, testFrameworkQuickcheck2, text +}: + +cabal.mkDerivation (self: { + pname = "attoparsec"; + version = "0.12.0.0"; + sha256 = "04wdb2i2yqybkfnjs3f25nf7xz1nq5sn8z23klbm4xnqaiajmkmr"; + buildDepends = [ deepseq scientific text ]; + testDepends = [ + deepseq QuickCheck scientific testFramework + testFrameworkQuickcheck2 text + ]; + meta = { + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 57cb164866ba..a9ed05451fbf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -195,7 +195,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; - attoparsec = self.attoparsec_0_11_3_4; + attoparsec_0_12_0_0 = callPackage ../development/libraries/haskell/attoparsec/0.12.0.0.nix {}; + attoparsec = self.attoparsec_0_12_0_0; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; From 1d392a56ae371bf30835bb044b7c3148712be6dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Jun 2014 14:49:15 +0200 Subject: [PATCH 178/424] Update the default version of transformers to 0.4.1 on older compilers. --- pkgs/top-level/haskell-defaults.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 697004c02fb3..6341b9a36dde 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,7 +15,7 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - mtl = self.mtl_2_2_1; + mtl = self.mtl_2_1_2; cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; }; @@ -41,8 +41,9 @@ gloss = null; # requires base >= 4.7 haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 + mtl = self.mtl_2_2_1; pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; - transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x + transformers = self.transformers_0_4_1_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; From 73e92d263454b90c377fd6e6be6ffaa3e6698452 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jun 2014 10:38:02 +0200 Subject: [PATCH 179/424] haskell-hsini: jailbreak to fix build with recent versions of mtl --- pkgs/development/libraries/haskell/hsini/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix index 73368a1dd6cf..52d8a26c92a8 100644 --- a/pkgs/development/libraries/haskell/hsini/default.nix +++ b/pkgs/development/libraries/haskell/hsini/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { HUnit mtl parsec QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh ]; + jailbreak = true; meta = { description = "Package for user configuration files (INI)"; license = self.stdenv.lib.licenses.bsd3; From 782d937dc471c01b7e79de707d277aa72459f617 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 10:52:01 +0200 Subject: [PATCH 180/424] haskell-MonadCatchIO-transformers: jailbreak to fix build with transformers 0.4.x --- .../libraries/haskell/MonadCatchIO-transformers/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index 838c92fff3f8..b6402f63abb5 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.3.1.0"; sha256 = "1r5syyalk8a81byhk39yp0j7vdrvlrpppbg52dql1fx6kfhysaxn"; buildDepends = [ extensibleExceptions monadsTf transformers ]; + jailbreak = true; meta = { description = "Monad-transformer compatible version of the Control.Exception module"; license = self.stdenv.lib.licenses.bsd3; From eaa151379a0bf4a66e8a047bafa24eb221492dee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:01:46 +0200 Subject: [PATCH 181/424] haskell-transformers-0.4.1.0: haddock from GHC 6.10.x cannot build this documentation --- pkgs/development/libraries/haskell/transformers/0.4.1.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix index 88ae33de7842..dd3789e58022 100644 --- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix @@ -4,6 +4,7 @@ cabal.mkDerivation (self: { pname = "transformers"; version = "0.4.1.0"; sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg"; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; meta = { description = "Concrete functor and monad transformers"; license = self.stdenv.lib.licenses.bsd3; From b5e87f63f9c4e11a66e92b6892b15497e0cd8e96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:40 +0200 Subject: [PATCH 182/424] haskell-idris: update to version 0.9.13 --- pkgs/development/compilers/idris/default.nix | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index c32c14cf5848..0c3c1c0fba8c 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,23 +1,25 @@ { cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary -, boehmgc, Cabal, cheapskate, deepseq, filepath, gmp, happy -, haskeline, languageJava, lens, libffi, llvmGeneral -, llvmGeneralPure, mtl, network, parsers, split, text, time -, transformers, trifecta, unorderedContainers, utf8String, vector -, vectorBinaryInstances, xml, zlib +, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq +, filepath, gmp, happy, haskeline, languageJava, lens, libffi +, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative +, parsers, split, text, time, transformers, trifecta +, unorderedContainers, utf8String, vector, vectorBinaryInstances +, xml, zlib }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.12"; - sha256 = "151h9qkx7yw24q0b60r78hki1y8m6sxmfars7wywnbzk3kalqb6x"; + version = "0.9.13"; + sha256 = "0bpp8b19s1przycndvl542ar9dc285ccnwm7cic33ym1lcqil86n"; isLibrary = true; isExecutable = true; buildDepends = [ - annotatedWlPprint ansiTerminal ansiWlPprint binary Cabal cheapskate - deepseq filepath haskeline languageJava lens libffi llvmGeneral - llvmGeneralPure mtl network parsers split text time transformers - trifecta unorderedContainers utf8String vector - vectorBinaryInstances xml zlib + annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml + blazeMarkup Cabal cheapskate deepseq filepath haskeline + languageJava lens libffi llvmGeneral llvmGeneralPure mtl network + optparseApplicative parsers split text time transformers trifecta + unorderedContainers utf8String vector vectorBinaryInstances xml + zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; From 180ad15ab53619d09250ff179fc663df053ea997 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:42 +0200 Subject: [PATCH 183/424] haskell-diagrams-core: update to version 1.2.0.1 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index dbbc3c030b58..153f109d14bf 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2"; - sha256 = "0qlkick9ppwaignh179w65gmiq5as1nsi1ymficdw1p0jldi5f51"; + version = "1.2.0.1"; + sha256 = "01rzd2zdg0pv7b299z6s6i6l6xggiszb2qs00vh5dbss295n1sps"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From 8e14d2908fc094e6433fd5164ed662d66c3cf8f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:44 +0200 Subject: [PATCH 184/424] haskell-diagrams-lib: update to version 1.2.0.1 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 26470c215152..03d6ad9f396f 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2"; - sha256 = "1gdc2k1dmqfv6pcznzngfv0gqsm7pd7ga65xjmd0rzyl8nqk4k3n"; + version = "1.2.0.1"; + sha256 = "0p7rq97hnal90dciq1nln1s16kdb1xk9rrwaxhkxqr6kjjr2njf4"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie From 2a53dce4e7cf0ea6cadd848b2ef34da76628b40c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:46 +0200 Subject: [PATCH 185/424] haskell-hit: update to version 0.6.1 --- pkgs/development/libraries/haskell/hit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix index 9e1a48d94e67..7e5b30ebbad3 100644 --- a/pkgs/development/libraries/haskell/hit/default.nix +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hit"; - version = "0.6.0"; - sha256 = "1haslqhnpfdll5cl3vq1y03h916lydhc9mq4gagm9qzjfjqv54k2"; + version = "0.6.1"; + sha256 = "175i6gag596dy341jlr5sjj55qcaqgymrcr1czcaigsxsn5yx8b9"; isLibrary = true; isExecutable = true; buildDepends = [ From 0e015977e21aca3b3ee9dac7af963ede091b792b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:48 +0200 Subject: [PATCH 186/424] haskell-hourglass: update to version 0.2.0 --- .../libraries/haskell/hourglass/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix index 3fc43ef63489..7a5cf59b3283 100644 --- a/pkgs/development/libraries/haskell/hourglass/default.nix +++ b/pkgs/development/libraries/haskell/hourglass/default.nix @@ -1,15 +1,12 @@ -{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, time -}: +{ cabal, deepseq, mtl, tasty, tastyHunit, tastyQuickcheck, time }: cabal.mkDerivation (self: { pname = "hourglass"; - version = "0.1.2"; - sha256 = "18jvl4f8vfabvd9vlhxjjlswc80x8w4h6gdflvzdkjrknnyk118j"; + version = "0.2.0"; + sha256 = "13zphy3gfj9p7vsa477qy30968fnz5kq7d0lzb1pyg5hxkx44rim"; buildDepends = [ deepseq ]; testDepends = [ - deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 time + deepseq mtl tasty tastyHunit tastyQuickcheck time ]; meta = { homepage = "https://github.com/vincenthz/hs-hourglass"; From 226d0941e6d9ce4940e7e8312e065233258aaf78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:50 +0200 Subject: [PATCH 187/424] haskell-mono-traversable: update to version 0.6.0.1 --- .../libraries/haskell/mono-traversable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index a296b3d310e1..60cb273d3a37 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.0"; - sha256 = "1ibf7iz24ic2vz0dvmbn5w06vz73g05ipl2q8f93a6zlkqysrkm4"; + version = "0.6.0.1"; + sha256 = "0pxmkz5jq511ys77sq2zxmgab7njrhbi01x51lf247z8ii0rdbns"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms From 8dc527529915d0200cef1cf2abf930933f05175f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:52 +0200 Subject: [PATCH 188/424] haskell-pipes-aeson: update to version 0.4.1 --- pkgs/development/libraries/haskell/pipes-aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix index 85fd3a0a548b..aa226aa4e3b3 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.4"; - sha256 = "0cz9av3w8h2gh3cz7gs3ikplf60a111wcsr3z6vi8gqlmmgmck07"; + version = "0.4.1"; + sha256 = "06fxl4az5brbivc5db498fc3yawrc2rwnrn20rbssihd0lp9xm1i"; buildDepends = [ aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse transformers From 3e53f7128aa3da496285a383e1660a15411b95af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:54 +0200 Subject: [PATCH 189/424] haskell-pipes-attoparsec: update to version 0.5.1 --- .../libraries/haskell/pipes-attoparsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix index d886d17478ba..04efb0cee738 100644 --- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-attoparsec"; - version = "0.5.0"; - sha256 = "1xpqna850lxawx0m84lzaxwrwfw4vccr7jjf199ir7bmwwhqlr5h"; + version = "0.5.1"; + sha256 = "0qvsvbcn211xp4c669cpljmnsqn9zk1rn94ya1dbq77l970s8xah"; buildDepends = [ attoparsec pipes pipesParse text transformers ]; testDepends = [ attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text From b2ec2c58ba1a27120b8aaf0948b2a2f876f84641 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:56 +0200 Subject: [PATCH 190/424] haskell-postgresql-simple: update to version 0.4.2.3 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index b97830899873..c88ba4e845da 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.2.2"; - sha256 = "0ipwpggzgqsi8ii12pk4c1bmwv2y5yj6yvyh8ma9rsz9f081bzyy"; + version = "0.4.2.3"; + sha256 = "1rg6virvz4nr0m39sr72h23yks5f8ih9nimgacx30zw7xvnx942p"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector From 9bc7005ecd39bdda42032c7be42854cf6028f2b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:03:58 +0200 Subject: [PATCH 191/424] haskell-semigroupoids: update to version 4.0.2.1 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 45e2adb35fd6..455396564ec8 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "4.0.2"; - sha256 = "07xzqqdra2d5jr4wclislj1lhbb1nlry65m0y42hdxsjf3n05931"; + version = "4.0.2.1"; + sha256 = "00ga4spbnvwnk7j4h7zjw3bkd98glaganhcwq947ffadc0nansb1"; buildDepends = [ comonad contravariant distributive semigroups transformers ]; From bdbd0d0ccf6cdbad86b18c361f403570a36a6a7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:00 +0200 Subject: [PATCH 192/424] haskell-snap-core: update to version 0.9.6.3 --- pkgs/development/libraries/haskell/snap/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 0a1d1b7c5cf4..d208cadf8cf1 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.6.2"; - sha256 = "1s77p2q4zrpw2fksklqc9sgcb214fijsk88lqqasdiw9kb9xmwij"; + version = "0.9.6.3"; + sha256 = "0i3gl1kxzi2l76sqhyhda7lrcvq8hq6aqgwvfx5k9fa2xic01dw1"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath hashable From 9a76b00dd5189e53ce83ee3c465ac0a93eb008b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:02 +0200 Subject: [PATCH 193/424] haskell-snap-server: update to version 0.9.4.5 --- pkgs/development/libraries/haskell/snap/server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 0f9a05177d6e..a59252fb38cc 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.4.4"; - sha256 = "1y53baxyn6z6g4vc3j66w60s0vxdblkg8az712iw2030q2brilg2"; + version = "0.9.4.5"; + sha256 = "09399vlqgic0iwmx31c01bjpbdblw8gayxnz71lwzkixqibkbbip"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator MonadCatchIOTransformers mtl network From 6b3ca84380b350f8d3aa5baefe8a7b190f20ff36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:04 +0200 Subject: [PATCH 194/424] haskell-texmath: update to version 0.6.6.3 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index d7e60bf4aed4..76963ae36c53 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.6.2"; - sha256 = "0lwkbniw7nn19gaw5bl1fsbl5q54n111zpiwz8b49d03vmmvd3hs"; + version = "0.6.6.3"; + sha256 = "1sly6acnb4299wd8380fkgnb7lzjrwml5lljyv73si84b3v0bnw2"; isLibrary = true; isExecutable = true; buildDepends = [ pandocTypes parsec syb xml ]; From 8fd61a33452cf1ee186c18a4ae63d9e1b9b1848a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:06 +0200 Subject: [PATCH 195/424] haskell-timerep: update to version 1.0.3 --- pkgs/development/libraries/haskell/timerep/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/timerep/default.nix b/pkgs/development/libraries/haskell/timerep/default.nix index 6ebc44cb8940..24bd1c017aa1 100644 --- a/pkgs/development/libraries/haskell/timerep/default.nix +++ b/pkgs/development/libraries/haskell/timerep/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, time }: cabal.mkDerivation (self: { pname = "timerep"; version = "1.0.3"; sha256 = "14lz8nzfy1j7snvifbwjkk1fjc8wy4jk67xk9n87r25v3cva3x0p"; + buildDepends = [ time ]; meta = { description = "Parse and display time according to some RFCs (RFC3339, RFC2822)"; license = self.stdenv.lib.licenses.bsd3; From 4d5a789169bd17aba7b742d621c737771a6ff125 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:08 +0200 Subject: [PATCH 196/424] haskell-transformers-compat: update to version 0.3.3.4 --- .../libraries/haskell/transformers-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix index dfe9e2ef0d65..4647bbe2980b 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/default.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "transformers-compat"; - version = "0.3.3"; - sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps"; + version = "0.3.3.4"; + sha256 = "1hab41ggyaxr4xn2szv8y9fg9np8zi8ifhimr33fspid1jz14xr5"; buildDepends = [ transformers ]; meta = { homepage = "http://github.com/ekmett/transformers-compat/"; From 2acc27c2c6ec3a2b1e79746fdadf45975b77c154 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:10 +0200 Subject: [PATCH 197/424] haskell-twitter-types: update to version 0.3.20140601 --- pkgs/development/libraries/haskell/twitter-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 0d40217c3d55..4b73fc5cf5a5 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.2.20140424"; - sha256 = "0ap2l3mclcilm58awz0fdayzcs7fckv69l6xdklp1yqyj6i7zk9a"; + version = "0.3.20140601"; + sha256 = "1z8vdhyklgb4s3jxkavb8n62h9cn3y80qqzab3hswfv5xwri20ni"; buildDepends = [ aeson httpTypes text unorderedContainers ]; testDepends = [ aeson attoparsec httpTypes HUnit shakespeare testFramework From 404e05c4e5ab9b22a7b3ddfcebe6956b5bab3e24 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:12 +0200 Subject: [PATCH 198/424] haskell-vinyl: update to version 0.4 --- pkgs/development/libraries/haskell/vinyl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix index 239221dc0482..52db901c495d 100644 --- a/pkgs/development/libraries/haskell/vinyl/default.nix +++ b/pkgs/development/libraries/haskell/vinyl/default.nix @@ -1,10 +1,10 @@ -{ cabal, doctest, lens }: +{ cabal, doctest, lens, singletons }: cabal.mkDerivation (self: { pname = "vinyl"; - version = "0.3"; - sha256 = "0wa7pdk5ds1zq0yy6lbzhpjglpnz56hg36iwma09b6jk2x71sf5r"; - testDepends = [ doctest lens ]; + version = "0.4"; + sha256 = "16v13bd5dvm9axngx1pvm7bq9412f6awz0cggsif1z0dy2kjpwgb"; + testDepends = [ doctest lens singletons ]; meta = { description = "Extensible Records"; license = self.stdenv.lib.licenses.mit; From 743ad37a1f62d1c24156a157bf082d010d4971ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:14 +0200 Subject: [PATCH 199/424] haskell-yesod-auth: update to version 1.3.1 --- .../libraries/haskell/yesod-auth/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index ecea7b9f99de..a54c714e979a 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,20 +1,22 @@ -{ cabal, aeson, authenticate, base16Bytestring, base64Bytestring -, binary, blazeHtml, blazeMarkup, byteable, cryptohash, dataDefault -, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes -, liftedBase, mimeMail, network, persistent, persistentTemplate -, random, resourcet, safe, shakespeare, shakespeareCss -, shakespeareJs, text, time, transformers, unorderedContainers, wai -, yesodCore, yesodForm, yesodPersistent +{ cabal, aeson, attoparsecConduit, authenticate, base16Bytestring +, base64Bytestring, binary, blazeBuilder, blazeHtml, blazeMarkup +, byteable, conduit, conduitExtra, cryptohash, dataDefault +, emailValidate, fileEmbed, hamlet, httpClient, httpConduit +, httpTypes, liftedBase, mimeMail, network, persistent +, persistentTemplate, random, resourcet, safe, shakespeare +, shakespeareCss, shakespeareJs, text, time, transformers +, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.0.5"; - sha256 = "03vwmc2hql07mfl2s7a3sry82x0y0icr1977p1ljfhinyh35zc6l"; + version = "1.3.1"; + sha256 = "1fv5z938rpiyhkl4zjb2ss496bgqvdvn7di5im089zmxvx1m81lz"; buildDepends = [ - aeson authenticate base16Bytestring base64Bytestring binary - blazeHtml blazeMarkup byteable cryptohash dataDefault emailValidate - fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network + aeson attoparsecConduit authenticate base16Bytestring + base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable + conduit conduitExtra cryptohash dataDefault emailValidate fileEmbed + hamlet httpClient httpConduit httpTypes liftedBase mimeMail network persistent persistentTemplate random resourcet safe shakespeare shakespeareCss shakespeareJs text time transformers unorderedContainers wai yesodCore yesodForm yesodPersistent From b3fd1fcf5688849c5e4612074a61a9314b6e32c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:16 +0200 Subject: [PATCH 200/424] haskell-yesod-core: update to version 1.2.15.2 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 433b39852694..ae63f4dbc16b 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.15.1"; - sha256 = "0xvfkplxsvacwkmplhzdyqk028yqkj1bql5x6qsizvj60fwsnnyk"; + version = "1.2.15.2"; + sha256 = "1k5dqcfpwqac81p9w2i1kz5pcvr21ibia5kh441811bdzlpwsiwq"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie From 4acb2ca9bf729b3ece1d303656eac8d65359b1b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:18 +0200 Subject: [PATCH 201/424] haskell-yesod-form: update to version 1.3.9.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 6744a230ca7d..add7d94bac42 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.9"; - sha256 = "1jq281avpw9x5nz6qn6zgc3fh76i48xh9pj980g53rx8ndg3g7x4"; + version = "1.3.9.1"; + sha256 = "1iw2vcdvp77vz3az9g9y4nk29g098fa9lvqzc7hwypvdawgwpgwm"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet From 6f8794ecb294a1cca462fc23d26b06dab83c4471 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:20 +0200 Subject: [PATCH 202/424] haskell-yesod-test: update to version 1.2.2 --- pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index a70490320e05..292941c01717 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.1.5"; - sha256 = "0ylm6zisz6l2rbn5dr8k0rxszgg1aa1w4ixpvai1xm6y8m17cy0i"; + version = "1.2.2"; + sha256 = "1vf5g83mj2a38f34llg6wa63whj13p0vgbzfvi3ic5j7qy5gb8g5"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network From 8b07b3a6a112d3804882c3d49c632dffeab9b82e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:04:22 +0200 Subject: [PATCH 203/424] haskell-codex: update to version 0.0.2.1 --- pkgs/development/tools/haskell/codex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index eeba452f5c8a..3bc9959c8d7a 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "codex"; - version = "0.0.2"; - sha256 = "156830krsn1qczrx27bn3ihqlis698sjf563sa2njvc7v85plx55"; + version = "0.0.2.1"; + sha256 = "0cwn44dw3fks1qaymrjn3q99lq6baginh12y6wwkhz53cd6cv41z"; isLibrary = true; isExecutable = true; buildDepends = [ From c82d37a6b3034b10e7a7cc7054734024681b7dcb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:11:48 +0200 Subject: [PATCH 204/424] haskell-base64-bytestring: disable test suite do fix the build https://github.com/bos/base64-bytestring/issues/15 --- pkgs/development/libraries/haskell/base64-bytestring/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 67450dc88874..6b753f7b9800 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and decoding for ByteStrings"; From 035192b813c9ed41627464e798e318cb6d6302e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:13:50 +0200 Subject: [PATCH 205/424] haskell-alternative-io: drop obsolete package --- .../haskell/alternative-io/default.nix | 17 ----------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 19 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/alternative-io/default.nix diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix deleted file mode 100644 index 9daf9406742c..000000000000 --- a/pkgs/development/libraries/haskell/alternative-io/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, liftedBase, monadControl, transformers, transformersBase -}: - -cabal.mkDerivation (self: { - pname = "alternative-io"; - version = "0.0.1"; - sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch"; - buildDepends = [ - liftedBase monadControl transformers transformersBase - ]; - meta = { - description = "IO as Alternative instance (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a9ed05451fbf..c0535f5ef40e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -147,8 +147,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aesonQq = callPackage ../development/libraries/haskell/aeson-qq {}; - alternativeIo = callPackage ../development/libraries/haskell/alternative-io {}; - alsaCore = callPackage ../development/libraries/haskell/alsa-core {}; alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {}; From d07125a0d985db0b0c8d8b2cf92db3834225ef4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:21:56 +0200 Subject: [PATCH 206/424] haskell-transformers-compat: provide different versions for GHC 7.8.2 and below transformers is a core library in GHC 7.8.2, so that compiler is stuck with an older version of the -compat library. --- .../{default.nix => 0.3.3.4.nix} | 0 .../haskell/transformers-compat/0.3.3.nix | 14 ++++++++++++++ pkgs/top-level/haskell-defaults.nix | 2 ++ pkgs/top-level/haskell-packages.nix | 4 +++- 4 files changed, 19 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/transformers-compat/{default.nix => 0.3.3.4.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix similarity index 100% rename from pkgs/development/libraries/haskell/transformers-compat/default.nix rename to pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix new file mode 100644 index 000000000000..dfe9e2ef0d65 --- /dev/null +++ b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "transformers-compat"; + version = "0.3.3"; + sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/transformers-compat/"; + description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 6341b9a36dde..4139c9fcb977 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -17,6 +17,7 @@ ghcHEADPrefs = self : super : super // { mtl = self.mtl_2_1_2; cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; + transformersCompat = super.transformersCompat_0_3_3; }; ghc782Prefs = self : super : ghcHEADPrefs self super // { @@ -44,6 +45,7 @@ mtl = self.mtl_2_2_1; pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; transformers = self.transformers_0_4_1_0; # core packagen in ghc > 7.6.x + transformersCompat = super.transformersCompat; zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c0535f5ef40e..f00901f9d16b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2269,7 +2269,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; - transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; + transformersCompat_0_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.nix {}; + transformersCompat_0_3_3_4 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.4.nix {}; + transformersCompat = self.transformersCompat_0_3_3_4; transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; From c027434f9fd56fafea24388c903c3047fc3dab85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:34:15 +0200 Subject: [PATCH 207/424] haskell-HTTP: don't add a global 'network' override for HTTP 4000.2.5 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f00901f9d16b..493355e30415 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1021,7 +1021,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; - HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; }; + HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; HTTP_4000_2_17 = callPackage ../development/libraries/haskell/HTTP/4000.2.17.nix {}; HTTP = self.HTTP_4000_2_17; From 4f2992c3fa2020dcc0bf22b25b0464fd2366acbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:36:05 +0200 Subject: [PATCH 208/424] Switch GHC 6.10.x to network 2.2.x because newer versions give buffering errors (according to the Cabal file from HTTP, which excludes newer versions from building) --- pkgs/top-level/haskell-defaults.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 4139c9fcb977..62d9115a6659 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -114,7 +114,7 @@ hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; - network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; OpenGLRaw = self.OpenGLRaw_1_3_0_0; OpenGL = self.OpenGL_2_6_0_1; QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; From 3fefc29ee6a8ccbfe7a61bd2fc16fff7a6f07261 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:39:37 +0200 Subject: [PATCH 209/424] haskell-haskeline: jailbreak to fix build with transformers 0.4.x --- pkgs/development/libraries/haskell/haskeline/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 83e49e746c63..f813ddc25131 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "178hzal5gqw3rmgijv9ph9xa6d4sld279z4a8cjyx3hv4azciwr4"; buildDepends = [ filepath terminfo transformers utf8String ]; configureFlags = "-fterminfo"; + jailbreak = true; meta = { homepage = "http://trac.haskell.org/haskeline"; description = "A command-line interface for user input, written in Haskell"; From 63fdb6f64f378c5eee87f958f08df1aba12a02e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:40:36 +0200 Subject: [PATCH 210/424] haskell-storable-record: jailbreak to fix build with transformers 0.4.x --- pkgs/development/libraries/haskell/storable-record/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix index 455d860ba5e9..787956be46db 100644 --- a/pkgs/development/libraries/haskell/storable-record/default.nix +++ b/pkgs/development/libraries/haskell/storable-record/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ transformers utilityHt ]; + jailbreak = true; meta = { homepage = "http://code.haskell.org/~thielema/storable-record/"; description = "Elegant definition of Storable instances for records"; From 84fb4b94c1063d02ff91b548ed388647fd9e79a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:41:16 +0200 Subject: [PATCH 211/424] haskell-failure: jailbreak to fix build with transformers 0.4.x --- pkgs/development/libraries/haskell/failure/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix index 9c0edece3029..afb016736506 100644 --- a/pkgs/development/libraries/haskell/failure/default.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.0.2"; sha256 = "0hvcsn7qx00613f23vvb3vjpjlcy0nfavsai9f6s3yvmyssk5kfv"; buildDepends = [ transformers ]; + jailbreak = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Failure"; description = "A simple type class for success/failure computations. (deprecated)"; From 0e3dfb5c71ee51e5f1240645981e0afd1501c1b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:42:05 +0200 Subject: [PATCH 212/424] * haskell-blaze-builder-enumerator: jailbreak to fix build with transformers 0.4.x --- .../libraries/haskell/blaze-builder-enumerator/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index 00176d215bae..f751126f142a 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.0.5"; sha256 = "0bbbv9wwzw9ss3d02mszdzxzhg6pcrnpwir9bvby7xkmfqpyffaa"; buildDepends = [ blazeBuilder enumerator transformers ]; + jailbreak = true; meta = { homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; From 1304beac01c17f52941d073a1a7dc57b37fc6367 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:53:35 +0200 Subject: [PATCH 213/424] haskell-utf8-string: patch to fix build with GHC 6.12.x https://github.com/glguy/utf8-string/issues/9 --- pkgs/development/libraries/haskell/utf8-string/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix index ec946dcdbdf3..1233ce8806d3 100644 --- a/pkgs/development/libraries/haskell/utf8-string/default.nix +++ b/pkgs/development/libraries/haskell/utf8-string/default.nix @@ -4,6 +4,10 @@ cabal.mkDerivation (self: { pname = "utf8-string"; version = "0.3.8"; sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0"; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; + patchPhase = '' + sed -ir -e 's|Extensions: | Extensions: UndecidableInstances, |' utf8-string.cabal + ''; meta = { homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; From 3584bfe0fda1bab95e1f0402f953a448721404ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:55:50 +0200 Subject: [PATCH 214/424] haskell-cabal-dev: remove obsolete package All cabal-dev functionality has been merged into cabal-install. --- .../tools/haskell/cabal-dev/default.nix | 21 ------------------- pkgs/top-level/haskell-packages.nix | 4 ---- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/tools/haskell/cabal-dev/default.nix diff --git a/pkgs/development/tools/haskell/cabal-dev/default.nix b/pkgs/development/tools/haskell/cabal-dev/default.nix deleted file mode 100644 index fef9892bce82..000000000000 --- a/pkgs/development/tools/haskell/cabal-dev/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, setenv -, tar, transformers, zlib -}: - -cabal.mkDerivation (self: { - pname = "cabal-dev"; - version = "0.9.2"; - sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - Cabal filepath HTTP mtl network setenv tar transformers zlib - ]; - buildTools = [ cabalInstall ]; - meta = { - homepage = "http://github.com/creswick/cabal-dev"; - description = "Manage sandboxed Haskell build environments"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 493355e30415..fa3e2f008e5a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2721,10 +2721,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in else self.Cabal_1_18_1_3; }; - cabalDev = callPackage ../development/tools/haskell/cabal-dev { - HTTP = self.HTTP.override { network = self.network_2_4_1_2; }; - }; - cabalMeta = callPackage ../development/tools/haskell/cabal-meta {}; cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {}; From 6bb301420ec7585b6ee18df74bf1f36383e24e0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 11:56:42 +0200 Subject: [PATCH 215/424] haskell-data-accessor: jailbreak to fix build with transformers 0.4.x --- .../libraries/haskell/data-accessor/data-accessor.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 8fdde66f5fd6..5f6dff99dd26 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2.5"; sha256 = "0z63fv41cnpk3h404gprk2f5jl7rrpyv97xmsgac9zgdm5zkkhm6"; buildDepends = [ transformers ]; + jailbreak = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Utilities for accessing and manipulating fields of records"; From 5062c9147e7ba8ca1711f09db75cb332c9475478 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:12:39 +0200 Subject: [PATCH 216/424] haskell-arithmoi: jailbreak to fix build with transformers 0.4.x --- pkgs/development/libraries/haskell/arithmoi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix index e4d1f522bc11..c027a92c38d4 100644 --- a/pkgs/development/libraries/haskell/arithmoi/default.nix +++ b/pkgs/development/libraries/haskell/arithmoi/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.4.1.0"; sha256 = "1xmwxmvl9l1fa2sgr4ff7al8b5d5136h4fq9r05abj3nfnx1a0iq"; buildDepends = [ mtl random ]; + jailbreak = true; meta = { homepage = "https://bitbucket.org/dafis/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; From 7c89fcc5012e16d7ec588c41468fc183ec254f50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:13:45 +0200 Subject: [PATCH 217/424] haskell-persistent-template: jailbreak to fix build with transformers 0.4.x --- .../libraries/haskell/persistent-template/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 994632c40e20..98f9e91e9832 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { testDepends = [ aeson hspec persistent QuickCheck text transformers ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; From 9dd2b3c651c623bc9ad861163769938f5cb67a98 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:20:34 +0200 Subject: [PATCH 218/424] haskell-shelly: move version override to haskell-defaults.nix --- pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 62d9115a6659..8c2325250061 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -57,6 +57,7 @@ haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; scientific = self.scientific_0_2_0_2; + shelly = self.shelly_0_15_4_1; }; ghc722Prefs = self : super : ghc742Prefs self super // { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fa3e2f008e5a..abbdca0eef6b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1936,9 +1936,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; - shelly = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") - then self.shelly_0_15_4_1 - else self.shelly_1_5_3_1; + shelly = self.shelly_1_5_3_1; simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; From 22cc19e96eb67a9d9a427ff9fcba5ee3c7f16021 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:21:16 +0200 Subject: [PATCH 219/424] haskell-multiplate: jailbreak to fix build with transformers 0.4.x --- pkgs/development/libraries/haskell/multiplate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index 14310f50ef6f..32626ae68e6c 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.0.2"; sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw"; buildDepends = [ transformers ]; + jailbreak = true; meta = { homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; From 1d50ed522a87e98706de843ad459e6c4c0db8615 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:22:53 +0200 Subject: [PATCH 220/424] haskell-system-filepath: require at least Cabal 1.8 to build --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 8c2325250061..ff8049efc361 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -120,6 +120,7 @@ OpenGL = self.OpenGL_2_6_0_1; QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + systemFilepath = super.systemFilepath.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; From 67cfb66cea956c07436912e7332943852051aa97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:23:42 +0200 Subject: [PATCH 221/424] haskell-tabular: jailbreak to fix build with transformers 0.4.x --- pkgs/development/libraries/haskell/tabular/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix index f90c56871932..10f78671013f 100644 --- a/pkgs/development/libraries/haskell/tabular/default.nix +++ b/pkgs/development/libraries/haskell/tabular/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2.5"; sha256 = "00d1f8yr7kbg30ziv09pb8f4apcvrfb6izb26my1s97kw9ixa740"; buildDepends = [ csv html mtl ]; + jailbreak = true; meta = { homepage = "http://hub.darcs.net/kowey/tabular"; description = "Two-dimensional data tables with rendering functions"; From c7a18e326fb06f66c6c0e127e6f3c7e3ae29cd72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 14:39:03 +0200 Subject: [PATCH 222/424] Stick to transformers 0.3.x everywhere; the new versions breaks just about every other package that we have. --- pkgs/top-level/haskell-defaults.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index ff8049efc361..d0892ccf0d8c 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -42,10 +42,8 @@ gloss = null; # requires base >= 4.7 haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 - mtl = self.mtl_2_2_1; pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; - transformers = self.transformers_0_4_1_0; # core packagen in ghc > 7.6.x - transformersCompat = super.transformersCompat; + transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; From fdee6e37a6d37fd610288833b7ad89fbeca29ee9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:30 +0200 Subject: [PATCH 223/424] haskell-BlogLiterately: update to version 0.7.1.7 --- pkgs/development/libraries/haskell/BlogLiterately/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix index e4005ed4ec04..7d5c01f64bf6 100644 --- a/pkgs/development/libraries/haskell/BlogLiterately/default.nix +++ b/pkgs/development/libraries/haskell/BlogLiterately/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "BlogLiterately"; - version = "0.7.1.6"; - sha256 = "0mzq0br9jsymml57kcxqyr401lckzm43fy74l3wy25n6grv64hd4"; + version = "0.7.1.7"; + sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90"; isLibrary = true; isExecutable = true; buildDepends = [ From 056b9ba32ff597dc41db537e74be739fb6e375c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:32 +0200 Subject: [PATCH 224/424] haskell-adjunctions: update to version 4.1.0.1 --- .../libraries/haskell/adjunctions/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix index d0804959ccb6..74e564af62a6 100644 --- a/pkgs/development/libraries/haskell/adjunctions/default.nix +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -1,14 +1,15 @@ { cabal, comonad, contravariant, distributive, free, mtl -, semigroupoids, semigroups, tagged, transformers, void +, profunctors, semigroupoids, semigroups, tagged, transformers +, void }: cabal.mkDerivation (self: { pname = "adjunctions"; - version = "4.0.3"; - sha256 = "0rh3vffbq407k9g95dingw6zqq3fk87pknyrqj1mrbmgrnllr8k0"; + version = "4.1.0.1"; + sha256 = "18p2pabid7dx96qcpd2ywv5mhjp55srhm5g013pn697jcxyq2xiv"; buildDepends = [ - comonad contravariant distributive free mtl semigroupoids - semigroups tagged transformers void + comonad contravariant distributive free mtl profunctors + semigroupoids semigroups tagged transformers void ]; meta = { homepage = "http://github.com/ekmett/adjunctions/"; From e77179fd448d72f26b7d6c05e7794b7e525af27d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:33 +0200 Subject: [PATCH 225/424] haskell-conduit: update to version 1.1.5 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 48422e602b2d..07f43f0eda8c 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.1.4"; - sha256 = "1fw55rmmhznkpbblc7gqy463lza7fi9yr0n27g38afdfql8mz5mm"; + version = "1.1.5"; + sha256 = "107mfkw2jin724cdkn5mkhxgfv2mf1nkhcn12mwaw9cnkxxxx78z"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void From 1538d3ff108ecc15b3e9ef5814124f274c53c4b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:35 +0200 Subject: [PATCH 226/424] haskell-io-streams: update to version 1.1.4.6 --- pkgs/development/libraries/haskell/io-streams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index 1fc49e1c068d..864c0cdddaea 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.1.4.5"; - sha256 = "1w76p9hb83x2fjlldcnbk3zddaph4cccka2g13b1rcjssqgnbk8h"; + version = "1.1.4.6"; + sha256 = "0vn6vlgfapmyd9y87i9i0y480w8w81xd3lnhh66a6lalskd4bjdw"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings From 948669f683d127abe1e3481890fc73ab4d077acf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:36 +0200 Subject: [PATCH 227/424] haskell-linear: update to version 1.10.1.2 --- pkgs/development/libraries/haskell/linear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index a1837b4baab9..ce9fe66a1262 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.10.1.1"; - sha256 = "0falp5mpd9lifzz11dy3lvfph8n0i8n4mh5kk5kg974qvdvjilgq"; + version = "1.10.1.2"; + sha256 = "05zbqdcdjq7anng2nymy05wsnk9qpk8mgivqcndbfjpk4l1r9k94"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers From 471dd8d1f0c652f73125aecfbf966772c7d8ff04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:38 +0200 Subject: [PATCH 228/424] haskell-pgm: update to version 0.1.4 --- pkgs/development/libraries/haskell/pgm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix index b1be8dd6d035..560826a08b21 100644 --- a/pkgs/development/libraries/haskell/pgm/default.nix +++ b/pkgs/development/libraries/haskell/pgm/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "pgm"; - version = "0.1.3"; - sha256 = "1byq8bacqgdpahf57ccwwa45wf9ij0kkgp89rg9flsv1g10364d4"; + version = "0.1.4"; + sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv"; buildDepends = [ parsec ]; meta = { - homepage = "https://github.com/sergeyastanin/haskell-pgm"; + homepage = "https://github.com/astanin/haskell-pgm"; description = "Pure Haskell implementation of PGM image format"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 4e02b6ca9f4cd6e78ebd8987fb5ab99f29c7e8cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:39 +0200 Subject: [PATCH 229/424] haskell-shake: update to version 0.13.1 --- pkgs/development/libraries/haskell/shake/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index a2b8cc24e65d..f07e0f54b9b8 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -16,7 +16,6 @@ cabal.mkDerivation (self: { binary deepseq filepath hashable QuickCheck random time transformers unorderedContainers utf8String ]; - doCheck = !self.stdenv.isDarwin; meta = { homepage = "https://github.com/ndmitchell/shake"; description = "Build system library, like Make, but more accurate dependencies"; From 3bb029e9a1ee2a0fbaa5061a0f7856a6a1e6e92f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:43 +0200 Subject: [PATCH 230/424] haskell-vinyl: update to version 0.4.1 --- pkgs/development/libraries/haskell/vinyl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix index 52db901c495d..725567ff16bb 100644 --- a/pkgs/development/libraries/haskell/vinyl/default.nix +++ b/pkgs/development/libraries/haskell/vinyl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vinyl"; - version = "0.4"; - sha256 = "16v13bd5dvm9axngx1pvm7bq9412f6awz0cggsif1z0dy2kjpwgb"; + version = "0.4.1"; + sha256 = "1x8kxb4z4nj7h6pbl0r37rr7k88ly64cn0bf7izyaqjrsf0kxdci"; testDepends = [ doctest lens singletons ]; meta = { description = "Extensible Records"; From 9e4254a84f4ad3d6ef4b439ef10c6d695c2928de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 11:36:44 +0200 Subject: [PATCH 231/424] haskell-yesod: update to version 1.2.5.3 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index a3416cf59c6d..630b04af26b9 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.5.2"; - sha256 = "0vvpzyfwzgnnd8h60pqz5z1474isp487p43vx7cyzhj423c50p6r"; + version = "1.2.5.3"; + sha256 = "1w9bbvinnbnhrajjqj6yhy9dgggdf6n98x04dys45anssiwrd2ss"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger hamlet monadControl monadLogger networkConduit safe shakespeare From 1a1c1ba734a7351079b5a5473129ae59d497c20b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:24:57 +0200 Subject: [PATCH 232/424] haskell-git-annex: update to version 5.20140606 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 24f993b88124..217e4067cb94 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -16,8 +16,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140529"; - sha256 = "18fb0gb38wcdbdz2rlg5vn99gfi1c8hflgcpz96lx4rg2pl8jpf8"; + version = "5.20140606"; + sha256 = "1b9hslkdv82lf8njwzy51yj8dgg2wn7g08wy73lk7pnddfh8qjpy"; isLibrary = false; isExecutable = true; buildDepends = [ From d9344b772351bd4a3a24235113f97d6a2b9a96d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:24:59 +0200 Subject: [PATCH 233/424] haskell-conduit: update to version 1.1.6 --- pkgs/development/libraries/haskell/conduit/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 07f43f0eda8c..630e9610bbb1 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,13 +4,15 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.1.5"; - sha256 = "107mfkw2jin724cdkn5mkhxgfv2mf1nkhcn12mwaw9cnkxxxx78z"; + version = "1.1.6"; + sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void ]; - testDepends = [ hspec mtl QuickCheck resourcet transformers void ]; + testDepends = [ + exceptions hspec mtl QuickCheck resourcet transformers void + ]; doCheck = false; meta = { homepage = "http://github.com/snoyberg/conduit"; From ddb6bb8d4fddf7e8a1472938aabaddaa0e6dead3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:00 +0200 Subject: [PATCH 234/424] haskell-dbmigrations: update to version 0.8 --- pkgs/development/libraries/haskell/dbmigrations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix index 008cb04f2fa3..f8efb9537991 100644 --- a/pkgs/development/libraries/haskell/dbmigrations/default.nix +++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbmigrations"; - version = "0.7"; - sha256 = "1mpmka6jszip8sm8k9mrk0fg1q7wp36n0szyiqy7fnbzijfw0xlz"; + version = "0.8"; + sha256 = "0m1zvc61y0n7p66iwsb8wzwgivxnc08cm1h3xvf1jnwrv294dwch"; isLibrary = true; isExecutable = true; buildDepends = [ From b23949f2d70fb48c85e994ca11c5b0985fd38d57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:02 +0200 Subject: [PATCH 235/424] haskell-ekg-core: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/ekg-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix index 6c332f832cd3..759a60407462 100644 --- a/pkgs/development/libraries/haskell/ekg-core/default.nix +++ b/pkgs/development/libraries/haskell/ekg-core/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ekg-core"; - version = "0.1.0.0"; - sha256 = "19ghqj9zbb198d45bw7k9mlf2z57yq74wgbkp62b9li2ndbcpdzh"; + version = "0.1.0.1"; + sha256 = "1zha9r43nalxdw22s79mf89fwfzi8lq0q9ldhw7f6c63dnwxyjja"; buildDepends = [ text unorderedContainers ]; meta = { homepage = "https://github.com/tibbe/ekg-core"; From 66e3410c4d520a0088f6d3c3ee0f8e2927cfa79e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:03 +0200 Subject: [PATCH 236/424] haskell-failure: update to version 0.2.0.3 --- pkgs/development/libraries/haskell/failure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix index afb016736506..4181883f7b01 100644 --- a/pkgs/development/libraries/haskell/failure/default.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "failure"; - version = "0.2.0.2"; - sha256 = "0hvcsn7qx00613f23vvb3vjpjlcy0nfavsai9f6s3yvmyssk5kfv"; + version = "0.2.0.3"; + sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p"; buildDepends = [ transformers ]; jailbreak = true; meta = { From f4f89ce91d712fa89bcad630d50f1113db392530 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:05 +0200 Subject: [PATCH 237/424] haskell-ghcjs-dom: update to version 0.0.9 --- pkgs/development/libraries/haskell/ghcjs-dom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index 20fc85b95f18..2c9770b20e30 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.0.7"; - sha256 = "1yg2c0slndg3y9bk95xkbgl8zp4lmcgw9wk3jkk1sdizn3y3yggq"; + version = "0.0.9"; + sha256 = "0vphhm9wr80p4brcjzhmp2kh0a5rlwzif26w2q054fshxa97kv2a"; buildDepends = [ ghcjsBase mtl ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; From 88413cdaa543c995cb808d2080cb557aca24a612 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:06 +0200 Subject: [PATCH 238/424] haskell-hoauth2: update to version 0.4.0 --- .../libraries/haskell/hoauth2/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix index 949e1bdfc590..fa0a913e1819 100644 --- a/pkgs/development/libraries/haskell/hoauth2/default.nix +++ b/pkgs/development/libraries/haskell/hoauth2/default.nix @@ -1,14 +1,16 @@ -{ cabal, aeson, bytestringShow, conduit, httpConduit, httpTypes -, monadControl, mtl, random, resourcet, text, transformers +{ cabal, aeson, bytestringShow, httpConduit, httpTypes +, monadControl, mtl, random, text, transformers }: cabal.mkDerivation (self: { pname = "hoauth2"; - version = "0.3.7"; - sha256 = "0v43hr7vw2iikhx2bldkb0fa5j95msgn7s7k09vkxz3qwqh9maz7"; + version = "0.4.0"; + sha256 = "1499rgcn3h4921x21s6l0spnjf3wvmsaa07pimgjgb4rjib3z2d5"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson bytestringShow conduit httpConduit httpTypes monadControl mtl - random resourcet text transformers + aeson bytestringShow httpConduit httpTypes monadControl mtl random + text transformers ]; meta = { homepage = "https://github.com/freizl/hoauth2"; From d72b09eaa910f1062cbe03db2f787654b0b54ae7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:07 +0200 Subject: [PATCH 239/424] haskell-libjenkins: update to version 0.4.3.0 --- .../libraries/haskell/libjenkins/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix index 67f0b698d47b..fc7c8b37323b 100644 --- a/pkgs/development/libraries/haskell/libjenkins/default.nix +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -1,24 +1,23 @@ { cabal, async, conduit, doctest, filepath, free, hspec , hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens -, monadControl, network, text, transformers, xmlConduit +, monadControl, network, resourcet, text, transformers, xmlConduit }: cabal.mkDerivation (self: { pname = "libjenkins"; - version = "0.4.2.0"; - sha256 = "11013klk2gvcaf2d2gmi0bf3jg2m82li19szqlwb325kdjmdf546"; - patches = [ ./new-conduit.patch ]; + version = "0.4.3.0"; + sha256 = "18z1yaf1a1ncvflxzv96b35d44933yrmsmxv5dr87iyfry28qbnv"; buildDepends = [ async conduit free httpClient httpConduit httpTypes lens - monadControl network text transformers xmlConduit + monadControl network resourcet text transformers xmlConduit ]; testDepends = [ async conduit doctest filepath free hspec hspecExpectationsLens - httpClient httpConduit httpTypes lens monadControl network text - transformers xmlConduit + httpClient httpConduit httpTypes lens monadControl network + resourcet text transformers xmlConduit ]; - doCheck = false; jailbreak = true; + doCheck = false; meta = { description = "Jenkins API interface"; license = self.stdenv.lib.licenses.bsd3; From 5e458d55707bc4965033c637eecc721a7f294bf0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:09 +0200 Subject: [PATCH 240/424] haskell-mono-traversable: update to version 0.6.0.2 --- .../libraries/haskell/mono-traversable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 60cb273d3a37..b8acec758dea 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.0.1"; - sha256 = "0pxmkz5jq511ys77sq2zxmgab7njrhbi01x51lf247z8ii0rdbns"; + version = "0.6.0.2"; + sha256 = "1ckdx8szllk4np5samfdx7l6lzarmfabm8w4210b5m7yms2w98sy"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms From eac3634da3f36426f4ae0ed6ae5fff7ddff1eac9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:10 +0200 Subject: [PATCH 241/424] haskell-persistent-template: update to version 1.3.1.4 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 98f9e91e9832..b967e17f8f74 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.3.1.3"; - sha256 = "0q5ysv1r6p4mg79waq2g6ql11rap6znawkplddblpaa8lq9qalj6"; + version = "1.3.1.4"; + sha256 = "1ys5s1vb9w3nrv9kwvzgjwfs2j09pslpplz05idpfn02xx03hcfk"; buildDepends = [ aeson monadControl monadLogger persistent text transformers unorderedContainers From 5be634fab543b5d6841277ded38084c3d0e0efb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:12 +0200 Subject: [PATCH 242/424] haskell-purescript: update to version 0.5.2.2 --- pkgs/development/libraries/haskell/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index bbf380f3e73c..8e23a0cf8f28 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -5,15 +5,15 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.2.1"; - sha256 = "1dr34capgjlyjsaghsv11zz6ph5l0y8dz0q398f0f3hplcal3f58"; + version = "0.5.2.2"; + sha256 = "07gkd897qcgn7yf81bii5njkiq1hlhfz5jx3spdlv64a492grmg2"; isLibrary = true; isExecutable = true; buildDepends = [ cmdtheline filepath haskeline monadUnify mtl parsec patternArrows time transformers unorderedContainers utf8String xdgBasedir ]; - # The example don't seem to get packaged in the release. + testDepends = [ filepath mtl parsec transformers utf8String ]; doCheck = false; meta = { homepage = "http://www.purescript.org/"; From 5043062e6891ae5141486545fd36931996a897f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:13 +0200 Subject: [PATCH 243/424] haskell-resource-pool: update to version 0.2.3.0 --- pkgs/development/libraries/haskell/resource-pool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index 677243190b14..72178ddc1cf1 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resource-pool"; - version = "0.2.2.0"; - sha256 = "0h00q6lmv21nqjs81r7y3ig4y65zpap1r6xqz9lc3zxx29bgl8xk"; + version = "0.2.3.0"; + sha256 = "15igbvnqs6ig1k30l3jngyi60ay7k15mwgza5smv8zbpx86vb1mh"; buildDepends = [ hashable monadControl stm time transformers transformersBase vector ]; From 7ac38497121c576548f65fc54c6e73f52b97857e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:15 +0200 Subject: [PATCH 244/424] haskell-snap: update to version 0.13.2.7 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index ecbb5da37a71..97e4a4d67a5d 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.6"; - sha256 = "0f9m8rvciis16w211hfrablh3xzxwcqqsgvfc34j70lazj3kigs3"; + version = "0.13.2.7"; + sha256 = "1vw8c48rb1clahm1yw951si9dv9mk0gfldxvk3jd7rvsfzg97s4z"; isLibrary = true; isExecutable = true; buildDepends = [ From 6aea9b49cac9d5c758544546c457f3d418ff86fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:16 +0200 Subject: [PATCH 245/424] haskell-threads: update to version 0.5.1.2 --- pkgs/development/libraries/haskell/threads/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index 932ef113fa70..48b4ee2fb11a 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "threads"; - version = "0.5.1.1"; - sha256 = "196yjkq7wgjcck9wqj4f3x3k47ls9yiay3k6d8k7kzixc2xc621z"; + version = "0.5.1.2"; + sha256 = "1bq2aza6sam4zkgpgf8x4lhkk2na1i8annx9cwad3j68p5vdg929"; buildDepends = [ baseUnicodeSymbols stm ]; testDepends = [ baseUnicodeSymbols concurrentExtra HUnit stm testFramework From 717fe5e3e4f29a8305550bc0256ff5a384fb12dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:25:18 +0200 Subject: [PATCH 246/424] haskell-threadscope: update to version 0.2.4 --- pkgs/development/tools/haskell/threadscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index afc904ecf953..1158221ad1a3 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "threadscope"; - version = "0.2.3"; - sha256 = "07kbkcckxfsb50zks8jgw2g0ary63hymicq5lqrm5jjaarjb80gr"; + version = "0.2.4"; + sha256 = "1208gp80vj3dngc4nrj1jk5y4h1181bgwq2qj764kcjvkaxch599"; isLibrary = false; isExecutable = true; buildDepends = [ From b134e2a0fd397d2580ad8c998be8d5b494408ad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:32:22 +0200 Subject: [PATCH 247/424] haskell-defaults.nix: don't provide singletons on pre-7.8.x platforms --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d0892ccf0d8c..fb6094fa781c 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -43,6 +43,7 @@ haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; + singletons = null; # requires base >= 4.7 transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; From 40eb5a5f739bf6ca88748f2e7de95d4a16e6e2cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:32:47 +0200 Subject: [PATCH 248/424] haskell-system-fileio: require Cabal >= 1.8 --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index fb6094fa781c..959fa331c053 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -120,6 +120,7 @@ QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; systemFilepath = super.systemFilepath.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + systemFileio = super.systemFileio.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; From f085cf39993a64c58e44eca50c37053d96b6115e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:49:07 +0200 Subject: [PATCH 249/424] haskell-snap: jailbreak to fix build with lens 4.2 --- pkgs/development/libraries/haskell/snap/snap.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 97e4a4d67a5d..435bccd9cb5d 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -20,6 +20,9 @@ cabal.mkDerivation (self: { unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; + patchPhase = '' + sed -i -e 's|lens .*< 4.2|lens|' snap.cabal + ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From 6071b304ef7fe8f848322ad4baf24889542483c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 09:52:41 +0200 Subject: [PATCH 250/424] haskell-cabal-lenses: jailbreak to fix build --- pkgs/development/libraries/haskell/cabal-lenses/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index 06777aadc4d3..39c0eeb1dd16 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1"; sha256 = "0jss4h7crh7mndl5ghbpziy37cg9i29cc64fgxvxb63hpk0q2m17"; buildDepends = [ Cabal lens unorderedContainers ]; + jailbreak = true; meta = { description = "Lenses and traversals for the Cabal library"; license = self.stdenv.lib.licenses.bsd3; From 766d934090f52adb9e932f04d9a90aa7c86b4ac7 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sun, 8 Jun 2014 23:56:52 -0400 Subject: [PATCH 251/424] haskell-cabal-cargs: add version 0.6.1 --- .../libraries/haskell/cabal-cargs/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cabal-cargs/default.nix diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix new file mode 100644 index 000000000000..243dd2beb000 --- /dev/null +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -0,0 +1,23 @@ +{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens +, strict, systemFileio, systemFilepath, tasty, tastyGolden, text +, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "cabal-cargs"; + version = "0.6.1"; + sha256 = "1bf903kgs16f054crwq0yyp6ijch80qn3d5ksy4j0fnyxxrdqvsa"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + Cabal cabalLenses cmdargs either lens strict systemFileio + systemFilepath text transformers unorderedContainers + ]; + testDepends = [ filepath tasty tastyGolden ]; + meta = { + description = "A command line program for extracting compiler arguments from a cabal file"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index abbdca0eef6b..b282ff44e412 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -326,6 +326,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {}; Cabal = null; # core package since forever + cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {}; + cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; cabalLenses = callPackage ../development/libraries/haskell/cabal-lenses {}; From c7e1a2c5cc01371767bf033fd78999b87d2f939a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 10:03:56 +0200 Subject: [PATCH 252/424] haskell-cabal-cargs: jailbreak to fix build with recent versions of either, lens, and tasty https://github.com/dan-t/cabal-cargs/issues/3 --- pkgs/development/libraries/haskell/cabal-cargs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index 243dd2beb000..34759c9b8926 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { systemFilepath text transformers unorderedContainers ]; testDepends = [ filepath tasty tastyGolden ]; + jailbreak = true; meta = { description = "A command line program for extracting compiler arguments from a cabal file"; license = self.stdenv.lib.licenses.bsd3; From f481b682b6312f454e246629f2ff6de08f994760 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 6 Jun 2014 23:55:42 +0200 Subject: [PATCH 253/424] test-framework-smallcheck: 0.2 --- .../haskell/test-framework-smallcheck/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix diff --git a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix new file mode 100644 index 000000000000..120425e8c017 --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix @@ -0,0 +1,14 @@ +{ cabal, smallcheck, testFramework, transformers }: + +cabal.mkDerivation (self: { + pname = "test-framework-smallcheck"; + version = "0.2"; + sha256 = "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0"; + buildDepends = [ smallcheck testFramework transformers ]; + meta = { + homepage = "https://github.com/feuerbach/smallcheck"; + description = "Support for SmallCheck tests in test-framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b282ff44e412..28bd1b4b5350 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2186,6 +2186,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; + testFrameworkSmallcheck = callPackage ../development/libraries/haskell/test-framework-smallcheck {}; + testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {}; testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; From 3287542c579d4a93b11b7dfc28a66f54997728e8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 6 Jun 2014 23:56:29 +0200 Subject: [PATCH 254/424] haskell-vty: add version 5.1.0 --- .../haskell/vty/{default.nix => 4.7.5.nix} | 0 .../libraries/haskell/vty/5.1.0.nix | 32 +++++++++++++++++++ pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 ++- 4 files changed, 36 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/vty/{default.nix => 4.7.5.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/vty/5.1.0.nix diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix similarity index 100% rename from pkgs/development/libraries/haskell/vty/default.nix rename to pkgs/development/libraries/haskell/vty/4.7.5.nix diff --git a/pkgs/development/libraries/haskell/vty/5.1.0.nix b/pkgs/development/libraries/haskell/vty/5.1.0.nix new file mode 100644 index 000000000000..fc2f0256d7f8 --- /dev/null +++ b/pkgs/development/libraries/haskell/vty/5.1.0.nix @@ -0,0 +1,32 @@ +{ cabal, blazeBuilder, Cabal, dataDefault, deepseq, filepath +, hashable, HUnit, lens, mtl, parallel, parsec, QuickCheck +, quickcheckAssertions, random, smallcheck, stringQq, terminfo +, testFramework, testFrameworkHunit, testFrameworkSmallcheck, text +, transformers, utf8String, vector +}: + +cabal.mkDerivation (self: { + pname = "vty"; + version = "5.1.0"; + sha256 = "0cq9y802z9wq69yw1yy916xsz6j7v8208k5mxixp41375cdm141x"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + blazeBuilder dataDefault deepseq filepath hashable lens mtl + parallel parsec terminfo text transformers utf8String vector + ]; + testDepends = [ + blazeBuilder Cabal dataDefault deepseq HUnit lens mtl QuickCheck + quickcheckAssertions random smallcheck stringQq terminfo + testFramework testFrameworkHunit testFrameworkSmallcheck text + utf8String vector + ]; + doCheck = false; + meta = { + homepage = "https://github.com/coreyoconnor/vty"; + description = "A simple terminal UI library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 959fa331c053..d002503d0c73 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -44,6 +44,7 @@ modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 + vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 28bd1b4b5350..e63e49367003 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2397,7 +2397,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; - vty = callPackage ../development/libraries/haskell/vty {}; + vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; + vty_5_1_0 = callPackage ../development/libraries/haskell/vty/5.1.0.nix {}; + vty = self.vty_4_7_5; vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; From b3c9513efe2aafe840a45923c5a903cfd6893e55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 10:14:21 +0200 Subject: [PATCH 255/424] haskell-vty-5.1.0: jailbreak to fix build with lens 4.2 --- pkgs/development/libraries/haskell/vty/5.1.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/vty/5.1.0.nix b/pkgs/development/libraries/haskell/vty/5.1.0.nix index fc2f0256d7f8..b04f7ff33eda 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.0.nix +++ b/pkgs/development/libraries/haskell/vty/5.1.0.nix @@ -21,6 +21,7 @@ cabal.mkDerivation (self: { testFramework testFrameworkHunit testFrameworkSmallcheck text utf8String vector ]; + jailbreak = true; doCheck = false; meta = { homepage = "https://github.com/coreyoconnor/vty"; From 20da5ecc9cce6bf8852abd493c7fe7c1e2609f1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 10:25:45 +0200 Subject: [PATCH 256/424] haskell-parsers: update to version 0.11.0.2 Unfortunately, there are still build errors with this package (see https://github.com/ekmett/parsers/issues/39). We need the latest version, though, because older ones won't work with the latest attoparsec. --- .../libraries/haskell/parsers/{0.11.0.1.nix => 0.11.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/parsers/{0.11.0.1.nix => 0.11.0.2.nix} (84%) diff --git a/pkgs/development/libraries/haskell/parsers/0.11.0.1.nix b/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix similarity index 84% rename from pkgs/development/libraries/haskell/parsers/0.11.0.1.nix rename to pkgs/development/libraries/haskell/parsers/0.11.0.2.nix index f24c96b1fad3..36c5f2ae998d 100644 --- a/pkgs/development/libraries/haskell/parsers/0.11.0.1.nix +++ b/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.11.0.1"; - sha256 = "0jg91zzsq12vxxsxrd1kx8h2c06asccymjbpx0zl7nvj5dhjfkpq"; + version = "0.11.0.2"; + sha256 = "0b2qb6lhn647926s2g7qrzhnvnym5dr7fny784bv19mfvimwi81c"; buildDepends = [ attoparsec charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e63e49367003..3c3ee8e7f809 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1644,8 +1644,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = self.parsec_3_1_5; parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_11_0_1 = callPackage ../development/libraries/haskell/parsers/0.11.0.1.nix {}; - parsers = self.parsers_0_11_0_1; + parsers_0_11_0_2 = callPackage ../development/libraries/haskell/parsers/0.11.0.2.nix {}; + parsers = self.parsers_0_11_0_2; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From 1986a10d41c9206b684539125373f2e1d7114a5e Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 9 Jun 2014 03:58:18 -0500 Subject: [PATCH 257/424] cabal-db: new expression --- .../tools/haskell/cabal-db/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/tools/haskell/cabal-db/default.nix diff --git a/pkgs/development/tools/haskell/cabal-db/default.nix b/pkgs/development/tools/haskell/cabal-db/default.nix new file mode 100644 index 000000000000..0d8b6ce5993f --- /dev/null +++ b/pkgs/development/tools/haskell/cabal-db/default.nix @@ -0,0 +1,20 @@ +{ cabal, ansiWlPprint, Cabal, filepath, mtl, optparseApplicative +, tar, utf8String +}: + +cabal.mkDerivation (self: { + pname = "cabal-db"; + version = "0.1.9"; + sha256 = "19mw5ycc2y5wkn1h7wkdm2gb29pq2sh0n8z52dbxlkf0rwcgjbfq"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + ansiWlPprint Cabal filepath mtl optparseApplicative tar utf8String + ]; + meta = { + homepage = "http://github.com/vincenthz/cabal-db"; + description = "query tools for the local cabal database (revdeps, graph, info, search-by, license, bounds)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3c3ee8e7f809..9d6fb9080178 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2692,6 +2692,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Tools. + cabalDb = callPackage ../development/tools/haskell/cabal-db {}; + cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; # Build a cabal package given a local .cabal file From 0e400be1ecc9eb08911ad6d2e348f28a698516c7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 9 Jun 2014 03:58:34 -0500 Subject: [PATCH 258/424] haskell-RepLib: do not build haddocks --- pkgs/development/libraries/haskell/RepLib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 89e13f1eddc6..769a1d534ba4 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.5.3.3"; sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr"; buildDepends = [ mtl typeEquality ]; + noHaddock = true; meta = { homepage = "http://code.google.com/p/replib/"; description = "Generic programming library with representation types"; From 208d466c21cd51e64ef9b8a32462af9b2991d78d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 9 Jun 2014 11:26:22 +0200 Subject: [PATCH 259/424] nixos/graphite-service: make option descriptions end with '.' Because that is how it is supposed to be. --- .../modules/services/monitoring/graphite.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 3a5b13d6d40b..8ef6b8d029e7 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -47,19 +47,19 @@ in { web = { enable = mkOption { - description = "Whether to enable graphite web frontend"; + description = "Whether to enable graphite web frontend."; default = false; type = types.uniq types.bool; }; host = mkOption { - description = "Graphite web frontend listen address"; + description = "Graphite web frontend listen address."; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Graphite web frontend port"; + description = "Graphite web frontend port."; default = 8080; type = types.int; }; @@ -67,7 +67,7 @@ in { carbon = { config = mkOption { - description = "Content of carbon configuration file"; + description = "Content of carbon configuration file."; default = '' [cache] # Listen on localhost by default for security reasons @@ -83,13 +83,13 @@ in { }; enableCache = mkOption { - description = "Whether to enable carbon cache, the graphite storage daemon"; + description = "Whether to enable carbon cache, the graphite storage daemon."; default = false; type = types.uniq types.bool; }; storageAggregation = mkOption { - description = "Defines how to aggregate data to lower-precision retentions"; + description = "Defines how to aggregate data to lower-precision retentions."; default = null; type = types.uniq (types.nullOr types.string); example = '' @@ -101,7 +101,7 @@ in { }; storageSchemas = mkOption { - description = "Defines retention rates for storing metrics"; + description = "Defines retention rates for storing metrics."; default = ""; type = types.uniq (types.nullOr types.string); example = '' @@ -112,21 +112,24 @@ in { }; blacklist = mkOption { - description = "Any metrics received which match one of the experssions will be dropped"; + description = "Any metrics received which match one of the experssions will be dropped."; default = null; type = types.uniq (types.nullOr types.string); example = "^some\.noisy\.metric\.prefix\..*"; }; whitelist = mkOption { - description = "Only metrics received which match one of the experssions will be persisted"; + description = "Only metrics received which match one of the experssions will be persisted."; default = null; type = types.uniq (types.nullOr types.string); example = ".*"; }; rewriteRules = mkOption { - description = "Regular expression patterns that can be used to rewrite metric names in a search and replace fashion"; + description = '' + Regular expression patterns that can be used to rewrite metric names + in a search and replace fashion. + ''; default = null; type = types.uniq (types.nullOr types.string); example = '' @@ -137,7 +140,7 @@ in { }; enableRelay = mkOption { - description = "Whether to enable carbon relay, the carbon replication and sharding service"; + description = "Whether to enable carbon relay, the carbon replication and sharding service."; default = false; type = types.uniq types.bool; }; @@ -154,13 +157,13 @@ in { }; enableAggregator = mkOption { - description = "Whether to enable carbon agregator, the carbon buffering service"; + description = "Whether to enable carbon agregator, the carbon buffering service."; default = false; type = types.uniq types.bool; }; aggregationRules = mkOption { - description = "Defines if and how received metrics will be agregated"; + description = "Defines if and how received metrics will be agregated."; default = null; type = types.uniq (types.nullOr types.string); example = '' From 054a3c0321d7c7894eac7562e4405edea159223f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 9 Jun 2014 11:29:05 +0200 Subject: [PATCH 260/424] nixos/graphite-service: clean up restartTriggers Currently, the restartTriggers are abusing the systemd unit file in that the cfg.carbon.config/storageAggregation/... option text is pasted into the unit file. Even though this sort-of works (the service is restarted if the config changes) this causes systemd to print error messages about invalid sections (rightfully so!). The correct use of restartTriggers is to list storage paths, which is what this change does. If any of the cfg.carbon/config/storageAggregation/... options change, configDir will get a new hash. It is not as "fine grained" as the current version, but it is not abusing the interface. Also, remove unneeded 'waitress' in one of the restartTriggers, because it is already listed as part of the service config. --- nixos/modules/services/monitoring/graphite.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 8ef6b8d029e7..dbfe0ee182a0 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -191,10 +191,7 @@ in { }; restartTriggers = [ pkgs.pythonPackages.carbon - cfg.carbon.config - cfg.carbon.storageAggregation - cfg.carbon.storageSchemas - cfg.carbon.rewriteRules + configDir ]; preStart = '' mkdir -p ${cfg.dataDir}/whisper @@ -215,7 +212,8 @@ in { Group = "graphite"; }; restartTriggers = [ - pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.aggregationRules + pkgs.pythonPackages.carbon + configDir ]; }; @@ -231,7 +229,8 @@ in { Group = "graphite"; }; restartTriggers = [ - pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.relayRules + pkgs.pythonPackages.carbon + configDir ]; }; @@ -274,7 +273,6 @@ in { ''; restartTriggers = [ pkgs.python27Packages.graphite_web - pkgs.python27Packages.waitress ]; }; From 977d43f6c536d5d7fe6969854a0b53f62cfd648d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 12:56:04 +0200 Subject: [PATCH 261/424] cran-packages.nix: fix a couple of builds --- pkgs/development/r-modules/cran-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 2c48adc558b7..3bebd5468e9c 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -64,6 +64,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [Rcpp]; patchPhase = "patchShebangs configure"; + meta.hydraPlatforms = R.meta.hydraPlatforms; }; A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; }; @@ -334,16 +335,16 @@ let self = _self // overrides; _self = with self; { bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; }; BayesQTLBIC = derive { name="BayesQTLBIC"; version="1.0-2"; sha256="1pgd3h45v3l44pfkin2883lk1davp0y4fq80lp6nqrsbx9cpsy2z"; depends=[leaps]; }; bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[MASS mnormt gplots combinat]; }; - BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; }; + BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice pkgs.gsl]; }; BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; }; bayesSurv = derive { name="bayesSurv"; version="2.1-1"; sha256="076lzaiwjp4ahw36wvx9sb1g86b9cidvjv91sc1r509s8khph91w"; depends=[survival coda smoothSurv]; }; bayesTFR = derive { name="bayesTFR"; version="4.0-5"; sha256="1cyzkgx0f275ng0ds0lvm3rwryd2ai20shhilp7ajvsria4h4dcw"; depends=[mvtnorm MASS coda wpp2012]; }; Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; }; BayesTree = derive { name="BayesTree"; version="0.3-1.1"; sha256="1sdxya2nli590m837zmqn4y3h62ph1hx8qszp6ayb19liff2bnmd"; depends=[nnet]; }; BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; - BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS]; }; + BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS pkgs.gsl]; }; BayesX = derive { name="BayesX"; version="0.2-8"; sha256="1kj0xwy972383vx52i8dn7vp0x8r5cbbii0s7nwfz0bn2iaks0c0"; depends=[shapefiles sp maptools colorspace coda]; }; - BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; }; + BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[pkgs.readline]; }; BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; }; BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; @@ -646,7 +647,7 @@ let self = _self // overrides; _self = with self; { cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; - CDM = derive { name="CDM"; version="3.2-6"; sha256="07vnvqzrs3zny0p2sq0df37jgiwhzrnlgw9p6dd9x9qn5m9asfm6"; depends=[mvtnorm MASS psych polycor sfsmisc Rcpp]; }; + CDM = derive { name="CDM"; version="3.2-6"; sha256="07vnvqzrs3zny0p2sq0df37jgiwhzrnlgw9p6dd9x9qn5m9asfm6"; depends=[mvtnorm MASS psych polycor sfsmisc Rcpp RcppArmadillo]; }; CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; }; CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; }; cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.3"; sha256="1fc833ji557y2vb6snlxh90gz1n7fxjfkwjmdcmasj1sfzaalsjy"; depends=[]; }; From 164c81be8467e0935782d4110946c0a73ae10694 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 10:31:29 +0200 Subject: [PATCH 262/424] haskell-hscolour: define the bootstap version of this package using 'extension' rather than by passing an additional parameter to it --- pkgs/development/tools/haskell/hscolour/default.nix | 3 +-- pkgs/top-level/haskell-packages.nix | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/hscolour/default.nix b/pkgs/development/tools/haskell/hscolour/default.nix index 88c4545ff6d9..d8bc08b4b33c 100644 --- a/pkgs/development/tools/haskell/hscolour/default.nix +++ b/pkgs/development/tools/haskell/hscolour/default.nix @@ -1,4 +1,4 @@ -{ cabal, hyperlinkSource ? true }: +{ cabal }: cabal.mkDerivation (self: { pname = "hscolour"; @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs"; isLibrary = true; isExecutable = true; - hyperlinkSource = hyperlinkSource; meta = { homepage = "http://code.haskell.org/~malcolm/hscolour/"; description = "Colourise Haskell code"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9d6fb9080178..f083490ddc6e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2641,7 +2641,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hlint = callPackage ../development/tools/haskell/hlint {}; hscolour = callPackage ../development/tools/haskell/hscolour {}; - hscolourBootstrap = self.hscolour.override { hyperlinkSource = false; }; + hscolourBootstrap = self.hscolour.override { + cabal = self.cabal.override { + extension = self : super : { hyperlinkSource = false; }; + }; + }; hslogger = callPackage ../development/tools/haskell/hslogger {}; From 473ab2b36293d483fae6a80ad02c552febb0769b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 10:40:31 +0200 Subject: [PATCH 263/424] haskell-vector: add version 0.10.11.0 --- .../libraries/haskell/vector/0.10.11.0.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/vector/0.10.11.0.nix diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix new file mode 100644 index 000000000000..1b8cb381f0bc --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq, primitive }: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.10.11.0"; + sha256 = "0f5jks8q0287zgzlfg3x7akpahck6dm1c37hb8kk6qn51csx515j"; + buildDepends = [ deepseq primitive ]; + meta = { + homepage = "https://github.com/haskell/vector"; + description = "Efficient Arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f083490ddc6e..a2bd99a7ca93 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2379,7 +2379,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; - vector = self.vector_0_10_9_3; + vector_0_10_11_0 = callPackage ../development/libraries/haskell/vector/0.10.11.0.nix {}; + vector = self.vector_0_10_11_0; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; From 33d99a22cab7375bf947e87ca2120b9e591cbaaf Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Jun 2014 13:36:26 +0200 Subject: [PATCH 264/424] nixos-build-vms: Fix function invocation to test driver --- nixos/modules/installer/tools/nixos-build-vms/build-vms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix index 5e77b701ff5a..4372d196261e 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix @@ -6,4 +6,4 @@ let nodes = import networkExpr; in with import ../../../../lib/testing.nix { inherit system; }; -(complete { inherit nodes; testScript = ""; }).driver +(makeTest { inherit nodes; testScript = ""; }).driver From cf3a2d04751fcc875656b0af6bf2e7f728cf770d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 9 Jun 2014 13:37:49 +0200 Subject: [PATCH 265/424] Add vtop, update some node packages. --- pkgs/top-level/node-packages-generated.nix | 6397 +++++++++++++------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 4248 insertions(+), 2150 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index e250085f7307..84440094a447 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -34,7 +34,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.5" + self.by-version."CSSwhat"."0.4.7" self.by-version."domutils"."1.4.3" self.by-version."boolbase"."1.0.0" self.by-version."nth-check"."1.0.0" @@ -57,7 +57,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.5" + self.by-version."CSSwhat"."0.4.7" self.by-version."domutils"."1.4.3" ]; peerDependencies = [ @@ -65,14 +65,14 @@ passthru.names = [ "CSSselect" ]; }; by-spec."CSSwhat"."0.4" = - self.by-version."CSSwhat"."0.4.5"; - by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSwhat-0.4.5"; + self.by-version."CSSwhat"."0.4.7"; + by-version."CSSwhat"."0.4.7" = lib.makeOverridable self.buildNodePackage { + name = "node-CSSwhat-0.4.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz"; - name = "CSSwhat-0.4.5.tgz"; - sha1 = "85d7b2799ff3d98055353c802949e39913e16a62"; + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; + name = "CSSwhat-0.4.7.tgz"; + sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; }) ]; buildInputs = @@ -105,14 +105,14 @@ passthru.names = [ "JSONStream" ]; }; by-spec."JSONStream"."~0.7.1" = - self.by-version."JSONStream"."0.7.2"; - by-version."JSONStream"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "node-JSONStream-0.7.2"; + self.by-version."JSONStream"."0.7.4"; + by-version."JSONStream"."0.7.4" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.7.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.2.tgz"; - name = "JSONStream-0.7.2.tgz"; - sha1 = "27f4d7fe1918dc08ee72aed9c794e32ce80618f7"; + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz"; + name = "JSONStream-0.7.4.tgz"; + sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786"; }) ]; buildInputs = @@ -167,6 +167,8 @@ self.by-version."abbrev"."1.0.5"; by-spec."abbrev"."~1.0.4" = self.by-version."abbrev"."1.0.5"; + by-spec."abbrev"."~1.0.5" = + self.by-version."abbrev"."1.0.5"; by-spec."accepts"."1.0.0" = self.by-version."accepts"."1.0.0"; by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -188,6 +190,48 @@ ]; passthru.names = [ "accepts" ]; }; + by-spec."accepts"."1.0.1" = + self.by-version."accepts"."1.0.1"; + by-version."accepts"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.0.1.tgz"; + name = "accepts-1.0.1.tgz"; + sha1 = "c1e06d613e6246ba874678d6d9b92389b7ce310c"; + }) + ]; + buildInputs = + (self.nativeDeps."accepts" or []); + deps = [ + self.by-version."mime"."1.2.11" + self.by-version."negotiator"."0.4.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "accepts" ]; + }; + by-spec."accepts"."1.0.2" = + self.by-version."accepts"."1.0.2"; + by-version."accepts"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.0.2.tgz"; + name = "accepts-1.0.2.tgz"; + sha1 = "96266ace1b4c03f9637428f3acafe891959f3883"; + }) + ]; + buildInputs = + (self.nativeDeps."accepts" or []); + deps = [ + self.by-version."mime"."1.2.11" + self.by-version."negotiator"."0.4.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "accepts" ]; + }; 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 { @@ -208,7 +252,7 @@ ]; passthru.names = [ "active-x-obfuscator" ]; }; - by-spec."addressparser"."~0.2.0" = + by-spec."addressparser"."~0.2.1" = self.by-version."addressparser"."0.2.1"; by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "node-addressparser-0.2.1"; @@ -309,6 +353,25 @@ "amdefine" = self.by-version."amdefine"."0.1.0"; by-spec."amdefine".">=0.0.4" = self.by-version."amdefine"."0.1.0"; + by-spec."ansi"."^0.3.0" = + self.by-version."ansi"."0.3.0"; + by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-ansi-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"; + name = "ansi-0.3.0.tgz"; + sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ansi" ]; + }; by-spec."ansi"."~0.2.1" = self.by-version."ansi"."0.2.1"; by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -482,24 +545,26 @@ ]; passthru.names = [ "apparatus" ]; }; - 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"; + by-spec."archiver"."~0.10.0" = + self.by-version."archiver"."0.10.0"; + by-version."archiver"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-archiver-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz"; - name = "archiver-0.5.2.tgz"; - sha1 = "4e021b1fea5d902201f4886fca6a19fcc760083b"; + url = "http://registry.npmjs.org/archiver/-/archiver-0.10.0.tgz"; + name = "archiver-0.10.0.tgz"; + sha1 = "49e84512f31e4ec1cff27d7913f58ab61b80136b"; }) ]; buildInputs = (self.nativeDeps."archiver" or []); deps = [ + self.by-version."buffer-crc32"."0.2.1" self.by-version."readable-stream"."1.0.27-1" - self.by-version."zip-stream"."0.1.4" + self.by-version."tar-stream"."0.3.3" + self.by-version."zip-stream"."0.3.4" self.by-version."lazystream"."0.1.0" - self.by-version."file-utils"."0.1.5" + self.by-version."file-utils"."0.2.0" self.by-version."lodash"."2.4.1" ]; peerDependencies = [ @@ -527,6 +592,8 @@ }; by-spec."archy"."0.0.2" = self.by-version."archy"."0.0.2"; + by-spec."archy"."~0.0.2" = + self.by-version."archy"."0.0.2"; by-spec."argparse"."0.1.15" = self.by-version."argparse"."0.1.15"; by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -746,6 +813,30 @@ ]; passthru.names = [ "assertion-error" ]; }; + by-spec."ast-query"."~0.2.3" = + self.by-version."ast-query"."0.2.4"; + by-version."ast-query"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-ast-query-0.2.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ast-query/-/ast-query-0.2.4.tgz"; + name = "ast-query-0.2.4.tgz"; + sha1 = "853d13e6493fe8c88c19b8fecb098183c3d7449a"; + }) + ]; + buildInputs = + (self.nativeDeps."ast-query" or []); + deps = [ + self.by-version."esprima"."1.1.1" + self.by-version."escodegen"."1.3.3" + self.by-version."lodash"."2.4.1" + self.by-version."traverse"."0.6.6" + self.by-version."class-extend"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ast-query" ]; + }; by-spec."astw"."~1.1.0" = self.by-version."astw"."1.1.0"; by-version."astw"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -767,14 +858,14 @@ passthru.names = [ "astw" ]; }; by-spec."async"."*" = - self.by-version."async"."0.7.0"; - by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.7.0"; + self.by-version."async"."0.9.0"; + by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz"; - name = "async-0.7.0.tgz"; - sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5"; + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; }) ]; buildInputs = @@ -785,7 +876,7 @@ ]; passthru.names = [ "async" ]; }; - "async" = self.by-version."async"."0.7.0"; + "async" = self.by-version."async"."0.9.0"; by-spec."async"."0.1.15" = self.by-version."async"."0.1.15"; by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -864,12 +955,31 @@ ]; passthru.names = [ "async" ]; }; + by-spec."async"."0.8.x" = + self.by-version."async"."0.8.0"; + by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.8.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz"; + name = "async-0.8.0.tgz"; + sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; by-spec."async"."^0.2.10" = self.by-version."async"."0.2.10"; + by-spec."async"."^0.9.0" = + self.by-version."async"."0.9.0"; by-spec."async"."~0.1.22" = self.by-version."async"."0.1.22"; - by-spec."async"."~0.2.10" = - self.by-version."async"."0.2.10"; by-spec."async"."~0.2.6" = self.by-version."async"."0.2.10"; by-spec."async"."~0.2.7" = @@ -878,44 +988,12 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.4" = - self.by-version."async"."0.4.1"; - by-version."async"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.4.1.tgz"; - name = "async-0.4.1.tgz"; - sha1 = "1985abade017df906bfaa8d77d424b25366b3a5b"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - by-spec."async"."~0.6.2" = - self.by-version."async"."0.6.2"; - by-version."async"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz"; - name = "async-0.6.2.tgz"; - sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; + by-spec."async"."~0.8" = + self.by-version."async"."0.8.0"; + by-spec."async"."~0.8.0" = + self.by-version."async"."0.8.0"; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; by-spec."aws-sdk"."*" = self.by-version."aws-sdk"."2.0.0-rc9"; by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage { @@ -1076,14 +1154,14 @@ passthru.names = [ "base62" ]; }; by-spec."base64-js"."~0.0.4" = - self.by-version."base64-js"."0.0.6"; - by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-base64-js-0.0.6"; + self.by-version."base64-js"."0.0.7"; + by-version."base64-js"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "node-base64-js-0.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"; - name = "base64-js-0.0.6.tgz"; - sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947"; + url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"; + name = "base64-js-0.0.7.tgz"; + sha1 = "54400dc91d696cec32a8a47902f971522fee8f48"; }) ]; buildInputs = @@ -1152,14 +1230,14 @@ passthru.names = [ "batch" ]; }; by-spec."bcrypt"."*" = - self.by-version."bcrypt"."0.7.7"; - by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage { - name = "node-bcrypt-0.7.7"; + self.by-version."bcrypt"."0.7.8"; + by-version."bcrypt"."0.7.8" = lib.makeOverridable self.buildNodePackage { + name = "node-bcrypt-0.7.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz"; - name = "bcrypt-0.7.7.tgz"; - sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868"; + url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.8.tgz"; + name = "bcrypt-0.7.8.tgz"; + sha1 = "42c99aac202918e947b5bd086110184f62745e3e"; }) ]; buildInputs = @@ -1171,7 +1249,7 @@ ]; passthru.names = [ "bcrypt" ]; }; - "bcrypt" = self.by-version."bcrypt"."0.7.7"; + "bcrypt" = self.by-version."bcrypt"."0.7.8"; by-spec."binary"."~0.3.0" = self.by-version."binary"."0.3.0"; by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -1231,6 +1309,47 @@ ]; passthru.names = [ "bindings" ]; }; + by-spec."bindings".">=1.2.0" = + self.by-version."bindings"."1.2.0"; + by-spec."bl"."~0.6.0" = + self.by-version."bl"."0.6.0"; + by-version."bl"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-bl-0.6.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bl/-/bl-0.6.0.tgz"; + name = "bl-0.6.0.tgz"; + sha1 = "30910299937294133844ee34aa479a5344b4cd29"; + }) + ]; + buildInputs = + (self.nativeDeps."bl" or []); + deps = [ + self.by-version."readable-stream"."1.0.27-1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bl" ]; + }; + by-spec."blessed"."0.0.33" = + self.by-version."blessed"."0.0.33"; + by-version."blessed"."0.0.33" = lib.makeOverridable self.buildNodePackage { + name = "blessed-0.0.33"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/blessed/-/blessed-0.0.33.tgz"; + name = "blessed-0.0.33.tgz"; + sha1 = "da5837b2539921a7aeb57ac6ff48f038c8b9e750"; + }) + ]; + buildInputs = + (self.nativeDeps."blessed" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "blessed" ]; + }; by-spec."block-stream"."*" = self.by-version."block-stream"."0.0.7"; by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -1272,23 +1391,47 @@ ]; passthru.names = [ "blueimp-md5" ]; }; - by-spec."body-parser"."~1.0.1" = - self.by-version."body-parser"."1.0.2"; - by-version."body-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.0.2"; + by-spec."body-parser"."1.3.0" = + self.by-version."body-parser"."1.3.0"; + by-version."body-parser"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-body-parser-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.0.2.tgz"; - name = "body-parser-1.0.2.tgz"; - sha1 = "3461479a3278fe00fcaebec3314bb54fc4f7b47c"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.3.0.tgz"; + name = "body-parser-1.3.0.tgz"; + sha1 = "1a651cb9993a01a65531ae38395ceb0199dd7e3c"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); deps = [ - self.by-version."type-is"."1.1.0" - self.by-version."raw-body"."1.1.4" + self.by-version."bytes"."1.0.0" self.by-version."qs"."0.6.6" + self.by-version."raw-body"."1.1.6" + self.by-version."type-is"."1.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "body-parser" ]; + }; + by-spec."body-parser"."~1.2.0" = + self.by-version."body-parser"."1.2.2"; + by-version."body-parser"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-body-parser-1.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.2.2.tgz"; + name = "body-parser-1.2.2.tgz"; + sha1 = "6106373cc1d34d559ebcfdb582e4e37d4312acfb"; + }) + ]; + buildInputs = + (self.nativeDeps."body-parser" or []); + deps = [ + self.by-version."bytes"."1.0.0" + self.by-version."qs"."0.6.6" + self.by-version."raw-body"."1.1.6" + self.by-version."type-is"."1.2.0" ]; peerDependencies = [ ]; @@ -1354,14 +1497,14 @@ passthru.names = [ "boom" ]; }; by-spec."bower"."*" = - self.by-version."bower"."1.3.2"; - by-version."bower"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "bower-1.3.2"; + self.by-version."bower"."1.3.5"; + by-version."bower"."1.3.5" = lib.makeOverridable self.buildNodePackage { + name = "bower-1.3.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower/-/bower-1.3.2.tgz"; - name = "bower-1.3.2.tgz"; - sha1 = "ae1eeea5c3ba9300e10e55b193e9d2fd5407fb7b"; + url = "http://registry.npmjs.org/bower/-/bower-1.3.5.tgz"; + name = "bower-1.3.5.tgz"; + sha1 = "36a749fa8d0ac4d96609f721d15c93834bdaf98b"; }) ]; buildInputs = @@ -1369,55 +1512,55 @@ deps = [ self.by-version."abbrev"."1.0.5" self.by-version."archy"."0.0.2" - self.by-version."bower-config"."0.5.0" + self.by-version."bower-config"."0.5.1" self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-json"."0.4.0" self.by-version."bower-logger"."0.2.2" - self.by-version."bower-registry-client"."0.1.6" + self.by-version."bower-registry-client"."0.2.1" self.by-version."cardinal"."0.4.4" self.by-version."chalk"."0.4.0" self.by-version."chmodr"."0.1.0" - self.by-version."decompress-zip"."0.0.6" + self.by-version."decompress-zip"."0.0.8" self.by-version."fstream"."0.1.25" - self.by-version."fstream-ignore"."0.0.7" - self.by-version."glob"."3.2.9" + self.by-version."fstream-ignore"."0.0.8" + self.by-version."glob"."3.2.11" self.by-version."graceful-fs"."2.0.3" self.by-version."handlebars"."1.3.0" self.by-version."inquirer"."0.4.1" - self.by-version."junk"."0.2.2" - self.by-version."mkdirp"."0.3.5" - self.by-version."mout"."0.9.1" - self.by-version."nopt"."2.1.2" - self.by-version."lru-cache"."2.5.0" - self.by-version."open"."0.0.5" - self.by-version."osenv"."0.0.3" - self.by-version."promptly"."0.2.0" - self.by-version."q"."1.0.1" - self.by-version."request"."2.33.0" - self.by-version."request-progress"."0.3.1" - self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.6" - self.by-version."semver"."2.2.1" - self.by-version."stringify-object"."0.2.0" - self.by-version."tar"."0.1.19" - self.by-version."tmp"."0.0.23" - self.by-version."update-notifier"."0.1.8" - self.by-version."which"."1.0.5" - self.by-version."p-throttler"."0.0.1" self.by-version."insight"."0.3.1" self.by-version."is-root"."0.1.0" - self.by-version."shell-quote"."1.4.1" + self.by-version."junk"."0.3.0" self.by-version."lockfile"."0.4.2" + self.by-version."lru-cache"."2.5.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."mout"."0.9.1" + self.by-version."nopt"."2.2.1" + self.by-version."opn"."0.1.2" + self.by-version."osenv"."0.0.3" + self.by-version."p-throttler"."0.0.1" + self.by-version."promptly"."0.2.0" + self.by-version."q"."1.0.1" + self.by-version."request"."2.34.0" + self.by-version."request-progress"."0.3.1" + self.by-version."retry"."0.6.0" + self.by-version."rimraf"."2.2.8" + self.by-version."semver"."2.2.1" + self.by-version."shell-quote"."1.4.1" + self.by-version."stringify-object"."0.2.1" + self.by-version."tar"."0.1.19" + self.by-version."tmp"."0.0.23" + self.by-version."update-notifier"."0.1.10" + self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "bower" ]; }; - "bower" = self.by-version."bower"."1.3.2"; + "bower" = self.by-version."bower"."1.3.5"; by-spec."bower".">=0.9.0" = - self.by-version."bower"."1.3.2"; + self.by-version."bower"."1.3.5"; by-spec."bower".">=1.2.8 <2" = - self.by-version."bower"."1.3.2"; + self.by-version."bower"."1.3.5"; by-spec."bower"."~1.2.0" = self.by-version."bower"."1.2.8"; by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage { @@ -1434,7 +1577,7 @@ deps = [ self.by-version."abbrev"."1.0.5" self.by-version."archy"."0.0.2" - self.by-version."bower-config"."0.5.0" + self.by-version."bower-config"."0.5.1" self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-json"."0.4.0" self.by-version."bower-logger"."0.2.2" @@ -1442,10 +1585,10 @@ self.by-version."cardinal"."0.4.4" self.by-version."chalk"."0.2.1" self.by-version."chmodr"."0.1.0" - self.by-version."decompress-zip"."0.0.6" + self.by-version."decompress-zip"."0.0.8" self.by-version."fstream"."0.1.25" - self.by-version."fstream-ignore"."0.0.7" - self.by-version."glob"."3.2.9" + self.by-version."fstream-ignore"."0.0.8" + self.by-version."glob"."3.2.11" self.by-version."graceful-fs"."2.0.3" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" @@ -1461,13 +1604,13 @@ self.by-version."request"."2.27.0" self.by-version."request-progress"."0.3.1" self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" self.by-version."semver"."2.1.0" 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" - self.by-version."update-notifier"."0.1.8" + self.by-version."update-notifier"."0.1.10" self.by-version."which"."1.0.5" self.by-version."p-throttler"."0.0.1" ]; @@ -1475,6 +1618,29 @@ ]; passthru.names = [ "bower" ]; }; + by-spec."bower-config"."^0.5.0" = + self.by-version."bower-config"."0.5.1"; + by-version."bower-config"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "node-bower-config-0.5.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.1.tgz"; + name = "bower-config-0.5.1.tgz"; + sha1 = "dbcfac40734f5e7c61c5c8353c1dfb0ed5f51ce1"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-config" or []); + deps = [ + self.by-version."graceful-fs"."2.0.3" + self.by-version."mout"."0.9.1" + self.by-version."optimist"."0.6.1" + self.by-version."osenv"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bower-config" ]; + }; 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 { @@ -1499,28 +1665,7 @@ passthru.names = [ "bower-config" ]; }; 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 = "node-bower-config-0.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz"; - name = "bower-config-0.5.0.tgz"; - sha1 = "d081d43008816b1beb876dee272219851dd4c89c"; - }) - ]; - buildInputs = - (self.nativeDeps."bower-config" or []); - deps = [ - self.by-version."graceful-fs"."2.0.3" - self.by-version."mout"."0.6.0" - self.by-version."optimist"."0.6.1" - self.by-version."osenv"."0.0.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bower-config" ]; - }; + self.by-version."bower-config"."0.5.1"; 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 { @@ -1556,7 +1701,7 @@ buildInputs = (self.nativeDeps."bower-json" or []); deps = [ - self.by-version."deep-extend"."0.2.8" + self.by-version."deep-extend"."0.2.10" self.by-version."graceful-fs"."2.0.3" self.by-version."intersect"."0.0.3" ]; @@ -1626,7 +1771,34 @@ self.by-version."lru-cache"."2.3.1" self.by-version."request"."2.27.0" self.by-version."request-replay"."0.2.0" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" + self.by-version."mkdirp"."0.3.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bower-registry-client" ]; + }; + by-spec."bower-registry-client"."~0.2.0" = + self.by-version."bower-registry-client"."0.2.1"; + by-version."bower-registry-client"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-bower-registry-client-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.1.tgz"; + name = "bower-registry-client-0.2.1.tgz"; + sha1 = "06fbff982f82a4a4045dc53ac9dcb1c43d9cd591"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-registry-client" or []); + deps = [ + self.by-version."async"."0.2.10" + self.by-version."bower-config"."0.5.1" + self.by-version."graceful-fs"."2.0.3" + self.by-version."lru-cache"."2.3.1" + self.by-version."request"."2.27.0" + self.by-version."request-replay"."0.2.0" + self.by-version."rimraf"."2.2.8" self.by-version."mkdirp"."0.3.5" ]; peerDependencies = [ @@ -1652,10 +1824,10 @@ self.by-version."bower-json"."0.4.0" self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" - self.by-version."bower"."1.3.2" + self.by-version."bower"."1.3.5" self.by-version."argparse"."0.1.15" self.by-version."clone"."0.1.11" - self.by-version."semver"."2.2.1" + self.by-version."semver"."2.3.0" self.by-version."fetch-bower"."2.0.0" ]; peerDependencies = [ @@ -1733,6 +1905,8 @@ }; by-spec."browser-resolve"."~1.2.2" = self.by-version."browser-resolve"."1.2.4"; + by-spec."browser-resolve"."~1.2.4" = + self.by-version."browser-resolve"."1.2.4"; by-spec."browserchannel"."*" = self.by-version."browserchannel"."1.2.0"; by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1748,8 +1922,8 @@ (self.nativeDeps."browserchannel" or []); deps = [ self.by-version."hat"."0.0.3" - self.by-version."connect"."2.14.4" - self.by-version."request"."2.34.0" + self.by-version."connect"."2.19.4" + self.by-version."request"."2.36.0" self.by-version."ascii-json"."0.2.0" ]; peerDependencies = [ @@ -1758,70 +1932,73 @@ }; "browserchannel" = self.by-version."browserchannel"."1.2.0"; by-spec."browserify"."*" = - self.by-version."browserify"."3.44.2"; - by-version."browserify"."3.44.2" = lib.makeOverridable self.buildNodePackage { - name = "browserify-3.44.2"; + self.by-version."browserify"."4.1.8"; + by-version."browserify"."4.1.8" = lib.makeOverridable self.buildNodePackage { + name = "browserify-4.1.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-3.44.2.tgz"; - name = "browserify-3.44.2.tgz"; - sha1 = "ffa2788d06e8073ffd734d94c3ae272ca3dd630a"; + url = "http://registry.npmjs.org/browserify/-/browserify-4.1.8.tgz"; + name = "browserify-4.1.8.tgz"; + sha1 = "fe567fd8493e25c0ab33985eb62595bc9be66780"; }) ]; buildInputs = (self.nativeDeps."browserify" or []); deps = [ - self.by-version."JSONStream"."0.7.2" + self.by-version."JSONStream"."0.7.4" self.by-version."assert"."1.1.1" self.by-version."browser-pack"."2.0.1" self.by-version."browser-resolve"."1.2.4" self.by-version."browserify-zlib"."0.1.4" - self.by-version."buffer"."2.1.13" - self.by-version."builtins"."0.0.3" + self.by-version."buffer"."2.3.2" + self.by-version."builtins"."0.0.4" self.by-version."commondir"."0.0.1" - self.by-version."concat-stream"."1.4.5" + self.by-version."concat-stream"."1.4.6" self.by-version."console-browserify"."1.0.3" self.by-version."constants-browserify"."0.0.1" self.by-version."crypto-browserify"."1.0.9" self.by-version."deep-equal"."0.1.2" self.by-version."defined"."0.0.0" - self.by-version."deps-sort"."0.1.1" + self.by-version."deps-sort"."0.1.2" self.by-version."derequire"."0.8.0" - self.by-version."domain-browser"."1.1.1" + self.by-version."domain-browser"."1.1.2" self.by-version."duplexer"."0.1.1" - self.by-version."events"."1.0.0" - self.by-version."glob"."3.2.9" + self.by-version."events"."1.0.1" + self.by-version."glob"."3.2.11" self.by-version."http-browserify"."1.3.2" self.by-version."https-browserify"."0.0.0" self.by-version."inherits"."2.0.1" - self.by-version."insert-module-globals"."5.0.1" - self.by-version."module-deps"."1.10.0" + self.by-version."insert-module-globals"."6.0.0" + self.by-version."module-deps"."2.1.2" self.by-version."os-browserify"."0.1.2" self.by-version."parents"."0.0.2" self.by-version."path-browserify"."0.0.0" self.by-version."punycode"."1.2.4" - self.by-version."querystring-es3"."0.2.0" + self.by-version."querystring-es3"."0.2.1-0" + self.by-version."readable-stream"."1.1.13-1" self.by-version."resolve"."0.6.3" self.by-version."shallow-copy"."0.0.1" self.by-version."shell-quote"."0.0.1" - self.by-version."stream-browserify"."0.1.3" + self.by-version."stream-browserify"."1.0.0" self.by-version."stream-combiner"."0.0.4" self.by-version."string_decoder"."0.0.1" self.by-version."subarg"."0.0.1" self.by-version."syntax-error"."1.1.0" - self.by-version."through2"."0.4.1" + self.by-version."through2"."0.4.2" self.by-version."timers-browserify"."1.0.1" self.by-version."tty-browserify"."0.0.0" - self.by-version."umd"."2.0.0" + self.by-version."umd"."2.1.0" self.by-version."url"."0.10.1" self.by-version."util"."0.10.3" self.by-version."vm-browserify"."0.0.4" + self.by-version."xtend"."3.0.0" + self.by-version."process"."0.7.0" ]; peerDependencies = [ ]; passthru.names = [ "browserify" ]; }; - "browserify" = self.by-version."browserify"."3.44.2"; + "browserify" = self.by-version."browserify"."4.1.8"; by-spec."browserify"."~3.38.0" = self.by-version."browserify"."3.38.1"; by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage { @@ -1836,25 +2013,25 @@ buildInputs = (self.nativeDeps."browserify" or []); deps = [ - self.by-version."JSONStream"."0.7.2" + self.by-version."JSONStream"."0.7.4" self.by-version."assert"."1.1.1" self.by-version."browser-pack"."2.0.1" self.by-version."browser-resolve"."1.2.4" self.by-version."buffer"."2.1.13" - self.by-version."builtins"."0.0.3" + self.by-version."builtins"."0.0.4" self.by-version."commondir"."0.0.1" - self.by-version."concat-stream"."1.4.5" + self.by-version."concat-stream"."1.4.6" self.by-version."console-browserify"."1.0.3" self.by-version."constants-browserify"."0.0.1" self.by-version."crypto-browserify"."1.0.9" self.by-version."deep-equal"."0.1.2" self.by-version."defined"."0.0.0" - self.by-version."deps-sort"."0.1.1" + self.by-version."deps-sort"."0.1.2" self.by-version."derequire"."0.8.0" - self.by-version."domain-browser"."1.1.1" + self.by-version."domain-browser"."1.1.2" self.by-version."duplexer"."0.1.1" - self.by-version."events"."1.0.0" - self.by-version."glob"."3.2.9" + self.by-version."events"."1.0.1" + self.by-version."glob"."3.2.11" self.by-version."http-browserify"."1.3.2" self.by-version."https-browserify"."0.0.0" self.by-version."inherits"."2.0.1" @@ -1873,7 +2050,7 @@ self.by-version."string_decoder"."0.0.1" self.by-version."subarg"."0.0.1" self.by-version."syntax-error"."1.1.0" - self.by-version."through2"."0.4.1" + self.by-version."through2"."0.4.2" self.by-version."timers-browserify"."1.0.1" self.by-version."tty-browserify"."0.0.0" self.by-version."umd"."2.0.0" @@ -1900,7 +2077,7 @@ buildInputs = (self.nativeDeps."browserify-zlib" or []); deps = [ - self.by-version."pako"."0.2.0" + self.by-version."pako"."0.2.3" ]; peerDependencies = [ ]; @@ -1963,26 +2140,47 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.7" = - self.by-version."bson"."0.2.7"; - by-version."bson"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "node-bson-0.2.7"; + by-spec."bson"."0.2.8" = + self.by-version."bson"."0.2.8"; + by-version."bson"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "node-bson-0.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz"; - name = "bson-0.2.7.tgz"; - sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.8.tgz"; + name = "bson-0.2.8.tgz"; + sha1 = "7ad6ddc15aafa63808942bd53c61387f825d64a1"; }) ]; buildInputs = (self.nativeDeps."bson" or []); deps = [ - self.by-version."nan"."0.8.0" + self.by-version."nan"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "bson" ]; }; + by-spec."buffer"."^2.3.0" = + self.by-version."buffer"."2.3.2"; + by-version."buffer"."2.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-buffer-2.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffer/-/buffer-2.3.2.tgz"; + name = "buffer-2.3.2.tgz"; + sha1 = "05f14d173c73d24f21045a9f83e1c396ae34d74b"; + }) + ]; + buildInputs = + (self.nativeDeps."buffer" or []); + deps = [ + self.by-version."base64-js"."0.0.7" + self.by-version."ieee754"."1.1.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "buffer" ]; + }; by-spec."buffer"."~2.1.4" = self.by-version."buffer"."2.1.13"; by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage { @@ -1997,7 +2195,7 @@ buildInputs = (self.nativeDeps."buffer" or []); deps = [ - self.by-version."base64-js"."0.0.6" + self.by-version."base64-js"."0.0.7" self.by-version."ieee754"."1.1.3" ]; peerDependencies = [ @@ -2103,14 +2301,14 @@ passthru.names = [ "buffertools" ]; }; by-spec."builtins"."~0.0.3" = - self.by-version."builtins"."0.0.3"; - by-version."builtins"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-builtins-0.0.3"; + self.by-version."builtins"."0.0.4"; + by-version."builtins"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-builtins-0.0.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/builtins/-/builtins-0.0.3.tgz"; - name = "builtins-0.0.3.tgz"; - sha1 = "5d006166da71610bc2bcf73019f0f0cc43309755"; + url = "http://registry.npmjs.org/builtins/-/builtins-0.0.4.tgz"; + name = "builtins-0.0.4.tgz"; + sha1 = "ec6d4ca4ba5a3a173749f10146bdcda28ea6d65d"; }) ]; buildInputs = @@ -2219,15 +2417,15 @@ ]; passthru.names = [ "bytes" ]; }; - by-spec."bytes"."0.3.0" = - self.by-version."bytes"."0.3.0"; - by-version."bytes"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-bytes-0.3.0"; + by-spec."bytes"."1" = + self.by-version."bytes"."1.0.0"; + by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-bytes-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz"; - name = "bytes-0.3.0.tgz"; - sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935"; + url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + name = "bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; }) ]; buildInputs = @@ -2238,12 +2436,10 @@ ]; passthru.names = [ "bytes" ]; }; - by-spec."bytes"."~0.2.0" = - self.by-version."bytes"."0.2.1"; + by-spec."bytes"."1.0.0" = + self.by-version."bytes"."1.0.0"; by-spec."bytes"."~0.2.1" = self.by-version."bytes"."0.2.1"; - by-spec."bytes"."~0.3.0" = - self.by-version."bytes"."0.3.0"; by-spec."callsite"."~1.0.0" = self.by-version."callsite"."1.0.0"; by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -2413,6 +2609,25 @@ }; by-spec."chalk"."~0.4.0" = self.by-version."chalk"."0.4.0"; + by-spec."char-spinner"."~1.0.1" = + self.by-version."char-spinner"."1.0.1"; + by-version."char-spinner"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-char-spinner-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"; + name = "char-spinner-1.0.1.tgz"; + sha1 = "e6ea67bd247e107112983b7ab0479ed362800081"; + }) + ]; + buildInputs = + (self.nativeDeps."char-spinner" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "char-spinner" ]; + }; 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 { @@ -2432,6 +2647,29 @@ ]; passthru.names = [ "character-parser" ]; }; + by-spec."cheerio"."^0.16.0" = + self.by-version."cheerio"."0.16.0"; + by-version."cheerio"."0.16.0" = lib.makeOverridable self.buildNodePackage { + name = "node-cheerio-0.16.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cheerio/-/cheerio-0.16.0.tgz"; + name = "cheerio-0.16.0.tgz"; + sha1 = "780ae472692ea85e1e0fe332e806bdba98c16d0a"; + }) + ]; + buildInputs = + (self.nativeDeps."cheerio" or []); + deps = [ + self.by-version."CSSselect"."0.4.1" + self.by-version."entities"."1.1.1" + self.by-version."htmlparser2"."3.7.2" + self.by-version."lodash"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cheerio" ]; + }; by-spec."cheerio"."~0.12.0" = self.by-version."cheerio"."0.12.4"; by-version."cheerio"."0.12.4" = lib.makeOverridable self.buildNodePackage { @@ -2576,27 +2814,7 @@ ]; passthru.names = [ "chownr" ]; }; - by-spec."circular-json"."0.1.x" = - self.by-version."circular-json"."0.1.6"; - by-version."circular-json"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "node-circular-json-0.1.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/circular-json/-/circular-json-0.1.6.tgz"; - name = "circular-json-0.1.6.tgz"; - sha1 = "fd692b65f8bce4f2900bea14f74ad681ab294c7f"; - }) - ]; - buildInputs = - (self.nativeDeps."circular-json" or []); - deps = [ - self.by-version."wru"."0.2.7" - ]; - peerDependencies = [ - ]; - passthru.names = [ "circular-json" ]; - }; - by-spec."class-extend"."~0.1.0" = + 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 = "node-class-extend-0.1.1"; @@ -2616,6 +2834,10 @@ ]; passthru.names = [ "class-extend" ]; }; + by-spec."class-extend"."~0.1.0" = + self.by-version."class-extend"."0.1.1"; + by-spec."class-extend"."~0.1.1" = + self.by-version."class-extend"."0.1.1"; by-spec."clean-css"."2.1.x" = self.by-version."clean-css"."2.1.8"; by-version."clean-css"."2.1.8" = lib.makeOverridable self.buildNodePackage { @@ -2638,27 +2860,51 @@ }; by-spec."clean-css"."~2.1.0" = self.by-version."clean-css"."2.1.8"; - by-spec."cli"."0.4.x" = - self.by-version."cli"."0.4.5"; - by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-cli-0.4.5"; + by-spec."cli"."0.6.x" = + self.by-version."cli"."0.6.3"; + by-version."cli"."0.6.3" = lib.makeOverridable self.buildNodePackage { + name = "node-cli-0.6.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; - name = "cli-0.4.5.tgz"; - sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; + url = "http://registry.npmjs.org/cli/-/cli-0.6.3.tgz"; + name = "cli-0.6.3.tgz"; + sha1 = "31418ed08d60a1b02cf180c6d6fee3204bfe65cd"; }) ]; buildInputs = (self.nativeDeps."cli" or []); deps = [ - self.by-version."glob"."3.2.9" + self.by-version."glob"."3.2.11" + self.by-version."exit"."0.1.2" ]; peerDependencies = [ ]; passthru.names = [ "cli" ]; }; by-spec."cli-color"."*" = + self.by-version."cli-color"."0.3.2"; + by-version."cli-color"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-cli-color-0.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz"; + name = "cli-color-0.3.2.tgz"; + sha1 = "75fa5f728c308cc4ac594b05e06cc5d80daccd86"; + }) + ]; + buildInputs = + (self.nativeDeps."cli-color" or []); + deps = [ + self.by-version."d"."0.1.1" + self.by-version."es5-ext"."0.10.4" + self.by-version."memoizee"."0.3.3" + self.by-version."timers-ext"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cli-color" ]; + }; + 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 = "node-cli-color-0.2.3"; @@ -2679,10 +2925,10 @@ ]; passthru.names = [ "cli-color" ]; }; - by-spec."cli-color"."~0.2.2" = - self.by-version."cli-color"."0.2.3"; by-spec."cli-color"."~0.2.3" = self.by-version."cli-color"."0.2.3"; + by-spec."cli-color"."~0.3.2" = + self.by-version."cli-color"."0.3.2"; by-spec."cli-log"."~0.0.8" = self.by-version."cli-log"."0.0.8"; by-version."cli-log"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -2697,7 +2943,7 @@ buildInputs = (self.nativeDeps."cli-log" or []); deps = [ - self.by-version."cli-color"."0.2.3" + self.by-version."cli-color"."0.3.2" ]; peerDependencies = [ ]; @@ -2891,7 +3137,7 @@ ]; passthru.names = [ "coffee-script-redux" ]; }; - by-spec."collections"."^2.0.0" = + by-spec."collections".">=2.0.1 <3.0.0" = self.by-version."collections"."2.0.1"; by-version."collections"."2.0.1" = lib.makeOverridable self.buildNodePackage { name = "node-collections-2.0.1"; @@ -2905,21 +3151,21 @@ buildInputs = (self.nativeDeps."collections" or []); deps = [ - self.by-version."weak-map"."1.0.4" + self.by-version."weak-map"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "collections" ]; }; - 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"; + by-spec."color"."~0.6.0" = + self.by-version."color"."0.6.0"; + by-version."color"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-color-0.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/color/-/color-0.5.0.tgz"; - name = "color-0.5.0.tgz"; - sha1 = "4d283d8bfe4cbc7006de6b6d25a3c26f00e3ee6d"; + url = "http://registry.npmjs.org/color/-/color-0.6.0.tgz"; + name = "color-0.6.0.tgz"; + sha1 = "53f4b27698e1fe42a19423dc092dd8ee529b4267"; }) ]; buildInputs = @@ -3034,7 +3280,7 @@ ]; passthru.names = [ "colour" ]; }; - by-spec."columnify"."0.1.2" = + by-spec."columnify"."~0.1.2" = self.by-version."columnify"."0.1.2"; by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "node-columnify-0.1.2"; @@ -3068,7 +3314,7 @@ (self.nativeDeps."combine-source-map" or []); deps = [ self.by-version."inline-source-map"."0.3.0" - self.by-version."convert-source-map"."0.3.3" + self.by-version."convert-source-map"."0.3.4" self.by-version."source-map"."0.1.33" ]; peerDependencies = [ @@ -3214,6 +3460,25 @@ }; by-spec."commander"."2.1.x" = self.by-version."commander"."2.1.0"; + by-spec."commander"."2.2.0" = + self.by-version."commander"."2.2.0"; + by-version."commander"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-commander-2.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.2.0.tgz"; + name = "commander-2.2.0.tgz"; + sha1 = "175ad4b9317f3ff615f201c1e57224f55a3e91df"; + }) + ]; + buildInputs = + (self.nativeDeps."commander" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "commander" ]; + }; by-spec."commander"."~0.6.1" = self.by-version."commander"."0.6.1"; by-spec."commander"."~2.1.0" = @@ -3237,15 +3502,34 @@ ]; passthru.names = [ "commondir" ]; }; - by-spec."compressible"."1.0.0" = - self.by-version."compressible"."1.0.0"; - by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-compressible-1.0.0"; + by-spec."component-emitter"."1.1.2" = + self.by-version."component-emitter"."1.1.2"; + by-version."component-emitter"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-component-emitter-1.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz"; - name = "compressible-1.0.0.tgz"; - sha1 = "f83e49c1cb61421753545125a8011d68b492427d"; + url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + name = "component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }) + ]; + buildInputs = + (self.nativeDeps."component-emitter" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "component-emitter" ]; + }; + by-spec."compressible"."1.0.1" = + self.by-version."compressible"."1.0.1"; + by-version."compressible"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-compressible-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/compressible/-/compressible-1.0.1.tgz"; + name = "compressible-1.0.1.tgz"; + sha1 = "8ed8224822c60c3c8dabcad34e913ed2952ad170"; }) ]; buildInputs = @@ -3256,44 +3540,45 @@ ]; passthru.names = [ "compressible" ]; }; - by-spec."compression"."1.0.0" = - self.by-version."compression"."1.0.0"; - by-version."compression"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-compression-1.0.0"; + by-spec."compression"."1.0.6" = + self.by-version."compression"."1.0.6"; + by-version."compression"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-compression-1.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz"; - name = "compression-1.0.0.tgz"; - sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020"; + url = "http://registry.npmjs.org/compression/-/compression-1.0.6.tgz"; + name = "compression-1.0.6.tgz"; + sha1 = "efbc5c5870980e9d7e5a9d6e6d7437cccf6a9a8a"; }) ]; buildInputs = (self.nativeDeps."compression" or []); deps = [ - self.by-version."bytes"."0.2.1" - self.by-version."negotiator"."0.3.0" - self.by-version."compressible"."1.0.0" + self.by-version."accepts"."1.0.2" + self.by-version."bytes"."1.0.0" + self.by-version."compressible"."1.0.1" + self.by-version."on-headers"."0.0.0" ]; peerDependencies = [ ]; passthru.names = [ "compression" ]; }; by-spec."concat-stream"."^1.4.1" = - self.by-version."concat-stream"."1.4.5"; - by-version."concat-stream"."1.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-concat-stream-1.4.5"; + self.by-version."concat-stream"."1.4.6"; + by-version."concat-stream"."1.4.6" = lib.makeOverridable self.buildNodePackage { + name = "node-concat-stream-1.4.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.5.tgz"; - name = "concat-stream-1.4.5.tgz"; - sha1 = "cbf6ffd17c15d58f0baeacbb47d927cf566446a6"; + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.6.tgz"; + name = "concat-stream-1.4.6.tgz"; + sha1 = "8cb736a556a32f020f1ddc82fa3448381c5e5cce"; }) ]; buildInputs = (self.nativeDeps."concat-stream" or []); deps = [ self.by-version."inherits"."2.0.1" - self.by-version."typedarray"."0.0.5" + self.by-version."typedarray"."0.0.6" self.by-version."readable-stream"."1.1.13-1" ]; peerDependencies = [ @@ -3301,7 +3586,9 @@ passthru.names = [ "concat-stream" ]; }; by-spec."concat-stream"."~1.4.1" = - self.by-version."concat-stream"."1.4.5"; + self.by-version."concat-stream"."1.4.6"; + by-spec."concat-stream"."~1.4.5" = + self.by-version."concat-stream"."1.4.6"; by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { @@ -3339,7 +3626,7 @@ (self.nativeDeps."config-chain" or []); deps = [ self.by-version."proto-list"."1.2.2" - self.by-version."ini"."1.1.0" + self.by-version."ini"."1.2.1" ]; peerDependencies = [ ]; @@ -3347,6 +3634,31 @@ }; by-spec."config-chain"."~1.1.8" = self.by-version."config-chain"."1.1.8"; + by-spec."configstore"."^0.3.0" = + self.by-version."configstore"."0.3.0"; + by-version."configstore"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-configstore-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/configstore/-/configstore-0.3.0.tgz"; + name = "configstore-0.3.0.tgz"; + sha1 = "9bf5a709e6a6df6559068dd0e7eab7d3c0c6791f"; + }) + ]; + buildInputs = + (self.nativeDeps."configstore" or []); + deps = [ + self.by-version."graceful-fs"."2.0.3" + self.by-version."js-yaml"."3.0.2" + self.by-version."mkdirp"."0.3.5" + self.by-version."object-assign"."0.2.2" + self.by-version."osenv"."0.0.3" + self.by-version."uuid"."1.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "configstore" ]; + }; by-spec."configstore"."~0.2.1" = self.by-version."configstore"."0.2.3"; by-version."configstore"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -3372,8 +3684,6 @@ ]; passthru.names = [ "configstore" ]; }; - by-spec."configstore"."~0.2.2" = - self.by-version."configstore"."0.2.3"; by-spec."connect"."1.x" = self.by-version."connect"."1.9.2"; by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage { @@ -3419,7 +3729,7 @@ self.by-version."fresh"."0.2.0" self.by-version."pause"."0.0.1" self.by-version."uid2"."0.0.3" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" self.by-version."methods"."0.0.1" self.by-version."raw-body"."0.0.3" self.by-version."negotiator"."0.3.0" @@ -3429,42 +3739,47 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.14.1" = - self.by-version."connect"."2.14.1"; - by-version."connect"."2.14.1" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-2.14.1"; + by-spec."connect"."2.19.4" = + self.by-version."connect"."2.19.4"; + by-version."connect"."2.19.4" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-2.19.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.14.1.tgz"; - name = "connect-2.14.1.tgz"; - sha1 = "e6fd676a5735ca703a89eb970f3d283fadecc2c7"; + url = "http://registry.npmjs.org/connect/-/connect-2.19.4.tgz"; + name = "connect-2.19.4.tgz"; + sha1 = "01f8f103b2ec7c7f26fea65645d38f3c89d295f7"; }) ]; buildInputs = (self.nativeDeps."connect" or []); deps = [ self.by-version."basic-auth-connect"."1.0.0" - self.by-version."cookie-parser"."1.0.1" + self.by-version."body-parser"."1.3.0" + self.by-version."bytes"."1.0.0" + self.by-version."cookie"."0.1.2" + self.by-version."cookie-parser"."1.1.0" self.by-version."cookie-signature"."1.0.3" - self.by-version."compression"."1.0.0" - self.by-version."connect-timeout"."1.0.0" - self.by-version."csurf"."1.0.0" - self.by-version."errorhandler"."1.0.0" - self.by-version."express-session"."1.0.2" + self.by-version."compression"."1.0.6" + self.by-version."connect-timeout"."1.1.0" + self.by-version."csurf"."1.2.0" + self.by-version."errorhandler"."1.0.2" + self.by-version."escape-html"."1.0.1" + self.by-version."express-session"."1.2.1" self.by-version."fresh"."0.2.2" - self.by-version."method-override"."1.0.0" - self.by-version."morgan"."1.0.0" + self.by-version."method-override"."2.0.2" + self.by-version."morgan"."1.1.1" + self.by-version."multiparty"."3.2.8" + self.by-version."on-headers"."0.0.0" + self.by-version."parseurl"."1.0.1" self.by-version."qs"."0.6.6" - self.by-version."response-time"."1.0.0" - self.by-version."serve-index"."1.0.1" - self.by-version."serve-static"."1.0.2" - self.by-version."static-favicon"."1.0.0" + self.by-version."response-time"."2.0.0" + self.by-version."serve-favicon"."2.0.1" + self.by-version."serve-index"."1.1.0" + self.by-version."serve-static"."1.2.1" + self.by-version."type-is"."1.2.0" self.by-version."vhost"."1.0.0" - self.by-version."bytes"."0.2.1" self.by-version."pause"."0.0.1" self.by-version."debug"."0.8.1" - self.by-version."raw-body"."1.1.3" - self.by-version."multiparty"."2.2.0" ]; peerDependencies = [ ]; @@ -3491,7 +3806,7 @@ self.by-version."bytes"."0.1.0" self.by-version."send"."0.0.3" self.by-version."fresh"."0.1.0" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" ]; peerDependencies = [ ]; @@ -3520,7 +3835,7 @@ self.by-version."bytes"."0.2.0" self.by-version."fresh"."0.1.0" self.by-version."pause"."0.0.1" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" ]; peerDependencies = [ ]; @@ -3549,54 +3864,14 @@ self.by-version."bytes"."0.2.0" self.by-version."fresh"."0.1.0" self.by-version."pause"."0.0.1" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.14.4"; - by-version."connect"."2.14.4" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-2.14.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.14.4.tgz"; - name = "connect-2.14.4.tgz"; - sha1 = "40e74de3947a5278035c12f21535604555609a5a"; - }) - ]; - buildInputs = - (self.nativeDeps."connect" or []); - deps = [ - self.by-version."basic-auth-connect"."1.0.0" - self.by-version."cookie-parser"."1.0.1" - self.by-version."cookie-signature"."1.0.3" - self.by-version."compression"."1.0.0" - self.by-version."connect-timeout"."1.0.0" - self.by-version."csurf"."1.1.0" - self.by-version."errorhandler"."1.0.0" - self.by-version."express-session"."1.0.2" - self.by-version."fresh"."0.2.2" - self.by-version."method-override"."1.0.0" - self.by-version."morgan"."1.0.0" - self.by-version."qs"."0.6.6" - self.by-version."response-time"."1.0.0" - self.by-version."setimmediate"."1.0.1" - self.by-version."serve-index"."1.0.1" - self.by-version."serve-static"."1.0.4" - self.by-version."static-favicon"."1.0.2" - self.by-version."vhost"."1.0.0" - self.by-version."bytes"."0.3.0" - self.by-version."pause"."0.0.1" - self.by-version."debug"."0.8.1" - self.by-version."raw-body"."1.1.3" - self.by-version."multiparty"."2.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "connect" ]; - }; + self.by-version."connect"."2.19.4"; by-spec."connect"."~2.12.0" = self.by-version."connect"."2.12.0"; by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { @@ -3692,14 +3967,14 @@ }; "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3"; by-spec."connect-mongo"."*" = - self.by-version."connect-mongo"."0.4.0"; - by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-mongo-0.4.0"; + self.by-version."connect-mongo"."0.4.1"; + by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-mongo-0.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz"; - name = "connect-mongo-0.4.0.tgz"; - sha1 = "4cb33728334a8f10f2d9e43d31369dbc2f856336"; + url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz"; + name = "connect-mongo-0.4.1.tgz"; + sha1 = "01ed3e71558fb3f0fdc97b784ef974f9909ddd11"; }) ]; buildInputs = @@ -3711,16 +3986,16 @@ ]; passthru.names = [ "connect-mongo" ]; }; - "connect-mongo" = self.by-version."connect-mongo"."0.4.0"; - by-spec."connect-timeout"."1.0.0" = - self.by-version."connect-timeout"."1.0.0"; - by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-timeout-1.0.0"; + "connect-mongo" = self.by-version."connect-mongo"."0.4.1"; + by-spec."connect-timeout"."1.1.0" = + self.by-version."connect-timeout"."1.1.0"; + by-version."connect-timeout"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-timeout-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz"; - name = "connect-timeout-1.0.0.tgz"; - sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb"; + url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.1.0.tgz"; + name = "connect-timeout-1.1.0.tgz"; + sha1 = "fc80615fc7a5b3863bd0319af2491d2d7fdc5f05"; }) ]; buildInputs = @@ -3751,20 +4026,21 @@ ]; passthru.names = [ "connection-parse" ]; }; - 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 = "node-console-browserify-0.1.6"; + by-spec."console-browserify"."1.1.x" = + self.by-version."console-browserify"."1.1.0"; + by-version."console-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-console-browserify-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz"; - name = "console-browserify-0.1.6.tgz"; - sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c"; + url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + name = "console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; }) ]; buildInputs = (self.nativeDeps."console-browserify" or []); deps = [ + self.by-version."date-now"."0.1.4" ]; peerDependencies = [ ]; @@ -3851,14 +4127,14 @@ passthru.names = [ "constants-browserify" ]; }; by-spec."convert-source-map"."~0.3.0" = - self.by-version."convert-source-map"."0.3.3"; - by-version."convert-source-map"."0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-convert-source-map-0.3.3"; + self.by-version."convert-source-map"."0.3.4"; + by-version."convert-source-map"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "node-convert-source-map-0.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.3.tgz"; - name = "convert-source-map-0.3.3.tgz"; - sha1 = "f77f130ded4e611d313a1bcf78f988990831c69b"; + url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.4.tgz"; + name = "convert-source-map-0.3.4.tgz"; + sha1 = "9bfff1d4a21b9be94da60271ea2b5e6b5a761572"; }) ]; buildInputs = @@ -3926,25 +4202,6 @@ ]; passthru.names = [ "cookie" ]; }; - by-spec."cookie"."0.1.1" = - self.by-version."cookie"."0.1.1"; - by-version."cookie"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cookie/-/cookie-0.1.1.tgz"; - name = "cookie-0.1.1.tgz"; - sha1 = "cbd4b537aa65f800b6c66ead2520ba8d6afbdf54"; - }) - ]; - buildInputs = - (self.nativeDeps."cookie" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "cookie" ]; - }; by-spec."cookie"."0.1.2" = self.by-version."cookie"."0.1.2"; by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -4002,29 +4259,29 @@ ]; passthru.names = [ "cookie-jar" ]; }; - by-spec."cookie-parser"."1.0.1" = - self.by-version."cookie-parser"."1.0.1"; - by-version."cookie-parser"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-parser-1.0.1"; + by-spec."cookie-parser"."1.1.0" = + self.by-version."cookie-parser"."1.1.0"; + by-version."cookie-parser"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-parser-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz"; - name = "cookie-parser-1.0.1.tgz"; - sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0"; + url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.1.0.tgz"; + name = "cookie-parser-1.1.0.tgz"; + sha1 = "2f8265aa3b55733a85eef207f0e2530c3e8cf705"; }) ]; buildInputs = (self.nativeDeps."cookie-parser" or []); deps = [ - self.by-version."cookie"."0.1.0" + self.by-version."cookie"."0.1.2" self.by-version."cookie-signature"."1.0.3" ]; peerDependencies = [ ]; passthru.names = [ "cookie-parser" ]; }; - by-spec."cookie-parser"."~1.0.1" = - self.by-version."cookie-parser"."1.0.1"; + by-spec."cookie-parser"."~1.1.0" = + self.by-version."cookie-parser"."1.1.0"; 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 { @@ -4101,35 +4358,54 @@ ]; passthru.names = [ "cookiejar" ]; }; - by-spec."cookies".">= 0.2.2" = - self.by-version."cookies"."0.4.0"; - by-version."cookies"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-cookies-0.4.0"; + by-spec."cookiejar"."1.3.2" = + self.by-version."cookiejar"."1.3.2"; + by-version."cookiejar"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-cookiejar-1.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookies/-/cookies-0.4.0.tgz"; - name = "cookies-0.4.0.tgz"; - sha1 = "c5d1f8b76217ed653135afe32bdad747c2fa9190"; + url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz"; + name = "cookiejar-1.3.2.tgz"; + sha1 = "61d3229e2da20c859032233502958a9b7df58249"; + }) + ]; + buildInputs = + (self.nativeDeps."cookiejar" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookiejar" ]; + }; + by-spec."cookies".">= 0.2.2" = + self.by-version."cookies"."0.4.1"; + by-version."cookies"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-cookies-0.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookies/-/cookies-0.4.1.tgz"; + name = "cookies-0.4.1.tgz"; + sha1 = "7d43bd00583c985acc032258b97988b7d03b629e"; }) ]; buildInputs = (self.nativeDeps."cookies" or []); deps = [ - self.by-version."keygrip"."1.0.0" + self.by-version."keygrip"."1.0.1" ]; peerDependencies = [ ]; passthru.names = [ "cookies" ]; }; by-spec."copy-paste"."~0.2.0" = - self.by-version."copy-paste"."0.2.0"; - by-version."copy-paste"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-copy-paste-0.2.0"; + self.by-version."copy-paste"."0.2.2"; + by-version."copy-paste"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-copy-paste-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.0.tgz"; - name = "copy-paste-0.2.0.tgz"; - sha1 = "6a83a3a073fc144adfa83cd03adb8db35953c424"; + url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.2.tgz"; + name = "copy-paste-0.2.2.tgz"; + sha1 = "036942c5ab735eec9a8e0a2308759e7feadb2625"; }) ]; buildInputs = @@ -4174,7 +4450,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = [ - self.by-version."request"."2.34.0" + self.by-version."request"."2.36.0" ]; peerDependencies = [ ]; @@ -4223,6 +4499,27 @@ ]; passthru.names = [ "crc" ]; }; + by-spec."crc32-stream"."~0.2.0" = + self.by-version."crc32-stream"."0.2.0"; + by-version."crc32-stream"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-crc32-stream-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz"; + name = "crc32-stream-0.2.0.tgz"; + sha1 = "5c80d480c8682f904b6f15530dbbe0b8c063dbbe"; + }) + ]; + buildInputs = + (self.nativeDeps."crc32-stream" or []); + deps = [ + self.by-version."readable-stream"."1.0.27-1" + self.by-version."buffer-crc32"."0.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "crc32-stream" ]; + }; by-spec."crossroads"."~0.12.0" = self.by-version."crossroads"."0.12.0"; by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage { @@ -4418,35 +4715,15 @@ ]; passthru.names = [ "css-stringify" ]; }; - by-spec."csurf"."1.0.0" = - self.by-version."csurf"."1.0.0"; - by-version."csurf"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-csurf-1.0.0"; + by-spec."csurf"."1.2.0" = + self.by-version."csurf"."1.2.0"; + by-version."csurf"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-csurf-1.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/csurf/-/csurf-1.0.0.tgz"; - name = "csurf-1.0.0.tgz"; - sha1 = "a68d5718b988032e270abf1f4b34f272753d745b"; - }) - ]; - buildInputs = - (self.nativeDeps."csurf" or []); - deps = [ - self.by-version."uid2"."0.0.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "csurf" ]; - }; - by-spec."csurf"."1.1.0" = - self.by-version."csurf"."1.1.0"; - by-version."csurf"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-csurf-1.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz"; - name = "csurf-1.1.0.tgz"; - sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2"; + url = "http://registry.npmjs.org/csurf/-/csurf-1.2.0.tgz"; + name = "csurf-1.2.0.tgz"; + sha1 = "56d1d1e921a4027e6adf87f51e706b825c74ab13"; }) ]; buildInputs = @@ -4516,7 +4793,27 @@ ]; passthru.names = [ "cycle" ]; }; - by-spec."dargs"."~0.1.0" = + by-spec."d"."~0.1.1" = + self.by-version."d"."0.1.1"; + by-version."d"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-d-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz"; + name = "d-0.1.1.tgz"; + sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309"; + }) + ]; + buildInputs = + (self.nativeDeps."d" or []); + deps = [ + self.by-version."es5-ext"."0.10.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "d" ]; + }; + by-spec."dargs"."^0.1.0" = self.by-version."dargs"."0.1.0"; by-version."dargs"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "node-dargs-0.1.0"; @@ -4535,6 +4832,27 @@ ]; passthru.names = [ "dargs" ]; }; + by-spec."dargs"."~0.1.0" = + self.by-version."dargs"."0.1.0"; + by-spec."date-now"."^0.1.4" = + self.by-version."date-now"."0.1.4"; + by-version."date-now"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-date-now-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; + name = "date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; + }) + ]; + buildInputs = + (self.nativeDeps."date-now" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "date-now" ]; + }; 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 { @@ -4555,14 +4873,14 @@ passthru.names = [ "dateformat" ]; }; 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 = "node-dateformat-1.0.7-1.2.3"; + self.by-version."dateformat"."1.0.8-1.2.3"; + by-version."dateformat"."1.0.8-1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-dateformat-1.0.8-1.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz"; - name = "dateformat-1.0.7-1.2.3.tgz"; - sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c"; + url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.8-1.2.3.tgz"; + name = "dateformat-1.0.8-1.2.3.tgz"; + sha1 = "5d60c5d574dc778a7f98139156c6cfc9d851d1e7"; }) ]; buildInputs = @@ -4574,19 +4892,20 @@ passthru.names = [ "dateformat" ]; }; by-spec."debug"."*" = - self.by-version."debug"."0.8.1"; - by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-0.8.1"; + self.by-version."debug"."1.0.1"; + by-version."debug"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-debug-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; - name = "debug-0.8.1.tgz"; - sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; + url = "http://registry.npmjs.org/debug/-/debug-1.0.1.tgz"; + name = "debug-1.0.1.tgz"; + sha1 = "3c03d40462f0be20468e4f77dd3f2bf7a722cfb7"; }) ]; buildInputs = (self.nativeDeps."debug" or []); deps = [ + self.by-version."ms"."0.6.2" ]; peerDependencies = [ ]; @@ -4630,23 +4949,87 @@ ]; passthru.names = [ "debug" ]; }; + by-spec."debug"."0.8.0" = + self.by-version."debug"."0.8.0"; + by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-debug-0.8.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz"; + name = "debug-0.8.0.tgz"; + sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; + by-spec."debug"."0.8.1" = + self.by-version."debug"."0.8.1"; + by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "node-debug-0.8.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; + name = "debug-0.8.1.tgz"; + sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; + by-spec."debug"."1.0.0" = + self.by-version."debug"."1.0.0"; + by-version."debug"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-debug-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-1.0.0.tgz"; + name = "debug-1.0.0.tgz"; + sha1 = "553678b67494cacc2d5330c24dfb2f275b1ceb5a"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = [ + self.by-version."ms"."0.6.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; by-spec."debug".">= 0.7.3 < 1" = self.by-version."debug"."0.8.1"; + by-spec."debug".">= 0.8.0 < 1" = + self.by-version."debug"."0.8.1"; + by-spec."debug"."^0.8.0" = + self.by-version."debug"."0.8.1"; by-spec."debug"."~0.7.0" = self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.2" = self.by-version."debug"."0.7.4"; by-spec."debug"."~0.8" = self.by-version."debug"."0.8.1"; + by-spec."debug"."~0.8.0" = + self.by-version."debug"."0.8.1"; by-spec."decompress"."^0.2.0" = - self.by-version."decompress"."0.2.3"; - by-version."decompress"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "decompress-0.2.3"; + self.by-version."decompress"."0.2.4"; + by-version."decompress"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "decompress-0.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress/-/decompress-0.2.3.tgz"; - name = "decompress-0.2.3.tgz"; - sha1 = "ad471a0fc51b7193b72f60c9e040ce1a7a4b9fcc"; + url = "http://registry.npmjs.org/decompress/-/decompress-0.2.4.tgz"; + name = "decompress-0.2.4.tgz"; + sha1 = "33d08cc3678d3f84cb0c7606242b4ff1faf8d45a"; }) ]; buildInputs = @@ -4655,10 +5038,10 @@ self.by-version."adm-zip"."0.4.4" self.by-version."extname"."0.1.2" self.by-version."get-stdin"."0.1.0" - self.by-version."map-key"."0.1.1" + self.by-version."map-key"."0.1.4" self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.2.0" - self.by-version."rimraf"."2.2.6" + self.by-version."nopt"."2.2.1" + self.by-version."rimraf"."2.2.8" self.by-version."stream-combiner"."0.0.4" self.by-version."tar"."0.1.19" self.by-version."tempfile"."0.1.3" @@ -4668,14 +5051,14 @@ passthru.names = [ "decompress" ]; }; by-spec."decompress-zip"."~0.0.3" = - self.by-version."decompress-zip"."0.0.6"; - by-version."decompress-zip"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "decompress-zip-0.0.6"; + self.by-version."decompress-zip"."0.0.8"; + by-version."decompress-zip"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "decompress-zip-0.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.6.tgz"; - name = "decompress-zip-0.0.6.tgz"; - sha1 = "263ef05b304cdcd1172858af453561c53ae017bb"; + url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz"; + name = "decompress-zip-0.0.8.tgz"; + sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3"; }) ]; buildInputs = @@ -4686,12 +5069,15 @@ self.by-version."binary"."0.3.0" self.by-version."touch"."0.0.2" self.by-version."readable-stream"."1.1.13-1" - self.by-version."nopt"."2.2.0" + self.by-version."nopt"."2.2.1" + self.by-version."graceful-fs"."3.0.1" ]; peerDependencies = [ ]; passthru.names = [ "decompress-zip" ]; }; + by-spec."decompress-zip"."~0.0.6" = + self.by-version."decompress-zip"."0.0.8"; 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 { @@ -4772,14 +5158,14 @@ passthru.names = [ "deep-equal" ]; }; by-spec."deep-extend"."~0.2.5" = - 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"; + self.by-version."deep-extend"."0.2.10"; + by-version."deep-extend"."0.2.10" = lib.makeOverridable self.buildNodePackage { + name = "node-deep-extend-0.2.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz"; - name = "deep-extend-0.2.8.tgz"; - sha1 = "6d2893a805286e46d8243137c32fb991b50f4299"; + url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz"; + name = "deep-extend-0.2.10.tgz"; + sha1 = "8dd87f56835e91a7da57d07f3c5472165cf5d467"; }) ]; buildInputs = @@ -4791,7 +5177,7 @@ passthru.names = [ "deep-extend" ]; }; by-spec."deep-extend"."~0.2.8" = - self.by-version."deep-extend"."0.2.8"; + self.by-version."deep-extend"."0.2.10"; by-spec."deepmerge"."*" = self.by-version."deepmerge"."0.2.7"; by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -4831,6 +5217,26 @@ ]; passthru.names = [ "defined" ]; }; + by-spec."deflate-crc32-stream"."~0.1.0" = + self.by-version."deflate-crc32-stream"."0.1.1"; + by-version."deflate-crc32-stream"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-deflate-crc32-stream-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.1.tgz"; + name = "deflate-crc32-stream-0.1.1.tgz"; + sha1 = "5df9e343174f56e7d6056e8ba1f91e5576c02160"; + }) + ]; + buildInputs = + (self.nativeDeps."deflate-crc32-stream" or []); + deps = [ + self.by-version."buffer-crc32"."0.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "deflate-crc32-stream" ]; + }; 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 { @@ -4851,14 +5257,14 @@ passthru.names = [ "delayed-stream" ]; }; by-spec."deps-sort"."~0.1.1" = - self.by-version."deps-sort"."0.1.1"; - by-version."deps-sort"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "deps-sort-0.1.1"; + self.by-version."deps-sort"."0.1.2"; + by-version."deps-sort"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "deps-sort-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz"; - name = "deps-sort-0.1.1.tgz"; - sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6"; + url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz"; + name = "deps-sort-0.1.2.tgz"; + sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a"; }) ]; buildInputs = @@ -4866,7 +5272,7 @@ deps = [ self.by-version."through"."2.3.4" self.by-version."JSONStream"."0.6.4" - self.by-version."minimist"."0.0.8" + self.by-version."minimist"."0.0.10" ]; peerDependencies = [ ]; @@ -4953,7 +5359,7 @@ ]; passthru.names = [ "diff" ]; }; - by-spec."diff"."~1.0.3" = + by-spec."diff"."^1.0.4" = self.by-version."diff"."1.0.8"; by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage { name = "node-diff-1.0.8"; @@ -4972,6 +5378,8 @@ ]; passthru.names = [ "diff" ]; }; + by-spec."diff"."~1.0.3" = + self.by-version."diff"."1.0.8"; by-spec."diff"."~1.0.4" = self.by-version."diff"."1.0.8"; by-spec."diff"."~1.0.7" = @@ -4995,36 +5403,36 @@ ]; passthru.names = [ "director" ]; }; - 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 = "node-dkim-signer-0.1.0"; + by-spec."dkim-signer"."~0.1.1" = + self.by-version."dkim-signer"."0.1.2"; + by-version."dkim-signer"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-dkim-signer-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz"; - name = "dkim-signer-0.1.0.tgz"; - sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b"; + url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz"; + name = "dkim-signer-0.1.2.tgz"; + sha1 = "2ff5d61c87d8fbff5a8b131cffc5ec3ba1c25553"; }) ]; buildInputs = (self.nativeDeps."dkim-signer" or []); deps = [ self.by-version."punycode"."1.2.4" - self.by-version."mimelib"."0.2.14" + self.by-version."mimelib"."0.2.16" ]; peerDependencies = [ ]; passthru.names = [ "dkim-signer" ]; }; by-spec."domain-browser"."~1.1.0" = - self.by-version."domain-browser"."1.1.1"; - by-version."domain-browser"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-domain-browser-1.1.1"; + self.by-version."domain-browser"."1.1.2"; + by-version."domain-browser"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-domain-browser-1.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz"; - name = "domain-browser-1.1.1.tgz"; - sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0"; + url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz"; + name = "domain-browser-1.1.2.tgz"; + sha1 = "5a21f30a29a9891533915061426974dc2f14e56b"; }) ]; buildInputs = @@ -5074,26 +5482,6 @@ ]; passthru.names = [ "domhandler" ]; }; - by-spec."domhandler"."2.1" = - self.by-version."domhandler"."2.1.0"; - by-version."domhandler"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-domhandler-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz"; - name = "domhandler-2.1.0.tgz"; - sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"; - }) - ]; - buildInputs = - (self.nativeDeps."domhandler" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domhandler" ]; - }; by-spec."domhandler"."2.2" = self.by-version."domhandler"."2.2.0"; by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -5174,33 +5562,55 @@ ]; passthru.names = [ "domutils" ]; }; - by-spec."download"."~0.1.6" = - self.by-version."download"."0.1.16"; - by-version."download"."0.1.16" = lib.makeOverridable self.buildNodePackage { - name = "download-0.1.16"; + by-spec."domutils"."1.5" = + self.by-version."domutils"."1.5.0"; + by-version."domutils"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-domutils-1.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/download/-/download-0.1.16.tgz"; - name = "download-0.1.16.tgz"; - sha1 = "46783e7f590d1c0d49eb1915ab8941c74cb45e99"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.5.0.tgz"; + name = "domutils-1.5.0.tgz"; + sha1 = "bfa4ceb8b7ab6f9423fe59154e04da6cc3ff3949"; + }) + ]; + buildInputs = + (self.nativeDeps."domutils" or []); + deps = [ + self.by-version."domelementtype"."1.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "domutils" ]; + }; + by-spec."download"."^0.1.6" = + self.by-version."download"."0.1.17"; + by-version."download"."0.1.17" = lib.makeOverridable self.buildNodePackage { + name = "download-0.1.17"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/download/-/download-0.1.17.tgz"; + name = "download-0.1.17.tgz"; + sha1 = "c2516c92b05d0447364e9a9e0ea060edef79dc3a"; }) ]; buildInputs = (self.nativeDeps."download" or []); deps = [ - self.by-version."decompress"."0.2.3" - self.by-version."each-async"."0.1.2" + self.by-version."decompress"."0.2.4" + self.by-version."each-async"."0.1.3" self.by-version."get-stdin"."0.1.0" - self.by-version."get-urls"."0.1.1" + self.by-version."get-urls"."0.1.2" self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.2.0" - self.by-version."request"."2.34.0" - self.by-version."through2"."0.4.1" + self.by-version."nopt"."2.2.1" + self.by-version."request"."2.36.0" + self.by-version."through2"."0.4.2" ]; peerDependencies = [ ]; passthru.names = [ "download" ]; }; + by-spec."download"."~0.1.6" = + self.by-version."download"."0.1.17"; by-spec."dox"."~0.4.4" = self.by-version."dox"."0.4.4"; by-version."dox"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -5222,6 +5632,25 @@ ]; passthru.names = [ "dox" ]; }; + by-spec."drawille"."0.0.3" = + self.by-version."drawille"."0.0.3"; + by-version."drawille"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-drawille-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/drawille/-/drawille-0.0.3.tgz"; + name = "drawille-0.0.3.tgz"; + sha1 = "182dda93748911f2583d37b423a1ad04f3337f91"; + }) + ]; + buildInputs = + (self.nativeDeps."drawille" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "drawille" ]; + }; 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 { @@ -5260,15 +5689,35 @@ ]; passthru.names = [ "duplexer" ]; }; - by-spec."each-async"."^0.1.1" = - self.by-version."each-async"."0.1.2"; - by-version."each-async"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-each-async-0.1.2"; + by-spec."duplexer2"."0.0.2" = + self.by-version."duplexer2"."0.0.2"; + by-version."duplexer2"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-duplexer2-0.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/each-async/-/each-async-0.1.2.tgz"; - name = "each-async-0.1.2.tgz"; - sha1 = "d5b900bd92705ed5b8cad3307a6536adb0f134c6"; + url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; + name = "duplexer2-0.0.2.tgz"; + sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + }) + ]; + buildInputs = + (self.nativeDeps."duplexer2" or []); + deps = [ + self.by-version."readable-stream"."1.1.13-1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "duplexer2" ]; + }; + by-spec."each-async"."^0.1.1" = + self.by-version."each-async"."0.1.3"; + by-version."each-async"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-each-async-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/each-async/-/each-async-0.1.3.tgz"; + name = "each-async-0.1.3.tgz"; + sha1 = "b436025b08da2f86608025519e3096763dedfca3"; }) ]; buildInputs = @@ -5336,26 +5785,7 @@ ]; passthru.names = [ "emitter-component" ]; }; - 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 = "node-emitter-component-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz"; - name = "emitter-component-1.0.0.tgz"; - sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f"; - }) - ]; - buildInputs = - (self.nativeDeps."emitter-component" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "emitter-component" ]; - }; - by-spec."encoding"."~0.1" = + by-spec."encoding"."~0.1.7" = self.by-version."encoding"."0.1.7"; by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "node-encoding-0.1.7"; @@ -5375,6 +5805,26 @@ ]; passthru.names = [ "encoding" ]; }; + by-spec."end-of-stream"."~0.1.3" = + self.by-version."end-of-stream"."0.1.4"; + by-version."end-of-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-end-of-stream-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.4.tgz"; + name = "end-of-stream-0.1.4.tgz"; + sha1 = "4a69b38706ecaaed83c53d22b7f073848ca9a203"; + }) + ]; + buildInputs = + (self.nativeDeps."end-of-stream" or []); + deps = [ + self.by-version."once"."1.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "end-of-stream" ]; + }; by-spec."entities"."0.x" = self.by-version."entities"."0.5.0"; by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -5394,6 +5844,44 @@ ]; passthru.names = [ "entities" ]; }; + by-spec."entities"."1.0" = + self.by-version."entities"."1.0.0"; + by-version."entities"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-entities-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; + name = "entities-1.0.0.tgz"; + sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; + }) + ]; + buildInputs = + (self.nativeDeps."entities" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "entities" ]; + }; + by-spec."entities"."~1.1.1" = + self.by-version."entities"."1.1.1"; + by-version."entities"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-entities-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; + name = "entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + }) + ]; + buildInputs = + (self.nativeDeps."entities" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "entities" ]; + }; by-spec."envify"."~1.2.0" = self.by-version."envify"."1.2.1"; by-version."envify"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -5417,15 +5905,15 @@ ]; passthru.names = [ "envify" ]; }; - by-spec."errorhandler"."1.0.0" = - self.by-version."errorhandler"."1.0.0"; - by-version."errorhandler"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-errorhandler-1.0.0"; + by-spec."errorhandler"."1.0.2" = + self.by-version."errorhandler"."1.0.2"; + by-version."errorhandler"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-errorhandler-1.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz"; - name = "errorhandler-1.0.0.tgz"; - sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a"; + url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.2.tgz"; + name = "errorhandler-1.0.2.tgz"; + sha1 = "587d47bbbbc48cffe132c3acda7215c902558108"; }) ]; buildInputs = @@ -5436,6 +5924,29 @@ ]; passthru.names = [ "errorhandler" ]; }; + by-spec."es5-ext"."~0.10.2" = + self.by-version."es5-ext"."0.10.4"; + by-version."es5-ext"."0.10.4" = lib.makeOverridable self.buildNodePackage { + name = "node-es5-ext-0.10.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.4.tgz"; + name = "es5-ext-0.10.4.tgz"; + sha1 = "f4d7d85d45acfbe93379d4c0948fbae6466ec876"; + }) + ]; + buildInputs = + (self.nativeDeps."es5-ext" or []); + deps = [ + self.by-version."es6-iterator"."0.1.1" + self.by-version."es6-symbol"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "es5-ext" ]; + }; + by-spec."es5-ext"."~0.10.4" = + self.by-version."es5-ext"."0.10.4"; by-spec."es5-ext"."~0.9.2" = self.by-version."es5-ext"."0.9.2"; by-version."es5-ext"."0.9.2" = lib.makeOverridable self.buildNodePackage { @@ -5455,6 +5966,49 @@ ]; passthru.names = [ "es5-ext" ]; }; + by-spec."es6-iterator"."~0.1.1" = + self.by-version."es6-iterator"."0.1.1"; + by-version."es6-iterator"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-es6-iterator-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.1.tgz"; + name = "es6-iterator-0.1.1.tgz"; + sha1 = "5e136c899aa1c26296414f90859b73934812d275"; + }) + ]; + buildInputs = + (self.nativeDeps."es6-iterator" or []); + deps = [ + self.by-version."d"."0.1.1" + self.by-version."es5-ext"."0.10.4" + self.by-version."es6-symbol"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "es6-iterator" ]; + }; + by-spec."es6-symbol"."0.1.x" = + self.by-version."es6-symbol"."0.1.0"; + by-version."es6-symbol"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-es6-symbol-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.0.tgz"; + name = "es6-symbol-0.1.0.tgz"; + sha1 = "ba5878f37a652f6c713244716fc7b24d61d2dc39"; + }) + ]; + buildInputs = + (self.nativeDeps."es6-symbol" or []); + deps = [ + self.by-version."d"."0.1.1" + self.by-version."es5-ext"."0.10.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "es6-symbol" ]; + }; by-spec."escape-html"."*" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -5478,14 +6032,14 @@ by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; by-spec."escodegen"."1.3.x" = - self.by-version."escodegen"."1.3.2"; - by-version."escodegen"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.3.2"; + self.by-version."escodegen"."1.3.3"; + by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.2.tgz"; - name = "escodegen-1.3.2.tgz"; - sha1 = "bb0f434dbd594f2060639a79b4b06259dd5372de"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; + name = "escodegen-1.3.3.tgz"; + sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; }) ]; buildInputs = @@ -5547,6 +6101,8 @@ ]; passthru.names = [ "escodegen" ]; }; + by-spec."escodegen"."~1.3.1" = + self.by-version."escodegen"."1.3.3"; by-spec."escope"."~ 1.0.0" = self.by-version."escope"."1.0.1"; by-version."escope"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -5613,15 +6169,15 @@ ]; passthru.names = [ "esmangle" ]; }; - by-spec."esprima"."1.1.x" = - self.by-version."esprima"."1.1.1"; - by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "esprima-1.1.1"; + by-spec."esprima"."1.2.x" = + self.by-version."esprima"."1.2.2"; + by-version."esprima"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "esprima-1.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - name = "esprima-1.1.1.tgz"; - sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; + url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz"; + name = "esprima-1.2.2.tgz"; + sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b"; }) ]; buildInputs = @@ -5657,6 +6213,23 @@ self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.1.1" = self.by-version."esprima"."1.1.1"; + by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "esprima-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; + name = "esprima-1.1.1.tgz"; + sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "esprima" ]; + }; by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage { @@ -5842,6 +6415,27 @@ ]; passthru.names = [ "event-emitter" ]; }; + by-spec."event-emitter"."~0.3.1" = + self.by-version."event-emitter"."0.3.1"; + by-version."event-emitter"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "node-event-emitter-0.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.1.tgz"; + name = "event-emitter-0.3.1.tgz"; + sha1 = "1425ca9c5649a1a31ba835bd9dba6bfad3880238"; + }) + ]; + buildInputs = + (self.nativeDeps."event-emitter" or []); + deps = [ + self.by-version."es5-ext"."0.10.4" + self.by-version."d"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "event-emitter" ]; + }; by-spec."event-stream"."~0.5" = self.by-version."event-stream"."0.5.3"; by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage { @@ -5902,15 +6496,34 @@ }; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.13"; - by-spec."events"."~1.0.0" = - self.by-version."events"."1.0.0"; - by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-events-1.0.0"; + by-spec."eventemitter3"."*" = + self.by-version."eventemitter3"."0.1.2"; + by-version."eventemitter3"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-eventemitter3-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz"; - name = "events-1.0.0.tgz"; - sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0"; + url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.2.tgz"; + name = "eventemitter3-0.1.2.tgz"; + sha1 = "4ede96d72b971a217987df4f1d4ca54dd8d20b79"; + }) + ]; + buildInputs = + (self.nativeDeps."eventemitter3" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "eventemitter3" ]; + }; + by-spec."events"."~1.0.0" = + self.by-version."events"."1.0.1"; + by-version."events"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-events-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/events/-/events-1.0.1.tgz"; + name = "events-1.0.1.tgz"; + sha1 = "386f6471cbb609e7925e7bfe7468634b9e069ac2"; }) ]; buildInputs = @@ -5957,12 +6570,12 @@ self.by-version."oauth"."0.9.11" self.by-version."request"."2.9.203" self.by-version."connect"."2.3.9" - self.by-version."openid"."0.5.8" - self.by-version."xml2js"."0.4.2" + self.by-version."openid"."0.5.9" + self.by-version."xml2js"."0.4.4" self.by-version."node-swt"."0.1.1" self.by-version."node-wsfederation"."0.1.1" self.by-version."debug"."0.5.0" - self.by-version."express"."3.5.1" + self.by-version."express"."3.10.3" ]; peerDependencies = [ ]; @@ -5988,7 +6601,7 @@ ]; passthru.names = [ "execSync" ]; }; - by-spec."exit"."0.1.x" = + by-spec."exit"."0.1.2" = self.by-version."exit"."0.1.2"; by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "node-exit-0.1.2"; @@ -6007,37 +6620,40 @@ ]; passthru.names = [ "exit" ]; }; + by-spec."exit"."0.1.x" = + self.by-version."exit"."0.1.2"; by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."4.0.0"; - by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.0.0"; + self.by-version."express"."4.4.1"; + by-version."express"."4.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz"; - name = "express-4.0.0.tgz"; - sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094"; + url = "http://registry.npmjs.org/express/-/express-4.4.1.tgz"; + name = "express-4.4.1.tgz"; + sha1 = "9e0364d1c74e076d7409d302429a384b10dfbd42"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."parseurl"."1.0.1" - self.by-version."accepts"."1.0.0" - self.by-version."type-is"."1.0.0" - self.by-version."range-parser"."1.0.0" - self.by-version."cookie"."0.1.0" + self.by-version."accepts"."1.0.2" self.by-version."buffer-crc32"."0.2.1" + self.by-version."methods"."1.0.1" + self.by-version."parseurl"."1.0.1" + self.by-version."proxy-addr"."1.0.0" + self.by-version."range-parser"."1.0.0" + self.by-version."send"."0.4.1" + self.by-version."serve-static"."1.2.1" + self.by-version."type-is"."1.2.0" + self.by-version."cookie"."0.1.2" self.by-version."fresh"."0.2.2" - self.by-version."methods"."0.1.0" - self.by-version."send"."0.2.0" self.by-version."cookie-signature"."1.0.3" self.by-version."merge-descriptors"."0.0.2" self.by-version."utils-merge"."1.0.0" self.by-version."escape-html"."1.0.1" self.by-version."qs"."0.6.6" - self.by-version."serve-static"."1.0.1" self.by-version."path-to-regexp"."0.1.2" self.by-version."debug"."0.8.1" ]; @@ -6045,7 +6661,7 @@ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.0.0"; + "express" = self.by-version."express"."4.4.1"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -6093,7 +6709,7 @@ self.by-version."methods"."0.0.1" self.by-version."send"."0.1.0" self.by-version."cookie-signature"."1.0.1" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" ]; peerDependencies = [ ]; @@ -6123,45 +6739,49 @@ self.by-version."methods"."0.1.0" self.by-version."send"."0.1.4" self.by-version."cookie-signature"."1.0.1" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.5.1"; - by-version."express"."3.5.1" = lib.makeOverridable self.buildNodePackage { - name = "express-3.5.1"; + self.by-version."express"."3.10.3"; + by-version."express"."3.10.3" = lib.makeOverridable self.buildNodePackage { + name = "express-3.10.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.5.1.tgz"; - name = "express-3.5.1.tgz"; - sha1 = "4b333e1117faca336a538f4c724140b9ce1a87e7"; + url = "http://registry.npmjs.org/express/-/express-3.10.3.tgz"; + name = "express-3.10.3.tgz"; + sha1 = "d669d5fa2d79fa6349af5fa6338d646bc346ada5"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."connect"."2.14.1" - self.by-version."commander"."1.3.2" - self.by-version."range-parser"."1.0.0" - self.by-version."mkdirp"."0.3.5" - self.by-version."cookie"."0.1.1" self.by-version."buffer-crc32"."0.2.1" + self.by-version."connect"."2.19.4" + self.by-version."commander"."1.3.2" + self.by-version."debug"."1.0.0" + self.by-version."escape-html"."1.0.1" + self.by-version."methods"."1.0.1" + self.by-version."mkdirp"."0.5.0" + self.by-version."parseurl"."1.0.1" + self.by-version."proxy-addr"."1.0.1" + self.by-version."range-parser"."1.0.0" + self.by-version."send"."0.4.1" + self.by-version."vary"."0.1.0" + self.by-version."cookie"."0.1.2" self.by-version."fresh"."0.2.2" - self.by-version."methods"."0.1.0" - self.by-version."send"."0.2.0" self.by-version."cookie-signature"."1.0.3" self.by-version."merge-descriptors"."0.0.2" - self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; by-spec."express".">=3.0.0" = - self.by-version."express"."4.0.0"; + self.by-version."express"."4.4.1"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -6186,16 +6806,84 @@ self.by-version."methods"."0.0.1" self.by-version."send"."0.1.0" self.by-version."cookie-signature"."1.0.0" + self.by-version."debug"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; + by-spec."express"."~4.0" = + self.by-version."express"."4.0.0"; + by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz"; + name = "express-4.0.0.tgz"; + sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = [ + self.by-version."parseurl"."1.0.1" + self.by-version."accepts"."1.0.0" + self.by-version."type-is"."1.0.0" + self.by-version."range-parser"."1.0.0" + self.by-version."cookie"."0.1.0" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.2.2" + self.by-version."methods"."0.1.0" + self.by-version."send"."0.2.0" + self.by-version."cookie-signature"."1.0.3" + self.by-version."merge-descriptors"."0.0.2" + self.by-version."utils-merge"."1.0.0" + self.by-version."escape-html"."1.0.1" + self.by-version."qs"."0.6.6" + self.by-version."serve-static"."1.0.1" + self.by-version."path-to-regexp"."0.1.2" + self.by-version."debug"."0.8.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; + by-spec."express"."~4.2.0" = + self.by-version."express"."4.2.0"; + by-version."express"."4.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-4.2.0.tgz"; + name = "express-4.2.0.tgz"; + sha1 = "3121993a45126693e8bf897aefb4dd783762dc60"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = [ + self.by-version."parseurl"."1.0.1" + self.by-version."accepts"."1.0.1" + self.by-version."type-is"."1.1.0" + self.by-version."range-parser"."1.0.0" + self.by-version."cookie"."0.1.2" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.2.2" + self.by-version."methods"."1.0.0" + self.by-version."send"."0.3.0" + self.by-version."cookie-signature"."1.0.3" + self.by-version."merge-descriptors"."0.0.2" + self.by-version."utils-merge"."1.0.0" + self.by-version."escape-html"."1.0.1" + self.by-version."qs"."0.6.6" + self.by-version."serve-static"."1.1.0" + self.by-version."path-to-regexp"."0.1.2" self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - by-spec."express"."~3.5" = - self.by-version."express"."3.5.1"; - by-spec."express"."~4.0.0-rc4" = - self.by-version."express"."4.0.0"; by-spec."express-form"."*" = self.by-version."express-form"."0.12.2"; by-version."express-form"."0.12.2" = lib.makeOverridable self.buildNodePackage { @@ -6215,7 +6903,7 @@ self.by-version."async"."0.2.10" ]; peerDependencies = [ - self.by-version."express"."4.0.0" + self.by-version."express"."4.4.1" ]; passthru.names = [ "express-form" ]; }; @@ -6239,40 +6927,41 @@ ]; passthru.names = [ "express-partials" ]; }; - by-spec."express-session"."1.0.2" = - self.by-version."express-session"."1.0.2"; - by-version."express-session"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-express-session-1.0.2"; + by-spec."express-session"."1.2.1" = + self.by-version."express-session"."1.2.1"; + by-version."express-session"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-express-session-1.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz"; - name = "express-session-1.0.2.tgz"; - sha1 = "004478c742561774411ceb79733155a56b6d49eb"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.2.1.tgz"; + name = "express-session-1.2.1.tgz"; + sha1 = "2741a1661eb3a4a17a7db0a48049fbf05574e465"; }) ]; buildInputs = (self.nativeDeps."express-session" or []); deps = [ self.by-version."utils-merge"."1.0.0" - self.by-version."cookie"."0.1.0" + self.by-version."cookie"."0.1.2" self.by-version."cookie-signature"."1.0.3" + self.by-version."on-headers"."0.0.0" self.by-version."uid2"."0.0.3" self.by-version."buffer-crc32"."0.2.1" - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express-session" ]; }; - by-spec."express-session"."~1.0.2" = - self.by-version."express-session"."1.0.3"; - by-version."express-session"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-express-session-1.0.3"; + by-spec."express-session"."~1.1.0" = + self.by-version."express-session"."1.1.0"; + by-version."express-session"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-session-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.0.3.tgz"; - name = "express-session-1.0.3.tgz"; - sha1 = "a45ec65dda263f74f3b5b9c6da0ac74c36ac0639"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.1.0.tgz"; + name = "express-session-1.1.0.tgz"; + sha1 = "8c010bf58109ea235a65566d2a96703b41ee6eae"; }) ]; buildInputs = @@ -6283,7 +6972,7 @@ self.by-version."cookie-signature"."1.0.3" self.by-version."uid2"."0.0.3" self.by-version."buffer-crc32"."0.2.1" - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -6345,7 +7034,7 @@ (self.nativeDeps."extname" or []); deps = [ self.by-version."ext-list"."0.1.0" - self.by-version."map-key"."0.1.1" + self.by-version."map-key"."0.1.4" self.by-version."underscore.string"."2.3.3" ]; peerDependencies = [ @@ -6445,33 +7134,15 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = [ - self.by-version."websocket-driver"."0.3.2" + self.by-version."websocket-driver"."0.3.4" ]; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; "faye-websocket" = self.by-version."faye-websocket"."0.7.2"; - 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 = "node-faye-websocket-0.7.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; - name = "faye-websocket-0.7.0.tgz"; - sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be"; - }) - ]; - buildInputs = - (self.nativeDeps."faye-websocket" or []); - deps = [ - self.by-version."websocket-driver"."0.3.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "faye-websocket" ]; - }; + by-spec."faye-websocket"."0.7.2" = + self.by-version."faye-websocket"."0.7.2"; by-spec."fetch-bower"."*" = self.by-version."fetch-bower"."2.0.0"; by-version."fetch-bower"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -6488,8 +7159,8 @@ deps = [ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" - self.by-version."bower"."1.3.2" - self.by-version."glob"."3.2.9" + self.by-version."bower"."1.3.5" + self.by-version."glob"."3.2.11" ]; peerDependencies = [ ]; @@ -6520,6 +7191,32 @@ ]; passthru.names = [ "fields" ]; }; + by-spec."file-utils"."^0.2.0" = + self.by-version."file-utils"."0.2.0"; + by-version."file-utils"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-file-utils-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/file-utils/-/file-utils-0.2.0.tgz"; + name = "file-utils-0.2.0.tgz"; + sha1 = "0372c89b19bd96fc9a02a180c91fad29e4dbacaa"; + }) + ]; + buildInputs = + (self.nativeDeps."file-utils" or []); + deps = [ + self.by-version."lodash"."2.4.1" + self.by-version."iconv-lite"."0.2.11" + self.by-version."rimraf"."2.2.8" + self.by-version."glob"."3.2.11" + self.by-version."minimatch"."0.2.14" + self.by-version."findup-sync"."0.1.3" + self.by-version."isbinaryfile"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "file-utils" ]; + }; 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 { @@ -6536,8 +7233,8 @@ deps = [ self.by-version."lodash"."2.1.0" self.by-version."iconv-lite"."0.2.11" - self.by-version."rimraf"."2.2.6" - self.by-version."glob"."3.2.9" + self.by-version."rimraf"."2.2.8" + self.by-version."glob"."3.2.11" self.by-version."minimatch"."0.2.14" self.by-version."findup-sync"."0.1.3" self.by-version."isbinaryfile"."0.1.9" @@ -6546,8 +7243,8 @@ ]; passthru.names = [ "file-utils" ]; }; - by-spec."file-utils"."~0.1.5" = - self.by-version."file-utils"."0.1.5"; + by-spec."file-utils"."~0.2.0" = + self.by-version."file-utils"."0.2.0"; by-spec."fileset"."0.1.x" = self.by-version."fileset"."0.1.5"; by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -6562,22 +7259,22 @@ buildInputs = (self.nativeDeps."fileset" or []); deps = [ - self.by-version."minimatch"."0.2.14" - self.by-version."glob"."3.2.9" + self.by-version."minimatch"."0.3.0" + self.by-version."glob"."3.2.11" ]; peerDependencies = [ ]; passthru.names = [ "fileset" ]; }; by-spec."findit".">=1.1.0 <2.0.0" = - self.by-version."findit"."1.1.1"; - by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-findit-1.1.1"; + self.by-version."findit"."1.2.0"; + by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-findit-1.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz"; - name = "findit-1.1.1.tgz"; - sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a"; + url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz"; + name = "findit-1.2.0.tgz"; + sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8"; }) ]; buildInputs = @@ -6609,7 +7306,7 @@ ]; passthru.names = [ "findup" ]; }; - by-spec."findup-sync"."~0.1.0" = + by-spec."findup-sync"."^0.1.2" = self.by-version."findup-sync"."0.1.3"; by-version."findup-sync"."0.1.3" = lib.makeOverridable self.buildNodePackage { name = "node-findup-sync-0.1.3"; @@ -6623,15 +7320,36 @@ buildInputs = (self.nativeDeps."findup-sync" or []); deps = [ - self.by-version."glob"."3.2.9" + self.by-version."glob"."3.2.11" self.by-version."lodash"."2.4.1" ]; peerDependencies = [ ]; passthru.names = [ "findup-sync" ]; }; + by-spec."findup-sync"."~0.1.0" = + self.by-version."findup-sync"."0.1.3"; by-spec."findup-sync"."~0.1.2" = self.by-version."findup-sync"."0.1.3"; + by-spec."finished"."1.1.4" = + self.by-version."finished"."1.1.4"; + by-version."finished"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-finished-1.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/finished/-/finished-1.1.4.tgz"; + name = "finished-1.1.4.tgz"; + sha1 = "4db9fe20f920bccc2e7126ffa84175c8fcacb5d9"; + }) + ]; + buildInputs = + (self.nativeDeps."finished" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "finished" ]; + }; by-spec."flatiron"."*" = self.by-version."flatiron"."0.3.11"; by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage { @@ -6698,15 +7416,34 @@ ]; passthru.names = [ "forEachAsync" ]; }; - by-spec."forever"."*" = - self.by-version."forever"."0.11.0"; - by-version."forever"."0.11.0" = lib.makeOverridable self.buildNodePackage { - name = "forever-0.11.0"; + by-spec."foreachasync"."3.x" = + self.by-version."foreachasync"."3.0.0"; + by-version."foreachasync"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-foreachasync-3.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.11.0.tgz"; - name = "forever-0.11.0.tgz"; - sha1 = "97de678915c64dacce2ccbfb94620723b308d44f"; + url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; + name = "foreachasync-3.0.0.tgz"; + sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + }) + ]; + buildInputs = + (self.nativeDeps."foreachasync" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "foreachasync" ]; + }; + by-spec."forever"."*" = + self.by-version."forever"."0.11.1"; + by-version."forever"."0.11.1" = lib.makeOverridable self.buildNodePackage { + name = "forever-0.11.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forever/-/forever-0.11.1.tgz"; + name = "forever-0.11.1.tgz"; + sha1 = "50ac8744c0a6e0c266524c4746397f74d6b09c5b"; }) ]; buildInputs = @@ -6729,7 +7466,7 @@ ]; passthru.names = [ "forever" ]; }; - "forever" = self.by-version."forever"."0.11.0"; + "forever" = self.by-version."forever"."0.11.1"; 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 { @@ -6821,6 +7558,28 @@ }; by-spec."forever-monitor"."1.2.3" = self.by-version."forever-monitor"."1.2.3"; + by-spec."form-data"."0.1.2" = + self.by-version."form-data"."0.1.2"; + by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-form-data-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; + name = "form-data-0.1.2.tgz"; + sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; + }) + ]; + 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.10" + ]; + 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 { @@ -6844,14 +7603,14 @@ passthru.names = [ "form-data" ]; }; 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 = "node-form-data-0.1.2"; + self.by-version."form-data"."0.1.3"; + by-version."form-data"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-form-data-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; - name = "form-data-0.1.2.tgz"; - sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; + name = "form-data-0.1.3.tgz"; + sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; }) ]; buildInputs = @@ -6859,7 +7618,7 @@ deps = [ self.by-version."combined-stream"."0.0.4" self.by-version."mime"."1.2.11" - self.by-version."async"."0.2.10" + self.by-version."async"."0.9.0" ]; peerDependencies = [ ]; @@ -7039,7 +7798,7 @@ self.by-version."ncp"."0.4.2" self.by-version."mkdirp"."0.3.5" self.by-version."jsonfile"."1.0.1" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" ]; peerDependencies = [ ]; @@ -7059,7 +7818,7 @@ buildInputs = (self.nativeDeps."fs-walk" or []); deps = [ - self.by-version."async"."0.7.0" + self.by-version."async"."0.9.0" ]; peerDependencies = [ ]; @@ -7124,7 +7883,7 @@ buildInputs = (self.nativeDeps."fstream" or []); deps = [ - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" self.by-version."mkdirp"."0.3.5" self.by-version."graceful-fs"."2.0.3" self.by-version."inherits"."2.0.1" @@ -7141,45 +7900,45 @@ self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.8" = self.by-version."fstream"."0.1.25"; - 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 = "node-fstream-ignore-0.0.7"; + by-spec."fstream-ignore"."~0.0" = + self.by-version."fstream-ignore"."0.0.8"; + by-version."fstream-ignore"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "node-fstream-ignore-0.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; - name = "fstream-ignore-0.0.7.tgz"; - sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz"; + name = "fstream-ignore-0.0.8.tgz"; + sha1 = "cc4830fb9963178be5d9eb37569a4a0785cf9e53"; }) ]; buildInputs = (self.nativeDeps."fstream-ignore" or []); deps = [ - self.by-version."minimatch"."0.2.14" self.by-version."fstream"."0.1.25" self.by-version."inherits"."2.0.1" + self.by-version."minimatch"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "fstream-ignore" ]; }; by-spec."fstream-ignore"."~0.0.6" = - self.by-version."fstream-ignore"."0.0.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 = "node-fstream-npm-0.1.6"; + self.by-version."fstream-ignore"."0.0.8"; + by-spec."fstream-npm"."~0.1.7" = + self.by-version."fstream-npm"."0.1.7"; + by-version."fstream-npm"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "node-fstream-npm-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz"; - name = "fstream-npm-0.1.6.tgz"; - sha1 = "1369323075d9bd85cfcc9409f33f0d6fe5be104d"; + url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.7.tgz"; + name = "fstream-npm-0.1.7.tgz"; + sha1 = "423dc5d1d1fcb7d878501f43c7e11a33292bd55f"; }) ]; buildInputs = (self.nativeDeps."fstream-npm" or []); deps = [ - self.by-version."fstream-ignore"."0.0.7" + self.by-version."fstream-ignore"."0.0.8" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ @@ -7187,45 +7946,47 @@ passthru.names = [ "fstream-npm" ]; }; by-spec."generator-angular"."*" = - self.by-version."generator-angular"."0.8.0"; - by-version."generator-angular"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-generator-angular-0.8.0"; + self.by-version."generator-angular"."0.9.0-0"; + by-version."generator-angular"."0.9.0-0" = lib.makeOverridable self.buildNodePackage { + name = "node-generator-angular-0.9.0-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.8.0.tgz"; - name = "generator-angular-0.8.0.tgz"; - sha1 = "c2115b1a7a304b884b7f8857cade77dc36b63d13"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.9.0-0.tgz"; + name = "generator-angular-0.9.0-0.tgz"; + sha1 = "f954bb283e570fba4e1ef1f30c497b56ffff522a"; }) ]; buildInputs = (self.nativeDeps."generator-angular" or []); deps = [ - self.by-version."chalk"."0.4.0" - self.by-version."wiredep"."1.0.0" + self.by-version."wiredep"."1.7.3" self.by-version."yeoman-generator"."0.16.0" + self.by-version."yosay"."0.2.1" + self.by-version."chalk"."0.4.0" ]; peerDependencies = [ - self.by-version."generator-karma"."0.7.0" + self.by-version."generator-karma"."0.8.2" self.by-version."yo"."1.1.2" ]; passthru.names = [ "generator-angular" ]; }; - "generator-angular" = self.by-version."generator-angular"."0.8.0"; - by-spec."generator-karma".">=0.6.0" = - self.by-version."generator-karma"."0.7.0"; - by-version."generator-karma"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-generator-karma-0.7.0"; + "generator-angular" = self.by-version."generator-angular"."0.9.0-0"; + by-spec."generator-karma".">=0.8.2" = + self.by-version."generator-karma"."0.8.2"; + by-version."generator-karma"."0.8.2" = lib.makeOverridable self.buildNodePackage { + name = "node-generator-karma-0.8.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.7.0.tgz"; - name = "generator-karma-0.7.0.tgz"; - sha1 = "aaa2b6d8905b687343fe6a10b15279afd984048d"; + url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.8.2.tgz"; + name = "generator-karma-0.8.2.tgz"; + sha1 = "46c6cd5fa3bf8ff54553f748a4fa75108ed0d74f"; }) ]; buildInputs = (self.nativeDeps."generator-karma" or []); deps = [ - self.by-version."yeoman-generator"."0.16.0" + self.by-version."underscore"."1.6.0" + self.by-version."yeoman-generator"."0.17.0" ]; peerDependencies = [ self.by-version."yo"."1.1.2" @@ -7298,14 +8059,14 @@ passthru.names = [ "get-stdin" ]; }; by-spec."get-urls"."^0.1.1" = - self.by-version."get-urls"."0.1.1"; - by-version."get-urls"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "get-urls-0.1.1"; + self.by-version."get-urls"."0.1.2"; + by-version."get-urls"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "get-urls-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.1.tgz"; - name = "get-urls-0.1.1.tgz"; - sha1 = "f94aa79c9e5d99cb843e44c5f67e24954e08fb59"; + url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.2.tgz"; + name = "get-urls-0.1.2.tgz"; + sha1 = "92a3e5ce2b9af2d2764ff5198681db373227b844"; }) ]; buildInputs = @@ -7373,14 +8134,14 @@ self.by-version."cli-color"."0.2.3" self.by-version."cli-log"."0.0.8" self.by-version."github"."0.1.16" - self.by-version."copy-paste"."0.2.0" + self.by-version."copy-paste"."0.2.2" self.by-version."handlebars"."1.3.0" self.by-version."inquirer"."0.4.1" self.by-version."moment"."2.5.1" - self.by-version."nopt"."2.2.0" + self.by-version."nopt"."2.2.1" self.by-version."open"."0.0.5" self.by-version."truncate"."1.0.2" - self.by-version."update-notifier"."0.1.8" + self.by-version."update-notifier"."0.1.10" self.by-version."userhome"."0.1.0" self.by-version."which"."1.0.5" self.by-version."wordwrap"."0.0.2" @@ -7449,15 +8210,15 @@ }; by-spec."github-url-from-git"."~1.1.1" = self.by-version."github-url-from-git"."1.1.1"; - 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 = "node-github-url-from-username-repo-0.0.2"; + by-spec."github-url-from-username-repo"."^0.1.0" = + self.by-version."github-url-from-username-repo"."0.1.0"; + by-version."github-url-from-username-repo"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-github-url-from-username-repo-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; - name = "github-url-from-username-repo-0.0.2.tgz"; - sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; + url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.1.0.tgz"; + name = "github-url-from-username-repo-0.1.0.tgz"; + sha1 = "fe398af670692e91af7bcfc5ae1d99ff97b1df89"; }) ]; buildInputs = @@ -7468,22 +8229,43 @@ ]; passthru.names = [ "github-url-from-username-repo" ]; }; - by-spec."glob"."3" = - self.by-version."glob"."3.2.9"; - by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-3.2.9"; + by-spec."github-url-from-username-repo"."^0.2.0" = + self.by-version."github-url-from-username-repo"."0.2.0"; + by-version."github-url-from-username-repo"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-github-url-from-username-repo-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz"; - name = "glob-3.2.9.tgz"; - sha1 = "56af2289aa43d07d7702666480373eb814d91d40"; + url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.2.0.tgz"; + name = "github-url-from-username-repo-0.2.0.tgz"; + sha1 = "7590b4fa605b7a6cbb7e06ffcd9d253210f9dbe1"; + }) + ]; + buildInputs = + (self.nativeDeps."github-url-from-username-repo" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "github-url-from-username-repo" ]; + }; + by-spec."github-url-from-username-repo"."~0.1.0" = + self.by-version."github-url-from-username-repo"."0.1.0"; + by-spec."glob"."3" = + self.by-version."glob"."3.2.11"; + by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage { + name = "node-glob-3.2.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + name = "glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; }) ]; buildInputs = (self.nativeDeps."glob" or []); deps = [ - self.by-version."minimatch"."0.2.14" self.by-version."inherits"."2.0.1" + self.by-version."minimatch"."0.3.0" ]; peerDependencies = [ ]; @@ -7512,13 +8294,37 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3.2.x" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; by-spec."glob"."3.x" = - self.by-version."glob"."3.2.9"; - by-spec."glob".">= 3.1.4" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; by-spec."glob".">=3.2.7 <4" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; + by-spec."glob"."^3.2.0" = + self.by-version."glob"."3.2.11"; + by-spec."glob"."^4.0.2" = + self.by-version."glob"."4.0.2"; + by-version."glob"."4.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-glob-4.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-4.0.2.tgz"; + name = "glob-4.0.2.tgz"; + sha1 = "d57dbdf54984dd7635c8247d1f2ebde2e81f4ee1"; + }) + ]; + buildInputs = + (self.nativeDeps."glob" or []); + deps = [ + self.by-version."inherits"."2.0.1" + self.by-version."minimatch"."0.3.0" + self.by-version."once"."1.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "glob" ]; + }; + by-spec."glob"."~ 3.2.1" = + self.by-version."glob"."3.2.11"; by-spec."glob"."~3.1.21" = self.by-version."glob"."3.1.21"; by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage { @@ -7542,17 +8348,19 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."~3.2.0" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; + by-spec."glob"."~3.2.10" = + self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.7" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.8" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.9" = - self.by-version."glob"."3.2.9"; + self.by-version."glob"."3.2.11"; by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.3"; by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage { @@ -7572,6 +8380,25 @@ ]; passthru.names = [ "graceful-fs" ]; }; + by-spec."graceful-fs"."2 || 3" = + self.by-version."graceful-fs"."3.0.1"; + by-version."graceful-fs"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-graceful-fs-3.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.1.tgz"; + name = "graceful-fs-3.0.1.tgz"; + sha1 = "93352b5b951b009ef541271204122b612e46edaf"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; by-spec."graceful-fs"."~1" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -7612,23 +8439,25 @@ }; by-spec."graceful-fs"."~1.2.0" = self.by-version."graceful-fs"."1.2.3"; - by-spec."graceful-fs"."~2" = - self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.0" = self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.1" = self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.2" = self.by-version."graceful-fs"."2.0.3"; + by-spec."graceful-fs"."~2.0.3" = + self.by-version."graceful-fs"."2.0.3"; + by-spec."graceful-fs"."~3.0.0" = + self.by-version."graceful-fs"."3.0.1"; by-spec."gridfs-stream"."*" = - 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"; + self.by-version."gridfs-stream"."0.5.1"; + by-version."gridfs-stream"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "node-gridfs-stream-0.5.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.1.tgz"; - name = "gridfs-stream-0.4.1.tgz"; - sha1 = "1bcccb1b05b57946363b5e53fbe2bc95dd8877bb"; + url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.1.tgz"; + name = "gridfs-stream-0.5.1.tgz"; + sha1 = "5fd94b0da4df1a602f7b0a02fb2365460d91b90c"; }) ]; buildInputs = @@ -7639,7 +8468,28 @@ ]; passthru.names = [ "gridfs-stream" ]; }; - "gridfs-stream" = self.by-version."gridfs-stream"."0.4.1"; + "gridfs-stream" = self.by-version."gridfs-stream"."0.5.1"; + by-spec."grouped-queue"."^0.2.1" = + self.by-version."grouped-queue"."0.2.1"; + by-version."grouped-queue"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-grouped-queue-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/grouped-queue/-/grouped-queue-0.2.1.tgz"; + name = "grouped-queue-0.2.1.tgz"; + sha1 = "ede20396d6c7f313b6d44e438d7d646153fca9a9"; + }) + ]; + buildInputs = + (self.nativeDeps."grouped-queue" or []); + deps = [ + self.by-version."lodash"."2.4.1" + self.by-version."setimmediate"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "grouped-queue" ]; + }; by-spec."growl"."1.7.x" = self.by-version."growl"."1.7.0"; by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage { @@ -7660,14 +8510,14 @@ passthru.names = [ "growl" ]; }; by-spec."grunt"."0.4.x" = - self.by-version."grunt"."0.4.4"; - by-version."grunt"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-0.4.4"; + self.by-version."grunt"."0.4.5"; + by-version."grunt"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt/-/grunt-0.4.4.tgz"; - name = "grunt-0.4.4.tgz"; - sha1 = "f37fa46e2e52e37f9a0370542a74281c09c73f53"; + url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz"; + name = "grunt-0.4.5.tgz"; + sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0"; }) ]; buildInputs = @@ -7684,27 +8534,28 @@ self.by-version."iconv-lite"."0.2.11" self.by-version."minimatch"."0.2.14" self.by-version."nopt"."1.0.10" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" self.by-version."lodash"."0.9.2" self.by-version."underscore.string"."2.2.1" self.by-version."which"."1.0.5" self.by-version."js-yaml"."2.0.5" self.by-version."exit"."0.1.2" self.by-version."getobject"."0.1.0" - self.by-version."grunt-legacy-util"."0.1.2" + self.by-version."grunt-legacy-util"."0.2.0" + self.by-version."grunt-legacy-log"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "grunt" ]; }; by-spec."grunt"."^0.4.0" = - self.by-version."grunt"."0.4.4"; + self.by-version."grunt"."0.4.5"; by-spec."grunt"."~0.4" = - self.by-version."grunt"."0.4.4"; + self.by-version."grunt"."0.4.5"; by-spec."grunt"."~0.4.0" = - self.by-version."grunt"."0.4.4"; + self.by-version."grunt"."0.4.5"; by-spec."grunt"."~0.4.1" = - self.by-version."grunt"."0.4.4"; + self.by-version."grunt"."0.4.5"; 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 { @@ -7775,7 +8626,7 @@ self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ - self.by-version."grunt"."0.4.4" + self.by-version."grunt"."0.4.5" ]; passthru.names = [ "grunt-contrib-cssmin" ]; }; @@ -7794,63 +8645,63 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.by-version."jshint"."2.5.0" + self.by-version."jshint"."2.5.1" self.by-version."hooker"."0.2.3" ]; peerDependencies = [ - self.by-version."grunt"."0.4.4" + self.by-version."grunt"."0.4.5" ]; passthru.names = [ "grunt-contrib-jshint" ]; }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.10.0"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.11.0"; - by-version."grunt-contrib-less"."0.11.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-less-0.11.0"; + self.by-version."grunt-contrib-less"."0.11.1"; + by-version."grunt-contrib-less"."0.11.1" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-less-0.11.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.0.tgz"; - name = "grunt-contrib-less-0.11.0.tgz"; - sha1 = "601cbdda0591f7fde7fe50278cd904fedede90ed"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.1.tgz"; + name = "grunt-contrib-less-0.11.1.tgz"; + sha1 = "0671654e491a5c783893c2b49471c24992aca34e"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-less" or []); deps = [ - self.by-version."less"."1.7.0" + self.by-version."less"."1.7.1" self.by-version."chalk"."0.4.0" self.by-version."maxmin"."0.1.0" self.by-version."lodash"."2.4.1" self.by-version."async"."0.2.10" ]; peerDependencies = [ - self.by-version."grunt"."0.4.4" + self.by-version."grunt"."0.4.5" ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.0"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.1"; by-spec."grunt-contrib-requirejs"."*" = - self.by-version."grunt-contrib-requirejs"."0.4.3"; - by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-requirejs-0.4.3"; + self.by-version."grunt-contrib-requirejs"."0.4.4"; + by-version."grunt-contrib-requirejs"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-requirejs-0.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.3.tgz"; - name = "grunt-contrib-requirejs-0.4.3.tgz"; - sha1 = "ac243dc312af5c85cd095169da1b3177bfe89c59"; + url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz"; + name = "grunt-contrib-requirejs-0.4.4.tgz"; + sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-requirejs" or []); deps = [ - self.by-version."requirejs"."2.1.11" + self.by-version."requirejs"."2.1.14" ]; peerDependencies = [ - self.by-version."grunt"."0.4.4" + self.by-version."grunt"."0.4.5" ]; passthru.names = [ "grunt-contrib-requirejs" ]; }; - "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3"; + "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4"; by-spec."grunt-contrib-uglify"."*" = self.by-version."grunt-contrib-uglify"."0.4.0"; by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -7870,20 +8721,20 @@ self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ - self.by-version."grunt"."0.4.4" + self.by-version."grunt"."0.4.5" ]; passthru.names = [ "grunt-contrib-uglify" ]; }; "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0"; by-spec."grunt-karma"."*" = - self.by-version."grunt-karma"."0.8.2"; - by-version."grunt-karma"."0.8.2" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-karma-0.8.2"; + self.by-version."grunt-karma"."0.8.3"; + by-version."grunt-karma"."0.8.3" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-karma-0.8.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.2.tgz"; - name = "grunt-karma-0.8.2.tgz"; - sha1 = "0f422d357e4556fb96ab68c6d9a2be46908f1c84"; + url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.3.tgz"; + name = "grunt-karma-0.8.3.tgz"; + sha1 = "e9ecf718153af1914aa53602a37f85de04310e7f"; }) ]; buildInputs = @@ -7892,21 +8743,44 @@ self.by-version."lodash"."2.4.1" ]; peerDependencies = [ - self.by-version."grunt"."0.4.4" - self.by-version."karma"."0.12.9" + self.by-version."grunt"."0.4.5" + self.by-version."karma"."0.12.16" ]; passthru.names = [ "grunt-karma" ]; }; - "grunt-karma" = self.by-version."grunt-karma"."0.8.2"; - by-spec."grunt-legacy-util"."~0.1.2" = - self.by-version."grunt-legacy-util"."0.1.2"; - by-version."grunt-legacy-util"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-legacy-util-0.1.2"; + "grunt-karma" = self.by-version."grunt-karma"."0.8.3"; + by-spec."grunt-legacy-log"."~0.1.0" = + self.by-version."grunt-legacy-log"."0.1.1"; + by-version."grunt-legacy-log"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-legacy-log-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.1.2.tgz"; - name = "grunt-legacy-util-0.1.2.tgz"; - sha1 = "be84d337ef4a0137dc8566092a46528fd8957ebd"; + url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz"; + name = "grunt-legacy-log-0.1.1.tgz"; + sha1 = "d41f1a6abc9b0b1256a2b5ff02f4c3298dfcd57a"; + }) + ]; + buildInputs = + (self.nativeDeps."grunt-legacy-log" or []); + deps = [ + self.by-version."hooker"."0.2.3" + self.by-version."lodash"."2.4.1" + self.by-version."underscore.string"."2.3.3" + self.by-version."colors"."0.6.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "grunt-legacy-log" ]; + }; + by-spec."grunt-legacy-util"."~0.2.0" = + self.by-version."grunt-legacy-util"."0.2.0"; + by-version."grunt-legacy-util"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-legacy-util-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"; + name = "grunt-legacy-util-0.2.0.tgz"; + sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b"; }) ]; buildInputs = @@ -7941,11 +8815,32 @@ self.by-version."replace"."0.2.9" ]; peerDependencies = [ - self.by-version."grunt"."0.4.4" + self.by-version."grunt"."0.4.5" ]; passthru.names = [ "grunt-sed" ]; }; "grunt-sed" = self.by-version."grunt-sed"."0.1.1"; + by-spec."gruntfile-editor"."^0.1.0" = + self.by-version."gruntfile-editor"."0.1.0"; + by-version."gruntfile-editor"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-gruntfile-editor-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/gruntfile-editor/-/gruntfile-editor-0.1.0.tgz"; + name = "gruntfile-editor-0.1.0.tgz"; + sha1 = "b6cd84776dbf0681c16c95a8fce1f8ebb1b4e49e"; + }) + ]; + buildInputs = + (self.nativeDeps."gruntfile-editor" or []); + deps = [ + self.by-version."ast-query"."0.2.4" + self.by-version."lodash"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "gruntfile-editor" ]; + }; by-spec."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = self.by-version."guifi-earth"."0.2.1"; by-version."guifi-earth"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -7962,8 +8857,8 @@ deps = [ self.by-version."coffee-script"."1.7.1" self.by-version."jade"."1.3.1" - self.by-version."q"."2.0.1" - self.by-version."xml2js"."0.4.2" + self.by-version."q"."2.0.2" + self.by-version."xml2js"."0.4.4" self.by-version."msgpack"."0.2.3" ]; peerDependencies = [ @@ -7985,7 +8880,7 @@ buildInputs = (self.nativeDeps."gzip-size" or []); deps = [ - self.by-version."concat-stream"."1.4.5" + self.by-version."concat-stream"."1.4.6" self.by-version."zlib-browserify"."0.0.3" ]; peerDependencies = [ @@ -8006,7 +8901,7 @@ buildInputs = (self.nativeDeps."gzippo" or []); deps = [ - self.by-version."send"."0.2.0" + self.by-version."send"."0.4.1" ]; peerDependencies = [ ]; @@ -8206,44 +9101,45 @@ passthru.names = [ "he" ]; }; by-spec."hipache"."*" = - self.by-version."hipache"."0.2.9"; - by-version."hipache"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "hipache-0.2.9"; + self.by-version."hipache"."0.3.1"; + by-version."hipache"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "hipache-0.3.1"; src = [ - (self.patchSource fetchurl { - url = "http://registry.npmjs.org/hipache/-/hipache-0.2.9.tgz"; - name = "hipache-0.2.9.tgz"; - sha1 = "48a7fa7170be328b264d6e413bfb76d130e03b2a"; + (fetchurl { + url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz"; + name = "hipache-0.3.1.tgz"; + sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; }) ]; buildInputs = (self.nativeDeps."hipache" or []); deps = [ - self.by-version."http-proxy"."0.10.3" - self.by-version."redis"."0.8.6" - self.by-version."lru-cache"."2.2.4" - self.by-version."optimist"."0.3.7" + self.by-version."http-proxy"."1.0.2" + self.by-version."redis"."0.10.3" + self.by-version."lru-cache"."2.5.0" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; passthru.names = [ "hipache" ]; }; - "hipache" = self.by-version."hipache"."0.2.9"; + "hipache" = self.by-version."hipache"."0.3.1"; by-spec."hiredis"."*" = - self.by-version."hiredis"."0.1.16"; - by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage { - name = "node-hiredis-0.1.16"; + self.by-version."hiredis"."0.1.17"; + by-version."hiredis"."0.1.17" = lib.makeOverridable self.buildNodePackage { + name = "node-hiredis-0.1.17"; src = [ (fetchurl { - url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz"; - name = "hiredis-0.1.16.tgz"; - sha1 = "f6cee1add2589b8b71cef3c4d3936a9fcd638640"; + url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz"; + name = "hiredis-0.1.17.tgz"; + sha1 = "60a33a968efc9a974e7ebb832f33aa965d3d354e"; }) ]; buildInputs = (self.nativeDeps."hiredis" or []); deps = [ self.by-version."bindings"."1.2.0" + self.by-version."nan"."1.1.2" ]; peerDependencies = [ ]; @@ -8325,6 +9221,25 @@ ]; passthru.names = [ "hooks" ]; }; + by-spec."hooks"."0.3.2" = + self.by-version."hooks"."0.3.2"; + by-version."hooks"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-hooks-0.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hooks/-/hooks-0.3.2.tgz"; + name = "hooks-0.3.2.tgz"; + sha1 = "a31f060c2026cea6cf1ca3eb178430e718e1c4a3"; + }) + ]; + buildInputs = + (self.nativeDeps."hooks" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "hooks" ]; + }; by-spec."htmlparser2"."3.1.4" = self.by-version."htmlparser2"."3.1.4"; by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage { @@ -8348,24 +9263,25 @@ ]; passthru.names = [ "htmlparser2" ]; }; - by-spec."htmlparser2"."3.3.x" = - self.by-version."htmlparser2"."3.3.0"; - by-version."htmlparser2"."3.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-htmlparser2-3.3.0"; + by-spec."htmlparser2"."3.7.x" = + self.by-version."htmlparser2"."3.7.2"; + by-version."htmlparser2"."3.7.2" = lib.makeOverridable self.buildNodePackage { + name = "node-htmlparser2-3.7.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz"; - name = "htmlparser2-3.3.0.tgz"; - sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe"; + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.2.tgz"; + name = "htmlparser2-3.7.2.tgz"; + sha1 = "5f959dbc97e84a8418a9877c20f5f6f02a6482b0"; }) ]; buildInputs = (self.nativeDeps."htmlparser2" or []); deps = [ - self.by-version."domhandler"."2.1.0" - self.by-version."domutils"."1.1.6" + self.by-version."domhandler"."2.2.0" + self.by-version."domutils"."1.5.0" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.0.27-1" + self.by-version."readable-stream"."1.1.13-1" + self.by-version."entities"."1.0.0" ]; peerDependencies = [ ]; @@ -8394,6 +9310,8 @@ ]; passthru.names = [ "htmlparser2" ]; }; + by-spec."htmlparser2"."~3.7.0" = + self.by-version."htmlparser2"."3.7.2"; 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 { @@ -8436,24 +9354,21 @@ ]; passthru.names = [ "http-browserify" ]; }; - by-spec."http-proxy"."git+https://github.com/samalba/node-http-proxy.git" = - self.by-version."http-proxy"."0.10.3"; - by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { - name = "http-proxy-0.10.3"; + by-spec."http-proxy"."1.0.2" = + self.by-version."http-proxy"."1.0.2"; + by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-http-proxy-1.0.2"; src = [ - (fetchgit { - url = "https://github.com/samalba/node-http-proxy.git"; - rev = "8e277989d2d05edaee65e524fb4fba9142c52aa5"; - sha256 = "8ce0e05c73e517eefc6d9bf8b61349351aee119c2fb60763f23170607cc0e41f"; + (fetchurl { + url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz"; + name = "http-proxy-1.0.2.tgz"; + sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254"; }) ]; buildInputs = (self.nativeDeps."http-proxy" or []); deps = [ - self.by-version."colors"."0.6.2" - self.by-version."optimist"."0.3.7" - self.by-version."pkginfo"."0.2.3" - self.by-version."utile"."0.1.7" + self.by-version."eventemitter3"."0.1.2" ]; peerDependencies = [ ]; @@ -8584,26 +9499,26 @@ passthru.names = [ "i" ]; }; by-spec."i18next"."*" = - self.by-version."i18next"."1.7.3"; - by-version."i18next"."1.7.3" = lib.makeOverridable self.buildNodePackage { - name = "node-i18next-1.7.3"; + self.by-version."i18next"."1.7.4"; + by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage { + name = "node-i18next-1.7.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/i18next/-/i18next-1.7.3.tgz"; - name = "i18next-1.7.3.tgz"; - sha1 = "8a064866c8e6e87b4664a32fe81b9be34b4a3894"; + url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz"; + name = "i18next-1.7.4.tgz"; + sha1 = "b61629c9de95a5c076acb2f954f8a882ac0772af"; }) ]; buildInputs = (self.nativeDeps."i18next" or []); deps = [ - self.by-version."cookies"."0.4.0" + self.by-version."cookies"."0.4.1" ]; peerDependencies = [ ]; passthru.names = [ "i18next" ]; }; - "i18next" = self.by-version."i18next"."1.7.3"; + "i18next" = self.by-version."i18next"."1.7.4"; by-spec."ibrik"."~1.1.1" = self.by-version."ibrik"."1.1.1"; by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -8620,7 +9535,7 @@ deps = [ self.by-version."lodash"."2.4.1" self.by-version."coffee-script-redux"."2.0.0-beta8" - self.by-version."istanbul"."0.2.7" + self.by-version."istanbul"."0.2.10" self.by-version."estraverse"."1.5.0" self.by-version."escodegen"."1.1.0" self.by-version."which"."1.0.5" @@ -8631,7 +9546,7 @@ ]; passthru.names = [ "ibrik" ]; }; - by-spec."iconv-lite"."~0.2.10" = + 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 = "node-iconv-lite-0.2.11"; @@ -8650,6 +9565,8 @@ ]; passthru.names = [ "iconv-lite" ]; }; + by-spec."iconv-lite"."~0.2.10" = + self.by-version."iconv-lite"."0.2.11"; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; by-spec."ieee754"."~1.1.1" = @@ -8690,6 +9607,26 @@ ]; passthru.names = [ "indexof" ]; }; + by-spec."inflight"."~1.0.1" = + self.by-version."inflight"."1.0.1"; + by-version."inflight"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inflight-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz"; + name = "inflight-1.0.1.tgz"; + sha1 = "01f6911821535243c790ac0f998f54e9023ffb6f"; + }) + ]; + buildInputs = + (self.nativeDeps."inflight" or []); + deps = [ + self.by-version."once"."1.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "inflight" ]; + }; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -8739,6 +9676,29 @@ by-spec."inherits"."~2.0.1" = self.by-version."inherits"."2.0.1"; by-spec."ini"."1" = + self.by-version."ini"."1.2.1"; + by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-ini-1.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz"; + name = "ini-1.2.1.tgz"; + sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3"; + }) + ]; + buildInputs = + (self.nativeDeps."ini" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ini" ]; + }; + by-spec."ini"."1.x.x" = + self.by-version."ini"."1.2.1"; + by-spec."ini"."^1.2.0" = + self.by-version."ini"."1.2.1"; + by-spec."ini"."~1.1.0" = self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "node-ini-1.1.0"; @@ -8757,29 +9717,27 @@ ]; passthru.names = [ "ini" ]; }; - by-spec."ini"."1.x.x" = - self.by-version."ini"."1.1.0"; - by-spec."ini"."~1.1.0" = - self.by-version."ini"."1.1.0"; - by-spec."init-package-json"."0.0.15" = - self.by-version."init-package-json"."0.0.15"; - by-version."init-package-json"."0.0.15" = lib.makeOverridable self.buildNodePackage { - name = "node-init-package-json-0.0.15"; + by-spec."ini"."~1.2.0" = + self.by-version."ini"."1.2.1"; + by-spec."init-package-json"."0.0.17" = + self.by-version."init-package-json"."0.0.17"; + by-version."init-package-json"."0.0.17" = lib.makeOverridable self.buildNodePackage { + name = "node-init-package-json-0.0.17"; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.15.tgz"; - name = "init-package-json-0.0.15.tgz"; - sha1 = "d40f0201e4de6aa2b3fdc4208ae162766703ebed"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.17.tgz"; + name = "init-package-json-0.0.17.tgz"; + sha1 = "395f2cb8d1c5af93ba6ec19dafa64717047f90c3"; }) ]; buildInputs = (self.nativeDeps."init-package-json" or []); deps = [ - self.by-version."promzard"."0.2.1" + self.by-version."promzard"."0.2.2" self.by-version."read"."1.0.5" - self.by-version."read-package-json"."1.1.8" - self.by-version."semver"."2.2.1" - self.by-version."glob"."3.2.9" + self.by-version."read-package-json"."1.2.2" + self.by-version."semver"."2.3.0" + self.by-version."glob"."3.2.11" ]; peerDependencies = [ ]; @@ -8805,6 +9763,32 @@ ]; passthru.names = [ "inline-source-map" ]; }; + by-spec."inquirer"."^0.5.0" = + self.by-version."inquirer"."0.5.1"; + by-version."inquirer"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inquirer-0.5.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.5.1.tgz"; + name = "inquirer-0.5.1.tgz"; + sha1 = "e9f2cd1ee172c7a32e054b78a03d4ddb0d7707f1"; + }) + ]; + buildInputs = + (self.nativeDeps."inquirer" or []); + deps = [ + self.by-version."async"."0.8.0" + self.by-version."cli-color"."0.3.2" + self.by-version."lodash"."2.4.1" + self.by-version."mute-stream"."0.0.4" + self.by-version."readline2"."0.1.0" + self.by-version."through"."2.3.4" + self.by-version."chalk"."0.4.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "inquirer" ]; + }; by-spec."inquirer"."~0.3.0" = self.by-version."inquirer"."0.3.5"; by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -8871,8 +9855,8 @@ buildInputs = (self.nativeDeps."insert-module-globals" or []); deps = [ - self.by-version."JSONStream"."0.7.2" - self.by-version."concat-stream"."1.4.5" + self.by-version."JSONStream"."0.7.4" + self.by-version."concat-stream"."1.4.6" self.by-version."lexical-scope"."1.1.0" self.by-version."process"."0.6.0" self.by-version."through"."2.3.4" @@ -8881,6 +9865,31 @@ ]; passthru.names = [ "insert-module-globals" ]; }; + by-spec."insert-module-globals"."~6.0.0" = + self.by-version."insert-module-globals"."6.0.0"; + by-version."insert-module-globals"."6.0.0" = lib.makeOverridable self.buildNodePackage { + name = "insert-module-globals-6.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.0.0.tgz"; + name = "insert-module-globals-6.0.0.tgz"; + sha1 = "ee8aeb9dee16819e33aa14588a558824af0c15dc"; + }) + ]; + buildInputs = + (self.nativeDeps."insert-module-globals" or []); + deps = [ + self.by-version."JSONStream"."0.7.4" + self.by-version."concat-stream"."1.4.6" + self.by-version."lexical-scope"."1.1.0" + self.by-version."process"."0.6.0" + self.by-version."through"."2.3.4" + self.by-version."xtend"."3.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "insert-module-globals" ]; + }; by-spec."insight"."~0.3.0" = self.by-version."insight"."0.3.1"; by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -8926,6 +9935,25 @@ ]; passthru.names = [ "intersect" ]; }; + by-spec."ipaddr.js"."0.1.2" = + self.by-version."ipaddr.js"."0.1.2"; + by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-ipaddr.js-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; + name = "ipaddr.js-0.1.2.tgz"; + sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + }) + ]; + buildInputs = + (self.nativeDeps."ipaddr.js" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ipaddr.js" ]; + }; by-spec."ironhorse"."*" = self.by-version."ironhorse"."0.0.9"; by-version."ironhorse"."0.0.9" = lib.makeOverridable self.buildNodePackage { @@ -8944,18 +9972,18 @@ self.by-version."winston"."0.7.3" self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" - self.by-version."async"."0.7.0" - self.by-version."express"."4.0.0" + self.by-version."async"."0.9.0" + self.by-version."express"."4.4.1" self.by-version."jade"."1.3.1" self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" self.by-version."js-yaml"."3.0.2" - self.by-version."mongoose"."3.8.8" - self.by-version."gridfs-stream"."0.4.1" - self.by-version."temp"."0.7.0" - self.by-version."kue"."0.7.5" - self.by-version."redis"."0.10.1" - self.by-version."hiredis"."0.1.16" + self.by-version."mongoose"."3.9.0" + self.by-version."gridfs-stream"."0.5.1" + self.by-version."temp"."0.8.0" + self.by-version."kue"."0.7.9" + self.by-version."redis"."0.10.3" + self.by-version."hiredis"."0.1.17" ]; peerDependencies = [ ]; @@ -8963,14 +9991,14 @@ }; "ironhorse" = self.by-version."ironhorse"."0.0.9"; 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 = "node-is-promise-1.0.0"; + self.by-version."is-promise"."1.0.1"; + by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-is-promise-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz"; - name = "is-promise-1.0.0.tgz"; - sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f"; + url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; + name = "is-promise-1.0.1.tgz"; + sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; }) ]; buildInputs = @@ -9019,6 +10047,25 @@ ]; passthru.names = [ "isarray" ]; }; + by-spec."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.1.tgz"; + name = "isbinaryfile-2.0.1.tgz"; + sha1 = "b92369bfdaf616027133e077c5ba145f36699d55"; + }) + ]; + buildInputs = + (self.nativeDeps."isbinaryfile" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "isbinaryfile" ]; + }; by-spec."isbinaryfile"."~0.1.8" = self.by-version."isbinaryfile"."0.1.9"; by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage { @@ -9042,45 +10089,28 @@ self.by-version."isbinaryfile"."0.1.9"; by-spec."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.1.tgz"; - name = "isbinaryfile-2.0.1.tgz"; - sha1 = "b92369bfdaf616027133e077c5ba145f36699d55"; - }) - ]; - buildInputs = - (self.nativeDeps."isbinaryfile" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "isbinaryfile" ]; - }; by-spec."istanbul"."*" = - self.by-version."istanbul"."0.2.7"; - by-version."istanbul"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.2.7"; + self.by-version."istanbul"."0.2.10"; + by-version."istanbul"."0.2.10" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.2.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.7.tgz"; - name = "istanbul-0.2.7.tgz"; - sha1 = "bb482e1d06a0fea00993a10b2ee266fc740642bc"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.10.tgz"; + name = "istanbul-0.2.10.tgz"; + sha1 = "40b922b7a0dd4917609b9c26bb9a0bef5f98013a"; }) ]; buildInputs = (self.nativeDeps."istanbul" or []); deps = [ - self.by-version."esprima"."1.1.1" - self.by-version."escodegen"."1.3.2" + self.by-version."esprima"."1.2.2" + self.by-version."escodegen"."1.3.3" self.by-version."handlebars"."1.3.0" - self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.2.0" + self.by-version."mkdirp"."0.5.0" + self.by-version."nopt"."2.2.1" self.by-version."fileset"."0.1.5" self.by-version."which"."1.0.5" - self.by-version."async"."0.2.10" + self.by-version."async"."0.8.0" self.by-version."abbrev"."1.0.5" self.by-version."wordwrap"."0.0.2" self.by-version."resolve"."0.6.3" @@ -9090,11 +10120,11 @@ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.2.7"; - by-spec."istanbul"."~0.2.3" = - self.by-version."istanbul"."0.2.7"; + "istanbul" = self.by-version."istanbul"."0.2.10"; + by-spec."istanbul"."~0.2.10" = + self.by-version."istanbul"."0.2.10"; by-spec."istanbul"."~0.2.4" = - self.by-version."istanbul"."0.2.7"; + self.by-version."istanbul"."0.2.10"; by-spec."jade"."*" = self.by-version."jade"."1.3.1"; by-version."jade"."1.3.1" = lib.makeOverridable self.buildNodePackage { @@ -9369,35 +10399,35 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.5.0"; - by-version."jshint"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.5.0"; + self.by-version."jshint"."2.5.1"; + by-version."jshint"."2.5.1" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.5.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.5.0.tgz"; - name = "jshint-2.5.0.tgz"; - sha1 = "82fd1a235ffce75fad1b40b2a38bef47beac8c54"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.5.1.tgz"; + name = "jshint-2.5.1.tgz"; + sha1 = "8e96d27377806767d40f16676fbec113d33520ec"; }) ]; buildInputs = (self.nativeDeps."jshint" or []); deps = [ - self.by-version."shelljs"."0.1.4" - self.by-version."underscore"."1.4.4" - self.by-version."cli"."0.4.5" - self.by-version."minimatch"."0.2.14" - self.by-version."htmlparser2"."3.3.0" - self.by-version."console-browserify"."0.1.6" + self.by-version."shelljs"."0.3.0" + self.by-version."underscore"."1.6.0" + self.by-version."cli"."0.6.3" + self.by-version."minimatch"."0.3.0" + self.by-version."htmlparser2"."3.7.2" + self.by-version."console-browserify"."1.1.0" self.by-version."exit"."0.1.2" - self.by-version."strip-json-comments"."0.1.1" + self.by-version."strip-json-comments"."0.1.3" ]; peerDependencies = [ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.5.0"; + "jshint" = self.by-version."jshint"."2.5.1"; by-spec."jshint"."~2.5.0" = - self.by-version."jshint"."2.5.0"; + self.by-version."jshint"."2.5.1"; 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 { @@ -9595,28 +10625,47 @@ ]; passthru.names = [ "junk" ]; }; - by-spec."karma"."*" = - self.by-version."karma"."0.12.9"; - by-version."karma"."0.12.9" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.12.9"; + by-spec."junk"."~0.3.0" = + self.by-version."junk"."0.3.0"; + by-version."junk"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-junk-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.12.9.tgz"; - name = "karma-0.12.9.tgz"; - sha1 = "9431735e50fcbd8ca04963a0e4da0b6550b41998"; + url = "http://registry.npmjs.org/junk/-/junk-0.3.0.tgz"; + name = "junk-0.3.0.tgz"; + sha1 = "6c89c636f6e99898d8efbfc50430db40be71e10c"; + }) + ]; + buildInputs = + (self.nativeDeps."junk" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "junk" ]; + }; + by-spec."karma"."*" = + self.by-version."karma"."0.12.16"; + by-version."karma"."0.12.16" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.12.16"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/karma/-/karma-0.12.16.tgz"; + name = "karma-0.12.16.tgz"; + sha1 = "631bca7582b8b773162111708fcab69f8e2c5a37"; }) ]; buildInputs = (self.nativeDeps."karma" or []); deps = [ self.by-version."di"."0.0.1" - self.by-version."socket.io"."0.9.16" + self.by-version."socket.io"."0.9.17" self.by-version."chokidar"."0.8.2" - self.by-version."glob"."3.2.9" + self.by-version."glob"."3.2.11" self.by-version."minimatch"."0.2.14" self.by-version."http-proxy"."0.10.4" self.by-version."optimist"."0.6.1" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" self.by-version."q"."0.9.7" self.by-version."colors"."0.6.2" self.by-version."lodash"."2.4.1" @@ -9631,24 +10680,24 @@ ]; passthru.names = [ "karma" ]; }; - "karma" = self.by-version."karma"."0.12.9"; + "karma" = self.by-version."karma"."0.12.16"; by-spec."karma".">=0.11.11" = - self.by-version."karma"."0.12.9"; + self.by-version."karma"."0.12.16"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.12.9"; + self.by-version."karma"."0.12.16"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.12.9"; + self.by-version."karma"."0.12.16"; by-spec."karma"."~0.12.0" = - self.by-version."karma"."0.12.9"; + self.by-version."karma"."0.12.16"; by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.3"; - by-version."karma-chrome-launcher"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-chrome-launcher-0.1.3"; + self.by-version."karma-chrome-launcher"."0.1.4"; + by-version."karma-chrome-launcher"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-chrome-launcher-0.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.3.tgz"; - name = "karma-chrome-launcher-0.1.3.tgz"; - sha1 = "b7f82dd9c83c84d26355bf31159739706973a3ec"; + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.4.tgz"; + name = "karma-chrome-launcher-0.1.4.tgz"; + sha1 = "492f6b8ceed3dacb829b147514c9106660f1b185"; }) ]; buildInputs = @@ -9656,35 +10705,36 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.9" + self.by-version."karma"."0.12.16" ]; passthru.names = [ "karma-chrome-launcher" ]; }; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.3"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.4"; by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.2.1"; - by-version."karma-coverage"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-coverage-0.2.1"; + self.by-version."karma-coverage"."0.2.4"; + by-version."karma-coverage"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-coverage-0.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.1.tgz"; - name = "karma-coverage-0.2.1.tgz"; - sha1 = "3b1bce268711a631e008e108930906eceae0a623"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.4.tgz"; + name = "karma-coverage-0.2.4.tgz"; + sha1 = "5d9c3da5ab1ad27f6aaaa11796e6235dd37a0757"; }) ]; buildInputs = (self.nativeDeps."karma-coverage" or []); deps = [ - self.by-version."istanbul"."0.2.7" + self.by-version."istanbul"."0.2.10" self.by-version."ibrik"."1.1.1" - self.by-version."dateformat"."1.0.7-1.2.3" + self.by-version."dateformat"."1.0.8-1.2.3" + self.by-version."minimatch"."0.3.0" ]; peerDependencies = [ - self.by-version."karma"."0.12.9" + self.by-version."karma"."0.12.16" ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.2.1"; + "karma-coverage" = self.by-version."karma-coverage"."0.2.4"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.2"; by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -9702,7 +10752,7 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.12.9" + self.by-version."karma"."0.12.16" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -9723,21 +10773,21 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.9" - self.by-version."mocha"."1.18.2" + self.by-version."karma"."0.12.16" + self.by-version."mocha"."1.20.1" ]; passthru.names = [ "karma-mocha" ]; }; "karma-mocha" = self.by-version."karma-mocha"."0.1.3"; by-spec."karma-requirejs"."*" = - self.by-version."karma-requirejs"."0.2.1"; - by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-requirejs-0.2.1"; + self.by-version."karma-requirejs"."0.2.2"; + by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-requirejs-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz"; - name = "karma-requirejs-0.2.1.tgz"; - sha1 = "7f3ac5df67bccd9d832a928ec658d733ec983c5d"; + url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz"; + name = "karma-requirejs-0.2.2.tgz"; + sha1 = "e497ca0868e2e09a9b8e3f646745c31a935fe8b6"; }) ]; buildInputs = @@ -9745,46 +10795,46 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.9" - self.by-version."requirejs"."2.1.11" + self.by-version."karma"."0.12.16" + self.by-version."requirejs"."2.1.14" ]; passthru.names = [ "karma-requirejs" ]; }; - "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1"; + "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2"; by-spec."karma-sauce-launcher"."*" = - self.by-version."karma-sauce-launcher"."0.2.7"; - by-version."karma-sauce-launcher"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-sauce-launcher-0.2.7"; + self.by-version."karma-sauce-launcher"."0.2.8"; + by-version."karma-sauce-launcher"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-sauce-launcher-0.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.7.tgz"; - name = "karma-sauce-launcher-0.2.7.tgz"; - sha1 = "a87a0b2e3612b298f3f6c2a96839940af85ac849"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.8.tgz"; + name = "karma-sauce-launcher-0.2.8.tgz"; + sha1 = "3d80015d93cae8a1d041ae2f5568ef646ea7125d"; }) ]; buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.2.19" + self.by-version."wd"."0.2.27" self.by-version."sauce-connect-launcher"."0.4.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" ]; peerDependencies = [ - self.by-version."karma"."0.12.9" + self.by-version."karma"."0.12.16" ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.7"; - 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"; + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.8"; + by-spec."keen.io"."~0.1.2" = + self.by-version."keen.io"."0.1.2"; + by-version."keen.io"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-keen.io-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.4.tgz"; - name = "keen.io-0.0.4.tgz"; - sha1 = "041caa79371a6bec51288e222f3bb2e05c7e6b25"; + url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.2.tgz"; + name = "keen.io-0.1.2.tgz"; + sha1 = "a55b9d1d8b4354a8845f2a224eb3a6f7271378b2"; }) ]; buildInputs = @@ -9855,14 +10905,14 @@ 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"; + self.by-version."keygrip"."1.0.1"; + by-version."keygrip"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-keygrip-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.0.tgz"; - name = "keygrip-1.0.0.tgz"; - sha1 = "b771120e8e697b8692b76866a84cdff3912fc379"; + url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz"; + name = "keygrip-1.0.1.tgz"; + sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9"; }) ]; buildInputs = @@ -9914,14 +10964,14 @@ passthru.names = [ "knockout" ]; }; by-spec."knox"."*" = - self.by-version."knox"."0.8.9"; - by-version."knox"."0.8.9" = lib.makeOverridable self.buildNodePackage { - name = "node-knox-0.8.9"; + self.by-version."knox"."0.8.10"; + by-version."knox"."0.8.10" = lib.makeOverridable self.buildNodePackage { + name = "node-knox-0.8.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/knox/-/knox-0.8.9.tgz"; - name = "knox-0.8.9.tgz"; - sha1 = "b96ec0b4ec1be75d8006f80cb302bfa818d7001c"; + url = "http://registry.npmjs.org/knox/-/knox-0.8.10.tgz"; + name = "knox-0.8.10.tgz"; + sha1 = "6a2edcdac1d2ae379d1e1994d559b95c283b2588"; }) ]; buildInputs = @@ -9936,22 +10986,22 @@ ]; passthru.names = [ "knox" ]; }; - "knox" = self.by-version."knox"."0.8.9"; + "knox" = self.by-version."knox"."0.8.10"; by-spec."kue"."*" = - self.by-version."kue"."0.7.5"; - by-version."kue"."0.7.5" = lib.makeOverridable self.buildNodePackage { - name = "node-kue-0.7.5"; + self.by-version."kue"."0.7.9"; + by-version."kue"."0.7.9" = lib.makeOverridable self.buildNodePackage { + name = "node-kue-0.7.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/kue/-/kue-0.7.5.tgz"; - name = "kue-0.7.5.tgz"; - sha1 = "d815a8a35b22dd28df3f54f0b874403a257dc807"; + url = "http://registry.npmjs.org/kue/-/kue-0.7.9.tgz"; + name = "kue-0.7.9.tgz"; + sha1 = "7c4478db567fb45dbfe893a59699f0ef2fa0c935"; }) ]; buildInputs = (self.nativeDeps."kue" or []); deps = [ - self.by-version."redis"."0.10.1" + self.by-version."redis"."0.10.3" self.by-version."express"."3.1.2" self.by-version."jade"."1.1.5" self.by-version."stylus"."0.42.2" @@ -9962,7 +11012,7 @@ ]; passthru.names = [ "kue" ]; }; - "kue" = self.by-version."kue"."0.7.5"; + "kue" = self.by-version."kue"."0.7.9"; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -10035,7 +11085,7 @@ buildInputs = (self.nativeDeps."lcov-result-merger" or []); deps = [ - self.by-version."glob"."3.2.9" + self.by-version."glob"."3.2.11" ]; peerDependencies = [ ]; @@ -10043,19 +11093,20 @@ }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; by-spec."less"."*" = - self.by-version."less"."1.7.0"; - by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage { - name = "less-1.7.0"; + self.by-version."less"."1.7.1"; + by-version."less"."1.7.1" = lib.makeOverridable self.buildNodePackage { + name = "less-1.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz"; - name = "less-1.7.0.tgz"; - sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84"; + url = "http://registry.npmjs.org/less/-/less-1.7.1.tgz"; + name = "less-1.7.1.tgz"; + sha1 = "6f5580029b52c3ac590e85e2b079827a66f6cc74"; }) ]; buildInputs = (self.nativeDeps."less" or []); deps = [ + self.by-version."graceful-fs"."2.0.3" self.by-version."mime"."1.2.11" self.by-version."request"."2.34.0" self.by-version."mkdirp"."0.3.5" @@ -10066,11 +11117,11 @@ ]; passthru.names = [ "less" ]; }; - "less" = self.by-version."less"."1.7.0"; + "less" = self.by-version."less"."1.7.1"; by-spec."less"."^1.7.0" = - self.by-version."less"."1.7.0"; + self.by-version."less"."1.7.1"; by-spec."less"."~1.7.0" = - self.by-version."less"."1.7.0"; + self.by-version."less"."1.7.1"; by-spec."lexical-scope"."~1.1.0" = self.by-version."lexical-scope"."1.1.0"; by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -10645,6 +11696,8 @@ ]; passthru.names = [ "lru-cache" ]; }; + by-spec."lru-cache"."2.5.x" = + self.by-version."lru-cache"."2.5.0"; by-spec."lru-cache"."~1.0.2" = self.by-version."lru-cache"."1.0.6"; by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage { @@ -10685,6 +11738,26 @@ }; by-spec."lru-cache"."~2.5.0" = self.by-version."lru-cache"."2.5.0"; + by-spec."lru-queue"."0.1.x" = + self.by-version."lru-queue"."0.1.0"; + by-version."lru-queue"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-lru-queue-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"; + name = "lru-queue-0.1.0.tgz"; + sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; + }) + ]; + buildInputs = + (self.nativeDeps."lru-queue" or []); + deps = [ + self.by-version."es5-ext"."0.10.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lru-queue" ]; + }; by-spec."lsmod"."~0.0.3" = self.by-version."lsmod"."0.0.3"; by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10705,45 +11778,46 @@ passthru.names = [ "lsmod" ]; }; by-spec."mailcomposer".">= 0.1.27" = - self.by-version."mailcomposer"."0.2.9"; - by-version."mailcomposer"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "node-mailcomposer-0.2.9"; + self.by-version."mailcomposer"."0.2.11"; + by-version."mailcomposer"."0.2.11" = lib.makeOverridable self.buildNodePackage { + name = "node-mailcomposer-0.2.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.9.tgz"; - name = "mailcomposer-0.2.9.tgz"; - sha1 = "2b6417a4fb5de8ffcaf1a27e1b024463903f908e"; + url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.11.tgz"; + name = "mailcomposer-0.2.11.tgz"; + sha1 = "37ddfdb63aa2e37481c001ab5bb17aaa5c234c89"; }) ]; buildInputs = (self.nativeDeps."mailcomposer" or []); deps = [ - self.by-version."mimelib"."0.2.14" + self.by-version."mimelib"."0.2.16" self.by-version."mime"."1.2.11" self.by-version."he"."0.3.6" self.by-version."punycode"."1.2.4" self.by-version."follow-redirects"."0.0.3" - self.by-version."dkim-signer"."0.1.0" + self.by-version."dkim-signer"."0.1.2" ]; peerDependencies = [ ]; passthru.names = [ "mailcomposer" ]; }; by-spec."map-key"."^0.1.1" = - self.by-version."map-key"."0.1.1"; - by-version."map-key"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-map-key-0.1.1"; + self.by-version."map-key"."0.1.4"; + by-version."map-key"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-map-key-0.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/map-key/-/map-key-0.1.1.tgz"; - name = "map-key-0.1.1.tgz"; - sha1 = "cf0d6ad80ae145477d25904c9eb44b23ac471c8b"; + url = "http://registry.npmjs.org/map-key/-/map-key-0.1.4.tgz"; + name = "map-key-0.1.4.tgz"; + sha1 = "4cfae88e90b663d2c588ca5a6852f89ae049ad6b"; }) ]; buildInputs = (self.nativeDeps."map-key" or []); deps = [ - self.by-version."mout"."0.9.1" + self.by-version."lodash"."2.4.1" + self.by-version."underscore.string"."2.3.3" ]; peerDependencies = [ ]; @@ -10784,7 +11858,7 @@ (self.nativeDeps."maxmin" or []); deps = [ self.by-version."gzip-size"."0.1.1" - self.by-version."pretty-bytes"."0.1.0" + self.by-version."pretty-bytes"."0.1.1" self.by-version."chalk"."0.4.0" ]; peerDependencies = [ @@ -10819,6 +11893,31 @@ passthru.names = [ "meat" ]; }; "meat" = self.by-version."meat"."0.2.5"; + by-spec."memoizee"."0.3.x" = + self.by-version."memoizee"."0.3.3"; + by-version."memoizee"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-memoizee-0.3.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.3.tgz"; + name = "memoizee-0.3.3.tgz"; + sha1 = "1e1abceea17b733b495212449ef9a26fe022d2b6"; + }) + ]; + buildInputs = + (self.nativeDeps."memoizee" or []); + deps = [ + self.by-version."d"."0.1.1" + self.by-version."es5-ext"."0.10.4" + self.by-version."event-emitter"."0.3.1" + self.by-version."lru-queue"."0.1.0" + self.by-version."next-tick"."0.2.2" + self.by-version."timers-ext"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "memoizee" ]; + }; by-spec."memoizee"."~0.2.5" = self.by-version."memoizee"."0.2.6"; by-version."memoizee"."0.2.6" = lib.makeOverridable self.buildNodePackage { @@ -10860,45 +11959,28 @@ ]; passthru.names = [ "merge-descriptors" ]; }; - by-spec."method-override"."1.0.0" = - self.by-version."method-override"."1.0.0"; - by-version."method-override"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-method-override-1.0.0"; + by-spec."method-override"."2.0.2" = + self.by-version."method-override"."2.0.2"; + by-version."method-override"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-method-override-2.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz"; - name = "method-override-1.0.0.tgz"; - sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61"; + url = "http://registry.npmjs.org/method-override/-/method-override-2.0.2.tgz"; + name = "method-override-2.0.2.tgz"; + sha1 = "00531278c79789640bf27e97e26a3a5a1f7cca73"; }) ]; buildInputs = (self.nativeDeps."method-override" or []); deps = [ - self.by-version."methods"."0.1.0" + self.by-version."methods"."1.0.1" + self.by-version."parseurl"."1.0.1" + self.by-version."vary"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "method-override" ]; }; - by-spec."methods"."*" = - self.by-version."methods"."0.1.0"; - by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-methods-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; - name = "methods-0.1.0.tgz"; - sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; - }) - ]; - buildInputs = - (self.nativeDeps."methods" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "methods" ]; - }; by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -10920,6 +12002,61 @@ }; by-spec."methods"."0.1.0" = self.by-version."methods"."0.1.0"; + by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-methods-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + name = "methods-0.1.0.tgz"; + sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + }) + ]; + buildInputs = + (self.nativeDeps."methods" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "methods" ]; + }; + by-spec."methods"."1.0.0" = + self.by-version."methods"."1.0.0"; + by-version."methods"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-methods-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz"; + name = "methods-1.0.0.tgz"; + sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3"; + }) + ]; + buildInputs = + (self.nativeDeps."methods" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "methods" ]; + }; + by-spec."methods"."1.0.1" = + self.by-version."methods"."1.0.1"; + by-version."methods"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-methods-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; + name = "methods-1.0.1.tgz"; + sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + }) + ]; + buildInputs = + (self.nativeDeps."methods" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "methods" ]; + }; by-spec."mime"."*" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { @@ -11017,10 +12154,10 @@ ]; passthru.names = [ "mime" ]; }; - by-spec."mime"."1.2.x" = - self.by-version."mime"."1.2.11"; by-spec."mime".">= 0.0.1" = self.by-version."mime"."1.2.11"; + by-spec."mime"."^1.2.9" = + self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.2" = @@ -11029,15 +12166,15 @@ self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mimelib"."~0.2.14" = - self.by-version."mimelib"."0.2.14"; - by-version."mimelib"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "node-mimelib-0.2.14"; + by-spec."mimelib"."~0.2.15" = + self.by-version."mimelib"."0.2.16"; + by-version."mimelib"."0.2.16" = lib.makeOverridable self.buildNodePackage { + name = "node-mimelib-0.2.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; - name = "mimelib-0.2.14.tgz"; - sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; + url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.16.tgz"; + name = "mimelib-0.2.16.tgz"; + sha1 = "2df4fc292c381b662d81d0b926f6795e6aa1c4f4"; }) ]; buildInputs = @@ -11051,14 +12188,14 @@ passthru.names = [ "mimelib" ]; }; by-spec."minimatch"."0" = - self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "node-minimatch-0.2.14"; + self.by-version."minimatch"."0.3.0"; + by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-minimatch-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + name = "minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }) ]; buildInputs = @@ -11093,25 +12230,46 @@ }; by-spec."minimatch"."0.2.x" = self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "node-minimatch-0.2.14"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = [ + self.by-version."lru-cache"."2.5.0" + self.by-version."sigmund"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; + by-spec."minimatch"."0.3" = + self.by-version."minimatch"."0.3.0"; by-spec."minimatch"."0.x" = - self.by-version."minimatch"."0.2.14"; + self.by-version."minimatch"."0.3.0"; by-spec."minimatch"."0.x.x" = - self.by-version."minimatch"."0.2.14"; + self.by-version."minimatch"."0.3.0"; by-spec."minimatch".">=0.2.4" = - self.by-version."minimatch"."0.2.14"; + self.by-version."minimatch"."0.3.0"; + by-spec."minimatch"."^0.3.0" = + self.by-version."minimatch"."0.3.0"; by-spec."minimatch"."~0.2" = self.by-version."minimatch"."0.2.14"; - by-spec."minimatch"."~0.2.0" = - self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.11" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.12" = self.by-version."minimatch"."0.2.14"; - by-spec."minimatch"."~0.2.14" = - self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.14"; - by-spec."minimist"."~0.0.1" = + by-spec."minimatch"."~0.3.0" = + self.by-version."minimatch"."0.3.0"; + by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { name = "node-minimist-0.0.8"; @@ -11130,19 +12288,78 @@ ]; passthru.names = [ "minimist" ]; }; - by-spec."minimist"."~0.0.5" = - self.by-version."minimist"."0.0.8"; - by-spec."minimist"."~0.0.7" = - self.by-version."minimist"."0.0.8"; - by-spec."ministyle"."~0.1.3" = - self.by-version."ministyle"."0.1.3"; - by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-ministyle-0.1.3"; + by-spec."minimist"."0.0.9" = + self.by-version."minimist"."0.0.9"; + by-version."minimist"."0.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz"; - name = "ministyle-0.1.3.tgz"; - sha1 = "d7a639f29e9450b9d5ebf2255d1fa8d1d9d89900"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.9.tgz"; + name = "minimist-0.0.9.tgz"; + sha1 = "04e6034ffbf572be2fe42cf1da2c696be0901917"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."minimist"."^0.1.0" = + self.by-version."minimist"."0.1.0"; + by-version."minimist"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + name = "minimist-0.1.0.tgz"; + sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."minimist"."~0.0.1" = + self.by-version."minimist"."0.0.10"; + by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + name = "minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."minimist"."~0.0.5" = + self.by-version."minimist"."0.0.10"; + by-spec."minimist"."~0.0.7" = + self.by-version."minimist"."0.0.10"; + by-spec."minimist"."~0.0.9" = + self.by-version."minimist"."0.0.10"; + by-spec."ministyle"."~0.1.3" = + self.by-version."ministyle"."0.1.4"; + by-version."ministyle"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-ministyle-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz"; + name = "ministyle-0.1.4.tgz"; + sha1 = "b10481eb16aa8f7b6cd983817393a44da0e5a0cd"; }) ]; buildInputs = @@ -11174,6 +12391,29 @@ passthru.names = [ "miniwrite" ]; }; by-spec."mkdirp"."*" = + self.by-version."mkdirp"."0.5.0"; + by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + name = "mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = [ + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; + "mkdirp" = self.by-version."mkdirp"."0.5.0"; + by-spec."mkdirp"."0" = + self.by-version."mkdirp"."0.5.0"; + by-spec."mkdirp"."0.3" = self.by-version."mkdirp"."0.3.5"; by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { name = "node-mkdirp-0.3.5"; @@ -11192,11 +12432,6 @@ ]; passthru.names = [ "mkdirp" ]; }; - "mkdirp" = self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."0" = - self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."0.3" = - self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."0.3.0" = self.by-version."mkdirp"."0.3.0"; by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -11220,16 +12455,24 @@ self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."0.3.x" = self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."0.5.0" = + self.by-version."mkdirp"."0.5.0"; + by-spec."mkdirp"."0.5.x" = + self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp"."0.x.x" = - self.by-version."mkdirp"."0.3.5"; + self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp"."^0.3.5" = self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."^0.5.0" = + self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp"."~0.3.3" = self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.3.4" = self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.3.5" = self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."~0.5.0" = + self.by-version."mkdirp"."0.5.0"; by-spec."mkpath"."~0.1.0" = self.by-version."mkpath"."0.1.0"; by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -11250,14 +12493,14 @@ passthru.names = [ "mkpath" ]; }; by-spec."mocha"."*" = - self.by-version."mocha"."1.18.2"; - by-version."mocha"."1.18.2" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.18.2"; + self.by-version."mocha"."1.20.1"; + by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage { + name = "mocha-1.20.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.18.2.tgz"; - name = "mocha-1.18.2.tgz"; - sha1 = "800848f8f7884c61eefcfa2a27304ba9e5446d0b"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz"; + name = "mocha-1.20.1.tgz"; + sha1 = "f343832d9fe0c7d97c64fc70448f5136df9fed5b"; }) ]; buildInputs = @@ -11267,7 +12510,7 @@ self.by-version."growl"."1.7.0" self.by-version."jade"."0.26.3" self.by-version."diff"."1.0.7" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.3" ]; @@ -11275,7 +12518,7 @@ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.18.2"; + "mocha" = self.by-version."mocha"."1.20.1"; by-spec."mocha"."1.13.x" = self.by-version."mocha"."1.13.0"; by-version."mocha"."1.13.0" = lib.makeOverridable self.buildNodePackage { @@ -11294,7 +12537,7 @@ self.by-version."growl"."1.7.0" self.by-version."jade"."0.26.3" self.by-version."diff"."1.0.7" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.3" ]; @@ -11303,14 +12546,14 @@ passthru.names = [ "mocha" ]; }; by-spec."mocha-phantomjs"."*" = - self.by-version."mocha-phantomjs"."3.3.2"; - by-version."mocha-phantomjs"."3.3.2" = lib.makeOverridable self.buildNodePackage { - name = "mocha-phantomjs-3.3.2"; + self.by-version."mocha-phantomjs"."3.4.1"; + by-version."mocha-phantomjs"."3.4.1" = lib.makeOverridable self.buildNodePackage { + name = "mocha-phantomjs-3.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.3.2.tgz"; - name = "mocha-phantomjs-3.3.2.tgz"; - sha1 = "2d7cc9926f0fbbeb341697d7f2a031151c601722"; + url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.4.1.tgz"; + name = "mocha-phantomjs-3.4.1.tgz"; + sha1 = "c48fc97b993a0f89be30baa3732050f14cdf1036"; }) ]; buildInputs = @@ -11318,13 +12561,13 @@ deps = [ self.by-version."mocha"."1.13.0" self.by-version."commander"."1.2.0" - self.by-version."which"."1.0.5" ]; peerDependencies = [ + self.by-version."phantomjs"."1.9.7-8" ]; passthru.names = [ "mocha-phantomjs" ]; }; - "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.3.2"; + "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.4.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 { @@ -11342,40 +12585,13 @@ self.by-version."jsesc"."0.4.3" self.by-version."unfunk-diff"."0.0.2" self.by-version."miniwrite"."0.1.3" - self.by-version."ministyle"."0.1.3" + self.by-version."ministyle"."0.1.4" ]; peerDependencies = [ ]; passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; - by-spec."module-deps"."~1.10.0" = - self.by-version."module-deps"."1.10.0"; - by-version."module-deps"."1.10.0" = lib.makeOverridable self.buildNodePackage { - name = "module-deps-1.10.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-1.10.0.tgz"; - name = "module-deps-1.10.0.tgz"; - sha1 = "57a9cac9dbd092428ec5249f6cf37fb249d77db6"; - }) - ]; - buildInputs = - (self.nativeDeps."module-deps" or []); - deps = [ - self.by-version."JSONStream"."0.7.2" - self.by-version."browser-resolve"."1.2.4" - self.by-version."concat-stream"."1.4.5" - self.by-version."detective"."3.1.0" - self.by-version."minimist"."0.0.8" - self.by-version."parents"."0.0.2" - self.by-version."resolve"."0.6.3" - self.by-version."through"."2.3.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "module-deps" ]; - }; by-spec."module-deps"."~1.8.0" = self.by-version."module-deps"."1.8.1"; by-version."module-deps"."1.8.1" = lib.makeOverridable self.buildNodePackage { @@ -11390,11 +12606,11 @@ buildInputs = (self.nativeDeps."module-deps" or []); deps = [ - self.by-version."JSONStream"."0.7.2" + self.by-version."JSONStream"."0.7.4" self.by-version."browser-resolve"."1.2.4" - self.by-version."concat-stream"."1.4.5" + self.by-version."concat-stream"."1.4.6" self.by-version."detective"."3.1.0" - self.by-version."minimist"."0.0.8" + self.by-version."minimist"."0.0.10" self.by-version."parents"."0.0.2" self.by-version."resolve"."0.6.3" self.by-version."through"."2.3.4" @@ -11403,6 +12619,38 @@ ]; passthru.names = [ "module-deps" ]; }; + by-spec."module-deps"."~2.1.1" = + self.by-version."module-deps"."2.1.2"; + by-version."module-deps"."2.1.2" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-2.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-2.1.2.tgz"; + name = "module-deps-2.1.2.tgz"; + sha1 = "9cfb8cc4f2b13d648c5baa553d0cbc79692967c5"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = [ + self.by-version."JSONStream"."0.7.4" + self.by-version."browser-resolve"."1.2.4" + self.by-version."concat-stream"."1.4.6" + self.by-version."detective"."3.1.0" + self.by-version."duplexer2"."0.0.2" + self.by-version."inherits"."2.0.1" + self.by-version."minimist"."0.0.10" + self.by-version."parents"."0.0.2" + self.by-version."resolve"."0.6.3" + self.by-version."stream-combiner"."0.1.0" + self.by-version."through2"."0.4.2" + self.by-version."readable-stream"."1.1.13-1" + self.by-version."subarg"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -11460,28 +12708,48 @@ ]; passthru.names = [ "moment" ]; }; - by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.2"; - by-version."mongodb"."1.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-mongodb-1.4.2"; + by-spec."moment"."~2.6.0" = + self.by-version."moment"."2.6.0"; + by-version."moment"."2.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-moment-2.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.2.tgz"; - name = "mongodb-1.4.2.tgz"; - sha1 = "68b5a5ac7ee146dcbdf17d01f60ffe88e61e76aa"; + url = "http://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; + name = "moment-2.6.0.tgz"; + sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; + }) + ]; + buildInputs = + (self.nativeDeps."moment" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "moment" ]; + }; + by-spec."mongodb"."*" = + self.by-version."mongodb"."1.4.5"; + by-version."mongodb"."1.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-mongodb-1.4.5"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.5.tgz"; + name = "mongodb-1.4.5.tgz"; + sha1 = "efde318ef9739cf92466c38e35e3104f4a051e57"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = [ - self.by-version."bson"."0.2.7" + self.by-version."bson"."0.2.8" self.by-version."kerberos"."0.0.3" + self.by-version."readable-stream"."1.1.13-1" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.2"; + "mongodb" = self.by-version."mongodb"."1.4.5"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -11523,7 +12791,7 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.3.23" = + by-spec."mongodb"."1.3.x" = self.by-version."mongodb"."1.3.23"; by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage { name = "node-mongodb-1.3.23"; @@ -11544,31 +12812,31 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.3.x" = - self.by-version."mongodb"."1.3.23"; + by-spec."mongodb"."1.4.5" = + self.by-version."mongodb"."1.4.5"; by-spec."mongoose"."*" = - self.by-version."mongoose"."3.8.8"; - by-version."mongoose"."3.8.8" = lib.makeOverridable self.buildNodePackage { - name = "node-mongoose-3.8.8"; + self.by-version."mongoose"."3.9.0"; + by-version."mongoose"."3.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-mongoose-3.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.8.tgz"; - name = "mongoose-3.8.8.tgz"; - sha1 = "ab046f1fa17b0bdf090a04b6d034d87d240a47c2"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.9.0.tgz"; + name = "mongoose-3.9.0.tgz"; + sha1 = "e888b414025ee1fd4ce1eeef48031ceed896fc30"; }) ]; buildInputs = (self.nativeDeps."mongoose" or []); deps = [ - self.by-version."hooks"."0.2.1" - self.by-version."mongodb"."1.3.23" + self.by-version."hooks"."0.3.2" + self.by-version."mongodb"."1.4.5" self.by-version."ms"."0.1.0" self.by-version."sliced"."0.0.5" self.by-version."muri"."0.3.1" - self.by-version."mpromise"."0.4.3" + self.by-version."mpromise"."0.5.0" self.by-version."mpath"."0.1.1" self.by-version."regexp-clone"."0.0.1" - self.by-version."mquery"."0.5.3" + self.by-version."mquery"."0.7.0" ]; peerDependencies = [ ]; @@ -11708,45 +12976,26 @@ ]; passthru.names = [ "monocle" ]; }; - by-spec."morgan"."1.0.0" = - self.by-version."morgan"."1.0.0"; - by-version."morgan"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-morgan-1.0.0"; + by-spec."morgan"."1.1.1" = + self.by-version."morgan"."1.1.1"; + by-version."morgan"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-morgan-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz"; - name = "morgan-1.0.0.tgz"; - sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d"; + url = "http://registry.npmjs.org/morgan/-/morgan-1.1.1.tgz"; + name = "morgan-1.1.1.tgz"; + sha1 = "cde45d2e807ebcc439745846ea80392e69098146"; }) ]; buildInputs = (self.nativeDeps."morgan" or []); deps = [ - self.by-version."bytes"."0.2.1" + self.by-version."bytes"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "morgan" ]; }; - by-spec."mout"."^0.9.0" = - self.by-version."mout"."0.9.1"; - by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-mout-0.9.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz"; - name = "mout-0.9.1.tgz"; - sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477"; - }) - ]; - buildInputs = - (self.nativeDeps."mout" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mout" ]; - }; by-spec."mout"."~0.6.0" = self.by-version."mout"."0.6.0"; by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -11787,6 +13036,25 @@ }; by-spec."mout"."~0.9.0" = self.by-version."mout"."0.9.1"; + by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-mout-0.9.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz"; + name = "mout-0.9.1.tgz"; + sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477"; + }) + ]; + buildInputs = + (self.nativeDeps."mout" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mout" ]; + }; + by-spec."mout"."~0.9.1" = + self.by-version."mout"."0.9.1"; by-spec."mpath"."0.1.1" = self.by-version."mpath"."0.1.1"; by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -11826,15 +13094,15 @@ ]; passthru.names = [ "mpromise" ]; }; - by-spec."mpromise"."0.4.3" = - self.by-version."mpromise"."0.4.3"; - by-version."mpromise"."0.4.3" = lib.makeOverridable self.buildNodePackage { - name = "node-mpromise-0.4.3"; + by-spec."mpromise"."0.5.0" = + self.by-version."mpromise"."0.5.0"; + by-version."mpromise"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-mpromise-0.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz"; - name = "mpromise-0.4.3.tgz"; - sha1 = "edc47a75a2a177b0e9382735db52dbec3808cc33"; + url = "http://registry.npmjs.org/mpromise/-/mpromise-0.5.0.tgz"; + name = "mpromise-0.5.0.tgz"; + sha1 = "8ff8f6aba6534bffa6fff296e13348cd065091b5"; }) ]; buildInputs = @@ -11845,15 +13113,15 @@ ]; passthru.names = [ "mpromise" ]; }; - by-spec."mquery"."0.5.3" = - self.by-version."mquery"."0.5.3"; - by-version."mquery"."0.5.3" = lib.makeOverridable self.buildNodePackage { - name = "node-mquery-0.5.3"; + by-spec."mquery"."0.7.0" = + self.by-version."mquery"."0.7.0"; + by-version."mquery"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-mquery-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mquery/-/mquery-0.5.3.tgz"; - name = "mquery-0.5.3.tgz"; - sha1 = "b8a04d096ecf90bf17a81cc39b80dd4e5abcecec"; + url = "http://registry.npmjs.org/mquery/-/mquery-0.7.0.tgz"; + name = "mquery-0.7.0.tgz"; + sha1 = "2d205abe097aff0f898d3ad9e43bd031031cdb1e"; }) ]; buildInputs = @@ -11886,6 +13154,25 @@ ]; passthru.names = [ "ms" ]; }; + by-spec."ms"."0.6.2" = + self.by-version."ms"."0.6.2"; + by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "node-ms-0.6.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + name = "ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }) + ]; + buildInputs = + (self.nativeDeps."ms" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ms" ]; + }; by-spec."msgpack".">= 0.0.1" = self.by-version."msgpack"."0.2.3"; by-version."msgpack"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -11926,6 +13213,27 @@ ]; passthru.names = [ "multiparty" ]; }; + by-spec."multiparty"."3.2.8" = + self.by-version."multiparty"."3.2.8"; + by-version."multiparty"."3.2.8" = lib.makeOverridable self.buildNodePackage { + name = "node-multiparty-3.2.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/multiparty/-/multiparty-3.2.8.tgz"; + name = "multiparty-3.2.8.tgz"; + sha1 = "bde21301dad294286e155b2b60710c6ae04ae64f"; + }) + ]; + buildInputs = + (self.nativeDeps."multiparty" or []); + deps = [ + self.by-version."readable-stream"."1.1.13-1" + self.by-version."stream-counter"."0.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "multiparty" ]; + }; by-spec."muri"."0.3.1" = self.by-version."muri"."0.3.1"; by-version."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -12004,6 +13312,25 @@ ]; passthru.names = [ "mv" ]; }; + by-spec."nan".">=1.0.0" = + self.by-version."nan"."1.2.0"; + by-version."nan"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-nan-1.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz"; + name = "nan-1.2.0.tgz"; + sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; by-spec."nan"."~0.3.0" = self.by-version."nan"."0.3.2"; by-version."nan"."0.3.2" = lib.makeOverridable self.buildNodePackage { @@ -12061,6 +13388,44 @@ ]; passthru.names = [ "nan" ]; }; + by-spec."nan"."~1.0.0" = + self.by-version."nan"."1.0.0"; + by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-nan-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + name = "nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; + by-spec."nan"."~1.1.0" = + self.by-version."nan"."1.1.2"; + by-version."nan"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-nan-1.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz"; + name = "nan-1.1.2.tgz"; + sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; by-spec."natural"."0.1.17" = self.by-version."natural"."0.1.17"; by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage { @@ -12098,7 +13463,7 @@ (self.nativeDeps."nconf" or []); deps = [ self.by-version."async"."0.2.9" - self.by-version."ini"."1.1.0" + self.by-version."ini"."1.2.1" self.by-version."optimist"."0.6.0" ]; peerDependencies = [ @@ -12190,15 +13555,15 @@ ]; passthru.names = [ "negotiator" ]; }; - by-spec."negotiator"."0.4.2" = - self.by-version."negotiator"."0.4.2"; - by-version."negotiator"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-negotiator-0.4.2"; + by-spec."negotiator"."0.4.5" = + self.by-version."negotiator"."0.4.5"; + by-version."negotiator"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-negotiator-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz"; - name = "negotiator-0.4.2.tgz"; - sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.5.tgz"; + name = "negotiator-0.4.5.tgz"; + sha1 = "0e738eb225e3a166ee7d69ebcfdc702ba236a77b"; }) ]; buildInputs = @@ -12211,6 +13576,8 @@ }; by-spec."negotiator"."~0.3.0" = self.by-version."negotiator"."0.3.0"; + by-spec."negotiator"."~0.4.0" = + self.by-version."negotiator"."0.4.5"; 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 { @@ -12250,6 +13617,25 @@ ]; passthru.names = [ "next-tick" ]; }; + by-spec."next-tick"."~0.2.2" = + self.by-version."next-tick"."0.2.2"; + by-version."next-tick"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-next-tick-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"; + name = "next-tick-0.2.2.tgz"; + sha1 = "75da4a927ee5887e39065880065b7336413b310d"; + }) + ]; + buildInputs = + (self.nativeDeps."next-tick" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "next-tick" ]; + }; by-spec."nib"."0.5.0" = self.by-version."nib"."0.5.0"; by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -12326,14 +13712,14 @@ passthru.names = [ "node-appc" ]; }; 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-node-expat-2.1.4"; + self.by-version."node-expat"."2.2.0"; + by-version."node-expat"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-node-expat-2.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz"; - name = "node-expat-2.1.4.tgz"; - sha1 = "e55a82249b71afbce09ffa880705ec37553c5121"; + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.2.0.tgz"; + name = "node-expat-2.2.0.tgz"; + sha1 = "8e946c2707c11fbd52516bbe7e14190665adfef9"; }) ]; buildInputs = @@ -12345,31 +13731,31 @@ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.1.4"; + "node-expat" = self.by-version."node-expat"."2.2.0"; by-spec."node-gyp"."*" = - self.by-version."node-gyp"."0.13.0"; - by-version."node-gyp"."0.13.0" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.13.0"; + self.by-version."node-gyp"."0.13.1"; + by-version."node-gyp"."0.13.1" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.13.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz"; - name = "node-gyp-0.13.0.tgz"; - sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz"; + name = "node-gyp-0.13.1.tgz"; + sha1 = "5a484dd2dc13d5b894a8fe781a250c07eae7bffa"; }) ]; buildInputs = (self.nativeDeps."node-gyp" or []); deps = [ - self.by-version."glob"."3.2.9" + self.by-version."glob"."3.2.11" self.by-version."graceful-fs"."2.0.3" self.by-version."fstream"."0.1.25" - self.by-version."minimatch"."0.2.14" - self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.2.0" - self.by-version."npmlog"."0.0.6" - self.by-version."osenv"."0.0.3" - self.by-version."request"."2.34.0" - self.by-version."rimraf"."2.2.6" + self.by-version."minimatch"."0.3.0" + self.by-version."mkdirp"."0.5.0" + self.by-version."nopt"."2.2.1" + self.by-version."npmlog"."0.1.0" + self.by-version."osenv"."0.1.0" + self.by-version."request"."2.36.0" + self.by-version."rimraf"."2.2.8" self.by-version."semver"."2.2.1" self.by-version."tar"."0.1.19" self.by-version."which"."1.0.5" @@ -12378,59 +13764,61 @@ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.by-version."node-gyp"."0.13.0"; + "node-gyp" = self.by-version."node-gyp"."0.13.1"; by-spec."node-gyp"."~0.13.0" = - self.by-version."node-gyp"."0.13.0"; + self.by-version."node-gyp"."0.13.1"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.3"; - by-version."node-inspector"."0.7.3" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.3"; + self.by-version."node-inspector"."0.7.4"; + by-version."node-inspector"."0.7.4" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.3.tgz"; - name = "node-inspector-0.7.3.tgz"; - sha1 = "988317f9a7e645d1bb78e40bb2289db82a077e73"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz"; + name = "node-inspector-0.7.4.tgz"; + sha1 = "3d07234f0834e7f1e21a1669eceaa224a7be43f2"; }) ]; buildInputs = (self.nativeDeps."node-inspector" or []); deps = [ - self.by-version."express"."3.5.1" - self.by-version."async"."0.4.1" - self.by-version."glob"."3.2.9" + self.by-version."express"."4.0.0" + self.by-version."async"."0.8.0" + self.by-version."glob"."3.2.11" self.by-version."rc"."0.3.5" self.by-version."strong-data-uri"."0.1.1" self.by-version."debug"."0.8.1" self.by-version."ws"."0.4.31" self.by-version."opener"."1.3.0" - self.by-version."yargs"."1.1.3" + self.by-version."yargs"."1.2.2" self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.3"; + "node-inspector" = self.by-version."node-inspector"."0.7.4"; 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-node-protobuf-1.0.10"; + self.by-version."node-protobuf"."1.1.0"; + by-version."node-protobuf"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-node-protobuf-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.10.tgz"; - name = "node-protobuf-1.0.10.tgz"; - sha1 = "a8a02d55129efe1776bc3e038d7e6c676c001fcd"; + url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.1.0.tgz"; + name = "node-protobuf-1.1.0.tgz"; + sha1 = "9d30eabb363efb1855c2dfeb2d2e5246c115589d"; }) ]; buildInputs = (self.nativeDeps."node-protobuf" or []); deps = [ + self.by-version."bindings"."1.2.0" + self.by-version."nan"."1.2.0" ]; peerDependencies = [ ]; passthru.names = [ "node-protobuf" ]; }; - "node-protobuf" = self.by-version."node-protobuf"."1.0.10"; + "node-protobuf" = self.by-version."node-protobuf"."1.1.0"; by-spec."node-swt".">=0.1.1" = self.by-version."node-swt"."0.1.1"; by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -12581,7 +13969,7 @@ buildInputs = (self.nativeDeps."node-wsfederation" or []); deps = [ - self.by-version."xml2js"."0.4.2" + self.by-version."xml2js"."0.4.4" ]; peerDependencies = [ ]; @@ -12620,8 +14008,8 @@ buildInputs = (self.nativeDeps."nodemailer" or []); deps = [ - self.by-version."mailcomposer"."0.2.9" - self.by-version."simplesmtp"."0.3.25" + self.by-version."mailcomposer"."0.2.11" + self.by-version."simplesmtp"."0.3.32" self.by-version."optimist"."0.6.1" ]; peerDependencies = [ @@ -12629,27 +14017,28 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.0.17"; - by-version."nodemon"."1.0.17" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.0.17"; + self.by-version."nodemon"."1.2.0"; + by-version."nodemon"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.17.tgz"; - name = "nodemon-1.0.17.tgz"; - sha1 = "910a3f3cb66c06a3499498455cf4e0119f75799c"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.0.tgz"; + name = "nodemon-1.2.0.tgz"; + sha1 = "fd64fbbd2730c828fe897026ada53ab5ae42727c"; }) ]; buildInputs = (self.nativeDeps."nodemon" or []); deps = [ - self.by-version."update-notifier"."0.1.8" - self.by-version."minimatch"."0.2.14" + self.by-version."update-notifier"."0.1.10" + self.by-version."minimatch"."0.3.0" + self.by-version."ps-tree"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.0.17"; + "nodemon" = self.by-version."nodemon"."1.2.0"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -12672,14 +14061,34 @@ passthru.names = [ "nomnom" ]; }; by-spec."nopt"."2" = - self.by-version."nopt"."2.2.0"; - by-version."nopt"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.2.0"; + self.by-version."nopt"."2.2.1"; + by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "nopt-2.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.2.0.tgz"; - name = "nopt-2.2.0.tgz"; - sha1 = "3d106676f3607ac466af9bf82bd707b1501d3bd5"; + url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; + name = "nopt-2.2.1.tgz"; + sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; + }) + ]; + buildInputs = + (self.nativeDeps."nopt" or []); + deps = [ + self.by-version."abbrev"."1.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "nopt" ]; + }; + by-spec."nopt"."2 || 3" = + self.by-version."nopt"."3.0.0"; + by-version."nopt"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "nopt-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nopt/-/nopt-3.0.0.tgz"; + name = "nopt-3.0.0.tgz"; + sha1 = "4fcf4bf09123d5ee6b2f70214a4d95789b875c79"; }) ]; buildInputs = @@ -12712,9 +14121,11 @@ passthru.names = [ "nopt" ]; }; by-spec."nopt"."2.2.x" = - self.by-version."nopt"."2.2.0"; + self.by-version."nopt"."2.2.1"; by-spec."nopt"."^2.2.0" = - self.by-version."nopt"."2.2.0"; + self.by-version."nopt"."2.2.1"; + by-spec."nopt"."^2.2.1" = + self.by-version."nopt"."2.2.1"; by-spec."nopt"."~1.0.10" = self.by-version."nopt"."1.0.10"; by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage { @@ -12758,38 +14169,62 @@ by-spec."nopt"."~2.1.2" = self.by-version."nopt"."2.1.2"; by-spec."nopt"."~2.2.0" = - self.by-version."nopt"."2.2.0"; - by-spec."normalize-package-data"."~0.2.9" = - self.by-version."normalize-package-data"."0.2.12"; - by-version."normalize-package-data"."0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "node-normalize-package-data-0.2.12"; + self.by-version."nopt"."2.2.1"; + by-spec."nopt"."~2.2.1" = + self.by-version."nopt"."2.2.1"; + by-spec."normalize-package-data"."^0.2.13" = + self.by-version."normalize-package-data"."0.2.13"; + by-version."normalize-package-data"."0.2.13" = lib.makeOverridable self.buildNodePackage { + name = "node-normalize-package-data-0.2.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.12.tgz"; - name = "normalize-package-data-0.2.12.tgz"; - sha1 = "c8284cf0cb0466ea60ee64276b9070722c1da768"; + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.13.tgz"; + name = "normalize-package-data-0.2.13.tgz"; + sha1 = "50f9fd9e77b1c8411cd231db2962e73963de774d"; }) ]; buildInputs = (self.nativeDeps."normalize-package-data" or []); deps = [ - self.by-version."semver"."2.2.1" self.by-version."github-url-from-git"."1.1.1" - self.by-version."github-url-from-username-repo"."0.0.2" + self.by-version."github-url-from-username-repo"."0.1.0" + self.by-version."semver"."2.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "normalize-package-data" ]; + }; + by-spec."normalize-package-data"."^0.3.0" = + self.by-version."normalize-package-data"."0.3.0"; + by-version."normalize-package-data"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-normalize-package-data-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.3.0.tgz"; + name = "normalize-package-data-0.3.0.tgz"; + sha1 = "70ea9e5b6caf69faa9d83e42f71489642372d815"; + }) + ]; + buildInputs = + (self.nativeDeps."normalize-package-data" or []); + deps = [ + self.by-version."github-url-from-git"."1.1.1" + self.by-version."github-url-from-username-repo"."0.2.0" + self.by-version."semver"."2.3.0" ]; peerDependencies = [ ]; passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.4.7"; - by-version."npm"."1.4.7" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.4.7"; + self.by-version."npm"."1.4.14"; + by-version."npm"."1.4.14" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.4.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.4.7.tgz"; - name = "npm-1.4.7.tgz"; - sha1 = "7e3c4385973ffb58c9bf15eebe2668c0ce3fafe0"; + url = "http://registry.npmjs.org/npm/-/npm-1.4.14.tgz"; + name = "npm-1.4.14.tgz"; + sha1 = "b779a930fb7a1260f9784fb1e04b1e6898653bd9"; }) ]; buildInputs = @@ -12801,6 +14236,7 @@ self.by-version."ansistyles"."0.1.3" self.by-version."archy"."0.0.2" self.by-version."block-stream"."0.0.7" + self.by-version."char-spinner"."1.0.1" self.by-version."child-process-close"."0.1.1" self.by-version."chmodr"."0.1.0" self.by-version."chownr"."0.0.1" @@ -12808,36 +14244,38 @@ self.by-version."columnify"."0.1.2" self.by-version."editor"."0.0.5" self.by-version."fstream"."0.1.25" - self.by-version."fstream-npm"."0.1.6" + self.by-version."fstream-npm"."0.1.7" self.by-version."github-url-from-git"."1.1.1" - self.by-version."github-url-from-username-repo"."0.0.2" - self.by-version."glob"."3.2.9" + self.by-version."github-url-from-username-repo"."0.1.0" + self.by-version."glob"."3.2.11" self.by-version."graceful-fs"."2.0.3" - self.by-version."ini"."1.1.0" - self.by-version."init-package-json"."0.0.15" + self.by-version."inflight"."1.0.1" + self.by-version."ini"."1.2.1" + self.by-version."init-package-json"."0.0.17" self.by-version."lockfile"."0.4.2" self.by-version."lru-cache"."2.5.0" - self.by-version."minimatch"."0.2.14" + self.by-version."minimatch"."0.3.0" self.by-version."mkdirp"."0.3.5" - self.by-version."node-gyp"."0.13.0" - self.by-version."nopt"."2.2.0" - self.by-version."npm-install-checks"."1.0.0" - self.by-version."npm-registry-client"."0.4.7" - self.by-version."npm-user-validate"."0.0.3" - self.by-version."npmconf"."0.1.14" + self.by-version."node-gyp"."0.13.1" + self.by-version."nopt"."2.2.1" + self.by-version."npm-cache-filename"."1.0.1" + self.by-version."npm-install-checks"."1.0.2" + self.by-version."npm-registry-client"."1.0.1" + self.by-version."npm-user-validate"."0.1.0" + self.by-version."npmconf"."1.0.2" self.by-version."npmlog"."0.0.6" self.by-version."once"."1.3.0" self.by-version."opener"."1.3.0" - self.by-version."osenv"."0.0.3" + self.by-version."osenv"."0.1.0" self.by-version."path-is-inside"."1.0.1" self.by-version."read"."1.0.5" - self.by-version."read-installed"."2.0.2" - self.by-version."read-package-json"."1.1.8" + self.by-version."read-installed"."2.0.5" + self.by-version."read-package-json"."1.1.9" self.by-version."request"."2.30.0" self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.6" - self.by-version."semver"."2.2.1" - self.by-version."sha"."1.2.3" + self.by-version."rimraf"."2.2.8" + self.by-version."semver"."2.3.0" + self.by-version."sha"."1.2.4" self.by-version."slide"."1.1.5" self.by-version."sorted-object"."1.0.0" self.by-version."tar"."0.1.19" @@ -12849,23 +14287,44 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.4.7"; - by-spec."npm-install-checks"."~1.0.0" = - self.by-version."npm-install-checks"."1.0.0"; - by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-install-checks-1.0.0"; + "npm" = self.by-version."npm"."1.4.14"; + by-spec."npm-cache-filename"."^1.0.0" = + self.by-version."npm-cache-filename"."1.0.1"; + by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-cache-filename-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.0.tgz"; - name = "npm-install-checks-1.0.0.tgz"; - sha1 = "7e1469b5e0c693b2ae2a8830b5fc4e7bf76c88fd"; + url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"; + name = "npm-cache-filename-1.0.1.tgz"; + sha1 = "9b640f0c1a5ba1145659685372a9ff71f70c4323"; + }) + ]; + buildInputs = + (self.nativeDeps."npm-cache-filename" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "npm-cache-filename" ]; + }; + by-spec."npm-cache-filename"."~1.0.1" = + self.by-version."npm-cache-filename"."1.0.1"; + by-spec."npm-install-checks"."~1.0.0" = + self.by-version."npm-install-checks"."1.0.2"; + by-version."npm-install-checks"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-install-checks-1.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.2.tgz"; + name = "npm-install-checks-1.0.2.tgz"; + sha1 = "ebba769753fc8551308333ef411920743a6809f6"; }) ]; buildInputs = (self.nativeDeps."npm-install-checks" or []); deps = [ - self.by-version."npmlog"."0.0.6" - self.by-version."semver"."2.2.1" + self.by-version."npmlog"."0.1.0" + self.by-version."semver"."2.3.0" ]; peerDependencies = [ ]; @@ -12885,58 +14344,59 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.34.0" + self.by-version."request"."2.36.0" self.by-version."graceful-fs"."2.0.3" self.by-version."semver"."2.0.11" self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" self.by-version."retry"."0.6.0" self.by-version."couch-login"."0.1.20" - self.by-version."npmlog"."0.0.6" + self.by-version."npmlog"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.4.7" = - self.by-version."npm-registry-client"."0.4.7"; - by-version."npm-registry-client"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-registry-client-0.4.7"; + by-spec."npm-registry-client"."~1.0.0" = + self.by-version."npm-registry-client"."1.0.1"; + by-version."npm-registry-client"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-registry-client-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.7.tgz"; - name = "npm-registry-client-0.4.7.tgz"; - sha1 = "f4369b59890da7882527eb7c427dd95d43707afb"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-1.0.1.tgz"; + name = "npm-registry-client-1.0.1.tgz"; + sha1 = "c5f6a87d285f2005a35d3f67d9c724bce551b0f1"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.34.0" - self.by-version."graceful-fs"."2.0.3" - self.by-version."semver"."2.2.1" - self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" + self.by-version."graceful-fs"."2.0.3" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.6" + self.by-version."npm-cache-filename"."1.0.1" + self.by-version."request"."2.36.0" self.by-version."retry"."0.6.0" - self.by-version."npmlog"."0.0.6" + self.by-version."rimraf"."2.2.8" + self.by-version."semver"."2.3.0" + self.by-version."slide"."1.1.5" + self.by-version."npmlog"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; - 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 = "node-npm-user-validate-0.0.3"; + by-spec."npm-user-validate"."~0.1.0" = + self.by-version."npm-user-validate"."0.1.0"; + by-version."npm-user-validate"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-user-validate-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"; - name = "npm-user-validate-0.0.3.tgz"; - sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e"; + url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.0.tgz"; + name = "npm-user-validate-0.1.0.tgz"; + sha1 = "358a5b5148ed3f79771d980388c6e34c4a61f638"; }) ]; buildInputs = @@ -12961,14 +14421,14 @@ buildInputs = (self.nativeDeps."npm2nix" or []); deps = [ - self.by-version."semver"."2.2.1" + self.by-version."semver"."2.3.0" self.by-version."argparse"."0.1.15" self.by-version."npm-registry-client"."0.2.27" self.by-version."npmconf"."0.1.1" self.by-version."tar"."0.1.17" self.by-version."temp"."0.6.0" self.by-version."fs.extra"."1.2.1" - self.by-version."findit"."1.1.1" + self.by-version."findit"."1.2.0" ]; peerDependencies = [ ]; @@ -12994,7 +14454,7 @@ self.by-version."once"."1.1.1" self.by-version."mkdirp"."0.3.5" self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.2.0" + self.by-version."nopt"."2.2.1" self.by-version."semver"."1.1.4" self.by-version."ini"."1.1.0" ]; @@ -13021,23 +14481,23 @@ self.by-version."once"."1.1.1" self.by-version."mkdirp"."0.3.5" self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.2.0" - self.by-version."semver"."2.2.1" + self.by-version."nopt"."2.2.1" + self.by-version."semver"."2.3.0" self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."~0.1.13" = - self.by-version."npmconf"."0.1.14"; - by-version."npmconf"."0.1.14" = lib.makeOverridable self.buildNodePackage { - name = "node-npmconf-0.1.14"; + by-spec."npmconf"."~0.1.2" = + self.by-version."npmconf"."0.1.16"; + by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "node-npmconf-0.1.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.14.tgz"; - name = "npmconf-0.1.14.tgz"; - sha1 = "aea4bc12c5a84191a32cd350e325da4fe8b127e7"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; + name = "npmconf-0.1.16.tgz"; + sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; }) ]; buildInputs = @@ -13048,19 +14508,67 @@ self.by-version."once"."1.3.0" self.by-version."mkdirp"."0.3.5" self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.2.0" - self.by-version."semver"."2.2.1" + self.by-version."nopt"."2.2.1" + self.by-version."semver"."2.3.0" self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."~0.1.14" = - self.by-version."npmconf"."0.1.14"; - by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.14"; + by-spec."npmconf"."~1.0.0" = + self.by-version."npmconf"."1.0.2"; + by-version."npmconf"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-npmconf-1.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npmconf/-/npmconf-1.0.2.tgz"; + name = "npmconf-1.0.2.tgz"; + sha1 = "161a11fe5605f667edbf1aad797fd2d04c8c44e4"; + }) + ]; + buildInputs = + (self.nativeDeps."npmconf" or []); + deps = [ + self.by-version."config-chain"."1.1.8" + self.by-version."inherits"."2.0.1" + self.by-version."ini"."1.2.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."3.0.0" + self.by-version."once"."1.3.0" + self.by-version."osenv"."0.0.3" + self.by-version."semver"."2.3.0" + self.by-version."uid-number"."0.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "npmconf" ]; + }; + by-spec."npmconf"."~1.0.1" = + self.by-version."npmconf"."1.0.2"; by-spec."npmlog"."*" = + self.by-version."npmlog"."0.1.0"; + by-version."npmlog"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-npmlog-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.0.tgz"; + name = "npmlog-0.1.0.tgz"; + sha1 = "c88336df9426979b86d848d35357f4e6a558bd90"; + }) + ]; + buildInputs = + (self.nativeDeps."npmlog" or []); + deps = [ + self.by-version."ansi"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "npmlog" ]; + }; + by-spec."npmlog"."0" = + self.by-version."npmlog"."0.1.0"; + by-spec."npmlog"."0.0.6" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { name = "node-npmlog-0.0.6"; @@ -13080,10 +14588,8 @@ ]; passthru.names = [ "npmlog" ]; }; - by-spec."npmlog"."0" = - self.by-version."npmlog"."0.0.6"; - by-spec."npmlog"."0.0.6" = - self.by-version."npmlog"."0.0.6"; + by-spec."npmlog"."0.1" = + self.by-version."npmlog"."0.1.0"; by-spec."nssocket"."~0.5.1" = self.by-version."nssocket"."0.5.1"; by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -13133,7 +14639,7 @@ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; name = "oauth-0.9.11.tgz"; - sha256 = "14cc7a064e3eda0948ac8db72fae140cb7b0fdbe031375d02cd6d0359c8b8faa"; + sha256 = "71c7d2bd27de05fb0d6f233672c53765ecc028f100b5f1d4e7845f4637f47db4"; }) ]; buildInputs = @@ -13222,6 +14728,25 @@ }; by-spec."object-assign"."~0.1.2" = self.by-version."object-assign"."0.1.2"; + by-spec."object-assign"."~0.2.1" = + self.by-version."object-assign"."0.2.2"; + by-version."object-assign"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-object-assign-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/object-assign/-/object-assign-0.2.2.tgz"; + name = "object-assign-0.2.2.tgz"; + sha1 = "e0a78bc56af9c092051167f6b8f23249e7dde1a6"; + }) + ]; + buildInputs = + (self.nativeDeps."object-assign" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "object-assign" ]; + }; 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 { @@ -13241,6 +14766,25 @@ ]; passthru.names = [ "object-keys" ]; }; + by-spec."on-headers"."0.0.0" = + self.by-version."on-headers"."0.0.0"; + by-version."on-headers"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-on-headers-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/on-headers/-/on-headers-0.0.0.tgz"; + name = "on-headers-0.0.0.tgz"; + sha1 = "ee2817f8344325785cd9c2df2b242bbc17caf4c4"; + }) + ]; + buildInputs = + (self.nativeDeps."on-headers" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "on-headers" ]; + }; by-spec."once"."1.1.1" = self.by-version."once"."1.1.1"; by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -13260,9 +14804,7 @@ ]; passthru.names = [ "once" ]; }; - by-spec."once"."~1.1.1" = - self.by-version."once"."1.1.1"; - by-spec."once"."~1.3.0" = + by-spec."once"."^1.3.0" = self.by-version."once"."1.3.0"; by-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage { name = "node-once-1.3.0"; @@ -13281,6 +14823,10 @@ ]; passthru.names = [ "once" ]; }; + by-spec."once"."~1.1.1" = + self.by-version."once"."1.1.1"; + by-spec."once"."~1.3.0" = + self.by-version."once"."1.3.0"; by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -13340,6 +14886,8 @@ }; by-spec."open"."~0.0.4" = self.by-version."open"."0.0.5"; + by-spec."open"."~0.0.5" = + self.by-version."open"."0.0.5"; by-spec."opener"."~1.3.0" = self.by-version."opener"."1.3.0"; by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -13360,14 +14908,14 @@ passthru.names = [ "opener" ]; }; by-spec."openid".">=0.2.0" = - self.by-version."openid"."0.5.8"; - by-version."openid"."0.5.8" = lib.makeOverridable self.buildNodePackage { - name = "node-openid-0.5.8"; + self.by-version."openid"."0.5.9"; + by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage { + name = "node-openid-0.5.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/openid/-/openid-0.5.8.tgz"; - name = "openid-0.5.8.tgz"; - sha1 = "e1e3b26235cb8964ef850c074529b9d031550e85"; + url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz"; + name = "openid-0.5.9.tgz"; + sha1 = "f44dd2609764c458c65fb22c03db068579e4bfa8"; }) ]; buildInputs = @@ -13378,6 +14926,25 @@ ]; passthru.names = [ "openid" ]; }; + by-spec."opn"."~0.1.1" = + self.by-version."opn"."0.1.2"; + by-version."opn"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "opn-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/opn/-/opn-0.1.2.tgz"; + name = "opn-0.1.2.tgz"; + sha1 = "c527832cfd964d52096b524d0035ecaece51db4f"; + }) + ]; + buildInputs = + (self.nativeDeps."opn" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "opn" ]; + }; by-spec."optimist"."*" = self.by-version."optimist"."0.6.1"; by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -13393,7 +14960,7 @@ (self.nativeDeps."optimist" or []); deps = [ self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.8" + self.by-version."minimist"."0.0.10" ]; peerDependencies = [ ]; @@ -13420,7 +14987,30 @@ ]; passthru.names = [ "optimist" ]; }; - by-spec."optimist"."0.3.x" = + by-spec."optimist"."0.6.0" = + self.by-version."optimist"."0.6.0"; + by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-optimist-0.6.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + name = "optimist-0.6.0.tgz"; + sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; + }) + ]; + buildInputs = + (self.nativeDeps."optimist" or []); + deps = [ + self.by-version."wordwrap"."0.0.2" + self.by-version."minimist"."0.0.10" + ]; + peerDependencies = [ + ]; + passthru.names = [ "optimist" ]; + }; + by-spec."optimist"."0.6.x" = + self.by-version."optimist"."0.6.1"; + by-spec."optimist"."~0.3" = self.by-version."optimist"."0.3.7"; by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage { name = "node-optimist-0.3.7"; @@ -13440,31 +15030,6 @@ ]; passthru.names = [ "optimist" ]; }; - by-spec."optimist"."0.6.0" = - self.by-version."optimist"."0.6.0"; - by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "node-optimist-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; - name = "optimist-0.6.0.tgz"; - sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = [ - self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - by-spec."optimist"."0.6.x" = - self.by-version."optimist"."0.6.1"; - by-spec."optimist"."~0.3" = - self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.3.5" = self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.6.0" = @@ -13550,7 +15115,45 @@ ]; passthru.names = [ "os-browserify" ]; }; + by-spec."os-utils"."0.0.14" = + self.by-version."os-utils"."0.0.14"; + by-version."os-utils"."0.0.14" = lib.makeOverridable self.buildNodePackage { + name = "node-os-utils-0.0.14"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/os-utils/-/os-utils-0.0.14.tgz"; + name = "os-utils-0.0.14.tgz"; + sha1 = "29e511697b1982b8c627722175fe39797ef64156"; + }) + ]; + buildInputs = + (self.nativeDeps."os-utils" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "os-utils" ]; + }; by-spec."osenv"."0" = + self.by-version."osenv"."0.1.0"; + by-version."osenv"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-osenv-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"; + name = "osenv-0.1.0.tgz"; + sha1 = "61668121eec584955030b9f470b1d2309504bfcb"; + }) + ]; + buildInputs = + (self.nativeDeps."osenv" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "osenv" ]; + }; + by-spec."osenv"."0.0.3" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "node-osenv-0.0.3"; @@ -13569,8 +15172,6 @@ ]; passthru.names = [ "osenv" ]; }; - by-spec."osenv"."0.0.3" = - self.by-version."osenv"."0.0.3"; by-spec."osenv"."~0.0.3" = self.by-version."osenv"."0.0.3"; by-spec."owl-deepcopy"."*" = @@ -13615,15 +15216,34 @@ ]; passthru.names = [ "p-throttler" ]; }; - by-spec."pako"."~0.2.0" = - self.by-version."pako"."0.2.0"; - by-version."pako"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-pako-0.2.0"; + by-spec."pad-component"."0.0.1" = + self.by-version."pad-component"."0.0.1"; + by-version."pad-component"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-pad-component-0.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/pako/-/pako-0.2.0.tgz"; - name = "pako-0.2.0.tgz"; - sha1 = "bb93787e8c60587c8b13cd3cd8802e9d6f5dd8d5"; + url = "http://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; + name = "pad-component-0.0.1.tgz"; + sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; + }) + ]; + buildInputs = + (self.nativeDeps."pad-component" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "pad-component" ]; + }; + by-spec."pako"."~0.2.0" = + self.by-version."pako"."0.2.3"; + by-version."pako"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-pako-0.2.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pako/-/pako-0.2.3.tgz"; + name = "pako-0.2.3.tgz"; + sha1 = "da97260282d270c43f210d9e9bf9abdf54072641"; }) ]; buildInputs = @@ -13860,14 +15480,14 @@ passthru.names = [ "pause" ]; }; by-spec."phantomjs"."*" = - self.by-version."phantomjs"."1.9.7-4"; - by-version."phantomjs"."1.9.7-4" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.7-4"; + self.by-version."phantomjs"."1.9.7-8"; + by-version."phantomjs"."1.9.7-8" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.7-8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-4.tgz"; - name = "phantomjs-1.9.7-4.tgz"; - sha1 = "975b84f17b4b3bb28161d28303cb793b98c9d0dd"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-8.tgz"; + name = "phantomjs-1.9.7-8.tgz"; + sha1 = "f1858d1626bb62f8bbb2a06e733ea95c50c2deb5"; }) ]; buildInputs = @@ -13878,16 +15498,19 @@ self.by-version."ncp"."0.4.2" self.by-version."npmconf"."0.0.24" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.6" + self.by-version."request"."2.36.0" + self.by-version."rimraf"."2.2.8" self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "phantomjs" ]; }; - "phantomjs" = self.by-version."phantomjs"."1.9.7-4"; - by-spec."phantomjs"."~1.9.1-2" = - self.by-version."phantomjs"."1.9.7-4"; + "phantomjs" = self.by-version."phantomjs"."1.9.7-8"; + by-spec."phantomjs"."~1.9.1" = + self.by-version."phantomjs"."1.9.7-8"; + by-spec."phantomjs"."~1.9.7" = + self.by-version."phantomjs"."1.9.7-8"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -14010,14 +15633,14 @@ passthru.names = [ "posix-getopt" ]; }; by-spec."pretty-bytes"."^0.1.0" = - self.by-version."pretty-bytes"."0.1.0"; - by-version."pretty-bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "pretty-bytes-0.1.0"; + self.by-version."pretty-bytes"."0.1.1"; + by-version."pretty-bytes"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "pretty-bytes-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz"; - name = "pretty-bytes-0.1.0.tgz"; - sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e"; + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.1.tgz"; + name = "pretty-bytes-0.1.1.tgz"; + sha1 = "c99fc780053e49397155295f2fd1a196e8c3937a"; }) ]; buildInputs = @@ -14028,6 +15651,25 @@ ]; passthru.names = [ "pretty-bytes" ]; }; + by-spec."process"."^0.7.0" = + self.by-version."process"."0.7.0"; + by-version."process"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-process-0.7.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/process/-/process-0.7.0.tgz"; + name = "process-0.7.0.tgz"; + sha1 = "c52208161a34adf3812344ae85d3e6150469389d"; + }) + ]; + buildInputs = + (self.nativeDeps."process" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "process" ]; + }; by-spec."process"."~0.5.1" = self.by-version."process"."0.5.2"; by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage { @@ -14080,7 +15722,7 @@ buildInputs = (self.nativeDeps."promise" or []); deps = [ - self.by-version."is-promise"."1.0.0" + self.by-version."is-promise"."1.0.1" ]; peerDependencies = [ ]; @@ -14102,7 +15744,7 @@ deps = [ self.by-version."pkginfo"."0.3.0" self.by-version."read"."1.0.5" - self.by-version."revalidator"."0.1.7" + self.by-version."revalidator"."0.1.8" self.by-version."utile"."0.2.1" self.by-version."winston"."0.6.2" ]; @@ -14131,14 +15773,14 @@ passthru.names = [ "promptly" ]; }; by-spec."promzard"."~0.2.0" = - self.by-version."promzard"."0.2.1"; - by-version."promzard"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-promzard-0.2.1"; + self.by-version."promzard"."0.2.2"; + by-version."promzard"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-promzard-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/promzard/-/promzard-0.2.1.tgz"; - name = "promzard-0.2.1.tgz"; - sha1 = "c4c7cbe5182465c13b43540be9daf47098b4e75b"; + url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz"; + name = "promzard-0.2.2.tgz"; + sha1 = "918b9f2b29458cb001781a8856502e4a79b016e0"; }) ]; buildInputs = @@ -14170,14 +15812,14 @@ passthru.names = [ "proto-list" ]; }; by-spec."protobufjs".">= 1.1.4" = - self.by-version."protobufjs"."2.0.5"; - by-version."protobufjs"."2.0.5" = lib.makeOverridable self.buildNodePackage { - name = "protobufjs-2.0.5"; + self.by-version."protobufjs"."2.2.1"; + by-version."protobufjs"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "protobufjs-2.2.1"; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz"; - name = "protobufjs-2.0.5.tgz"; - sha1 = "7f351178c959b333d2327b773325ca4b2627a242"; + url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.2.1.tgz"; + name = "protobufjs-2.2.1.tgz"; + sha1 = "ce22d3f51f6685b8e783a7d7c2e956ada6147495"; }) ]; buildInputs = @@ -14190,6 +15832,46 @@ ]; passthru.names = [ "protobufjs" ]; }; + by-spec."proxy-addr"."1.0.0" = + self.by-version."proxy-addr"."1.0.0"; + by-version."proxy-addr"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-proxy-addr-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.0.tgz"; + name = "proxy-addr-1.0.0.tgz"; + sha1 = "478617ab0fba70e0c3dae9cf57469e36dd2febaf"; + }) + ]; + buildInputs = + (self.nativeDeps."proxy-addr" or []); + deps = [ + self.by-version."ipaddr.js"."0.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "proxy-addr" ]; + }; + by-spec."proxy-addr"."1.0.1" = + self.by-version."proxy-addr"."1.0.1"; + by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-proxy-addr-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; + name = "proxy-addr-1.0.1.tgz"; + sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; + }) + ]; + buildInputs = + (self.nativeDeps."proxy-addr" or []); + deps = [ + self.by-version."ipaddr.js"."0.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "proxy-addr" ]; + }; 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 { @@ -14210,6 +15892,8 @@ ]; passthru.names = [ "ps-tree" ]; }; + by-spec."ps-tree"."~0.0.3" = + self.by-version."ps-tree"."0.0.3"; by-spec."punycode"."1.2.4" = self.by-version."punycode"."1.2.4"; by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -14252,6 +15936,8 @@ }; by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.4"; + by-spec."punycode"."~1.2.4" = + self.by-version."punycode"."1.2.4"; by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" = self.by-version."pure-css"."0.5.0-rc-1"; by-version."pure-css"."0.5.0-rc-1" = lib.makeOverridable self.buildNodePackage { @@ -14273,14 +15959,14 @@ }; "pure-css" = self.by-version."pure-css"."0.5.0-rc-1"; by-spec."q".">= 0.0.1" = - self.by-version."q"."2.0.1"; - by-version."q"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-q-2.0.1"; + self.by-version."q"."2.0.2"; + by-version."q"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-q-2.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-2.0.1.tgz"; - name = "q-2.0.1.tgz"; - sha1 = "ae9dc1edd970e72820a1ca716ecc1b0fc96c1c5a"; + url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz"; + name = "q-2.0.2.tgz"; + sha1 = "4629e6cc668ff8554cfa775dab5aba50bad8f56d"; }) ]; buildInputs = @@ -14478,8 +16164,6 @@ self.by-version."qs"."0.5.6"; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; - by-spec."qs"."~0.6.6" = - self.by-version."qs"."0.6.6"; by-spec."querystring".">=0.1.0 <0.2.0" = self.by-version."querystring"."0.1.0"; by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -14518,15 +16202,34 @@ ]; passthru.names = [ "querystring-es3" ]; }; - by-spec."rai"."~0.1" = - self.by-version."rai"."0.1.9"; - by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "node-rai-0.1.9"; + by-spec."querystring-es3"."~0.2.0" = + self.by-version."querystring-es3"."0.2.1-0"; + by-version."querystring-es3"."0.2.1-0" = lib.makeOverridable self.buildNodePackage { + name = "node-querystring-es3-0.2.1-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz"; - name = "rai-0.1.9.tgz"; - sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc"; + url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1-0.tgz"; + name = "querystring-es3-0.2.1-0.tgz"; + sha1 = "bd38cbd701040e7ef66c94a93db4a5b45be39565"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring-es3" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "querystring-es3" ]; + }; + by-spec."rai"."~0.1.11" = + self.by-version."rai"."0.1.11"; + by-version."rai"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "node-rai-0.1.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz"; + name = "rai-0.1.11.tgz"; + sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228"; }) ]; buildInputs = @@ -14639,41 +16342,21 @@ ]; passthru.names = [ "raw-body" ]; }; - by-spec."raw-body"."1.1.3" = - self.by-version."raw-body"."1.1.3"; - by-version."raw-body"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-raw-body-1.1.3"; + by-spec."raw-body"."1.1.6" = + self.by-version."raw-body"."1.1.6"; + by-version."raw-body"."1.1.6" = lib.makeOverridable self.buildNodePackage { + name = "node-raw-body-1.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.3.tgz"; - name = "raw-body-1.1.3.tgz"; - sha1 = "3d2f91e2449259cc67b8c3ce9f061db5b987935b"; + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.6.tgz"; + name = "raw-body-1.1.6.tgz"; + sha1 = "98e9df9a7e2df994931b7cdb4b2a6b9694a74f02"; }) ]; buildInputs = (self.nativeDeps."raw-body" or []); deps = [ - self.by-version."bytes"."0.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "raw-body" ]; - }; - by-spec."raw-body"."~1.1.2" = - self.by-version."raw-body"."1.1.4"; - by-version."raw-body"."1.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-raw-body-1.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz"; - name = "raw-body-1.1.4.tgz"; - sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d"; - }) - ]; - buildInputs = - (self.nativeDeps."raw-body" or []); - deps = [ - self.by-version."bytes"."0.3.0" + self.by-version."bytes"."1.0.0" ]; peerDependencies = [ ]; @@ -14732,15 +16415,15 @@ buildInputs = (self.nativeDeps."rc" or []); deps = [ - self.by-version."minimist"."0.0.8" - self.by-version."deep-extend"."0.2.8" + self.by-version."minimist"."0.0.10" + self.by-version."deep-extend"."0.2.10" self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.4" = + by-spec."rc"."~0.3.5" = self.by-version."rc"."0.3.5"; by-spec."react"."*" = self.by-version."react"."0.10.0"; @@ -14783,61 +16466,107 @@ ]; passthru.names = [ "read" ]; }; + by-spec."read"."1.0.5" = + self.by-version."read"."1.0.5"; by-spec."read"."1.0.x" = self.by-version."read"."1.0.5"; by-spec."read"."~1.0.1" = self.by-version."read"."1.0.5"; by-spec."read"."~1.0.4" = self.by-version."read"."1.0.5"; - by-spec."read-installed"."~2.0.1" = - self.by-version."read-installed"."2.0.2"; - by-version."read-installed"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-read-installed-2.0.2"; + by-spec."read-installed"."~2.0.4" = + self.by-version."read-installed"."2.0.5"; + by-version."read-installed"."2.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-read-installed-2.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.2.tgz"; - name = "read-installed-2.0.2.tgz"; - sha1 = "e69e7e1946af932b2fa454465639ebea4d63773c"; + url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.5.tgz"; + name = "read-installed-2.0.5.tgz"; + sha1 = "761eda1fd2dc322f8e77844a8bf1ddedbcfc754b"; }) ]; buildInputs = (self.nativeDeps."read-installed" or []); deps = [ - self.by-version."read-package-json"."1.1.8" - self.by-version."semver"."2.2.1" + self.by-version."read-package-json"."1.2.2" + self.by-version."semver"."2.3.0" self.by-version."slide"."1.1.5" self.by-version."util-extend"."1.0.1" - self.by-version."graceful-fs"."2.0.3" + self.by-version."graceful-fs"."3.0.1" ]; peerDependencies = [ ]; passthru.names = [ "read-installed" ]; }; by-spec."read-package-json"."1" = - self.by-version."read-package-json"."1.1.8"; - by-version."read-package-json"."1.1.8" = lib.makeOverridable self.buildNodePackage { - name = "node-read-package-json-1.1.8"; + self.by-version."read-package-json"."1.2.2"; + by-version."read-package-json"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-read-package-json-1.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.8.tgz"; - name = "read-package-json-1.1.8.tgz"; - sha1 = "234928819444283fd63f9d93ce03ba00668e94f9"; + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.2.tgz"; + name = "read-package-json-1.2.2.tgz"; + sha1 = "545fc9044d135bf5fe0a67c6eab368c3186cbafe"; }) ]; buildInputs = (self.nativeDeps."read-package-json" or []); deps = [ - self.by-version."glob"."3.2.9" + self.by-version."glob"."4.0.2" self.by-version."lru-cache"."2.5.0" - self.by-version."normalize-package-data"."0.2.12" + self.by-version."normalize-package-data"."0.3.0" + self.by-version."graceful-fs"."3.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "read-package-json" ]; + }; + by-spec."read-package-json"."~1.1.9" = + self.by-version."read-package-json"."1.1.9"; + by-version."read-package-json"."1.1.9" = lib.makeOverridable self.buildNodePackage { + name = "node-read-package-json-1.1.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.9.tgz"; + name = "read-package-json-1.1.9.tgz"; + sha1 = "9c319185e5f8461661c01f8d4e5e80b468aa18ee"; + }) + ]; + buildInputs = + (self.nativeDeps."read-package-json" or []); + deps = [ + self.by-version."glob"."3.2.11" + self.by-version."lru-cache"."2.5.0" + self.by-version."normalize-package-data"."0.2.13" self.by-version."graceful-fs"."2.0.3" ]; peerDependencies = [ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."~1.1.8" = - self.by-version."read-package-json"."1.1.8"; + by-spec."readable-stream"."*" = + self.by-version."readable-stream"."1.1.13-1"; + by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.1.13-1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz"; + name = "readable-stream-1.1.13-1.tgz"; + sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46"; + }) + ]; + buildInputs = + (self.nativeDeps."readable-stream" or []); + deps = [ + self.by-version."core-util-is"."1.0.1" + self.by-version."isarray"."0.0.1" + self.by-version."string_decoder"."0.10.25" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "readable-stream" ]; + }; by-spec."readable-stream"."1.0" = self.by-version."readable-stream"."1.0.27-1"; by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage { @@ -14861,35 +16590,22 @@ ]; passthru.names = [ "readable-stream" ]; }; + by-spec."readable-stream"."1.0.27-1" = + self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.13-1"; - by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.1.13-1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz"; - name = "readable-stream-1.1.13-1.tgz"; - sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream" or []); - deps = [ - self.by-version."core-util-is"."1.0.1" - self.by-version."isarray"."0.0.1" - self.by-version."string_decoder"."0.10.25" - self.by-version."inherits"."2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; + by-spec."readable-stream"."^1.0.27-1" = + self.by-version."readable-stream"."1.1.13-1"; by-spec."readable-stream"."~1.0.17" = self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.0.2" = self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.0.24" = self.by-version."readable-stream"."1.0.27-1"; + by-spec."readable-stream"."~1.0.26" = + self.by-version."readable-stream"."1.0.27-1"; + by-spec."readable-stream"."~1.0.26-4" = + self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.1.8" = self.by-version."readable-stream"."1.1.13-1"; by-spec."readable-stream"."~1.1.9" = @@ -14908,7 +16624,7 @@ buildInputs = (self.nativeDeps."readdirp" or []); deps = [ - self.by-version."minimatch"."0.2.14" + self.by-version."minimatch"."0.3.0" ]; peerDependencies = [ ]; @@ -14976,14 +16692,14 @@ passthru.names = [ "redeyed" ]; }; by-spec."redis"."*" = - self.by-version."redis"."0.10.1"; - by-version."redis"."0.10.1" = lib.makeOverridable self.buildNodePackage { - name = "node-redis-0.10.1"; + self.by-version."redis"."0.10.3"; + by-version."redis"."0.10.3" = lib.makeOverridable self.buildNodePackage { + name = "node-redis-0.10.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.10.1.tgz"; - name = "redis-0.10.1.tgz"; - sha1 = "4f09258931d961377239fdbd495e1d99a263a8ec"; + url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + name = "redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; }) ]; buildInputs = @@ -14994,7 +16710,9 @@ ]; passthru.names = [ "redis" ]; }; - "redis" = self.by-version."redis"."0.10.1"; + "redis" = self.by-version."redis"."0.10.3"; + by-spec."redis"."0.10.x" = + self.by-version."redis"."0.10.3"; by-spec."redis"."0.7.2" = self.by-version."redis"."0.7.2"; by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -15009,7 +16727,7 @@ buildInputs = (self.nativeDeps."redis" or []); deps = [ - self.by-version."hiredis"."0.1.16" + self.by-version."hiredis"."0.1.17" ]; peerDependencies = [ ]; @@ -15034,27 +16752,8 @@ ]; passthru.names = [ "redis" ]; }; - by-spec."redis"."0.8.x" = - self.by-version."redis"."0.8.6"; - by-version."redis"."0.8.6" = lib.makeOverridable self.buildNodePackage { - name = "node-redis-0.8.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz"; - name = "redis-0.8.6.tgz"; - sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8"; - }) - ]; - buildInputs = - (self.nativeDeps."redis" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "redis" ]; - }; by-spec."redis"."~0.10.0" = - self.by-version."redis"."0.10.1"; + self.by-version."redis"."0.10.3"; by-spec."reds"."~0.2.4" = self.by-version."reds"."0.2.4"; by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -15137,14 +16836,14 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.34.0"; - by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.34.0"; + self.by-version."request"."2.36.0"; + by-version."request"."2.36.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.36.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; - name = "request-2.34.0.tgz"; - sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; + url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz"; + name = "request-2.36.0.tgz"; + sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; }) ]; buildInputs = @@ -15152,12 +16851,12 @@ deps = [ self.by-version."qs"."0.6.6" self.by-version."json-stringify-safe"."5.0.0" + self.by-version."mime"."1.2.11" self.by-version."forever-agent"."0.5.2" self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" self.by-version."tough-cookie"."0.12.1" - self.by-version."form-data"."0.1.2" - self.by-version."tunnel-agent"."0.3.0" + self.by-version."form-data"."0.1.3" + self.by-version."tunnel-agent"."0.4.0" self.by-version."http-signature"."0.10.0" self.by-version."oauth-sign"."0.3.0" self.by-version."hawk"."1.0.0" @@ -15168,9 +16867,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.34.0"; + self.by-version."request"."2.36.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.34.0"; + self.by-version."request"."2.36.0"; by-spec."request"."2.16.2" = self.by-version."request"."2.16.2"; by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { @@ -15231,6 +16930,8 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."2.36.0" = + self.by-version."request"."2.36.0"; by-spec."request"."2.9.x" = self.by-version."request"."2.9.203"; by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage { @@ -15250,12 +16951,12 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request".">=2.33.0" = - self.by-version."request"."2.34.0"; by-spec."request"."^2.34.0" = - self.by-version."request"."2.34.0"; + self.by-version."request"."2.36.0"; + by-spec."request"."^2.36.0" = + self.by-version."request"."2.36.0"; by-spec."request"."~2" = - self.by-version."request"."2.34.0"; + self.by-version."request"."2.36.0"; by-spec."request"."~2.27.0" = self.by-version."request"."2.27.0"; by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { @@ -15281,7 +16982,7 @@ 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.1.2" + self.by-version."form-data"."0.1.3" ]; peerDependencies = [ ]; @@ -15307,7 +17008,7 @@ self.by-version."node-uuid"."1.4.1" self.by-version."mime"."1.2.11" self.by-version."tough-cookie"."0.9.15" - self.by-version."form-data"."0.1.2" + self.by-version."form-data"."0.1.3" self.by-version."tunnel-agent"."0.3.0" self.by-version."http-signature"."0.10.0" self.by-version."oauth-sign"."0.3.0" @@ -15318,15 +17019,15 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.33.0" = - self.by-version."request"."2.33.0"; - by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.33.0"; + by-spec."request"."~2.34.0" = + self.by-version."request"."2.34.0"; + by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.34.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; - name = "request-2.33.0.tgz"; - sha1 = "5167878131726070ec633752ea230a2379dc65ff"; + url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; + name = "request-2.34.0.tgz"; + sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; }) ]; buildInputs = @@ -15338,7 +17039,7 @@ self.by-version."node-uuid"."1.4.1" self.by-version."mime"."1.2.11" self.by-version."tough-cookie"."0.12.1" - self.by-version."form-data"."0.1.2" + self.by-version."form-data"."0.1.3" self.by-version."tunnel-agent"."0.3.0" self.by-version."http-signature"."0.10.0" self.by-version."oauth-sign"."0.3.0" @@ -15349,6 +17050,8 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."~2.36.0" = + self.by-version."request"."2.36.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 { @@ -15390,14 +17093,14 @@ passthru.names = [ "request-replay" ]; }; by-spec."requirejs"."~2.1" = - self.by-version."requirejs"."2.1.11"; - by-version."requirejs"."2.1.11" = lib.makeOverridable self.buildNodePackage { - name = "requirejs-2.1.11"; + self.by-version."requirejs"."2.1.14"; + by-version."requirejs"."2.1.14" = lib.makeOverridable self.buildNodePackage { + name = "requirejs-2.1.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.11.tgz"; - name = "requirejs-2.1.11.tgz"; - sha1 = "0eafaa6b46ca9b5b1e13406f119c020190a24442"; + url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.14.tgz"; + name = "requirejs-2.1.14.tgz"; + sha1 = "de00290aa526192ff8df4dc0ba9370ce399a76b0"; }) ]; buildInputs = @@ -15409,7 +17112,7 @@ passthru.names = [ "requirejs" ]; }; by-spec."requirejs"."~2.1.0" = - self.by-version."requirejs"."2.1.11"; + self.by-version."requirejs"."2.1.14"; by-spec."resolve"."0.6.3" = self.by-version."resolve"."0.6.3"; by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage { @@ -15456,20 +17159,23 @@ self.by-version."resolve"."0.6.3"; by-spec."resolve"."~0.6.1" = self.by-version."resolve"."0.6.3"; - by-spec."response-time"."1.0.0" = - self.by-version."response-time"."1.0.0"; - by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-response-time-1.0.0"; + by-spec."resolve"."~0.6.3" = + self.by-version."resolve"."0.6.3"; + by-spec."response-time"."2.0.0" = + self.by-version."response-time"."2.0.0"; + by-version."response-time"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-response-time-2.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz"; - name = "response-time-1.0.0.tgz"; - sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9"; + url = "http://registry.npmjs.org/response-time/-/response-time-2.0.0.tgz"; + name = "response-time-2.0.0.tgz"; + sha1 = "65cb39fd50de2f4ffdbdd285f1855966bd6fcb36"; }) ]; buildInputs = (self.nativeDeps."response-time" or []); deps = [ + self.by-version."on-headers"."0.0.0" ]; peerDependencies = [ ]; @@ -15512,26 +17218,26 @@ passthru.names = [ "restify" ]; }; by-spec."rethinkdb"."*" = - self.by-version."rethinkdb"."1.12.0-0"; - by-version."rethinkdb"."1.12.0-0" = lib.makeOverridable self.buildNodePackage { - name = "node-rethinkdb-1.12.0-0"; + self.by-version."rethinkdb"."1.12.0-1"; + by-version."rethinkdb"."1.12.0-1" = lib.makeOverridable self.buildNodePackage { + name = "node-rethinkdb-1.12.0-1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-0.tgz"; - name = "rethinkdb-1.12.0-0.tgz"; - sha1 = "cad01e869bd12dcd09f235c5ec8f5ccf26cc6f81"; + url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-1.tgz"; + name = "rethinkdb-1.12.0-1.tgz"; + sha1 = "c6dfb03a0ca179d0bf798b8de0c13938b9d64595"; }) ]; buildInputs = (self.nativeDeps."rethinkdb" or []); deps = [ - self.by-version."protobufjs"."2.0.5" + self.by-version."protobufjs"."2.2.1" ]; peerDependencies = [ ]; passthru.names = [ "rethinkdb" ]; }; - "rethinkdb" = self.by-version."rethinkdb"."1.12.0-0"; + "rethinkdb" = self.by-version."rethinkdb"."1.12.0-1"; by-spec."retry"."0.6.0" = self.by-version."retry"."0.6.0"; by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -15554,14 +17260,14 @@ by-spec."retry"."~0.6.0" = self.by-version."retry"."0.6.0"; by-spec."revalidator"."0.1.x" = - self.by-version."revalidator"."0.1.7"; - by-version."revalidator"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "node-revalidator-0.1.7"; + self.by-version."revalidator"."0.1.8"; + by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "node-revalidator-0.1.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.7.tgz"; - name = "revalidator-0.1.7.tgz"; - sha1 = "f0b68b01bc5c5e0e9e6d864154d7098f24fec1db"; + url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; + name = "revalidator-0.1.8.tgz"; + sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; }) ]; buildInputs = @@ -15615,14 +17321,14 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.6"; - by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.6"; + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz"; - name = "rimraf-2.2.6.tgz"; - sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + name = "rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }) ]; buildInputs = @@ -15634,11 +17340,13 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2.x.x" = - self.by-version."rimraf"."2.2.6"; + self.by-version."rimraf"."2.2.8"; + by-spec."rimraf"."^2.2.0" = + self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."^2.2.2" = - self.by-version."rimraf"."2.2.6"; + self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2" = - self.by-version."rimraf"."2.2.6"; + self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.0.2" = self.by-version."rimraf"."2.0.3"; by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage { @@ -15680,13 +17388,15 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."~2.2.0" = - self.by-version."rimraf"."2.2.6"; + self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.2.2" = - self.by-version."rimraf"."2.2.6"; + self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.2.5" = - self.by-version."rimraf"."2.2.6"; + self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.2.6" = - self.by-version."rimraf"."2.2.6"; + self.by-version."rimraf"."2.2.8"; + by-spec."rimraf"."~2.2.8" = + self.by-version."rimraf"."2.2.8"; by-spec."ruglify"."~1.0.0" = self.by-version."ruglify"."1.0.0"; by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -15772,7 +17482,7 @@ self.by-version."lodash"."1.3.1" self.by-version."async"."0.2.10" self.by-version."adm-zip"."0.4.4" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" ]; peerDependencies = [ ]; @@ -15816,7 +17526,7 @@ ]; passthru.names = [ "sax" ]; }; - by-spec."sax".">=0.4.2" = + by-spec."sax"."0.6.x" = self.by-version."sax"."0.6.0"; by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "node-sax-0.6.0"; @@ -15835,6 +17545,8 @@ ]; passthru.names = [ "sax" ]; }; + by-spec."sax".">=0.4.2" = + self.by-version."sax"."0.6.0"; by-spec."scmp"."~0.0.3" = self.by-version."scmp"."0.0.3"; by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -15855,14 +17567,14 @@ passthru.names = [ "scmp" ]; }; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.41.0"; - by-version."selenium-webdriver"."2.41.0" = lib.makeOverridable self.buildNodePackage { - name = "node-selenium-webdriver-2.41.0"; + self.by-version."selenium-webdriver"."2.42.0"; + by-version."selenium-webdriver"."2.42.0" = lib.makeOverridable self.buildNodePackage { + name = "node-selenium-webdriver-2.42.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.41.0.tgz"; - name = "selenium-webdriver-2.41.0.tgz"; - sha1 = "d084dfbc73bdf33aedc7d731eaab028affad7f16"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.42.0.tgz"; + name = "selenium-webdriver-2.42.0.tgz"; + sha1 = "a7ec4ca8779378f6b2627ba342f529c8d1187195"; }) ]; buildInputs = @@ -15873,16 +17585,16 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.41.0"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.42.0"; by-spec."semver"."*" = - self.by-version."semver"."2.2.1"; - by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.2.1"; + self.by-version."semver"."2.3.0"; + by-version."semver"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; - name = "semver-2.2.1.tgz"; - sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + url = "http://registry.npmjs.org/semver/-/semver-2.3.0.tgz"; + name = "semver-2.3.0.tgz"; + sha1 = "d31b2903ebe2a1806c05b8e763916a7183108a15"; }) ]; buildInputs = @@ -15893,7 +17605,7 @@ ]; passthru.names = [ "semver" ]; }; - "semver" = self.by-version."semver"."2.2.1"; + "semver" = self.by-version."semver"."2.3.0"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -15933,15 +17645,17 @@ passthru.names = [ "semver" ]; }; by-spec."semver"."2" = - self.by-version."semver"."2.2.1"; + self.by-version."semver"."2.3.0"; + by-spec."semver"."2 >=2.2.1" = + self.by-version."semver"."2.3.0"; by-spec."semver"."2.x" = - self.by-version."semver"."2.2.1"; + self.by-version."semver"."2.3.0"; by-spec."semver".">=2.0.10 <3.0.0" = - self.by-version."semver"."2.2.1"; + self.by-version."semver"."2.3.0"; by-spec."semver".">=2.2.1 <3" = - self.by-version."semver"."2.2.1"; - by-spec."semver"."^2.2.1" = - self.by-version."semver"."2.2.1"; + self.by-version."semver"."2.3.0"; + by-spec."semver"."^2.3.0" = + self.by-version."semver"."2.3.0"; by-spec."semver"."~1.1.0" = self.by-version."semver"."1.1.4"; by-spec."semver"."~1.1.4" = @@ -15986,23 +17700,43 @@ }; by-spec."semver"."~2.2.1" = self.by-version."semver"."2.2.1"; - by-spec."send"."*" = - self.by-version."send"."0.2.0"; - by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.2.0"; + by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz"; - name = "send-0.2.0.tgz"; - sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58"; + url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; + sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + }) + ]; + buildInputs = + (self.nativeDeps."semver" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; + by-spec."semver"."~2.3.0" = + self.by-version."semver"."2.3.0"; + by-spec."send"."*" = + self.by-version."send"."0.4.1"; + by-version."send"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-send-0.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.4.1.tgz"; + name = "send-0.4.1.tgz"; + sha1 = "6e9a5d41cb9c0fb3514226446fa319aed46d433d"; }) ]; buildInputs = (self.nativeDeps."send" or []); deps = [ self.by-version."debug"."0.8.1" - self.by-version."mime"."1.2.11" + self.by-version."finished"."1.1.4" self.by-version."fresh"."0.2.2" + self.by-version."mime"."1.2.11" self.by-version."range-parser"."1.0.0" ]; peerDependencies = [ @@ -16023,7 +17757,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -16046,7 +17780,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -16069,7 +17803,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" self.by-version."mime"."1.2.11" self.by-version."fresh"."0.2.0" self.by-version."range-parser"."0.0.4" @@ -16080,6 +17814,53 @@ }; by-spec."send"."0.2.0" = 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.2.0.tgz"; + name = "send-0.2.0.tgz"; + sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58"; + }) + ]; + buildInputs = + (self.nativeDeps."send" or []); + deps = [ + self.by-version."debug"."1.0.1" + self.by-version."mime"."1.2.11" + self.by-version."fresh"."0.2.2" + self.by-version."range-parser"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "send" ]; + }; + by-spec."send"."0.3.0" = + self.by-version."send"."0.3.0"; + by-version."send"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-send-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz"; + name = "send-0.3.0.tgz"; + sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7"; + }) + ]; + buildInputs = + (self.nativeDeps."send" or []); + deps = [ + self.by-version."buffer-crc32"."0.2.1" + self.by-version."debug"."0.8.0" + self.by-version."fresh"."0.2.2" + self.by-version."mime"."1.2.11" + self.by-version."range-parser"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "send" ]; + }; + by-spec."send"."0.4.1" = + self.by-version."send"."0.4.1"; by-spec."sequence"."2.2.1" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -16101,22 +17882,42 @@ }; by-spec."sequence"."2.x" = self.by-version."sequence"."2.2.1"; - by-spec."serve-index"."1.0.1" = - self.by-version."serve-index"."1.0.1"; - by-version."serve-index"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-index-1.0.1"; + by-spec."serve-favicon"."2.0.1" = + self.by-version."serve-favicon"."2.0.1"; + by-version."serve-favicon"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-favicon-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz"; - name = "serve-index-1.0.1.tgz"; - sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6"; + url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz"; + name = "serve-favicon-2.0.1.tgz"; + sha1 = "4826975d9f173ca3a4158e9698161f75dec7afec"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-favicon" or []); + deps = [ + self.by-version."fresh"."0.2.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "serve-favicon" ]; + }; + by-spec."serve-index"."1.1.0" = + self.by-version."serve-index"."1.1.0"; + by-version."serve-index"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-index-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.1.0.tgz"; + name = "serve-index-1.1.0.tgz"; + sha1 = "4843b22d78eae51406adb8fa370c373b9499501d"; }) ]; buildInputs = (self.nativeDeps."serve-index" or []); deps = [ + self.by-version."accepts"."1.0.2" self.by-version."batch"."0.5.0" - self.by-version."negotiator"."0.4.2" ]; peerDependencies = [ ]; @@ -16142,58 +17943,60 @@ ]; passthru.names = [ "serve-static" ]; }; - by-spec."serve-static"."1.0.2" = - self.by-version."serve-static"."1.0.2"; - by-version."serve-static"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.0.2"; + by-spec."serve-static"."1.1.0" = + self.by-version."serve-static"."1.1.0"; + by-version."serve-static"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.2.tgz"; - name = "serve-static-1.0.2.tgz"; - sha1 = "4129f6727b09fb031134fa6d185683e30bfbef54"; - }) - ]; - buildInputs = - (self.nativeDeps."serve-static" or []); - deps = [ - self.by-version."send"."0.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "serve-static" ]; - }; - by-spec."serve-static"."1.0.4" = - self.by-version."serve-static"."1.0.4"; - by-version."serve-static"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.4.tgz"; - name = "serve-static-1.0.4.tgz"; - sha1 = "426fedebe77bad21f373f1efcae09746639fba06"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz"; + name = "serve-static-1.1.0.tgz"; + sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643"; }) ]; buildInputs = (self.nativeDeps."serve-static" or []); deps = [ self.by-version."parseurl"."1.0.1" - self.by-version."send"."0.2.0" + self.by-version."send"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "serve-static" ]; }; - by-spec."serve-static"."~1.0.3" = - self.by-version."serve-static"."1.0.4"; - by-spec."setimmediate"."1.0.1" = - self.by-version."setimmediate"."1.0.1"; - by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-setimmediate-1.0.1"; + by-spec."serve-static"."1.2.1" = + self.by-version."serve-static"."1.2.1"; + by-version."serve-static"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz"; - name = "setimmediate-1.0.1.tgz"; - sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.2.1.tgz"; + name = "serve-static-1.2.1.tgz"; + sha1 = "a800a9de23dbd1ffb1258edb986128ee4a4ea03d"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-static" or []); + deps = [ + self.by-version."escape-html"."1.0.1" + self.by-version."parseurl"."1.0.1" + self.by-version."send"."0.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "serve-static" ]; + }; + by-spec."serve-static"."~1.1.0" = + self.by-version."serve-static"."1.1.0"; + by-spec."setimmediate"."~1.0.1" = + self.by-version."setimmediate"."1.0.2"; + by-version."setimmediate"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-setimmediate-1.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"; + name = "setimmediate-1.0.2.tgz"; + sha1 = "d8221c4fdfeb2561556c5184fa05fb7ce0af73bd"; }) ]; buildInputs = @@ -16205,20 +18008,20 @@ passthru.names = [ "setimmediate" ]; }; by-spec."sha"."~1.2.1" = - self.by-version."sha"."1.2.3"; - by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-sha-1.2.3"; + self.by-version."sha"."1.2.4"; + by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-sha-1.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz"; - name = "sha-1.2.3.tgz"; - sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329"; + url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz"; + name = "sha-1.2.4.tgz"; + sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d"; }) ]; buildInputs = (self.nativeDeps."sha" or []); deps = [ - self.by-version."graceful-fs"."2.0.3" + self.by-version."graceful-fs"."3.0.1" self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ @@ -16287,6 +18090,30 @@ passthru.names = [ "shell-quote" ]; }; by-spec."shelljs"."*" = + self.by-version."shelljs"."0.3.0"; + by-version."shelljs"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "shelljs-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; + name = "shelljs-0.3.0.tgz"; + sha1 = "3596e6307a781544f591f37da618360f31db57b1"; + }) + ]; + buildInputs = + (self.nativeDeps."shelljs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shelljs" ]; + }; + "shelljs" = self.by-version."shelljs"."0.3.0"; + by-spec."shelljs"."0.3.x" = + self.by-version."shelljs"."0.3.0"; + by-spec."shelljs"."^0.3.0" = + self.by-version."shelljs"."0.3.0"; + by-spec."shelljs"."~0.2.6" = self.by-version."shelljs"."0.2.6"; by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage { name = "shelljs-0.2.6"; @@ -16305,37 +18132,15 @@ ]; passthru.names = [ "shelljs" ]; }; - "shelljs" = self.by-version."shelljs"."0.2.6"; - by-spec."shelljs"."0.1.x" = - self.by-version."shelljs"."0.1.4"; - by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "shelljs-0.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"; - name = "shelljs-0.1.4.tgz"; - sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e"; - }) - ]; - buildInputs = - (self.nativeDeps."shelljs" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "shelljs" ]; - }; - by-spec."shelljs"."~0.2.6" = - self.by-version."shelljs"."0.2.6"; by-spec."should"."*" = - self.by-version."should"."3.3.1"; - by-version."should"."3.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-should-3.3.1"; + self.by-version."should"."4.0.3"; + by-version."should"."4.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-should-4.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-3.3.1.tgz"; - name = "should-3.3.1.tgz"; - sha1 = "28c93a522ba001146af96078f0a88bf5ac929522"; + url = "http://registry.npmjs.org/should/-/should-4.0.3.tgz"; + name = "should-4.0.3.tgz"; + sha1 = "2711897494e7b0eb429aad16cc88c9594f9c230e"; }) ]; buildInputs = @@ -16346,7 +18151,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."3.3.1"; + "should" = self.by-version."should"."4.0.3"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -16409,20 +18214,20 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.25"; - by-version."simplesmtp"."0.3.25" = lib.makeOverridable self.buildNodePackage { - name = "node-simplesmtp-0.3.25"; + self.by-version."simplesmtp"."0.3.32"; + by-version."simplesmtp"."0.3.32" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.32"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.25.tgz"; - name = "simplesmtp-0.3.25.tgz"; - sha1 = "09b6ac292b7dae8053cfba11da09a0458eb8af39"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.32.tgz"; + name = "simplesmtp-0.3.32.tgz"; + sha1 = "b3589b4cbf90624e712ab0ec1a7480ec14fd1c12"; }) ]; buildInputs = (self.nativeDeps."simplesmtp" or []); deps = [ - self.by-version."rai"."0.1.9" + self.by-version."rai"."0.1.11" self.by-version."xoauth2"."0.1.8" ]; peerDependencies = [ @@ -16430,14 +18235,14 @@ passthru.names = [ "simplesmtp" ]; }; by-spec."sinon"."*" = - self.by-version."sinon"."1.9.1"; - by-version."sinon"."1.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-sinon-1.9.1"; + self.by-version."sinon"."1.10.2"; + by-version."sinon"."1.10.2" = lib.makeOverridable self.buildNodePackage { + name = "node-sinon-1.10.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sinon/-/sinon-1.9.1.tgz"; - name = "sinon-1.9.1.tgz"; - sha1 = "0dac622bd3f0e6f9662a7431baf65f58c3459d69"; + url = "http://registry.npmjs.org/sinon/-/sinon-1.10.2.tgz"; + name = "sinon-1.10.2.tgz"; + sha1 = "a33a1b902ee080da2bdca19781993a03c78bb5cc"; }) ]; buildInputs = @@ -16450,7 +18255,7 @@ ]; passthru.names = [ "sinon" ]; }; - "sinon" = self.by-version."sinon"."1.9.1"; + "sinon" = self.by-version."sinon"."1.10.2"; by-spec."slasp"."*" = self.by-version."slasp"."0.0.3"; by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -16666,14 +18471,14 @@ passthru.names = [ "socket.io" ]; }; by-spec."socket.io"."~0.9.13" = - self.by-version."socket.io"."0.9.16"; - by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage { - name = "node-socket.io-0.9.16"; + self.by-version."socket.io"."0.9.17"; + by-version."socket.io"."0.9.17" = lib.makeOverridable self.buildNodePackage { + name = "node-socket.io-0.9.17"; src = [ (fetchurl { - url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; - name = "socket.io-0.9.16.tgz"; - sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76"; + url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz"; + name = "socket.io-0.9.17.tgz"; + sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec"; }) ]; buildInputs = @@ -16689,7 +18494,7 @@ passthru.names = [ "socket.io" ]; }; by-spec."socket.io"."~0.9.16" = - self.by-version."socket.io"."0.9.16"; + self.by-version."socket.io"."0.9.17"; 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 { @@ -16737,27 +18542,27 @@ passthru.names = [ "socket.io-client" ]; }; by-spec."sockjs"."*" = - self.by-version."sockjs"."0.3.8"; - by-version."sockjs"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "node-sockjs-0.3.8"; + self.by-version."sockjs"."0.3.9"; + by-version."sockjs"."0.3.9" = lib.makeOverridable self.buildNodePackage { + name = "node-sockjs-0.3.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz"; - name = "sockjs-0.3.8.tgz"; - sha1 = "c083cb0505db1ea1a949d3bd12d8a1ea385a456c"; + url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.9.tgz"; + name = "sockjs-0.3.9.tgz"; + sha1 = "5ae2c732dac07f6d7e9e8a9a60ec86ec4fc3ffc7"; }) ]; buildInputs = (self.nativeDeps."sockjs" or []); deps = [ self.by-version."node-uuid"."1.3.3" - self.by-version."faye-websocket"."0.7.0" + self.by-version."faye-websocket"."0.7.2" ]; peerDependencies = [ ]; passthru.names = [ "sockjs" ]; }; - "sockjs" = self.by-version."sockjs"."0.3.8"; + "sockjs" = self.by-version."sockjs"."0.3.9"; by-spec."sorted-object"."~1.0.0" = self.by-version."sorted-object"."1.0.0"; by-version."sorted-object"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -16952,14 +18757,14 @@ passthru.names = [ "stack-trace" ]; }; by-spec."stackdriver-statsd-backend"."*" = - self.by-version."stackdriver-statsd-backend"."0.2.1"; - by-version."stackdriver-statsd-backend"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-stackdriver-statsd-backend-0.2.1"; + self.by-version."stackdriver-statsd-backend"."0.2.2"; + by-version."stackdriver-statsd-backend"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-stackdriver-statsd-backend-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.1.tgz"; - name = "stackdriver-statsd-backend-0.2.1.tgz"; - sha1 = "3109661288821e79259b4d750a25d7159265dd8e"; + url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.2.tgz"; + name = "stackdriver-statsd-backend-0.2.2.tgz"; + sha1 = "15bdc95adf083cfbfa20d7ff8f67277d7eba38f8"; }) ]; buildInputs = @@ -16970,45 +18775,7 @@ ]; passthru.names = [ "stackdriver-statsd-backend" ]; }; - "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.1"; - by-spec."static-favicon"."1.0.0" = - self.by-version."static-favicon"."1.0.0"; - by-version."static-favicon"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-static-favicon-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.0.tgz"; - name = "static-favicon-1.0.0.tgz"; - sha1 = "2e58dcfe58957a2d53337ef7a38cf9ad6c13c0d0"; - }) - ]; - buildInputs = - (self.nativeDeps."static-favicon" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "static-favicon" ]; - }; - by-spec."static-favicon"."1.0.2" = - self.by-version."static-favicon"."1.0.2"; - by-version."static-favicon"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-static-favicon-1.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz"; - name = "static-favicon-1.0.2.tgz"; - sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f"; - }) - ]; - buildInputs = - (self.nativeDeps."static-favicon" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "static-favicon" ]; - }; + "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.2"; by-spec."statsd"."*" = self.by-version."statsd"."0.7.1"; by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage { @@ -17052,6 +18819,27 @@ passthru.names = [ "statsd-librato-backend" ]; }; "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2"; + by-spec."stream-browserify"."^1.0.0" = + self.by-version."stream-browserify"."1.0.0"; + by-version."stream-browserify"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-stream-browserify-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"; + name = "stream-browserify-1.0.0.tgz"; + sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-browserify" or []); + deps = [ + self.by-version."inherits"."2.0.1" + self.by-version."readable-stream"."1.1.13-1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-browserify" ]; + }; by-spec."stream-browserify"."~0.1.0" = self.by-version."stream-browserify"."0.1.3"; by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -17095,6 +18883,27 @@ }; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; + by-spec."stream-combiner"."~0.1.0" = + self.by-version."stream-combiner"."0.1.0"; + by-version."stream-combiner"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-stream-combiner-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.1.0.tgz"; + name = "stream-combiner-0.1.0.tgz"; + sha1 = "0dc389a3c203f8f4d56368f95dde52eb9269b5be"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-combiner" or []); + deps = [ + self.by-version."duplexer"."0.1.1" + self.by-version."through"."2.3.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-combiner" ]; + }; 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 { @@ -17233,14 +19042,14 @@ passthru.names = [ "stringify-object" ]; }; by-spec."stringify-object"."~0.2.0" = - self.by-version."stringify-object"."0.2.0"; - by-version."stringify-object"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-stringify-object-0.2.0"; + self.by-version."stringify-object"."0.2.1"; + by-version."stringify-object"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-stringify-object-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.0.tgz"; - name = "stringify-object-0.2.0.tgz"; - sha1 = "832996ea55ab2aaa7570cc9bc0d5774adfc2c585"; + url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.1.tgz"; + name = "stringify-object-0.2.1.tgz"; + sha1 = "b58be50b3ff5f371038c545d4332656bfded5620"; }) ]; buildInputs = @@ -17271,14 +19080,14 @@ passthru.names = [ "strip-ansi" ]; }; by-spec."strip-json-comments"."0.1.x" = - self.by-version."strip-json-comments"."0.1.1"; - by-version."strip-json-comments"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "strip-json-comments-0.1.1"; + self.by-version."strip-json-comments"."0.1.3"; + by-version."strip-json-comments"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "strip-json-comments-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.1.tgz"; - name = "strip-json-comments-0.1.1.tgz"; - sha1 = "eb5a750bd4e8dc82817295a115dc11b63f01d4b0"; + url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; + name = "strip-json-comments-0.1.3.tgz"; + sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54"; }) ]; buildInputs = @@ -17310,14 +19119,14 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.44.0-beta3"; - by-version."stylus"."0.44.0-beta3" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.44.0-beta3"; + self.by-version."stylus"."0.46.2"; + by-version."stylus"."0.46.2" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.46.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.44.0-beta3.tgz"; - name = "stylus-0.44.0-beta3.tgz"; - sha1 = "a602b30f57f1692cf0f1fb664e60a14e26102cff"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.46.2.tgz"; + name = "stylus-0.46.2.tgz"; + sha1 = "9e6723aac7b582a9de6a0d1eacef20967c02e70b"; }) ]; buildInputs = @@ -17325,16 +19134,15 @@ deps = [ self.by-version."css-parse"."1.7.0" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" self.by-version."sax"."0.5.8" - self.by-version."glob"."3.2.9" - self.by-version."circular-json"."0.1.6" + self.by-version."glob"."3.2.11" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.44.0-beta3"; + "stylus" = self.by-version."stylus"."0.46.2"; by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { @@ -17351,9 +19159,9 @@ deps = [ self.by-version."css-parse"."1.7.0" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.8.1" + self.by-version."debug"."1.0.1" self.by-version."sax"."0.5.8" - self.by-version."glob"."3.2.9" + self.by-version."glob"."3.2.11" ]; peerDependencies = [ ]; @@ -17373,7 +19181,7 @@ buildInputs = (self.nativeDeps."subarg" or []); deps = [ - self.by-version."minimist"."0.0.8" + self.by-version."minimist"."0.0.10" ]; peerDependencies = [ ]; @@ -17419,29 +19227,31 @@ ]; passthru.names = [ "sudo-block" ]; }; - by-spec."superagent"."0.17.0" = - self.by-version."superagent"."0.17.0"; - by-version."superagent"."0.17.0" = lib.makeOverridable self.buildNodePackage { - name = "node-superagent-0.17.0"; + by-spec."superagent"."0.18.0" = + self.by-version."superagent"."0.18.0"; + by-version."superagent"."0.18.0" = lib.makeOverridable self.buildNodePackage { + name = "node-superagent-0.18.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz"; - name = "superagent-0.17.0.tgz"; - sha1 = "aadcd50fbe5a93e71991118d79bf0714d625bba8"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz"; + name = "superagent-0.18.0.tgz"; + sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62"; }) ]; buildInputs = (self.nativeDeps."superagent" or []); deps = [ - self.by-version."qs"."0.6.5" + self.by-version."qs"."0.6.6" 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."component-emitter"."1.1.2" self.by-version."methods"."0.0.1" - self.by-version."cookiejar"."1.3.0" + self.by-version."cookiejar"."1.3.2" self.by-version."debug"."0.7.4" self.by-version."reduce-component"."1.0.1" self.by-version."extend"."1.2.1" + self.by-version."form-data"."0.1.2" + self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -17472,30 +19282,30 @@ ]; passthru.names = [ "superagent" ]; }; - by-spec."superagent"."~0.17.0" = - self.by-version."superagent"."0.17.0"; + by-spec."superagent"."~0.18.0" = + self.by-version."superagent"."0.18.0"; by-spec."supertest"."*" = - self.by-version."supertest"."0.11.0"; - by-version."supertest"."0.11.0" = lib.makeOverridable self.buildNodePackage { - name = "node-supertest-0.11.0"; + self.by-version."supertest"."0.13.0"; + by-version."supertest"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "node-supertest-0.13.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.11.0.tgz"; - name = "supertest-0.11.0.tgz"; - sha1 = "f8496b9f05cac1ea2fcec1d21adeca7167f42460"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz"; + name = "supertest-0.13.0.tgz"; + sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f"; }) ]; buildInputs = (self.nativeDeps."supertest" or []); deps = [ - self.by-version."superagent"."0.17.0" - self.by-version."methods"."0.1.0" + self.by-version."superagent"."0.18.0" + self.by-version."methods"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "supertest" ]; }; - "supertest" = self.by-version."supertest"."0.11.0"; + "supertest" = self.by-version."supertest"."0.13.0"; by-spec."swig"."0.14.x" = self.by-version."swig"."0.14.0"; by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage { @@ -17633,27 +19443,49 @@ self.by-version."tar"."0.1.19"; by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.19"; - by-spec."temp"."*" = - self.by-version."temp"."0.7.0"; - by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-temp-0.7.0"; + by-spec."tar-stream"."~0.3.0" = + self.by-version."tar-stream"."0.3.3"; + by-version."tar-stream"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-tar-stream-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz"; - name = "temp-0.7.0.tgz"; - sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f"; + url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.3.3.tgz"; + name = "tar-stream-0.3.3.tgz"; + sha1 = "23ca53bd738b8702272a80e26cc938bc4b84b87b"; + }) + ]; + buildInputs = + (self.nativeDeps."tar-stream" or []); + deps = [ + self.by-version."bl"."0.6.0" + self.by-version."end-of-stream"."0.1.4" + self.by-version."readable-stream"."1.0.27-1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tar-stream" ]; + }; + by-spec."temp"."*" = + self.by-version."temp"."0.8.0"; + by-version."temp"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-temp-0.8.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.8.0.tgz"; + name = "temp-0.8.0.tgz"; + sha1 = "3a642f54ab725c8fb6125a284b119480314b3e32"; }) ]; buildInputs = (self.nativeDeps."temp" or []); deps = [ - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" ]; peerDependencies = [ ]; passthru.names = [ "temp" ]; }; - "temp" = self.by-version."temp"."0.7.0"; + "temp" = self.by-version."temp"."0.8.0"; by-spec."temp"."0.6.0" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -17699,6 +19531,24 @@ self.by-version."temp"."0.6.0"; by-spec."temp"."~0.7.0" = self.by-version."temp"."0.7.0"; + by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-temp-0.7.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz"; + name = "temp-0.7.0.tgz"; + sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f"; + }) + ]; + buildInputs = + (self.nativeDeps."temp" or []); + deps = [ + self.by-version."rimraf"."2.2.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "temp" ]; + }; by-spec."tempfile"."^0.1.2" = self.by-version."tempfile"."0.1.3"; by-version."tempfile"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -17719,7 +19569,7 @@ ]; passthru.names = [ "tempfile" ]; }; - by-spec."text-table"."~0.2.0" = + 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 = "node-text-table-0.2.0"; @@ -17738,6 +19588,8 @@ ]; passthru.names = [ "text-table" ]; }; + by-spec."text-table"."~0.2.0" = + self.by-version."text-table"."0.2.0"; by-spec."throttleit"."~0.0.2" = self.by-version."throttleit"."0.0.2"; by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -17798,14 +19650,14 @@ by-spec."through"."~2.3.4" = self.by-version."through"."2.3.4"; by-spec."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"; + self.by-version."through2"."0.4.2"; + by-version."through2"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-through2-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/through2/-/through2-0.4.1.tgz"; - name = "through2-0.4.1.tgz"; - sha1 = "afd849c65af513c2541a98a7cfbcfec3a15a9686"; + url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; + name = "through2-0.4.2.tgz"; + sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; }) ]; buildInputs = @@ -17819,7 +19671,7 @@ passthru.names = [ "through2" ]; }; by-spec."through2"."~0.4.1" = - self.by-version."through2"."0.4.1"; + self.by-version."through2"."0.4.2"; by-spec."timers-browserify"."~1.0.1" = self.by-version."timers-browserify"."1.0.1"; by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -17840,6 +19692,27 @@ ]; passthru.names = [ "timers-browserify" ]; }; + by-spec."timers-ext"."0.1.x" = + self.by-version."timers-ext"."0.1.0"; + by-version."timers-ext"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-timers-ext-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz"; + name = "timers-ext-0.1.0.tgz"; + sha1 = "00345a2ca93089d1251322054389d263e27b77e2"; + }) + ]; + buildInputs = + (self.nativeDeps."timers-ext" or []); + deps = [ + self.by-version."es5-ext"."0.10.4" + self.by-version."next-tick"."0.2.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "timers-ext" ]; + }; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -17860,14 +19733,14 @@ passthru.names = [ "timespan" ]; }; by-spec."timezone"."*" = - self.by-version."timezone"."0.0.30"; - by-version."timezone"."0.0.30" = lib.makeOverridable self.buildNodePackage { - name = "node-timezone-0.0.30"; + self.by-version."timezone"."0.0.32"; + by-version."timezone"."0.0.32" = lib.makeOverridable self.buildNodePackage { + name = "node-timezone-0.0.32"; src = [ (fetchurl { - url = "http://registry.npmjs.org/timezone/-/timezone-0.0.30.tgz"; - name = "timezone-0.0.30.tgz"; - sha1 = "f83e46d35c017a33a684a4d8bb8fac3debed49bf"; + url = "http://registry.npmjs.org/timezone/-/timezone-0.0.32.tgz"; + name = "timezone-0.0.32.tgz"; + sha1 = "3d5972876fffe0dbef77ab4f9a60ab242c8b0f18"; }) ]; buildInputs = @@ -17878,7 +19751,7 @@ ]; passthru.names = [ "timezone" ]; }; - "timezone" = self.by-version."timezone"."0.0.30"; + "timezone" = self.by-version."timezone"."0.0.32"; by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -18053,6 +19926,25 @@ ]; passthru.names = [ "traverse" ]; }; + by-spec."traverse"."~0.6.6" = + self.by-version."traverse"."0.6.6"; + by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage { + name = "node-traverse-0.6.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; + name = "traverse-0.6.6.tgz"; + sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + }) + ]; + buildInputs = + (self.nativeDeps."traverse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "traverse" ]; + }; by-spec."truncate"."~1.0.2" = self.by-version."truncate"."1.0.2"; by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -18129,6 +20021,25 @@ ]; passthru.names = [ "tunnel-agent" ]; }; + by-spec."tunnel-agent"."~0.4.0" = + self.by-version."tunnel-agent"."0.4.0"; + by-version."tunnel-agent"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-tunnel-agent-0.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"; + name = "tunnel-agent-0.4.0.tgz"; + sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550"; + }) + ]; + buildInputs = + (self.nativeDeps."tunnel-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tunnel-agent" ]; + }; 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 { @@ -18168,7 +20079,7 @@ ]; passthru.names = [ "type-is" ]; }; - by-spec."type-is"."~1.1.0" = + by-spec."type-is"."1.1.0" = self.by-version."type-is"."1.1.0"; by-version."type-is"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "node-type-is-1.1.0"; @@ -18188,6 +20099,26 @@ ]; passthru.names = [ "type-is" ]; }; + by-spec."type-is"."1.2.0" = + self.by-version."type-is"."1.2.0"; + by-version."type-is"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.2.0.tgz"; + name = "type-is-1.2.0.tgz"; + sha1 = "a9aaa3f2014850d4813663f6c714cf6318195138"; + }) + ]; + buildInputs = + (self.nativeDeps."type-is" or []); + deps = [ + self.by-version."mime"."1.2.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "type-is" ]; + }; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -18208,14 +20139,14 @@ passthru.names = [ "typechecker" ]; }; by-spec."typedarray"."~0.0.5" = - self.by-version."typedarray"."0.0.5"; - by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-typedarray-0.0.5"; + self.by-version."typedarray"."0.0.6"; + by-version."typedarray"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-typedarray-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz"; - name = "typedarray-0.0.5.tgz"; - sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664"; + url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + name = "typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }) ]; buildInputs = @@ -18447,6 +20378,29 @@ ]; passthru.names = [ "umd" ]; }; + by-spec."umd"."~2.1.0" = + self.by-version."umd"."2.1.0"; + by-version."umd"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "umd-2.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz"; + name = "umd-2.1.0.tgz"; + sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf"; + }) + ]; + buildInputs = + (self.nativeDeps."umd" or []); + deps = [ + self.by-version."rfile"."1.0.0" + self.by-version."ruglify"."1.0.0" + self.by-version."through"."2.3.4" + self.by-version."uglify-js"."2.4.13" + ]; + peerDependencies = [ + ]; + passthru.names = [ "umd" ]; + }; by-spec."underscore"."*" = self.by-version."underscore"."1.6.0"; by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage { @@ -18467,7 +20421,17 @@ passthru.names = [ "underscore" ]; }; "underscore" = self.by-version."underscore"."1.6.0"; - by-spec."underscore"."1.4.x" = + by-spec."underscore"."1.6.x" = + self.by-version."underscore"."1.6.0"; + by-spec."underscore".">=1.1.7" = + self.by-version."underscore"."1.6.0"; + by-spec."underscore".">=1.3.1" = + self.by-version."underscore"."1.6.0"; + by-spec."underscore".">=1.5.0" = + self.by-version."underscore"."1.6.0"; + by-spec."underscore"."^1.6.0" = + self.by-version."underscore"."1.6.0"; + by-spec."underscore"."~1.4" = self.by-version."underscore"."1.4.4"; by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { name = "node-underscore-1.4.4"; @@ -18486,14 +20450,6 @@ ]; passthru.names = [ "underscore" ]; }; - by-spec."underscore".">=1.1.7" = - self.by-version."underscore"."1.6.0"; - by-spec."underscore".">=1.3.1" = - self.by-version."underscore"."1.6.0"; - by-spec."underscore".">=1.5.0" = - self.by-version."underscore"."1.6.0"; - by-spec."underscore"."~1.4" = - self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.4.3" = self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.4.4" = @@ -18519,6 +20475,27 @@ }; by-spec."underscore"."~1.5.2" = self.by-version."underscore"."1.5.2"; + 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 = "node-underscore.string-2.3.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + name = "underscore.string-2.3.3.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore.string" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore.string" ]; + }; + by-spec."underscore.string"."^2.3.3" = + self.by-version."underscore.string"."2.3.3"; 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 { @@ -18540,23 +20517,6 @@ }; 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 = "node-underscore.string-2.3.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; - name = "underscore.string-2.3.3.tgz"; - sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore.string" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore.string" ]; - }; by-spec."underscore.string"."~2.3.3" = self.by-version."underscore.string"."2.3.3"; by-spec."unfunk-diff"."~0.0.1" = @@ -18575,92 +20535,94 @@ deps = [ self.by-version."diff"."1.0.8" self.by-version."jsesc"."0.4.3" - self.by-version."ministyle"."0.1.3" + self.by-version."ministyle"."0.1.4" ]; peerDependencies = [ ]; passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.8.0"; - by-version."ungit"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.8.0"; + self.by-version."ungit"."0.8.1"; + by-version."ungit"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.8.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.8.0.tgz"; - name = "ungit-0.8.0.tgz"; - sha1 = "ca1f166ee65fbfe54469459d51f77ca502f1c6a4"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.8.1.tgz"; + name = "ungit-0.8.1.tgz"; + sha1 = "41b07535b2239f8a31adfcce45bd59a20b575b2f"; }) ]; buildInputs = (self.nativeDeps."ungit" or []); deps = [ - self.by-version."express"."4.0.0" - self.by-version."superagent"."0.17.0" + self.by-version."express"."4.2.0" + self.by-version."superagent"."0.18.0" self.by-version."lodash"."2.4.1" self.by-version."temp"."0.7.0" - self.by-version."socket.io"."0.9.16" - self.by-version."moment"."2.5.1" - self.by-version."async"."0.6.2" + self.by-version."socket.io"."0.9.17" + self.by-version."moment"."2.6.0" + self.by-version."async"."0.9.0" self.by-version."rc"."0.3.5" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.3" self.by-version."passport"."0.2.0" self.by-version."passport-local"."1.0.0" - self.by-version."semver"."2.2.1" + self.by-version."semver"."2.3.0" self.by-version."forever-monitor"."1.1.0" - self.by-version."open"."0.0.4" + self.by-version."open"."0.0.5" self.by-version."optimist"."0.6.1" self.by-version."crossroads"."0.12.0" 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.5.0" - self.by-version."keen.io"."0.0.4" + self.by-version."color"."0.6.0" + self.by-version."keen.io"."0.1.2" self.by-version."getmac"."1.0.6" - self.by-version."deep-extend"."0.2.8" + self.by-version."deep-extend"."0.2.10" self.by-version."raven"."0.6.3" self.by-version."knockout"."3.1.0" - self.by-version."npm-registry-client"."0.4.7" - self.by-version."npmconf"."0.1.14" - self.by-version."mkdirp"."0.3.5" - self.by-version."less"."1.7.0" + self.by-version."npm-registry-client"."1.0.1" + self.by-version."npmconf"."1.0.2" + self.by-version."mkdirp"."0.5.0" + self.by-version."less"."1.7.1" self.by-version."browserify"."3.38.1" - self.by-version."body-parser"."1.0.2" - self.by-version."cookie-parser"."1.0.1" - self.by-version."express-session"."1.0.3" - self.by-version."serve-static"."1.0.4" + self.by-version."body-parser"."1.2.2" + self.by-version."cookie-parser"."1.1.0" + self.by-version."express-session"."1.1.0" + self.by-version."serve-static"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.8.0"; + "ungit" = self.by-version."ungit"."0.8.1"; by-spec."update-notifier"."~0.1.3" = - self.by-version."update-notifier"."0.1.8"; - by-version."update-notifier"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "node-update-notifier-0.1.8"; + self.by-version."update-notifier"."0.1.10"; + by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "node-update-notifier-0.1.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.8.tgz"; - name = "update-notifier-0.1.8.tgz"; - sha1 = "ebf5c698375f5c232031a419634fab66cc0322a6"; + url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.10.tgz"; + name = "update-notifier-0.1.10.tgz"; + sha1 = "215cbe1053369f0d4a44f84b51eba7cb80484695"; }) ]; buildInputs = (self.nativeDeps."update-notifier" or []); deps = [ - self.by-version."request"."2.27.0" - self.by-version."configstore"."0.2.3" - self.by-version."semver"."2.1.0" self.by-version."chalk"."0.4.0" + self.by-version."configstore"."0.3.0" + self.by-version."request"."2.36.0" + self.by-version."semver"."2.3.0" ]; peerDependencies = [ ]; passthru.names = [ "update-notifier" ]; }; by-spec."update-notifier"."~0.1.7" = - self.by-version."update-notifier"."0.1.8"; + self.by-version."update-notifier"."0.1.10"; + by-spec."update-notifier"."~0.1.8" = + self.by-version."update-notifier"."0.1.10"; by-spec."url"."~0.10.1" = self.by-version."url"."0.10.1"; by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage { @@ -18839,7 +20801,7 @@ self.by-version."async"."0.1.22" 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."mkdirp"."0.5.0" self.by-version."ncp"."0.2.7" self.by-version."rimraf"."1.0.9" ]; @@ -18864,9 +20826,9 @@ 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."mkdirp"."0.5.0" self.by-version."ncp"."0.4.2" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" ]; peerDependencies = [ ]; @@ -18874,8 +20836,6 @@ }; by-spec."utile"."0.2.x" = self.by-version."utile"."0.2.1"; - by-spec."utile"."~0.1.7" = - self.by-version."utile"."0.1.7"; by-spec."utile"."~0.2.1" = self.by-version."utile"."0.2.1"; by-spec."utils-merge"."1.0.0" = @@ -18958,6 +20918,25 @@ ]; passthru.names = [ "vargs" ]; }; + by-spec."vary"."0.1.0" = + self.by-version."vary"."0.1.0"; + by-version."vary"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-vary-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; + name = "vary-0.1.0.tgz"; + sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176"; + }) + ]; + buildInputs = + (self.nativeDeps."vary" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "vary" ]; + }; by-spec."vasync"."1.3.3" = self.by-version."vasync"."1.3.3"; by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -19119,27 +21098,52 @@ ]; 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"; + by-spec."vtop"."*" = + self.by-version."vtop"."0.1.6"; + by-version."vtop"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "vtop-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/walk/-/walk-2.3.1.tgz"; - name = "walk-2.3.1.tgz"; - sha1 = "015e0ef7a636ac43185661a9673d459572a44050"; + url = "http://registry.npmjs.org/vtop/-/vtop-0.1.6.tgz"; + name = "vtop-0.1.6.tgz"; + sha1 = "eda5437e0e724e39055ec66b8884a5345f727492"; + }) + ]; + buildInputs = + (self.nativeDeps."vtop" or []); + deps = [ + self.by-version."drawille"."0.0.3" + self.by-version."os-utils"."0.0.14" + self.by-version."read"."1.0.5" + self.by-version."blessed"."0.0.33" + self.by-version."commander"."2.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "vtop" ]; + }; + "vtop" = self.by-version."vtop"."0.1.6"; + by-spec."walk"."*" = + self.by-version."walk"."2.3.3"; + by-version."walk"."2.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-walk-2.3.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/walk/-/walk-2.3.3.tgz"; + name = "walk-2.3.3.tgz"; + sha1 = "b4c0e8c42464c16dbbe1d71666765eac07819e5f"; }) ]; buildInputs = (self.nativeDeps."walk" or []); deps = [ - self.by-version."forEachAsync"."2.2.1" + self.by-version."foreachasync"."3.0.0" ]; peerDependencies = [ ]; passthru.names = [ "walk" ]; }; - "walk" = self.by-version."walk"."2.3.1"; + "walk" = self.by-version."walk"."2.3.3"; by-spec."walk"."~2.2.1" = self.by-version."walk"."2.2.1"; by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -19199,40 +21203,40 @@ passthru.names = [ "watch" ]; }; by-spec."wd"."~0.2.12" = - self.by-version."wd"."0.2.19"; - by-version."wd"."0.2.19" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.2.19"; + self.by-version."wd"."0.2.27"; + by-version."wd"."0.2.27" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.27"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.2.19.tgz"; - name = "wd-0.2.19.tgz"; - sha1 = "347ae75adebc15ad642baec118742344d749f169"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.27.tgz"; + name = "wd-0.2.27.tgz"; + sha1 = "db25a671e14d76e4886a0c5014606acde065f4cf"; }) ]; buildInputs = (self.nativeDeps."wd" or []); deps = [ - self.by-version."async"."0.2.10" - self.by-version."vargs"."0.1.0" - self.by-version."q"."1.0.1" - self.by-version."request"."2.33.0" - self.by-version."archiver"."0.5.2" + self.by-version."archiver"."0.10.0" + self.by-version."async"."0.9.0" self.by-version."lodash"."2.4.1" + self.by-version."q"."1.0.1" + self.by-version."request"."2.36.0" self.by-version."underscore.string"."2.3.3" + self.by-version."vargs"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "wd" ]; }; by-spec."weak-map"."^1.0.4" = - self.by-version."weak-map"."1.0.4"; - by-version."weak-map"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-weak-map-1.0.4"; + self.by-version."weak-map"."1.0.5"; + by-version."weak-map"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-weak-map-1.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.4.tgz"; - name = "weak-map-1.0.4.tgz"; - sha1 = "1acddee2cc90eb30950860b7415c79cefc5f07c9"; + url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; + name = "weak-map-1.0.5.tgz"; + sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; }) ]; buildInputs = @@ -19244,14 +21248,14 @@ passthru.names = [ "weak-map" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.40.0"; - by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.40.0"; + self.by-version."webdrvr"."2.41.0-0"; + by-version."webdrvr"."2.41.0-0" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.41.0-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz"; - name = "webdrvr-2.40.0.tgz"; - sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.41.0-0.tgz"; + name = "webdrvr-2.41.0-0.tgz"; + sha1 = "c74f22b27f0778d0c2b7e5cbda1edd113d782884"; }) ]; buildInputs = @@ -19260,8 +21264,8 @@ self.by-version."adm-zip"."0.4.4" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.14" - self.by-version."phantomjs"."1.9.7-4" + self.by-version."npmconf"."0.1.16" + self.by-version."phantomjs"."1.9.7-8" self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" ]; @@ -19269,16 +21273,16 @@ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.40.0"; - 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 = "node-websocket-driver-0.3.2"; + "webdrvr" = self.by-version."webdrvr"."2.41.0-0"; + by-spec."websocket-driver".">=0.3.1" = + self.by-version."websocket-driver"."0.3.4"; + by-version."websocket-driver"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "node-websocket-driver-0.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.2.tgz"; - name = "websocket-driver-0.3.2.tgz"; - sha1 = "f177ef6611390e2401ae47f35e8386dda987daca"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.4.tgz"; + name = "websocket-driver-0.3.4.tgz"; + sha1 = "f37ab303f6a602c4b0dbcaa1cdd771e442b04ea7"; }) ]; buildInputs = @@ -19289,8 +21293,6 @@ ]; passthru.names = [ "websocket-driver" ]; }; - by-spec."websocket-driver".">=0.3.1" = - self.by-version."websocket-driver"."0.3.2"; by-spec."when"."~3.1.0" = self.by-version."when"."3.1.0"; by-version."when"."3.1.0" = lib.makeOverridable self.buildNodePackage { @@ -19439,23 +21441,26 @@ self.by-version."winston"."0.7.3"; by-spec."winston"."~0.7.3" = self.by-version."winston"."0.7.3"; - by-spec."wiredep"."~1.0.0" = - self.by-version."wiredep"."1.0.0"; - by-version."wiredep"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-wiredep-1.0.0"; + by-spec."wiredep"."^1.0.0" = + self.by-version."wiredep"."1.7.3"; + by-version."wiredep"."1.7.3" = lib.makeOverridable self.buildNodePackage { + name = "wiredep-1.7.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wiredep/-/wiredep-1.0.0.tgz"; - name = "wiredep-1.0.0.tgz"; - sha1 = "2e570465657b97e7494abf62978a3e52fc37ac52"; + url = "http://registry.npmjs.org/wiredep/-/wiredep-1.7.3.tgz"; + name = "wiredep-1.7.3.tgz"; + sha1 = "854c1482fa5c57fe2033ba655b49aa613f60fe3f"; }) ]; buildInputs = (self.nativeDeps."wiredep" or []); deps = [ - self.by-version."lodash"."1.3.1" + self.by-version."bower-config"."0.5.1" self.by-version."chalk"."0.1.1" - self.by-version."glob"."3.2.9" + self.by-version."glob"."3.2.11" + self.by-version."lodash"."1.3.1" + self.by-version."minimist"."0.1.0" + self.by-version."through2"."0.4.2" ]; peerDependencies = [ ]; @@ -19521,6 +21526,25 @@ ]; passthru.names = [ "with" ]; }; + by-spec."word-wrap"."^0.1.2" = + self.by-version."word-wrap"."0.1.3"; + by-version."word-wrap"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-word-wrap-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/word-wrap/-/word-wrap-0.1.3.tgz"; + name = "word-wrap-0.1.3.tgz"; + sha1 = "745523aa741b12bf23144d293795c6197b33eb1e"; + }) + ]; + buildInputs = + (self.nativeDeps."word-wrap" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "word-wrap" ]; + }; by-spec."wordwrap"."0.0.x" = self.by-version."wordwrap"."0.0.2"; by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -19584,25 +21608,6 @@ }; by-spec."wrench"."~1.5.4" = self.by-version."wrench"."1.5.8"; - by-spec."wru".">= 0.0.0" = - self.by-version."wru"."0.2.7"; - by-version."wru"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "wru-0.2.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wru/-/wru-0.2.7.tgz"; - name = "wru-0.2.7.tgz"; - sha1 = "f6fa4fc7d54f44bec19d55c66c4667078d73062d"; - }) - ]; - buildInputs = - (self.nativeDeps."wru" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "wru" ]; - }; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { @@ -19709,20 +21714,20 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">= 0.0.1" = - self.by-version."xml2js"."0.4.2"; - by-version."xml2js"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-xml2js-0.4.2"; + self.by-version."xml2js"."0.4.4"; + by-version."xml2js"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-xml2js-0.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.2.tgz"; - name = "xml2js-0.4.2.tgz"; - sha1 = "93911c393c4a332a2dce1222801eb571453b2f90"; + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz"; + name = "xml2js-0.4.4.tgz"; + sha1 = "3111010003008ae19240eba17497b57c729c555d"; }) ]; buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.5.8" + self.by-version."sax"."0.6.0" self.by-version."xmlbuilder"."2.2.1" ]; peerDependencies = [ @@ -19730,7 +21735,7 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">=0.1.7" = - self.by-version."xml2js"."0.4.2"; + self.by-version."xml2js"."0.4.4"; by-spec."xmlbuilder"."0.4.2" = self.by-version."xmlbuilder"."0.4.2"; by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -19750,7 +21755,7 @@ ]; passthru.names = [ "xmlbuilder" ]; }; - by-spec."xmlbuilder".">=0.4.2" = + by-spec."xmlbuilder".">=1.0.0" = self.by-version."xmlbuilder"."2.2.1"; by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage { name = "node-xmlbuilder-2.2.1"; @@ -19808,7 +21813,7 @@ ]; passthru.names = [ "xmlhttprequest" ]; }; - by-spec."xoauth2"."~0.1" = + by-spec."xoauth2"."~0.1.8" = self.by-version."xoauth2"."0.1.8"; by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage { name = "node-xoauth2-0.1.8"; @@ -19827,6 +21832,25 @@ ]; passthru.names = [ "xoauth2" ]; }; + by-spec."xtend"."^3.0.0" = + self.by-version."xtend"."3.0.0"; + by-version."xtend"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-xtend-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; + name = "xtend-3.0.0.tgz"; + sha1 = "5cce7407baf642cba7becda568111c493f59665a"; + }) + ]; + buildInputs = + (self.nativeDeps."xtend" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "xtend" ]; + }; by-spec."xtend"."~2.1.1" = self.by-version."xtend"."2.1.2"; by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage { @@ -19849,26 +21873,111 @@ }; by-spec."xtend"."~2.1.2" = self.by-version."xtend"."2.1.2"; - by-spec."yargs"."~1.1.2" = - self.by-version."yargs"."1.1.3"; - by-version."yargs"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-yargs-1.1.3"; + by-spec."yargs"."~1.2.1" = + self.by-version."yargs"."1.2.2"; + by-version."yargs"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-yargs-1.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yargs/-/yargs-1.1.3.tgz"; - name = "yargs-1.1.3.tgz"; - sha1 = "c44ed2bb9c86d55b557f2179fea7c7013fe4c42a"; + url = "http://registry.npmjs.org/yargs/-/yargs-1.2.2.tgz"; + name = "yargs-1.2.2.tgz"; + sha1 = "36b364c8d72d1213b4f720d5cf716dfde4f0a113"; }) ]; buildInputs = (self.nativeDeps."yargs" or []); deps = [ - self.by-version."minimist"."0.0.8" + self.by-version."minimist"."0.0.10" ]; peerDependencies = [ ]; passthru.names = [ "yargs" ]; }; + 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 = "node-yeoman-generator-0.16.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz"; + name = "yeoman-generator-0.16.0.tgz"; + sha1 = "0d1b655ea31660ab66837af1e686b795eae57c59"; + }) + ]; + buildInputs = + (self.nativeDeps."yeoman-generator" or []); + deps = [ + self.by-version."cheerio"."0.13.1" + self.by-version."rimraf"."2.2.8" + self.by-version."diff"."1.0.8" + self.by-version."mime"."1.2.11" + self.by-version."underscore.string"."2.3.3" + self.by-version."lodash"."2.4.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."glob"."3.2.11" + self.by-version."debug"."0.7.4" + self.by-version."isbinaryfile"."2.0.1" + self.by-version."dargs"."0.1.0" + self.by-version."async"."0.2.10" + self.by-version."inquirer"."0.4.1" + self.by-version."iconv-lite"."0.2.11" + self.by-version."shelljs"."0.2.6" + self.by-version."findup-sync"."0.1.3" + self.by-version."chalk"."0.4.0" + self.by-version."text-table"."0.2.0" + self.by-version."download"."0.1.17" + self.by-version."request"."2.30.0" + self.by-version."file-utils"."0.1.5" + self.by-version."class-extend"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yeoman-generator" ]; + }; + by-spec."yeoman-generator"."^0.17.0" = + self.by-version."yeoman-generator"."0.17.0"; + by-version."yeoman-generator"."0.17.0" = lib.makeOverridable self.buildNodePackage { + name = "node-yeoman-generator-0.17.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.17.0.tgz"; + name = "yeoman-generator-0.17.0.tgz"; + sha1 = "f005250770c01a60d1eb5b9a5b980af689b1517c"; + }) + ]; + buildInputs = + (self.nativeDeps."yeoman-generator" or []); + deps = [ + self.by-version."async"."0.9.0" + self.by-version."chalk"."0.4.0" + self.by-version."cheerio"."0.16.0" + self.by-version."class-extend"."0.1.1" + self.by-version."dargs"."0.1.0" + self.by-version."debug"."0.8.1" + self.by-version."diff"."1.0.8" + self.by-version."download"."0.1.17" + self.by-version."file-utils"."0.2.0" + self.by-version."findup-sync"."0.1.3" + self.by-version."glob"."3.2.11" + self.by-version."grouped-queue"."0.2.1" + self.by-version."gruntfile-editor"."0.1.0" + self.by-version."iconv-lite"."0.2.11" + self.by-version."inquirer"."0.5.1" + self.by-version."isbinaryfile"."2.0.1" + self.by-version."lodash"."2.4.1" + self.by-version."mime"."1.2.11" + self.by-version."mkdirp"."0.5.0" + self.by-version."nopt"."2.2.1" + self.by-version."request"."2.36.0" + self.by-version."rimraf"."2.2.8" + self.by-version."shelljs"."0.3.0" + self.by-version."text-table"."0.2.0" + self.by-version."underscore.string"."2.3.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yeoman-generator" ]; + }; 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 { @@ -19884,13 +21993,13 @@ (self.nativeDeps."yeoman-generator" or []); deps = [ self.by-version."cheerio"."0.12.4" - self.by-version."rimraf"."2.2.6" + self.by-version."rimraf"."2.2.8" self.by-version."diff"."1.0.8" self.by-version."mime"."1.2.11" self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."2.2.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.9" + self.by-version."glob"."3.2.11" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -19901,7 +22010,7 @@ self.by-version."findup-sync"."0.1.3" self.by-version."chalk"."0.3.0" self.by-version."text-table"."0.2.0" - self.by-version."download"."0.1.16" + self.by-version."download"."0.1.17" self.by-version."request"."2.27.0" self.by-version."file-utils"."0.1.5" ]; @@ -19911,45 +22020,6 @@ }; 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 = "node-yeoman-generator-0.16.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz"; - name = "yeoman-generator-0.16.0.tgz"; - sha1 = "0d1b655ea31660ab66837af1e686b795eae57c59"; - }) - ]; - buildInputs = - (self.nativeDeps."yeoman-generator" or []); - deps = [ - self.by-version."cheerio"."0.13.1" - self.by-version."rimraf"."2.2.6" - self.by-version."diff"."1.0.8" - self.by-version."mime"."1.2.11" - self.by-version."underscore.string"."2.3.3" - self.by-version."lodash"."2.4.1" - self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.9" - self.by-version."debug"."0.7.4" - self.by-version."isbinaryfile"."2.0.1" - self.by-version."dargs"."0.1.0" - self.by-version."async"."0.2.10" - self.by-version."inquirer"."0.4.1" - self.by-version."iconv-lite"."0.2.11" - self.by-version."shelljs"."0.2.6" - self.by-version."findup-sync"."0.1.3" - self.by-version."chalk"."0.4.0" - self.by-version."text-table"."0.2.0" - self.by-version."download"."0.1.16" - self.by-version."request"."2.30.0" - self.by-version."file-utils"."0.1.5" - self.by-version."class-extend"."0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "yeoman-generator" ]; - }; by-spec."yo"."*" = self.by-version."yo"."1.1.2"; by-version."yo"."1.1.2" = lib.makeOverridable self.buildNodePackage { @@ -19967,7 +22037,7 @@ self.by-version."yeoman-generator"."0.16.0" self.by-version."nopt"."2.1.2" self.by-version."lodash"."2.4.1" - self.by-version."update-notifier"."0.1.8" + self.by-version."update-notifier"."0.1.10" self.by-version."insight"."0.3.1" self.by-version."sudo-block"."0.3.0" self.by-version."async"."0.2.10" @@ -19978,7 +22048,7 @@ ]; peerDependencies = [ self.by-version."grunt-cli"."0.1.13" - self.by-version."bower"."1.3.2" + self.by-version."bower"."1.3.5" ]; passthru.names = [ "yo" ]; }; @@ -19987,6 +22057,29 @@ self.by-version."yo"."1.1.2"; by-spec."yo".">=1.0.0-rc.1.1" = self.by-version."yo"."1.1.2"; + by-spec."yosay"."^0.2.0" = + self.by-version."yosay"."0.2.1"; + by-version."yosay"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "yosay-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yosay/-/yosay-0.2.1.tgz"; + name = "yosay-0.2.1.tgz"; + sha1 = "01381b2165c8ef717610e073ecfa266dde195ae9"; + }) + ]; + buildInputs = + (self.nativeDeps."yosay" or []); + deps = [ + self.by-version."pad-component"."0.0.1" + self.by-version."word-wrap"."0.1.3" + self.by-version."chalk"."0.4.0" + self.by-version."minimist"."0.0.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yosay" ]; + }; by-spec."zeparser"."0.0.5" = self.by-version."zeparser"."0.0.5"; by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -20006,22 +22099,26 @@ ]; passthru.names = [ "zeparser" ]; }; - by-spec."zip-stream"."~0.1.0" = - self.by-version."zip-stream"."0.1.4"; - by-version."zip-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-zip-stream-0.1.4"; + by-spec."zip-stream"."~0.3.0" = + self.by-version."zip-stream"."0.3.4"; + by-version."zip-stream"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "node-zip-stream-0.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz"; - name = "zip-stream-0.1.4.tgz"; - sha1 = "fe5b565bc366b8d73d5d4c1606e07c8947de1654"; + url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.3.4.tgz"; + name = "zip-stream-0.3.4.tgz"; + sha1 = "1b7dc01591300032d69699fe66962bf52a0de91c"; }) ]; buildInputs = (self.nativeDeps."zip-stream" or []); deps = [ + self.by-version."crc32-stream"."0.2.0" + self.by-version."deflate-crc32-stream"."0.1.1" self.by-version."readable-stream"."1.0.27-1" self.by-version."lodash.defaults"."2.4.1" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 4d220a008290..a27dce115531 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -131,4 +131,5 @@ , "sinon" , "shelljs" , "typescript" +, "vtop" ] From c86d89639a4bef809ab9eff4de87915c0b12ef06 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 9 Jun 2014 15:13:28 +0200 Subject: [PATCH 266/424] postfix-211: Update from 2.11.0 to 2.11.1 --- pkgs/servers/mail/postfix/2.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix index 7164ace791ef..3651b1b74a48 100644 --- a/pkgs/servers/mail/postfix/2.11.nix +++ b/pkgs/servers/mail/postfix/2.11.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0f0c6cv6j5m5n4bjp18llvbbxmzmhb70qw1z9vf7h9k6slr9s7fa"; + sha256 = "1ql9cifjcfhfi81lrf6zvk0r3spgcp01xwna16a7k9cm7fkrhzs8"; }; patches = [ ./postfix-2.11.0.patch ]; From 9018d3c4f242c9bd434bc7c2253f9c8e65b052ae Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 9 Jun 2014 15:13:56 +0200 Subject: [PATCH 267/424] tinc: Update from 1.0.23 to 1.0.24 --- pkgs/tools/networking/tinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 61ff721a8479..f1f8801358cb 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.23"; + version = "1.0.24"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "04i88hr46nx3x3s71kasm9qrjhnn35icxh9zwchki47z2vgnpw5w"; + sha256 = "11xnz6lz917hq0zb544dvbxl0smlyjx65kv3181j4fcyygwmi3j9"; }; buildInputs = [ lzo openssl zlib ]; From 094635257ebaa1894298acf5c5242d1579134fee Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Jun 2014 19:11:33 +0200 Subject: [PATCH 268/424] mysql-connector-java: Bump to version 5.1.31 --- pkgs/servers/sql/mysql/jdbc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 424f6d021810..7fde706479d6 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation { - name = "mysql-connector-java-5.1.25"; + name = "mysql-connector-java-5.1.31"; builder = ./builder.sh; src = fetchurl { - url = http://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-5.1.25.zip; - sha256 = "1qwnha8w8xafcig8wdvbry93pbli2vmzks8ds6kbb9im2k0rrmrw"; + url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.31.zip; + sha256 = "1j6jvpadlib2hb6n3kh7s9ygjyqvi5gawrmnk1dsvvdcbkk1v871"; }; buildInputs = [ unzip ant ]; From 35f47bcfd8aa2f5d38fe565ba32ac62cbfd63118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 9 Jun 2014 19:11:38 +0200 Subject: [PATCH 269/424] fix evaluation (wrong meta.maintainers field) --- pkgs/development/ocaml-modules/lablgl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 8fd07ee06912..75c8d7ad2244 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; license = "GnuGPLV2"; - maintainers = [ stdenv.lib.maintainers.psub ]; + maintainers = [ stdenv.lib.maintainers.pSub ]; }; } From be976b2c465650fff7e11dce28d5dccad04f983b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 9 Jun 2014 18:52:24 +0200 Subject: [PATCH 270/424] pypy: disable a test --- pkgs/development/interpreters/pypy/2.2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix index b2b4157dcf6e..d67f1c2a8215 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -60,7 +60,8 @@ let # disable test_mhlib because it fails for unknown reason # disable test_multiprocessing due to transient errors # disable sqlite3 due to https://bugs.pypy.org/issue1740 - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_shutil -test_mhlib -test_multiprocessing' lib-python + # disable test_os because test_urandom_failure fails + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python ''; installPhase = '' From fb9c0d53b20a21b00209db1675429cce2f7089a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 9 Jun 2014 20:42:49 +0200 Subject: [PATCH 271/424] xbmc: 13.0 -> 13.1 --- pkgs/applications/video/xbmc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 94da757867e0..3232267fa94b 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -34,11 +34,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; assert pulseSupport -> pulseaudio != null; stdenv.mkDerivation rec { - name = "xbmc-13.0"; + name = "xbmc-13.1"; src = fetchurl { - url = "https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz"; - sha256 = "096hin8qp1864ypyw9xysy13niwf79bgfgivxi7w7mh2dagn0mjx"; + url = "https://github.com/xbmc/xbmc/archive/13.1-Gotham.tar.gz"; + sha256 = "0y56c5csfp8xhk088g47m3bzrri73z868yfx6b04gnrdmr760jrl"; }; buildInputs = [ From 6b6f098fd18cfa83cbcfa35ad98da48a59b0606b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Jun 2014 23:46:30 +0200 Subject: [PATCH 272/424] disnix: bump versions and update module to use its latest features --- nixos/modules/services/misc/disnix.nix | 3 ++- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 94d0caaa76b7..219c7ed95874 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -125,13 +125,14 @@ in after = [ "dbus.service" ] ++ optional config.services.httpd.enable "httpd.service" ++ optional config.services.mysql.enable "mysql.service" + ++ optional config.services.postgresql.enable "postgresql.service" ++ optional config.services.tomcat.enable "tomcat.service" ++ optional config.services.svnserve.enable "svnserve.service" ++ optional config.services.mongodb.enable "mongodb.service"; restartIfChanged = false; - path = [ pkgs.nix pkgs.disnix pkgs.dysnomia ]; + path = [ pkgs.nix pkgs.disnix dysnomia ]; environment = { HOME = "/root"; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index ff29316edbf2..d89ab7667e82 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }: stdenv.mkDerivation { - name = "disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea"; + name = "disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7"; src = fetchurl { - url = http://hydra.nixos.org/build/9876935/download/4/disnix-0.3pre15e93a364ad9439d8336e659921600d48252045d.tar.gz; - sha256 = "1kgc6cacpp3ly7c62ah6pdprdl1bab08b4ir4dcrrm44x6fa1k63"; + url = http://hydra.nixos.org/build/11773951/download/4/disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7.tar.gz; + sha256 = "19hdh2mrlyiq1g3z6lnnqqvripmfcdnm18jpm4anp5iarhnwh3y4"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 5c937bc8aef4..d2f3ae6468c7 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -19,10 +19,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484"; + name = "dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82"; src = fetchurl { - url = http://hydra.nixos.org/build/9146265/download/1/dysnomia-0.3pre313a5f99a166fee2e0245dfd25f41ec9ed958075.tar.gz; - sha256 = "0fgbqybr9rfr95fkmv1hpq7al0p1kxa385k6sjc7iwwcxs4cmxf5"; + url = http://hydra.nixos.org/build/11407191/download/1/dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82.tar.gz; + sha256 = "1i7yb299bq1z7cy4sk83m5faahj8inh73xn5bi6jcv492zv3kgwz"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 5100a2bbb315511ce8c1562ba65f621c8d249ec1 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 9 Jun 2014 20:51:54 -0500 Subject: [PATCH 273/424] texlive: upgrade to 20140528 --- pkgs/tools/typesetting/tex/texlive/default.nix | 18 +++++++++--------- pkgs/tools/typesetting/tex/texlive/extra.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 22ce7739a747..b1cb35e62ffd 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,20 +1,20 @@ args : with args; rec { src = fetchurl { - url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2013.20130729.30972.orig.tar.xz; - sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd"; + url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140528.34243.orig.tar.xz; + sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; }; - texmfVersion = "2013.20140408"; + texmfVersion = "2014.20140528"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "1pdbbp4sy6kypiqss9zfvr3m0agqzghagfr609pfjh9ka3ihv0kh"; + sha256 = "09z3jp5if0llszm02x3f93izrspjh14g77034c677r0sj4xrb63w"; }; - langTexmfVersion = "2013.20140408"; + langTexmfVersion = "2014.20140528"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "05qyhcfdbrrc8mnps5sv3fggjbxdj3bp9jd12ldzkjxxdbzhp475"; + sha256 = "0c7rppqya74g8fb431i3bbga88xzjiarj540fcn34plar5wz4k31"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -40,7 +40,7 @@ rec { sed -e '/ubidi_open/i#include ' -i $(find . -name configure) sed -e 's/-lttf/-lfreetype/' -i $(find . -name configure) - sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) + # sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) sed -e '1i\#include \n\#include ' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; @@ -111,7 +111,7 @@ rec { buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig - poppler graphite2 lesstif zziplib harfbuzz texinfo ] + poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ]; configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" @@ -134,7 +134,7 @@ rec { phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ]; - name = "texlive-core-2013"; + name = "texlive-core-2014"; meta = with stdenv.lib; { description = "A TeX distribution"; diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 8549c8c45481..1195eaa58f3b 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,11 +1,11 @@ args: with args; rec { - name = "texlive-extra-2013"; - version = "2013.20140408"; + name = "texlive-extra-2014"; + version = "2014.20140528"; src = fetchurl { url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "0d6b5kip7j8ljqn92bkdncvqxyk2756404hzsp4mh0s1jhfwws7y"; + sha256 = "1wlvafvc03qlic4gr883q3lvgjis0czw3z6gdp4qw8f51a0fyam9"; }; buildInputs = [texLive xz]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da97d66dc017..2ebbf7cd8ad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11012,7 +11012,8 @@ let texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo - libjpeg bison python fontconfig flex poppler graphite2 makeWrapper; + libjpeg bison python fontconfig flex poppler libpaper graphite2 + makeWrapper; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; From 7ebe9b1e16de530ba97eec4618b31f0f19604a33 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 9 Jun 2014 21:01:59 -0500 Subject: [PATCH 274/424] haskell-ghc-mod: 4.1.1 -> 4.1.2 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index b83d9de45522..04545dda87e4 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "4.1.1"; - sha256 = "0jsm881khbpa316rvka2ixzmm4kim7w9gbriz94m08b3yj3f00q9"; + version = "4.1.2"; + sha256 = "0xdpy61dc56zvpgr2z9cdyd85d65l426vnbfgsw6w494w0bp3sh7"; isLibrary = true; isExecutable = true; buildDepends = [ From d0365a6cde538525ed37ee7b60fbd789a2ff7325 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 10 Jun 2014 02:28:23 +0000 Subject: [PATCH 275/424] git-annex: build on Darwin, and rely on cabal to set flags Fixes #2519 --- .../git-and-tools/git-annex/default.nix | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 217e4067cb94..788c3c3211b2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -11,7 +11,7 @@ , tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers , unixCompat, utf8String, uuid, wai, waiLogger, warp, warpTls , which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm -, yesodStatic +, yesodStatic, fsnotify }: cabal.mkDerivation (self: { @@ -22,9 +22,9 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter byteable caseInsensitive - clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus - dlist dns editDistance exceptions extensibleExceptions fdoNotify - feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient + clientsession cryptoApi cryptohash dataDefault dataenc DAV + dlist dns editDistance exceptions extensibleExceptions + feed filepath gnutls hamlet hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse json liftedBase MissingH monadControl mtl network networkConduit networkInfo networkMulticast networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa @@ -32,19 +32,10 @@ cabal.mkDerivation (self: { tastyQuickcheck tastyRerun text time transformers unixCompat utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic - ]; + ] ++ (if !self.stdenv.isDarwin + then [ dbus fdoNotify hinotify ] else [ fsnotify ]); buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; - configureFlags = "-fS3 - -fWebDAV - -fInotify - -fDbus - -fAssistant - -fWebapp - -fPairing - -fXMPP - -fDNS - -fProduction - -fTDFA"; + configureFlags = "-fAssistant -fProduction"; preConfigure = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" From 8951ca0715a13274c2d0b81c34ede91a6260254f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Tue, 10 Jun 2014 11:59:55 +0800 Subject: [PATCH 276/424] add libxmp 4.2.7 --- pkgs/development/libraries/libxmp/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libxmp/default.nix diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix new file mode 100644 index 000000000000..7b4d3d6287aa --- /dev/null +++ b/pkgs/development/libraries/libxmp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libxmp-4.2.7"; + + meta = with stdenv.lib; { + description = "Extended module player library"; + homepage = "http://xmp.sourceforge.net/"; + longDescription = '' + Libxmp is a library that renders module files to PCM data. It supports + over 90 mainstream and obscure module formats including Protracker (MOD), + Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). + ''; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; + sha256 = "1isv8498869w8wc18lagi1p40z4blx684r21j9cligkfyrmri536"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29a77a9e7fa3..36c09242b9d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5488,6 +5488,8 @@ let libxmlxx = callPackage ../development/libraries/libxmlxx { }; + libxmp = callPackage ../development/libraries/libxmp { }; + libxslt = callPackage ../development/libraries/libxslt { }; libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { From 513165fc9a7e707707fd73a804ce03cd0d153ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Tue, 10 Jun 2014 12:03:13 +0800 Subject: [PATCH 277/424] add xmp 4.0.7 --- pkgs/applications/audio/xmp/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/audio/xmp/default.nix diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix new file mode 100644 index 000000000000..7f21d389cf5f --- /dev/null +++ b/pkgs/applications/audio/xmp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: + +stdenv.mkDerivation rec { + name = "xmp-4.0.7"; + + meta = with stdenv.lib; { + description = "Extended module player"; + homepage = "http://xmp.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz"; + sha256 = "0qgzzaxhshz5l7s21x89xb43pbbi0zap6a4lk4s7gjp1qca2agcw"; + }; + + buildInputs = [ pkgconfig alsaLib libxmp ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36c09242b9d9..cee7e3e183ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9861,6 +9861,8 @@ let xmove = callPackage ../applications/misc/xmove { }; + xmp = callPackage ../applications/audio/xmp { }; + xnee = callPackage ../tools/X11/xnee { # Work around "missing separator" error. stdenv = overrideInStdenv stdenv [ gnumake381 ]; From f4987a0edc5783d28333d06fd1d2751cf009e5be Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Jun 2014 09:20:00 +0400 Subject: [PATCH 278/424] Update Monotone and add source-updater script --- .../version-management/monotone/default.nix | 13 +- .../monotone/default.upstream | 8 + .../monotone/glibc-file-handle.patch | 166 ------------------ 3 files changed, 16 insertions(+), 171 deletions(-) create mode 100644 pkgs/applications/version-management/monotone/default.upstream delete mode 100644 pkgs/applications/version-management/monotone/glibc-file-handle.patch diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 0df1c652761e..6be36533ce6b 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, boost, zlib, botan, libidn -, lua, pcre, sqlite, perl, pkgconfig, expect }: +, lua, pcre, sqlite, perl, pkgconfig, expect +, bzip2, gmp, openssl +}: let - version = "1.0"; + version = "1.1"; perlVersion = (builtins.parseDrvName perl.name).version; in @@ -13,12 +15,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; - sha256 = "5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc"; + sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r"; }; - patches = [ ./glibc-file-handle.patch ]; + patches = [ ]; - buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect ]; + buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect + openssl gmp bzip2 ]; postInstall = '' mkdir -p $out/share/${name} diff --git a/pkgs/applications/version-management/monotone/default.upstream b/pkgs/applications/version-management/monotone/default.upstream new file mode 100644 index 000000000000..e0d01fb190c6 --- /dev/null +++ b/pkgs/applications/version-management/monotone/default.upstream @@ -0,0 +1,8 @@ +url http://www.monotone.ca/downloads.php + +do_overwrite(){ + ensure_version + ensure_hash + set_var_value version $CURRENT_VERSION + set_var_value sha256 $CURRENT_HASH +} diff --git a/pkgs/applications/version-management/monotone/glibc-file-handle.patch b/pkgs/applications/version-management/monotone/glibc-file-handle.patch deleted file mode 100644 index 601b6ede0fb9..000000000000 --- a/pkgs/applications/version-management/monotone/glibc-file-handle.patch +++ /dev/null @@ -1,166 +0,0 @@ -Revision: da62cad10eda55aa233ac124273f3db4f541137a -Parent: 65bcb8cf8b32f68a5b48629b328f6d65979e58df -Author: Thomas Moschny -Date: 07.05.2011 13:32:06 -Branch: net.venge.monotone - -Changelog: - -* src/rcs_file.cc: Rename struct "file_handle" to "rcs_file_handle" - to avoid a name clash with a struct of same name defined by newer - glibc's "fcntl.h". For aesthetic reasons, also rename struct - "file_source". - -References: -https://code.monotone.ca/p/monotone/source/commit/da62cad10eda55aa233ac124273f3db4f541137a/ -https://bugs.gentoo.org/396651 - -============================================================ ---- a/src/rcs_file.cc 885b3fbe7b6cfed78816f0e57cd71d44616213c6 -+++ b/src/rcs_file.cc 03cf68912a4a708545ebce3d415c0e970ddead0b -@@ -42,12 +42,12 @@ struct - - #ifdef HAVE_MMAP - struct --file_handle -+rcs_file_handle - { - string const & filename; - off_t length; - int fd; -- file_handle(string const & fn) : -+ rcs_file_handle(string const & fn) : - filename(fn), - length(0), - fd(-1) -@@ -60,13 +60,13 @@ file_handle - if (fd == -1) - throw oops("open of " + filename + " failed"); - } -- ~file_handle() -+ ~rcs_file_handle() - { - if (close(fd) == -1) - throw oops("close of " + filename + " failed"); - } - }; --struct file_source -+struct rcs_file_source - { - string const & filename; - int fd; -@@ -91,7 +91,7 @@ struct file_source - ++pos; - return good(); - } -- file_source(string const & fn, -+ rcs_file_source(string const & fn, - int f, - off_t len) : - filename(fn), -@@ -104,7 +104,7 @@ struct file_source - if (mapping == MAP_FAILED) - throw oops("mmap of " + filename + " failed"); - } -- ~file_source() -+ ~rcs_file_source() - { - if (munmap(mapping, length) == -1) - throw oops("munmapping " + filename + " failed, after reading RCS file"); -@@ -112,12 +112,12 @@ struct - }; - #elif defined(WIN32) - struct --file_handle -+rcs_file_handle - { - string const & filename; - off_t length; - HANDLE fd; -- file_handle(string const & fn) : -+ rcs_file_handle(string const & fn) : - filename(fn), - length(0), - fd(NULL) -@@ -134,7 +134,7 @@ file_handle - if (fd == NULL) - throw oops("open of " + filename + " failed"); - } -- ~file_handle() -+ ~rcs_file_handle() - { - if (CloseHandle(fd)==0) - throw oops("close of " + filename + " failed"); -@@ -142,7 +142,7 @@ struct - }; - - struct --file_source -+rcs_file_source - { - string const & filename; - HANDLE fd,map; -@@ -167,7 +167,7 @@ file_source - ++pos; - return good(); - } -- file_source(string const & fn, -+ rcs_file_source(string const & fn, - HANDLE f, - off_t len) : - filename(fn), -@@ -183,7 +183,7 @@ file_source - if (mapping==NULL) - throw oops("MapViewOfFile of " + filename + " failed"); - } -- ~file_source() -+ ~rcs_file_source() - { - if (UnmapViewOfFile(mapping)==0) - throw oops("UnmapViewOfFile of " + filename + " failed"); -@@ -193,7 +193,7 @@ file_source - }; - #else - // no mmap at all --typedef istream file_source; -+typedef istream rcs_file_source; - #endif - - typedef enum -@@ -220,7 +220,7 @@ static token_type - } - - static token_type --get_token(file_source & ist, -+get_token(rcs_file_source & ist, - string & str, - size_t & line, - size_t & col) -@@ -303,14 +303,14 @@ struct parser - - struct parser - { -- file_source & ist; -+ rcs_file_source & ist; - rcs_file & r; - string token; - token_type ttype; - - size_t line, col; - -- parser(file_source & s, -+ parser(rcs_file_source & s, - rcs_file & r) - : ist(s), r(r), line(1), col(1) - {} -@@ -489,8 +489,8 @@ parse_rcs_file(string const & filename, - parse_rcs_file(string const & filename, rcs_file & r) - { - #if defined(HAVE_MMAP) || defined(WIN32) -- file_handle handle(filename); -- file_source ifs(filename, handle.fd, handle.length); -+ rcs_file_handle handle(filename); -+ rcs_file_source ifs(filename, handle.fd, handle.length); - #else - ifstream ifs(filename.c_str()); - ifs.unsetf(ios_base::skipws); From cfe5bee0008362499657a69c230e531a66ad8539 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Jun 2014 09:29:13 +0400 Subject: [PATCH 279/424] Update botan --- pkgs/development/libraries/botan/default.nix | 7 ++++--- pkgs/development/libraries/botan/default.upstream | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/botan/default.upstream diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 18de87b06677..9f4d766f719f 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -14,12 +14,12 @@ let sourceInfo = rec { baseName="botan"; tarBaseName="Botan"; - baseVersion="1.8"; - revision="11"; + baseVersion = "1.10"; + revision = "8"; version="${baseVersion}.${revision}"; name="${baseName}-${version}"; url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz"; - hash="194vffc9gfb0912lzndn8nzblg2d2gjmk13fc8hppgpw7ln0mdn3"; + hash = "182f316rbdd6jrqn92vjms3jyb9syn4ic0nzi3b7rfjbj3zdabxw"; }; in rec { @@ -43,6 +43,7 @@ rec { ]; platforms = with a.lib.platforms; unix; + inherit version; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/botan/default.upstream b/pkgs/development/libraries/botan/default.upstream new file mode 100644 index 000000000000..becbf348b34e --- /dev/null +++ b/pkgs/development/libraries/botan/default.upstream @@ -0,0 +1,9 @@ +url http://botan.randombit.net/download.html +version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$' +ensure_version +ensure_hash +do_overwrite(){ + set_var_value hash $CURRENT_HASH + set_var_value baseVersion ${CURRENT_VERSION%.*} + set_var_value revision ${CURRENT_VERSION##*.} +} From b7b58f90d838caf37862109f70ad4e05da885507 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Jun 2014 09:41:23 +0400 Subject: [PATCH 280/424] Update ZPAQ --- pkgs/tools/archivers/zpaq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 2f44a8dd4db0..718a80e1406a 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="651"; + version="652"; name="${baseName}-${version}"; - hash="1n0qq4lia25n62jpa0gg29388xf8r75nv4h1vpc3s5rpymkq2qw5"; - url="http://mattmahoney.net/dc/zpaq651.zip"; - sha256="1n0qq4lia25n62jpa0gg29388xf8r75nv4h1vpc3s5rpymkq2qw5"; + hash="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky"; + url="http://mattmahoney.net/dc/zpaq652.zip"; + sha256="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky"; }; buildInputs = [ unzip From 99d59d8094515f5bd0733e019ac5fae9902aa924 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Jun 2014 09:41:48 +0400 Subject: [PATCH 281/424] Update jq --- pkgs/development/tools/jq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index f0c32fc0e9ec..514aa8746c66 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="jq"; - version="1.3"; + version="1.4"; name="${baseName}-${version}"; - hash="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2"; - url="http://stedolan.github.io/jq/download/source/jq-1.3.tar.gz"; - sha256="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2"; + hash="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r"; + url="http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz"; + sha256="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r"; }; buildInputs = [ ]; From c6c152daada5c9c1dc1c7c5bce724009a9075b2c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Jun 2014 10:48:38 +0400 Subject: [PATCH 282/424] Create botan.pc just in case --- pkgs/development/libraries/botan/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 9f4d766f719f..64dd821c43f4 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -32,8 +32,13 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"]; configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl --with-tr1-implementation=boost"; + + fixPkgConfig = a.fullDepEntry '' + cd "$out"/lib/pkgconfig + ln -s botan-*.pc botan.pc || true + '' ["minInit" "doMakeInstall"]; meta = { description = "Cryptographic algorithms library"; From 26c8490ea1070b63f1a05e2d85efe540136660c9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Jun 2014 11:24:43 +0400 Subject: [PATCH 283/424] Install libpotrace --- pkgs/applications/graphics/potrace/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 81af6db9a4cc..0ede3a0e921a 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256 = "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as"; }; + configureFlags = ["--with-libpotrace"]; + buildInputs = [ zlib ]; meta = { From a852b53bffecdba28344a7ccbe25b87e6cbd9344 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 10 Jun 2014 11:25:03 +0400 Subject: [PATCH 284/424] Add potrace to texLive dependencies --- pkgs/tools/typesetting/tex/texlive/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index b1cb35e62ffd..73c53bca2fb0 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -112,7 +112,9 @@ rec { freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo ] - ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ]; + ++ stdenv.lib.optionals (! stdenv.isDarwin) [ potrace ] + ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ] + ; configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ebbf7cd8ad3..3478e3a7cde0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11010,7 +11010,7 @@ let texFunctions = import ../tools/typesetting/tex/nix pkgs; texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { - inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby + inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo libjpeg bison python fontconfig flex poppler libpaper graphite2 makeWrapper; From 0085a1aae33483dfaae3a4559d53cc1688791258 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 10 Jun 2014 08:57:41 +0000 Subject: [PATCH 285/424] potrace: allow building on any unix --- pkgs/applications/graphics/potrace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 0ede3a0e921a..365f88b19b4c 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://potrace.sourceforge.net/; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pSub ]; license = "GPL2"; }; From 651595c96977b1f786bf8c5be5893c270bba38d3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 10 Jun 2014 08:57:52 +0000 Subject: [PATCH 286/424] texlive: add potrace dependency without qualification --- pkgs/tools/typesetting/tex/texlive/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 73c53bca2fb0..b9e71a7cde23 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -111,8 +111,7 @@ rec { buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig - poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo ] - ++ stdenv.lib.optionals (! stdenv.isDarwin) [ potrace ] + poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo potrace ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ] ; From 927c41e2585cf4b8d7fc1e64f8f9927af710cf94 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Tue, 20 May 2014 15:36:10 +0200 Subject: [PATCH 287/424] fish: Fixed tab completion with sudo (close #2705) We don't have /sbin and /usr/sbin, so fish complains. --- pkgs/shells/fish/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 7b70e98d2cd4..e69c033cf404 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { -e "s|which |${which}/bin/which |" \ -i "$out/share/fish/functions/_.fish" sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py" + sed -i "s|/sbin /usr/sbin||" \ + "$out/share/fish/functions/__fish_complete_subcommand_root.fish" ''; meta = with stdenv.lib; { From 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 3 Jun 2014 16:07:47 +0200 Subject: [PATCH 288/424] Merge #2692: Use pam_env to properly setup system-wide env --- nixos/modules/config/i18n.nix | 2 +- nixos/modules/config/shells-environment.nix | 1 + nixos/modules/config/system-environment.nix | 56 +++++++++++++++++++++ nixos/modules/config/timezone.nix | 2 +- nixos/modules/module-list.nix | 1 + nixos/modules/programs/environment.nix | 9 ++-- nixos/modules/security/ca.nix | 8 +-- nixos/modules/security/pam.nix | 1 + nixos/modules/security/sudo.nix | 3 -- nixos/modules/services/misc/nix-daemon.nix | 2 +- 10 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 nixos/modules/config/system-environment.nix diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 8182b8ae8081..7a7d713ef687 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -76,7 +76,7 @@ in environment.systemPackages = [ glibcLocales ]; - environment.variables = + environment.systemVariables = { LANG = config.i18n.defaultLocale; LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; }; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 9e212847e489..e3ddf9e3c5fa 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -19,6 +19,7 @@ in default = {}; description = '' A set of environment variables used in the global environment. + These variables will be set on shell initialisation. The value of each variable can be either a string or a list of strings. The latter is concatenated, interspersed with colon characters. diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix new file mode 100644 index 000000000000..b30c4e064750 --- /dev/null +++ b/nixos/modules/config/system-environment.nix @@ -0,0 +1,56 @@ +# This module defines a system-wide environment that will be +# initialised by pam_env (that is, not only in shells). +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.environment; + +in + +{ + + options = { + + environment.systemVariables = mkOption { + default = {}; + description = '' + A set of environment variables used in the global environment. + These variables will be set by PAM. + The value of each variable can be either a string or a list of + strings. The latter is concatenated, interspersed with colon + characters. + ''; + type = types.attrsOf (mkOptionType { + name = "a string or a list of strings"; + merge = loc: defs: + let + defs' = filterOverrides defs; + res = (head defs').value; + in + if isList res then concatLists (getValues defs') + else if lessThan 1 (length defs') then + throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}." + else if !isString res then + throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." + else res; + }); + apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); + }; + + }; + + config = { + + system.build.pamEnvironment = pkgs.writeText "pam-environment" + '' + ${concatStringsSep "\n" ( + (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'') + (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))} + ''; + + }; + +} diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index 65703d8bb080..4f7fc9ab262b 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -30,7 +30,7 @@ in config = { - environment.variables.TZDIR = "/etc/zoneinfo"; + environment.systemVariables.TZDIR = "/etc/zoneinfo"; systemd.globalEnvironment.TZDIR = tzdir; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4ceb48989beb..a6e0e0186695 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -14,6 +14,7 @@ ./config/power-management.nix ./config/pulseaudio.nix ./config/shells-environment.nix + ./config/system-environment.nix ./config/swap.nix ./config/sysctl.nix ./config/system-path.nix diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index aa9aec078342..c26c962b20a6 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -19,13 +19,16 @@ in environment.variables = { LOCATE_PATH = "/var/cache/locatedb"; NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; - NIX_PATH = + PAGER = "less -R"; + EDITOR = "nano"; + }; + + environment.systemVariables = + { NIX_PATH = [ "/nix/var/nix/profiles/per-user/root/channels/nixos" "nixpkgs=/etc/nixos/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" ]; - PAGER = "less -R"; - EDITOR = "nano"; }; environment.profiles = diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index f159e359f968..57764dc870f3 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -12,9 +12,11 @@ with lib; } ]; - environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; - environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; + environment.systemVariables = + { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; + }; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 6a5eb4c720f8..02340fd78e8c 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -186,6 +186,7 @@ let "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} # Session management. + session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_unix.so ${optionalString cfg.setLoginUid "session required pam_loginuid.so"} diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index cce1e785563b..e8ed545c8cc7 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -58,9 +58,6 @@ in # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead. # Environment variables to keep for root and %wheel. - Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE - Defaults:root,%wheel env_keep+=NIX_CONF_DIR - Defaults:root,%wheel env_keep+=NIX_PATH Defaults:root,%wheel env_keep+=TERMINFO_DIRS Defaults:root,%wheel env_keep+=TERMINFO diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4bfd6268234d..f373657b7918 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -318,7 +318,7 @@ in }; # Set up the environment variables for running Nix. - environment.variables = cfg.envVars; + environment.systemVariables = cfg.envVars; environment.extraInit = '' From 966f13880f30bde48dd40c33aecb9f2725c2f0e8 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 10 Jun 2014 11:45:02 +0200 Subject: [PATCH 289/424] Clojure: bump to 1.6.0. --- pkgs/development/interpreters/clojure/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 6db652572a3a..fd1a2d019fea 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, ant, jdk, makeWrapper }: -let version = "1.5.1"; in +let version = "1.6.0"; in stdenv.mkDerivation { name = "clojure-${version}"; src = fetchurl { url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; - sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy"; + sha256 = "0yv67gackrzlwn9f8cnpw14y2hwspklxhy1450rl71vdrqjahlwq"; }; buildInputs = [ unzip ant jdk makeWrapper ]; @@ -43,5 +43,6 @@ stdenv.mkDerivation { offers a software transactional memory system and reactive Agent system that ensure clean, correct, multithreaded designs. ''; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } From 717d9c39f94c667cca80fa4942e35cd51e5cc7eb Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 10 Jun 2014 11:49:47 +0200 Subject: [PATCH 290/424] leiningen: Update to 2.4.0. --- .../tools/build-managers/leiningen/default.nix | 10 +++++----- .../{lein_2.3.0.patch => lein-fix-jar-path.patch} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/tools/build-managers/leiningen/{lein_2.3.0.patch => lein-fix-jar-path.patch} (100%) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index a5f34746fef7..2c4ea8183af3 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.3.4"; + version = "2.4.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "1v83hpvp349pgqqiy4babc5m5b9lcwk0fif80fpv4jqvp0a8v6r7"; + sha256 = "0mdfp5r5qid42x7rq1cmyxqmvjdj2hk9rjz8pryf4zq3bk38m1cg"; }; jarsrc = fetchurl { - url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar"; - sha256 = "1pqc99p4vz4q3qcs90cqql6m7kc27ihx4hbqs5alxkzk7jv8s2bk"; + url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar"; + sha256 = "099r5qcldb214c3857i7dbbqn531aahzrz39qfhqxc6f476ncdh0"; }; - patches = ./lein_2.3.0.patch; + patches = [ ./lein-fix-jar-path.patch ]; inherit rlwrap clojure gnupg findutils coreutils jdk; diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch b/pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch similarity index 100% rename from pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch rename to pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch From 9265a61453f0df3a8bbaf3dc53e32c239e3bdcf9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 10 Jun 2014 12:25:00 +0200 Subject: [PATCH 291/424] gvfs: add more supported protocols in gnome 3.12. Closes #2880 --- pkgs/desktops/gnome-3/3.12/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index b33fad0e41e5..f5369b2a3c32 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -116,7 +116,7 @@ rec { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = gnome3; }; + gvfs = pkgs.gvfs.override { gnome = gnome3; lightWeight = false; }; eog = callPackage ./core/eog { }; From 491c088731022463978e595956427e72db6306a9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Jun 2014 13:03:44 +0200 Subject: [PATCH 292/424] Revert "Merge #2692: Use pam_env to properly setup system-wide env" This reverts commit 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c. --- nixos/modules/config/i18n.nix | 2 +- nixos/modules/config/shells-environment.nix | 1 - nixos/modules/config/system-environment.nix | 56 --------------------- nixos/modules/config/timezone.nix | 2 +- nixos/modules/module-list.nix | 1 - nixos/modules/programs/environment.nix | 9 ++-- nixos/modules/security/ca.nix | 8 ++- nixos/modules/security/pam.nix | 1 - nixos/modules/security/sudo.nix | 3 ++ nixos/modules/services/misc/nix-daemon.nix | 2 +- 10 files changed, 12 insertions(+), 73 deletions(-) delete mode 100644 nixos/modules/config/system-environment.nix diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 7a7d713ef687..8182b8ae8081 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -76,7 +76,7 @@ in environment.systemPackages = [ glibcLocales ]; - environment.systemVariables = + environment.variables = { LANG = config.i18n.defaultLocale; LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; }; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index e3ddf9e3c5fa..9e212847e489 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -19,7 +19,6 @@ in default = {}; description = '' A set of environment variables used in the global environment. - These variables will be set on shell initialisation. The value of each variable can be either a string or a list of strings. The latter is concatenated, interspersed with colon characters. diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix deleted file mode 100644 index b30c4e064750..000000000000 --- a/nixos/modules/config/system-environment.nix +++ /dev/null @@ -1,56 +0,0 @@ -# This module defines a system-wide environment that will be -# initialised by pam_env (that is, not only in shells). -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.environment; - -in - -{ - - options = { - - environment.systemVariables = mkOption { - default = {}; - description = '' - A set of environment variables used in the global environment. - These variables will be set by PAM. - The value of each variable can be either a string or a list of - strings. The latter is concatenated, interspersed with colon - characters. - ''; - type = types.attrsOf (mkOptionType { - name = "a string or a list of strings"; - merge = loc: defs: - let - defs' = filterOverrides defs; - res = (head defs').value; - in - if isList res then concatLists (getValues defs') - else if lessThan 1 (length defs') then - throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}." - else if !isString res then - throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." - else res; - }); - apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); - }; - - }; - - config = { - - system.build.pamEnvironment = pkgs.writeText "pam-environment" - '' - ${concatStringsSep "\n" ( - (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'') - (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))} - ''; - - }; - -} diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index 4f7fc9ab262b..65703d8bb080 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -30,7 +30,7 @@ in config = { - environment.systemVariables.TZDIR = "/etc/zoneinfo"; + environment.variables.TZDIR = "/etc/zoneinfo"; systemd.globalEnvironment.TZDIR = tzdir; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a6e0e0186695..4ceb48989beb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -14,7 +14,6 @@ ./config/power-management.nix ./config/pulseaudio.nix ./config/shells-environment.nix - ./config/system-environment.nix ./config/swap.nix ./config/sysctl.nix ./config/system-path.nix diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index c26c962b20a6..aa9aec078342 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -19,16 +19,13 @@ in environment.variables = { LOCATE_PATH = "/var/cache/locatedb"; NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; - PAGER = "less -R"; - EDITOR = "nano"; - }; - - environment.systemVariables = - { NIX_PATH = + NIX_PATH = [ "/nix/var/nix/profiles/per-user/root/channels/nixos" "nixpkgs=/etc/nixos/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" ]; + PAGER = "less -R"; + EDITOR = "nano"; }; environment.profiles = diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 57764dc870f3..f159e359f968 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -12,11 +12,9 @@ with lib; } ]; - environment.systemVariables = - { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; - GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; - }; + environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 02340fd78e8c..6a5eb4c720f8 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -186,7 +186,6 @@ let "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} # Session management. - session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_unix.so ${optionalString cfg.setLoginUid "session required pam_loginuid.so"} diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index e8ed545c8cc7..cce1e785563b 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -58,6 +58,9 @@ in # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead. # Environment variables to keep for root and %wheel. + Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE + Defaults:root,%wheel env_keep+=NIX_CONF_DIR + Defaults:root,%wheel env_keep+=NIX_PATH Defaults:root,%wheel env_keep+=TERMINFO_DIRS Defaults:root,%wheel env_keep+=TERMINFO diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index f373657b7918..4bfd6268234d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -318,7 +318,7 @@ in }; # Set up the environment variables for running Nix. - environment.systemVariables = cfg.envVars; + environment.variables = cfg.envVars; environment.extraInit = '' From 8ae659f16c0f2706bd264ba3ee880f265a847438 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Jun 2014 13:07:10 +0200 Subject: [PATCH 293/424] Revert "Revert "Merge #2692: Use pam_env to properly setup system-wide env"" This reverts commit 491c088731022463978e595956427e72db6306a9. --- nixos/modules/config/i18n.nix | 2 +- nixos/modules/config/shells-environment.nix | 1 + nixos/modules/config/system-environment.nix | 56 +++++++++++++++++++++ nixos/modules/config/timezone.nix | 2 +- nixos/modules/module-list.nix | 1 + nixos/modules/programs/environment.nix | 9 ++-- nixos/modules/security/ca.nix | 8 +-- nixos/modules/security/pam.nix | 1 + nixos/modules/security/sudo.nix | 3 -- nixos/modules/services/misc/nix-daemon.nix | 2 +- 10 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 nixos/modules/config/system-environment.nix diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 8182b8ae8081..7a7d713ef687 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -76,7 +76,7 @@ in environment.systemPackages = [ glibcLocales ]; - environment.variables = + environment.systemVariables = { LANG = config.i18n.defaultLocale; LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; }; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 9e212847e489..e3ddf9e3c5fa 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -19,6 +19,7 @@ in default = {}; description = '' A set of environment variables used in the global environment. + These variables will be set on shell initialisation. The value of each variable can be either a string or a list of strings. The latter is concatenated, interspersed with colon characters. diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix new file mode 100644 index 000000000000..b30c4e064750 --- /dev/null +++ b/nixos/modules/config/system-environment.nix @@ -0,0 +1,56 @@ +# This module defines a system-wide environment that will be +# initialised by pam_env (that is, not only in shells). +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.environment; + +in + +{ + + options = { + + environment.systemVariables = mkOption { + default = {}; + description = '' + A set of environment variables used in the global environment. + These variables will be set by PAM. + The value of each variable can be either a string or a list of + strings. The latter is concatenated, interspersed with colon + characters. + ''; + type = types.attrsOf (mkOptionType { + name = "a string or a list of strings"; + merge = loc: defs: + let + defs' = filterOverrides defs; + res = (head defs').value; + in + if isList res then concatLists (getValues defs') + else if lessThan 1 (length defs') then + throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}." + else if !isString res then + throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." + else res; + }); + apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); + }; + + }; + + config = { + + system.build.pamEnvironment = pkgs.writeText "pam-environment" + '' + ${concatStringsSep "\n" ( + (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'') + (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))} + ''; + + }; + +} diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index 65703d8bb080..4f7fc9ab262b 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -30,7 +30,7 @@ in config = { - environment.variables.TZDIR = "/etc/zoneinfo"; + environment.systemVariables.TZDIR = "/etc/zoneinfo"; systemd.globalEnvironment.TZDIR = tzdir; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4ceb48989beb..a6e0e0186695 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -14,6 +14,7 @@ ./config/power-management.nix ./config/pulseaudio.nix ./config/shells-environment.nix + ./config/system-environment.nix ./config/swap.nix ./config/sysctl.nix ./config/system-path.nix diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index aa9aec078342..c26c962b20a6 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -19,13 +19,16 @@ in environment.variables = { LOCATE_PATH = "/var/cache/locatedb"; NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; - NIX_PATH = + PAGER = "less -R"; + EDITOR = "nano"; + }; + + environment.systemVariables = + { NIX_PATH = [ "/nix/var/nix/profiles/per-user/root/channels/nixos" "nixpkgs=/etc/nixos/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" ]; - PAGER = "less -R"; - EDITOR = "nano"; }; environment.profiles = diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index f159e359f968..57764dc870f3 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -12,9 +12,11 @@ with lib; } ]; - environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; - environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; + environment.systemVariables = + { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; + }; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 6a5eb4c720f8..02340fd78e8c 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -186,6 +186,7 @@ let "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} # Session management. + session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_unix.so ${optionalString cfg.setLoginUid "session required pam_loginuid.so"} diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index cce1e785563b..e8ed545c8cc7 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -58,9 +58,6 @@ in # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead. # Environment variables to keep for root and %wheel. - Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE - Defaults:root,%wheel env_keep+=NIX_CONF_DIR - Defaults:root,%wheel env_keep+=NIX_PATH Defaults:root,%wheel env_keep+=TERMINFO_DIRS Defaults:root,%wheel env_keep+=TERMINFO diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4bfd6268234d..f373657b7918 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -318,7 +318,7 @@ in }; # Set up the environment variables for running Nix. - environment.variables = cfg.envVars; + environment.systemVariables = cfg.envVars; environment.extraInit = '' From 3d2091b9fa108da6a1971414143112cb6443e9e1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 10 Jun 2014 13:19:57 +0200 Subject: [PATCH 294/424] filezilla: update from 3.8.0 to 3.8.1, potentially fixes CVE-2013-4668 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index e88cf5b3f732..5f695f80b199 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK28, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite }: -let version = "3.8.0"; in +let version = "3.8.1"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "02635sh88zvmqhqs7yx982dmfa1qd0rhk4z1fqvgh5pr2ac1r74d"; + sha256 = "0kqyz8yb15kbzx02l3riswg95prbp402k4672nwxrzs35049rg36"; }; configureFlags = [ From 2e3c0f2d307425a4e200335ff7757ba220f4e929 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 10 Jun 2014 14:40:16 +0200 Subject: [PATCH 295/424] vimb: Upgrade from 2.2 to 2.4 --- pkgs/applications/networking/browsers/vimb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 6cb52be775c6..8a3ff788d420 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { name = "vimb-${version}"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz"; - sha256 = "18gig6rcxv0i4a8mz3jv29zpj0323zw45jsg1ycx61a08rzag60m"; + sha256 = "167ilbsd4y4zl493k6g4j5v85y784qz8z7qflzd1ccsjjznv7fm8"; }; # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/default.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/setting.c ''; buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; From bd7f3fbf0f1294e5b32caacbfa66b984aec85c5f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 10 Jun 2014 14:58:29 +0200 Subject: [PATCH 296/424] python-ldap-2.4.15 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13edd419076c..c75f329a3915 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5800,11 +5800,11 @@ rec { }); ldap = buildPythonPackage rec { - name = "ldap-2.4.10"; + name = "ldap-2.4.15"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz"; - sha256 = "0m6fm2alcb5v9xdcjv2nw2lhz9nnd3mnr5lrmf397hi4pw0pik37"; + url = "http://pypi.python.org/packages/source/p/python-ldap/python-${name}.tar.gz"; + sha256 = "0w0nn5yj0nbbkvpbqgfni56v7sjx6jf6s6zvp9zmahyrvqrsrg1h"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl"; From 84b8a9ceb0171c64badc1c026f5d04749fedc459 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 10 Jun 2014 15:31:48 +0200 Subject: [PATCH 297/424] pgadmin: bump to 1.18.1 --- pkgs/applications/misc/pgadmin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index aac15789a2db..f26326f4d4e4 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgadmin3-${version}"; - version = "1.16.1"; + version = "1.18.1"; src = fetchurl { url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz"; - sha256 = "13n2nyjnbmjbz9n0xp6627n3pavkqfp4n45l1mnqxhjdq8yj9fnl"; + sha256 = "1h6bqslw53q44vy7z1q7wmxkgqdzxacfs8pfm2fxm8vcd8lkxb17"; }; buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "PostgreSQL administration GUI tool"; homepage = http://www.pgadmin.org; license = licenses.gpl2; - maintainers = [ maintainers.iElectric ]; + maintainers = with maintainers; [ iElectric wmertens ]; platforms = platforms.unix; }; } From e1267f48a6499518bf91fc8551f6068de306e0ed Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Wed, 4 Jun 2014 17:21:07 +0200 Subject: [PATCH 298/424] davmail: update to 4.5.0 --- pkgs/applications/networking/davmail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index b95d29031542..3639f50c4393 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.4.1"; + name = "davmail-4.5.0"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/davmail/davmail/4.4.1/davmail-linux-x86_64-4.4.1-2225.tgz"; - sha256 = "66c7ae23c0242860cca1576e5fc29343431789a821f7623e420b91ba91e480a9"; + url = "http://downloads.sourceforge.net/project/davmail/davmail/4.5.0/davmail-linux-x86_64-4.5.0-2292.tgz"; + sha256 = "0ixg26s8535b4xf4i8jr0v3acwvaslmi2dvcxg2nmzkicvh6rfd4"; }; buildInputs = [ makeWrapper ]; From c6bd4d29732b948c1f54d668e1ff177465c505fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Tue, 10 Jun 2014 17:36:41 +0200 Subject: [PATCH 299/424] nix-prefetch-scripts: new expression --- .../nix-prefetch-tools/default.nix | 28 ---------------- .../nix-prefetch-scripts/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 pkgs/build-support/nix-prefetch-tools/default.nix create mode 100644 pkgs/tools/package-management/nix-prefetch-scripts/default.nix diff --git a/pkgs/build-support/nix-prefetch-tools/default.nix b/pkgs/build-support/nix-prefetch-tools/default.nix deleted file mode 100644 index de47b23925f0..000000000000 --- a/pkgs/build-support/nix-prefetch-tools/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv}: -stdenv.mkDerivation { - name = "nix-prefetch-tools"; - src = ""; - srcRoot="."; - prePhases = "undefUnpack"; - undefUnpack = '' - unpackPhase () { :; }; - ''; - installPhase = '' - mkdir -p $out/bin - cp ${../fetchbzr/nix-prefetch-bzr} $out/bin - cp ${../fetchcvs/nix-prefetch-cvs} $out/bin - cp ${../fetchgit/nix-prefetch-git} $out/bin - cp ${../fetchhg/nix-prefetch-hg} $out/bin - cp ${../fetchsvn/nix-prefetch-svn} $out/bin - chmod a+x $out/bin/* - ''; - meta = { - description = '' - A package to include all the NixPkgs prefetchers - ''; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = with stdenv.lib.platforms; unix; - # Quicker to build than to download, I hope - hydraPlatforms = []; - }; -} diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix new file mode 100644 index 000000000000..d7210b2f616b --- /dev/null +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -0,0 +1,33 @@ +{ stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs }: + +stdenv.mkDerivation { + name = "nix-prefetch-scripts"; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" "fixupPhase" ]; + installPhase = '' + mkdir -p $out/bin + function copyScript { + local name=nix-prefetch-$1; + local src=$2; + local exe=$3/bin; + cp $src $out/bin/$name; + wrapProgram $out/bin/$name --suffix PATH : "$exe" + } + + copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial} + copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git} + copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion} + copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} + copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs} + ''; + + meta = with stdenv.lib; { + description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; + maintainers = with maintainers; [ bennofs ]; + platforms = with stdenv.lib.platforms; unix; + # Quicker to build than to download, I hope + hydraPlatforms = []; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3478e3a7cde0..32c60e534ab3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10894,7 +10894,7 @@ let nixops = callPackage ../tools/package-management/nixops { }; - nix-prefetch-tools = callPackage ../build-support/nix-prefetch-tools {}; + nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; nix-repl = callPackage ../tools/package-management/nix-repl { }; From abff388c20993399edcc6abcc0f92239c33a8154 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jun 2014 18:58:55 +0200 Subject: [PATCH 300/424] ghc-head: update to version 7.9.20140608 --- pkgs/development/compilers/ghc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a357a090e357..312f79e97a5a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.9.20140430"; + version = "7.9.20140608"; name = "ghc-${version}"; src = fetchurl { - url = "http://deb.haskell.org/dailies/2014-05-01/ghc_7.9.20140430.orig.tar.bz2"; - sha256 = "072c1d71idi7jw711icn1wz4q64laasvb0ii8xvg5mbhi9szbwk4"; + url = "http://deb.haskell.org/dailies/2014-06-08/ghc_${version}.orig.tar.bz2"; + sha256 = "0x3hgh4zfns2m6bbq9xwwlafav0a29azl0xh8549za256clz97w1"; }; buildInputs = [ ghc perl gmp ncurses happy alex ]; From ac56e50d3aa5c7a57a9eca27beca8b523b2db262 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 01:21:48 +0200 Subject: [PATCH 301/424] haskell-defaults.nix: ghc-HEAD requires latest mtl --- pkgs/top-level/haskell-defaults.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d002503d0c73..beeee5663dc0 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,14 +15,15 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - mtl = self.mtl_2_1_2; cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; + mtl = self.mtl_2_2_1; transformersCompat = super.transformersCompat_0_3_3; }; ghc782Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_1; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; + mtl = self.mtl_2_1_2; }; ghc763Prefs = self : super : ghc782Prefs self super // { From 0bee2c38edd263efe28b95aa29fa37464af44699 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 19:20:14 +0200 Subject: [PATCH 302/424] haskell-syb: update to version 0.4.2 --- .../libraries/haskell/syb/{0.4.1.nix => 0.4.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/syb/{0.4.1.nix => 0.4.2.nix} (83%) diff --git a/pkgs/development/libraries/haskell/syb/0.4.1.nix b/pkgs/development/libraries/haskell/syb/0.4.2.nix similarity index 83% rename from pkgs/development/libraries/haskell/syb/0.4.1.nix rename to pkgs/development/libraries/haskell/syb/0.4.2.nix index 38c4f2cae3f9..fd67f63ced5c 100644 --- a/pkgs/development/libraries/haskell/syb/0.4.1.nix +++ b/pkgs/development/libraries/haskell/syb/0.4.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "syb"; - version = "0.4.1"; - sha256 = "1lkh4rrqdzvb8kyry07x2z88v478hrw5cp8wmhjgpg0ck8ywncma"; + version = "0.4.2"; + sha256 = "1gvyw2gbccip24wpp9xi6qgwvg4m5cijhzz1v51wvyamqv4p2b8l"; testDepends = [ HUnit mtl ]; doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9"; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a2bd99a7ca93..6a818c637d72 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2029,8 +2029,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {}; syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {}; - syb_0_4_1 = callPackage ../development/libraries/haskell/syb/0.4.1.nix {}; - syb = self.syb_0_4_1; + syb_0_4_2 = callPackage ../development/libraries/haskell/syb/0.4.2.nix {}; + syb = self.syb_0_4_2; sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {}; From 5956fc3f751d1aab4b30e4401b4b1d1811721fe4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 19:30:36 +0200 Subject: [PATCH 303/424] haskell-syb: drop obsolete versions 0.2.2 and 0.3.6.2 --- pkgs/development/libraries/haskell/syb/0.2.2.nix | 14 -------------- pkgs/development/libraries/haskell/syb/0.3.6.2.nix | 14 -------------- pkgs/top-level/haskell-packages.nix | 2 -- 3 files changed, 30 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/syb/0.2.2.nix delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.6.2.nix diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix deleted file mode 100644 index b03cb947d27d..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.2.2.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.2.2"; - sha256 = "0m29vnqkkmpf4m3gi42kcbr2gfyxgkcw85xsyrq0mgbxb0zg6ky9"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix b/pkgs/development/libraries/haskell/syb/0.3.6.2.nix deleted file mode 100644 index a37e238ff710..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.6.2"; - sha256 = "0n1h0zlq2ygwkh7s914gfy4rg4b5kg6msd65id84c5412sri3mk4"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6a818c637d72..a928ab30fbae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2022,11 +2022,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; - syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; - syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {}; syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {}; syb_0_4_2 = callPackage ../development/libraries/haskell/syb/0.4.2.nix {}; From d176729427a4a3ed9df235f3baaa8e3c2321ec83 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 10 Jun 2014 06:08:19 -0500 Subject: [PATCH 304/424] tbb: upgrade to 4.2-u5 Signed-off-by: Austin Seipp --- pkgs/development/libraries/tbb/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 13ec42f1ba2a..b06dffa1202d 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "tbb-4.0-u5"; + name = "tbb-4.2-u5"; src = fetchurl { - url = "http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb40_20120613oss_src.tgz"; - sha256 = "aaa98146049e55f6ac969298340eeb49df61395403fcc1480824a4ecd0d46192"; + url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb42_20140601oss_src.tgz"; + sha256 = "1zjh81hvfxvk1v1li27w1nm3bp6kqv913lxfb2pqa134dibw2pp7"; }; checkTarget = "test"; @@ -22,10 +22,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = "http://threadingbuildingblocks.org/"; description = "Intel Thread Building Blocks C++ Library"; + homepage = "http://threadingbuildingblocks.org/"; license = "LGPLv3+"; - longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you @@ -34,8 +33,7 @@ stdenv.mkDerivation { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ simons thoughtpolice ]; }; } From 509beb1f68ae0641470ccccf730bc4183ad645b9 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 10 Jun 2014 06:12:12 -0500 Subject: [PATCH 305/424] Add HHVM packages, replacing old hiphop-php expr Signed-off-by: Austin Seipp --- pkgs/development/compilers/hhvm/default.nix | 59 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/compilers/hhvm/default.nix diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix new file mode 100644 index 000000000000..918b75156c32 --- /dev/null +++ b/pkgs/development/compilers/hhvm/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchgit, cmake, boost, libunwind, mariadb, libmemcached, pcre +, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c +, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog +, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng +, libxslt, ocaml +}: + +stdenv.mkDerivation rec { + name = "hhvm-${version}"; + version = "3.1.0"; + + src = fetchgit { + url = "https://github.com/facebook/hhvm.git"; + rev = "71ecbd8fb5e94b2a008387a2b5e9a8df5c6f5c7b"; + sha256 = "1zv3k3bxahwyna2jgicwxm9lxs11jddpc9v41488rmzvfhdmzzkn"; + fetchSubmodules = true; + }; + + buildInputs = + [ cmake boost libunwind mariadb libmemcached pcre libevent gd curl + libxml2 icu flex bison openssl zlib php expat libcap oniguruma + libdwarf libmcrypt tbb gperftools bzip2 openldap readline + libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml + ]; + + enableParallelBuilding = true; + dontUseCmakeBuildDir = true; + dontUseCmakeConfigure = true; + NIX_LDFLAGS = "-lpam -L${pam}/lib"; + USE_HHVM=1; + MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; + MYSQL_DIR=mariadb; + + patchPhase = '' + substituteInPlace hphp/util/generate-buildinfo.sh \ + --replace /bin/bash ${stdenv.shell} + ''; + installPhase = '' + mkdir -p $out/bin $out/lib + mv hphp/hhvm/hhvm $out/bin + mv hphp/hack/bin/hh_server $out/bin + mv hphp/hack/bin/hh_client $out/bin + mv hphp/hack/hhi $out/lib/hack-hhi + + cat > $out/bin/hhvm-hhi-copy < Date: Tue, 10 Jun 2014 06:12:40 -0500 Subject: [PATCH 306/424] Remove old hiphop-vm package Signed-off-by: Austin Seipp --- .../interpreters/hiphopvm/default.nix | 61 ------------------- .../interpreters/hiphopvm/tbb.patch | 13 ---- pkgs/top-level/all-packages.nix | 7 +-- 3 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 pkgs/development/interpreters/hiphopvm/default.nix delete mode 100644 pkgs/development/interpreters/hiphopvm/tbb.patch diff --git a/pkgs/development/interpreters/hiphopvm/default.nix b/pkgs/development/interpreters/hiphopvm/default.nix deleted file mode 100644 index ae30d169b507..000000000000 --- a/pkgs/development/interpreters/hiphopvm/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre -, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c -, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools, glog -, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -}: -assert stdenv.system == "x86_64-linux"; -let - src = fetchgit { - url = "git://github.com/facebook/hiphop-php.git"; - rev = "1e23dec9f0b1ce8aaa5833d0527a369c8e254ffd"; - sha256 = "0fblwgq8c3hmamw0m5d1mn8qhyqf14v2zf62cgrkvmbiz6jlrbr6"; - }; - - libxml2_280 = stdenv.lib.overrideDerivation libxml2 (args: rec { - name = "libxml2-2.8.0"; - - src = fetchurl { - url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; - sha256 = "0ak2mjwvanz91nwxf1kkgbhrkm85vhhkpj7ymz8r6lb84bix1qpj"; - }; - - patches = []; - }); - - fbPatch = "${src}/hphp/third_party/libevent-1.4.14.fb-changes.diff"; - - libeventFB = stdenv.lib.overrideDerivation libevent (args: { patches = [fbPatch]; }); -in -stdenv.mkDerivation { - name = "hiphop-php-1e23dec9f0"; - inherit src; - dontUseCmakeBuildDir = true; - dontUseCmakeConfigure = true; - USE_HHVM=1; - preConfigure = '' - export HPHP_LIB=$PWD/bin - export TBB_INSTALL_DIR=${inteltbb} - export TBB_ARCH_PLATFORM="intel64/cc4.1.0_libc2.4_kernel2.6.16.21" - sed 's=/bin/bash=/${stdenv.shell}=g' -i hphp/util/generate-buildinfo.sh - ''; - NIX_LDFLAGS = "-lpam -L${pam}/lib"; - MYSQL_INCLUDE_DIR="${mysql}/include/mysql"; - MYSQL_DIR=mysql; - buildInputs = [ - cmake boost libunwind mysql libmemcached pcre libeventFB gd curl - libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma - libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng - ]; - installPhase = '' - mkdir -p $out/bin - cp hphp/hhvm/hhvm $out/bin - ''; - patches = [./tbb.patch]; - - meta = { - description = "High performance PHP toolchain"; - homepage = https://github.com/facebook/hiphop-php; - platforms = ["x86_64-linux"]; - }; -} diff --git a/pkgs/development/interpreters/hiphopvm/tbb.patch b/pkgs/development/interpreters/hiphopvm/tbb.patch deleted file mode 100644 index 0dee06d00fd7..000000000000 --- a/pkgs/development/interpreters/hiphopvm/tbb.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMake/FindTBB.cmake b/CMake/FindTBB.cmake -index 6a09c85..977418c 100644 ---- a/CMake/FindTBB.cmake -+++ b/CMake/FindTBB.cmake -@@ -164,7 +164,7 @@ mark_as_advanced(TBB_INCLUDE_DIR) - #-- Look for libraries - # GvdB: $ENV{TBB_ARCH_PLATFORM} is set by the build script tbbvars[.bat|.sh|.csh] - if (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "") -- set (TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/$ENV{TBB_ARCH_PLATFORM}/lib") -+ set (TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/lib/$ENV{TBB_ARCH_PLATFORM}") - else (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "") - # HH: deprecated - message(STATUS "[Warning] FindTBB.cmake: The use of TBB_ARCHITECTURE and TBB_COMPILER is deprecated and may not be supported in future versions. Please set $ENV{TBB_ARCH_PLATFORM} (using tbbvars.[bat|csh|sh]).") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0b358c5c649..f9ccb8c4db6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2940,12 +2940,7 @@ let haxe = callPackage ../development/compilers/haxe { }; hhvm = callPackage ../development/compilers/hhvm { }; - - hiphopvm = callPackage ../development/interpreters/hiphopvm { - libevent = libevent14; - boost = boost149; - stdenv = overrideGCC stdenv gcc48; - }; + hiphopvm = hhvm; /* Compatibility alias */ falcon = builderDefsPackage (import ../development/interpreters/falcon) { inherit cmake; From 20f3cbd99ef37ea692d3f041463b70ab4600496c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 10 Jun 2014 06:13:33 -0500 Subject: [PATCH 307/424] Remove old intel-tbb package It's unused now, and there's already the `tbb` package so this is totally redundant. Signed-off-by: Austin Seipp --- .../libraries/intel-tbb/default.nix | 29 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/libraries/intel-tbb/default.nix diff --git a/pkgs/development/libraries/intel-tbb/default.nix b/pkgs/development/libraries/intel-tbb/default.nix deleted file mode 100644 index ad2c317a9efa..000000000000 --- a/pkgs/development/libraries/intel-tbb/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl }: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - name = "intel-tbb-4.1"; - - src = fetchurl { - url = http://threadingbuildingblocks.org/sites/default/files/software_releases/linux/tbb41_20121003oss_lin.tgz; - sha256 = "12vxljcgkrcyw9mm8v5vfk03nkf3bmwz60r2qbljs0hl2yrx8jml"; - }; - - buildPhase = '' - mkdir -p $out - cp -R * $out - - for f in $out/lib/${if stdenv.system == "x86_64-linux" then "linux64" else "ia32"}/*.so.2; do - patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64 $f - done - - rm $out/CHANGES $out/README $out/COPYING - ''; - - dontInstall = true; - - meta = { - homepage = http://threadingbuildingblocks.org/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9ccb8c4db6b..6f03e9810758 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4841,8 +4841,6 @@ let iniparser = callPackage ../development/libraries/iniparser { }; - inteltbb = callPackage ../development/libraries/intel-tbb { }; - intltool = callPackage ../development/tools/misc/intltool { }; irrlicht3843 = callPackage ../development/libraries/irrlicht { }; From fe9133d52221275a7f91cb7efafeb6ebee6129a0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 10 Jun 2014 16:38:45 -0500 Subject: [PATCH 308/424] verifast: 14.5, x86_64 linux only Signed-off-by: Austin Seipp --- .../science/logic/verifast/default.nix | 24 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index a2959892ddb9..7ab08cf8799f 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -5,43 +5,39 @@ let libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ]; + ] + ":${stdenv.gcc.gcc}/lib64"; - patchLib = x: extra: "patchelf --set-rpath ${libPath}:${extra} ${x}"; - patchExe = x: extra: '' + patchExe = x: '' patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${extra} ${x} + --set-rpath ${libPath} ${x} ''; in stdenv.mkDerivation rec { name = "verifast-${version}"; - version = "13.11.14"; + version = "14.5"; src = fetchurl { - url = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/verifast-13.11.14.tar.gz"; - sha256 = "1ahay7achjsfz59d3b6vl1v91gr5j34vb494isqw3fsw5l8jd9p7"; + url = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/${name}-x64.tar.gz"; + sha256 = "03y1s6s2j9vqgiad0vbxriipsypxaylxxd3q36n9rvrc3lf9xra9"; }; dontStrip = true; + phases = "unpackPhase installPhase"; installPhase = '' mkdir -p $out/bin cp -R bin $out/libexec - ${patchLib "$out/libexec/libz3-gmp.so" "$out/libexec"} - ${patchExe "$out/libexec/vfide-core" "$out/libexec"} - ${patchExe "$out/libexec/verifast-core" "$out/libexec"} - + ${patchExe "$out/libexec/verifast-core"} + ${patchExe "$out/libexec/vfide-core"} ln -s $out/libexec/verifast-core $out/bin/verifast ln -s $out/libexec/vfide-core $out/bin/vfide ''; - phases = "unpackPhase installPhase"; - meta = { description = "Verification for C and Java programs via separation logic"; homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/"; license = stdenv.lib.licenses.msrla; - platforms = [ "i686-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f03e9810758..11cd21673d25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10657,7 +10657,7 @@ let tptp = callPackage ../applications/science/logic/tptp {}; - verifast = callPackage_i686 ../applications/science/logic/verifast {}; + verifast = callPackage ../applications/science/logic/verifast {}; why3 = callPackage ../applications/science/logic/why3 {}; From 2f996c60759f477a860cdbde09ea8e8d96d842e2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 10 Jun 2014 18:12:33 -0500 Subject: [PATCH 309/424] Add Rakudo Star (closes #2054) Signed-off-by: Austin Seipp --- .../interpreters/rakudo/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/interpreters/rakudo/default.nix diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix new file mode 100644 index 000000000000..e788e1ad13d0 --- /dev/null +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, perl, jdk, icu, zlib, gmp, readline }: + +stdenv.mkDerivation rec { + name = "rakudo-star-${version}"; + version = "2014.04"; + + src = fetchurl { + url = "http://rakudo.org/downloads/star/${name}.tar.gz"; + sha256 = "0spdrxc2kiidpgni1vl71brgs4d76h8029w5jxvah3yvjcqixz7l"; + }; + + buildInputs = [ icu zlib gmp readline jdk perl ]; + configureScript = "perl ./Configure.pl"; + configureFlags = + [ "--gen-moar" + "--gen-nqp" + "--gen-parrot" + ]; + + meta = { + description = "A Perl 6 implementation"; + homepage = "http://www.rakudo.org"; + license = stdenv.lib.licenses.artistic2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11cd21673d25..4c22c1dd02f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3549,6 +3549,8 @@ let racket = callPackage ../development/interpreters/racket { }; + rakudo = callPackage ../development/interpreters/rakudo { }; + rascal = callPackage ../development/interpreters/rascal { }; regina = callPackage ../development/interpreters/regina { }; From b415876bdbb257f1281a5092e8f56dee7878fe05 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 9 Jun 2014 22:41:07 +0300 Subject: [PATCH 310/424] systemd service: fix issues with escaping when unit name contains '-' systemd escaping rules translate this into a string containing '\' which is treated by some code paths as quoted, and by others as unquoted causing the affected units to fail. --- nixos/modules/system/boot/systemd.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 761600f9e551..ee94c91716cf 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -15,13 +15,13 @@ let pkgs.runCommand "unit" { preferLocalBuild = true; inherit (unit) text; } '' mkdir -p $out - echo -n "$text" > $out/${name} + echo -n "$text" > $out/${shellEscape name} '' else pkgs.runCommand "unit" { preferLocalBuild = true; } '' mkdir -p $out - ln -s /dev/null $out/${name} + ln -s /dev/null $out/${shellEscape name} ''; upstreamSystemUnits = @@ -187,9 +187,11 @@ let "timers.target" ]; + shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s); + makeJobScript = name: text: - let x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${name}"; inherit text; }; - in "${x}/bin/${name}"; + let x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${shellEscape name}"; inherit text; }; + in "${x}/bin/${shellEscape name}"; unitConfig = { name, config, ... }: { config = { From cc1318279592fa056959f629629d26faff7e082d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 11 Jun 2014 10:00:44 +0400 Subject: [PATCH 311/424] Create a PIL symlink when installing PIL so the recommended way of importing PIL.something works --- pkgs/development/python-modules/pil/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix index 0b462cb4e521..35a1e913bf7b 100644 --- a/pkgs/development/python-modules/pil/default.nix +++ b/pkgs/development/python-modules/pil/default.nix @@ -24,6 +24,11 @@ buildPythonPackage { checkPhase = "python selftest.py"; buildPhase = "python setup.py build_ext -i"; + postInstall = '' + cd "$out"/lib/python*/site-packages + ln -s $PWD PIL + ''; + meta = { homepage = http://www.pythonware.com/products/pil/; description = "The Python Imaging Library (PIL)"; From e0bdf466ef8d47c91054327966f3280e82d069b0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 11 Jun 2014 10:01:07 +0400 Subject: [PATCH 312/424] Update MITMProxy --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c75f329a3915..36c377543408 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4073,7 +4073,7 @@ rec { src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1ddqni6d4kc8ypl6yig4nc00izvbk359sz6hykb9g0lfcpfqlngj"; + sha256 = "0mpyw8iw4l4jv175qlbn0rrlgiz1k79m44jncbdxfj8ddvvvyz2j"; }; buildInputs = [ @@ -4090,7 +4090,7 @@ rec { ''; meta = { - version = "0.9"; + version = "0.10.1"; description = ''Man-in-the-middle proxy''; homepage = "http://mitmproxy.org/"; license = licenses.mit; From acb0c21bc8d67b48b13691c86fb6622db9abb2fc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 11 Jun 2014 10:05:57 +0400 Subject: [PATCH 313/424] Update netlib --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36c377543408..bca0a468809a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4385,7 +4385,7 @@ rec { src = fetchurl { url = "https://github.com/cortesi/netlib/archive/v${meta.version}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "1y8lx2j1jrr93mqfb06zg1x5jm9lllw744sb61ib8dagw43nnq3v"; + sha256 = "1x2n126b7fal64fb5fzkp4by7ym0iswn3w9mh6pm4c1vjdpnk592"; }; buildInputs = [ @@ -4395,7 +4395,7 @@ rec { doCheck = false; meta = { - version = "0.9"; + version = "0.10"; description = ''Man-in-the-middle proxy''; homepage = "https://github.com/cortesi/netlib"; license = licenses.mit; From 0c40023efd94773a7c252ee90a4a230b2dced92e Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Wed, 11 Jun 2014 09:26:41 +0800 Subject: [PATCH 314/424] Update haskell-hspec to version 1.10.0 --- .../libraries/haskell/hspec/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index b6d9365446d6..c0f5e4c14689 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,22 +1,22 @@ -{ cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths +{ cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo , random, setenv, silently, tfRandom, time, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "1.9.5"; - sha256 = "0y9gbm5rwwn80yzdllh1amaih4vxa61i9dzym88jr2kkwjrhxay4"; + version = "1.10.0"; + sha256 = "0lqc4sxl2c1rgnmp4a2fikc78f9caxswkmxfi8wajxlwaj58sy8p"; isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck - quickcheckIo random setenv tfRandom time transformers + ansiTerminal async deepseq filepath hspecExpectations HUnit + QuickCheck quickcheckIo random setenv tfRandom time transformers ]; testDepends = [ - ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - tfRandom time transformers + ansiTerminal async deepseq doctest filepath ghcPaths + hspecExpectations hspecMeta HUnit QuickCheck quickcheckIo random + setenv silently tfRandom time transformers ]; doCheck = false; meta = { From 87154e257ad923850103733e3f137341cb87b405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Wed, 11 Jun 2014 15:55:19 +0800 Subject: [PATCH 315/424] haskell-spawn: new package, v0.3 --- pkgs/development/libraries/haskell/spawn/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/spawn/default.nix diff --git a/pkgs/development/libraries/haskell/spawn/default.nix b/pkgs/development/libraries/haskell/spawn/default.nix new file mode 100644 index 000000000000..a69b7fd26419 --- /dev/null +++ b/pkgs/development/libraries/haskell/spawn/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "spawn"; + version = "0.3"; + sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8"; + meta = { + description = "Tiny library for concurrent computations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a928ab30fbae..3676d46cff1d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1982,6 +1982,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sparse = callPackage ../development/libraries/haskell/sparse {}; + spawn = callPackage ../development/libraries/haskell/spawn {}; + speculation = callPackage ../development/libraries/haskell/speculation {}; spoon = callPackage ../development/libraries/haskell/spoon {}; From 1d3477c422a1b756e46683f51a87ec8b58dc6c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Wed, 11 Jun 2014 15:56:41 +0800 Subject: [PATCH 316/424] haskell-io-memoize: new package, v1.0.0.0 --- .../libraries/haskell/io-memoize/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/io-memoize/default.nix diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix new file mode 100644 index 000000000000..bba2cd3b1e0f --- /dev/null +++ b/pkgs/development/libraries/haskell/io-memoize/default.nix @@ -0,0 +1,13 @@ +{ cabal, spawn }: + +cabal.mkDerivation (self: { + pname = "io-memoize"; + version = "1.0.0.0"; + sha256 = "1z6aimyg7wasaqmacpch7skfm9iyl7khd54lfmb8iwghyfvah5d0"; + buildDepends = [ spawn ]; + meta = { + description = "Memoize IO actions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3676d46cff1d..c519eb14080e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1236,6 +1236,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ioChoice = callPackage ../development/libraries/haskell/io-choice {}; + ioMemoize = callPackage ../development/libraries/haskell/io-memoize {}; + IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {}; IOSpec = callPackage ../development/libraries/haskell/IOSpec {}; From de0520bb3a56b8bec127d13a050b8f48ef26f0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Wed, 11 Jun 2014 15:57:48 +0800 Subject: [PATCH 317/424] haskell-hspec2: new package, v0.3.0 --- .../libraries/haskell/hspec2/default.nix | 29 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec2/default.nix diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix new file mode 100644 index 000000000000..be49f612aaac --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -0,0 +1,29 @@ +{ cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths +, hspecExpectations, hspecMeta, HUnit, ioMemoize, QuickCheck +, quickcheckIo, random, setenv, silently, tfRandom, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec2"; + version = "0.3.0"; + sha256 = "0ia19jraz2di31c48lh0kswkb2573jxm7msf33i8d5a5yq8y9wwp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansiTerminal async deepseq filepath hspecExpectations HUnit + ioMemoize QuickCheck quickcheckIo random setenv tfRandom time + transformers + ]; + testDepends = [ + ansiTerminal async deepseq doctest filepath ghcPaths + hspecExpectations hspecMeta HUnit ioMemoize QuickCheck quickcheckIo + random setenv silently tfRandom time transformers + ]; + meta = { + homepage = "http://hspec.github.io/"; + description = "Alpha version of Hspec 2.0"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c519eb14080e..ed1445e2e447 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1156,6 +1156,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspec = callPackage ../development/libraries/haskell/hspec {}; + hspec2 = callPackage ../development/libraries/haskell/hspec2 {}; + hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; From 08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 11 Jun 2014 10:18:23 +0200 Subject: [PATCH 318/424] Fix configuring httpd with custom user/group. --- nixos/modules/services/web-servers/apache-httpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 75ec6671d156..b8359d4756b3 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -594,14 +594,14 @@ in message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; } ]; - users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") singleton + users.extraUsers = optional (mainCfg.user == "wwwrun") { name = "wwwrun"; group = "wwwrun"; description = "Apache httpd user"; uid = config.ids.uids.wwwrun; }; - users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") singleton + users.extraGroups = optional (mainCfg.group == "wwwrun") { name = "wwwrun"; gid = config.ids.gids.wwwrun; }; From 66da23b011fa00b611b106fd79c55e59431ecf74 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 11:00:35 +0200 Subject: [PATCH 319/424] lilypond: cosmetic changes --- pkgs/misc/lilypond/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 2b6606faf3b5..859b74b8c0aa 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile , python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex -, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff +, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , fetchsvn, makeWrapper }: stdenv.mkDerivation rec{ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec{ ''; postInstall = '' - for f in "$out"/bin/*; do + for f in "$out/bin/"*; do wrapProgram "$f" --set GUILE_AUTO_COMPILE 0 \ --set PATH "${ghostscript}/bin" done @@ -38,7 +38,7 @@ stdenv.mkDerivation rec{ fontforge help2man groff makeWrapper ]; - meta = { + meta = { description = "Music typesetting system"; homepage = http://lilypond.org/; license = "GPL"; From a817ffe8c0849acabe112b29061ffcc402b70ae4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 11:01:10 +0200 Subject: [PATCH 320/424] all-packages.nix: cosmetic changes --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c22c1dd02f1..c0cc88c208e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4634,7 +4634,7 @@ let gperftools = callPackage ../development/libraries/gperftools { }; - gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_9; }); }); From e82eda551e51bae2e912bc7673b96bcce8cda4c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 11:12:57 +0200 Subject: [PATCH 321/424] haskell-libmpd: test suite build is broken by recent hspec update --- pkgs/development/libraries/haskell/libmpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 54f358547bd1..e760421d4ebf 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { dataDefault hspec HUnit mtl network QuickCheck text time utf8String ]; jailbreak = true; + doCheck = false; meta = { homepage = "http://github.com/joachifm/libmpd-haskell#readme"; description = "An MPD client library"; From 9b899d860065763454a3fcef79dbe15d06f3842b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 12:05:06 +0200 Subject: [PATCH 322/424] esniper: update to version 2.31.0 --- pkgs/applications/networking/esniper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 766ec0c17fc0..9fd8e7412c20 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.30.0"; + name = "esniper-2.31.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-30-0.tgz"; - sha256 = "1p85d5qfr3f35xfj5555ck4wwk5hqkh65ivam1527p8dwcz00wpl"; + url = "mirror://sourceforge/esniper/esniper-2-31-0.tgz"; + sha256 = "0xn6gdyr0c18khwcsi2brp49wkancrsrxxca7hvbawhbf263glih"; }; buildInputs = [ openssl curl ]; From be25ce8f5837eed6ada3c0da815b6fa189798c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 11 Jun 2014 14:09:58 +0200 Subject: [PATCH 323/424] nix-prefetch-git: fix printing of revision If the user explictly gives a ref such as "refs/heads/master", `git rev-parse` failed because we only checked out the `fetchgit` branch. Now, we also try `git rev-parse fetchgit` if the first call fails, which fixes the issue. --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index d4819574acb8..3574f3b7539b 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -217,7 +217,7 @@ clone_user_rev() { fi;; esac - echo "git revision is $(cd $dir && git rev-parse $rev)" + echo "git revision is $(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)" # Allow doing additional processing before .git removal eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" From 063efadd69ba56392be1bdd31872bed27becc92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 11 Jun 2014 14:42:39 +0200 Subject: [PATCH 324/424] nix-prefetch-{bzr,hg,svn}: print fetched revision --- pkgs/build-support/fetchbzr/nix-prefetch-bzr | 2 ++ pkgs/build-support/fetchhg/nix-prefetch-hg | 1 + pkgs/build-support/fetchsvn/nix-prefetch-svn | 1 + 3 files changed, 4 insertions(+) diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr index 9ff86c20ae3f..2f46819323f2 100755 --- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr +++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr @@ -52,6 +52,8 @@ if test -z "$finalPath"; then # Perform the checkout. bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url" + echo "bzr revision is $(bzr revno $revarg "$url")" + # Compute the hash. hash=$(nix-hash --type $hashType $hashFormat $tmpFile) if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg index f1f648f4aeb8..075dbc9c367b 100755 --- a/pkgs/build-support/fetchhg/nix-prefetch-hg +++ b/pkgs/build-support/fetchhg/nix-prefetch-hg @@ -51,6 +51,7 @@ if test -z "$finalPath"; then hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive rm -f $tmpArchive/.hg_archival.txt + echo "hg revision is $(cd $tmpClone; hg id -r "$rev" -i)" # Compute the hash. hash=$(nix-hash --type $hashType $hashFormat $tmpArchive) diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn index 2858a0b01ab1..a2ee3ac6052f 100755 --- a/pkgs/build-support/fetchsvn/nix-prefetch-svn +++ b/pkgs/build-support/fetchsvn/nix-prefetch-svn @@ -56,6 +56,7 @@ if test -z "$finalPath"; then fi echo p | svn "$command" --quiet -r "$rev" "$url" "$tmpFile" >&2 + echo "svn revision is $(svn info -r "$rev" "$url" | grep "Revision: " | cut -d' ' -f2)" # Compute the hash. hash=$(nix-hash --type $hashType $hashFormat $tmpFile) From 0205ec7878f2fdf8338bfe39c01fd94b98474eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 11 Jun 2014 18:49:48 +0200 Subject: [PATCH 325/424] haskell-pipes-text: new expression --- .../libraries/haskell/pipes-text/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pipes-text/default.nix diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix new file mode 100644 index 000000000000..ac4a57348feb --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -0,0 +1,19 @@ +{ cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe +, profunctors, text, textStreamDecode, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-text"; + version = "0.0.0.10"; + sha256 = "05lrxfy6cma7g5h41c74sc22p1y38kzbmiagr3grxk5a5110vhr1"; + buildDepends = [ + pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors + text textStreamDecode transformers + ]; + meta = { + homepage = "https://github.com/michaelt/text-pipes"; + description = "Text pipes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ed1445e2e447..b1ea4059da50 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1703,6 +1703,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pipesSafe = callPackage ../development/libraries/haskell/pipes-safe {}; + pipesText = callPackage ../development/libraries/haskell/pipes-text {}; + pipesZlib = callPackage ../development/libraries/haskell/pipes-zlib {}; polyparse = callPackage ../development/libraries/haskell/polyparse {}; From 2fec89295916968b12381b9c40ff1726d69063a4 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 11 Jun 2014 11:02:28 -0700 Subject: [PATCH 326/424] firefox: bump to 30.0. --- pkgs/applications/networking/browsers/firefox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 0c1a974ec692..a483399aa029 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -17,14 +17,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "29.0.1"; + firefoxVersion = "30.0"; - xulVersion = "29.0.1"; # this attribute is used by other packages + xulVersion = "30.0"; # this attribute is used by other packages src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "2819ef63403de2bcfff5496bd21a3b8cb5dfce82"; + sha1 = "bll9hxf31gvg9db6gxgmq25qsjif3p11"; }; commonConfigureFlags = From dbf92db3b986bed339f877895081aa8ba3132da4 Mon Sep 17 00:00:00 2001 From: System administrator Date: Wed, 11 Jun 2014 16:13:59 +0200 Subject: [PATCH 327/424] teamviewer: fix broken links (close #2901) --- pkgs/applications/networking/remote/teamviewer/8.nix | 2 +- pkgs/applications/networking/remote/teamviewer/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index ca938c086535..440eb90390ae 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { name = "teamviewer-8.0.17147"; src = fetchurl { - url = "http://download.teamviewer.com/download/teamviewer_linux_x64.deb"; + url = "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb"; sha256 = "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k"; }; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 1bf40eabfae4..6802782bcb5d 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation { name = "teamviewer-7.0.9377"; src = fetchurl { - url = "http://www.teamviewer.com/download/version_7x/teamviewer_linux.tar.gz"; + url = "http://download.teamviewer.com/download/version_7x/teamviewer_linux.tar.gz"; sha256 = "1f8934jqj093m1z56yl6k2ah6njkk6pz1rjvpqnryi29pp5piaiy"; }; From 751a01063dc9f40700e3774c3ee489f5fd1ee8ac Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Tue, 10 Jun 2014 13:55:25 +0400 Subject: [PATCH 328/424] lib: Do not take string context into account Close #2883. --- lib/strings.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 5f76da5c33c6..efdc265465f3 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -58,12 +58,13 @@ rec { # Determine whether a string has given prefix/suffix. hasPrefix = pref: str: - substring 0 (stringLength pref) str == pref; + eqStrings (substring 0 (stringLength pref) str) pref; hasSuffix = suff: str: - let lenStr = stringLength str; - lenSuff = stringLength suff; + let + lenStr = stringLength str; + lenSuff = stringLength suff; in lenStr >= lenSuff && - substring (lenStr - lenSuff) lenStr str == suff; + eqStrings (substring (lenStr - lenSuff) lenStr str) suff; # Convert a string to a list of characters (i.e. singleton strings). @@ -118,17 +119,21 @@ rec { toLower = replaceChars upperChars lowerChars; toUpper = replaceChars lowerChars upperChars; + # Appends string context from another string + addContextFrom = a: b: (substring 0 0 a)+b; # Compares strings not requiring context equality # Obviously, a workaround but works on all Nix versions - eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b); + eqStrings = a: b: addContextFrom b a == addContextFrom a b; # Cut a string with a separator and produces a list of strings which were # separated by this separator. e.g., # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"]. - splitString = sep: s: + splitString = _sep: _s: let + sep = addContextFrom _s _sep; + s = addContextFrom _sep _s; sepLen = stringLength sep; sLen = stringLength s; lastSearch = sub sLen sepLen; @@ -167,7 +172,7 @@ rec { sufLen = stringLength suf; sLen = stringLength s; in - if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then + if sufLen <= sLen && eqStrings suf (substring (sLen - sufLen) sufLen s) then substring 0 (sLen - sufLen) s else s; From 58971f7b1431128f70342869dcc50616004bc3ba Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Fri, 16 May 2014 16:28:19 -0700 Subject: [PATCH 329/424] add htop fork for darwin (close #2690) @vcunat made it a single conditional attribute. Conflicts (trivial): lib/maintainers.nix --- pkgs/os-specific/darwin/htop/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/darwin/htop/default.nix diff --git a/pkgs/os-specific/darwin/htop/default.nix b/pkgs/os-specific/darwin/htop/default.nix new file mode 100644 index 000000000000..65e8b09db348 --- /dev/null +++ b/pkgs/os-specific/darwin/htop/default.nix @@ -0,0 +1,21 @@ +{ fetchurl, stdenv, ncurses, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "htop-0.8.2.2"; + + src = fetchurl { + url = "https://github.com/max-horvath/htop-osx/archive/0.8.2.2.tar.gz"; + sha256 = "0qxibadn2lfqn10a5jmkv8r5ljfs0vaaa4j6psd7ppxa2w6bx5li"; + }; + + buildInputs = [ autoconf automake ncurses ]; + + preConfigure = "./autogen.sh"; + + meta = { + description = "An interactive process viewer for Mac OS X"; + homepage = "https://github.com/max-horvath/htop-osx"; + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ joelteon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e2883d45c4c..65390f09a424 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7054,7 +7054,12 @@ let hostapd = callPackage ../os-specific/linux/hostapd { }; - htop = callPackage ../os-specific/linux/htop { }; + htop = + if stdenv.isLinux then + callPackage ../os-specific/linux/htop { } + else if stdenv.isDarwin then + callPackage ../os-specific/darwin/htop { } + else null; # GNU/Hurd core packages. gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { From 8d8c761606cd93134b51a620bc55df2930f03ca7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 11 Jun 2014 21:10:18 +0200 Subject: [PATCH 330/424] Revert "Add vtop, update some node packages." This reverts commit cf3a2d04751fcc875656b0af6bf2e7f728cf770d. --- pkgs/top-level/node-packages-generated.nix | 6391 +++++++------------- pkgs/top-level/node-packages.json | 1 - 2 files changed, 2147 insertions(+), 4245 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 84440094a447..e250085f7307 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -34,7 +34,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.7" + self.by-version."CSSwhat"."0.4.5" self.by-version."domutils"."1.4.3" self.by-version."boolbase"."1.0.0" self.by-version."nth-check"."1.0.0" @@ -57,7 +57,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.7" + self.by-version."CSSwhat"."0.4.5" self.by-version."domutils"."1.4.3" ]; peerDependencies = [ @@ -65,14 +65,14 @@ passthru.names = [ "CSSselect" ]; }; by-spec."CSSwhat"."0.4" = - self.by-version."CSSwhat"."0.4.7"; - by-version."CSSwhat"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSwhat-0.4.7"; + self.by-version."CSSwhat"."0.4.5"; + by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-CSSwhat-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; - name = "CSSwhat-0.4.7.tgz"; - sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz"; + name = "CSSwhat-0.4.5.tgz"; + sha1 = "85d7b2799ff3d98055353c802949e39913e16a62"; }) ]; buildInputs = @@ -105,14 +105,14 @@ passthru.names = [ "JSONStream" ]; }; by-spec."JSONStream"."~0.7.1" = - self.by-version."JSONStream"."0.7.4"; - by-version."JSONStream"."0.7.4" = lib.makeOverridable self.buildNodePackage { - name = "node-JSONStream-0.7.4"; + self.by-version."JSONStream"."0.7.2"; + by-version."JSONStream"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.7.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz"; - name = "JSONStream-0.7.4.tgz"; - sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786"; + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.2.tgz"; + name = "JSONStream-0.7.2.tgz"; + sha1 = "27f4d7fe1918dc08ee72aed9c794e32ce80618f7"; }) ]; buildInputs = @@ -167,8 +167,6 @@ self.by-version."abbrev"."1.0.5"; by-spec."abbrev"."~1.0.4" = self.by-version."abbrev"."1.0.5"; - by-spec."abbrev"."~1.0.5" = - self.by-version."abbrev"."1.0.5"; by-spec."accepts"."1.0.0" = self.by-version."accepts"."1.0.0"; by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -190,48 +188,6 @@ ]; passthru.names = [ "accepts" ]; }; - by-spec."accepts"."1.0.1" = - self.by-version."accepts"."1.0.1"; - by-version."accepts"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-accepts-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.0.1.tgz"; - name = "accepts-1.0.1.tgz"; - sha1 = "c1e06d613e6246ba874678d6d9b92389b7ce310c"; - }) - ]; - buildInputs = - (self.nativeDeps."accepts" or []); - deps = [ - self.by-version."mime"."1.2.11" - self.by-version."negotiator"."0.4.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "accepts" ]; - }; - by-spec."accepts"."1.0.2" = - self.by-version."accepts"."1.0.2"; - by-version."accepts"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-accepts-1.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.0.2.tgz"; - name = "accepts-1.0.2.tgz"; - sha1 = "96266ace1b4c03f9637428f3acafe891959f3883"; - }) - ]; - buildInputs = - (self.nativeDeps."accepts" or []); - deps = [ - self.by-version."mime"."1.2.11" - self.by-version."negotiator"."0.4.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "accepts" ]; - }; 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 { @@ -252,7 +208,7 @@ ]; passthru.names = [ "active-x-obfuscator" ]; }; - by-spec."addressparser"."~0.2.1" = + by-spec."addressparser"."~0.2.0" = self.by-version."addressparser"."0.2.1"; by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "node-addressparser-0.2.1"; @@ -353,25 +309,6 @@ "amdefine" = self.by-version."amdefine"."0.1.0"; by-spec."amdefine".">=0.0.4" = self.by-version."amdefine"."0.1.0"; - by-spec."ansi"."^0.3.0" = - self.by-version."ansi"."0.3.0"; - by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-ansi-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"; - name = "ansi-0.3.0.tgz"; - sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0"; - }) - ]; - buildInputs = - (self.nativeDeps."ansi" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ansi" ]; - }; by-spec."ansi"."~0.2.1" = self.by-version."ansi"."0.2.1"; by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -545,26 +482,24 @@ ]; passthru.names = [ "apparatus" ]; }; - by-spec."archiver"."~0.10.0" = - self.by-version."archiver"."0.10.0"; - by-version."archiver"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-archiver-0.10.0"; + 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.10.0.tgz"; - name = "archiver-0.10.0.tgz"; - sha1 = "49e84512f31e4ec1cff27d7913f58ab61b80136b"; + 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."buffer-crc32"."0.2.1" self.by-version."readable-stream"."1.0.27-1" - self.by-version."tar-stream"."0.3.3" - self.by-version."zip-stream"."0.3.4" + self.by-version."zip-stream"."0.1.4" self.by-version."lazystream"."0.1.0" - self.by-version."file-utils"."0.2.0" + self.by-version."file-utils"."0.1.5" self.by-version."lodash"."2.4.1" ]; peerDependencies = [ @@ -592,8 +527,6 @@ }; by-spec."archy"."0.0.2" = self.by-version."archy"."0.0.2"; - by-spec."archy"."~0.0.2" = - self.by-version."archy"."0.0.2"; by-spec."argparse"."0.1.15" = self.by-version."argparse"."0.1.15"; by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -813,30 +746,6 @@ ]; passthru.names = [ "assertion-error" ]; }; - by-spec."ast-query"."~0.2.3" = - self.by-version."ast-query"."0.2.4"; - by-version."ast-query"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-ast-query-0.2.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ast-query/-/ast-query-0.2.4.tgz"; - name = "ast-query-0.2.4.tgz"; - sha1 = "853d13e6493fe8c88c19b8fecb098183c3d7449a"; - }) - ]; - buildInputs = - (self.nativeDeps."ast-query" or []); - deps = [ - self.by-version."esprima"."1.1.1" - self.by-version."escodegen"."1.3.3" - self.by-version."lodash"."2.4.1" - self.by-version."traverse"."0.6.6" - self.by-version."class-extend"."0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ast-query" ]; - }; by-spec."astw"."~1.1.0" = self.by-version."astw"."1.1.0"; by-version."astw"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -858,14 +767,14 @@ passthru.names = [ "astw" ]; }; by-spec."async"."*" = - self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.9.0"; + self.by-version."async"."0.7.0"; + by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz"; + name = "async-0.7.0.tgz"; + sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5"; }) ]; buildInputs = @@ -876,7 +785,7 @@ ]; passthru.names = [ "async" ]; }; - "async" = self.by-version."async"."0.9.0"; + "async" = self.by-version."async"."0.7.0"; by-spec."async"."0.1.15" = self.by-version."async"."0.1.15"; by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -955,15 +864,48 @@ ]; passthru.names = [ "async" ]; }; - by-spec."async"."0.8.x" = - self.by-version."async"."0.8.0"; - by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.8.0"; + by-spec."async"."^0.2.10" = + 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.10" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.6" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.7" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.8" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.9" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.4" = + self.by-version."async"."0.4.1"; + by-version."async"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz"; - name = "async-0.8.0.tgz"; - sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; + url = "http://registry.npmjs.org/async/-/async-0.4.1.tgz"; + name = "async-0.4.1.tgz"; + sha1 = "1985abade017df906bfaa8d77d424b25366b3a5b"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + by-spec."async"."~0.6.2" = + self.by-version."async"."0.6.2"; + by-version."async"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.6.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz"; + name = "async-0.6.2.tgz"; + sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef"; }) ]; buildInputs = @@ -974,26 +916,6 @@ ]; passthru.names = [ "async" ]; }; - by-spec."async"."^0.2.10" = - self.by-version."async"."0.2.10"; - by-spec."async"."^0.9.0" = - self.by-version."async"."0.9.0"; - by-spec."async"."~0.1.22" = - self.by-version."async"."0.1.22"; - by-spec."async"."~0.2.6" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.7" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.8" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.9" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.8" = - self.by-version."async"."0.8.0"; - by-spec."async"."~0.8.0" = - self.by-version."async"."0.8.0"; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; by-spec."aws-sdk"."*" = self.by-version."aws-sdk"."2.0.0-rc9"; by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage { @@ -1154,14 +1076,14 @@ passthru.names = [ "base62" ]; }; by-spec."base64-js"."~0.0.4" = - self.by-version."base64-js"."0.0.7"; - by-version."base64-js"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-base64-js-0.0.7"; + self.by-version."base64-js"."0.0.6"; + by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-base64-js-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"; - name = "base64-js-0.0.7.tgz"; - sha1 = "54400dc91d696cec32a8a47902f971522fee8f48"; + url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"; + name = "base64-js-0.0.6.tgz"; + sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947"; }) ]; buildInputs = @@ -1230,14 +1152,14 @@ passthru.names = [ "batch" ]; }; by-spec."bcrypt"."*" = - self.by-version."bcrypt"."0.7.8"; - by-version."bcrypt"."0.7.8" = lib.makeOverridable self.buildNodePackage { - name = "node-bcrypt-0.7.8"; + self.by-version."bcrypt"."0.7.7"; + by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage { + name = "node-bcrypt-0.7.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.8.tgz"; - name = "bcrypt-0.7.8.tgz"; - sha1 = "42c99aac202918e947b5bd086110184f62745e3e"; + url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz"; + name = "bcrypt-0.7.7.tgz"; + sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868"; }) ]; buildInputs = @@ -1249,7 +1171,7 @@ ]; passthru.names = [ "bcrypt" ]; }; - "bcrypt" = self.by-version."bcrypt"."0.7.8"; + "bcrypt" = self.by-version."bcrypt"."0.7.7"; by-spec."binary"."~0.3.0" = self.by-version."binary"."0.3.0"; by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -1309,47 +1231,6 @@ ]; passthru.names = [ "bindings" ]; }; - by-spec."bindings".">=1.2.0" = - self.by-version."bindings"."1.2.0"; - by-spec."bl"."~0.6.0" = - self.by-version."bl"."0.6.0"; - by-version."bl"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "node-bl-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-0.6.0.tgz"; - name = "bl-0.6.0.tgz"; - sha1 = "30910299937294133844ee34aa479a5344b4cd29"; - }) - ]; - buildInputs = - (self.nativeDeps."bl" or []); - deps = [ - self.by-version."readable-stream"."1.0.27-1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bl" ]; - }; - by-spec."blessed"."0.0.33" = - self.by-version."blessed"."0.0.33"; - by-version."blessed"."0.0.33" = lib.makeOverridable self.buildNodePackage { - name = "blessed-0.0.33"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/blessed/-/blessed-0.0.33.tgz"; - name = "blessed-0.0.33.tgz"; - sha1 = "da5837b2539921a7aeb57ac6ff48f038c8b9e750"; - }) - ]; - buildInputs = - (self.nativeDeps."blessed" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "blessed" ]; - }; by-spec."block-stream"."*" = self.by-version."block-stream"."0.0.7"; by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -1391,47 +1272,23 @@ ]; passthru.names = [ "blueimp-md5" ]; }; - by-spec."body-parser"."1.3.0" = - self.by-version."body-parser"."1.3.0"; - by-version."body-parser"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.3.0"; + by-spec."body-parser"."~1.0.1" = + self.by-version."body-parser"."1.0.2"; + by-version."body-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-body-parser-1.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.3.0.tgz"; - name = "body-parser-1.3.0.tgz"; - sha1 = "1a651cb9993a01a65531ae38395ceb0199dd7e3c"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.0.2.tgz"; + name = "body-parser-1.0.2.tgz"; + sha1 = "3461479a3278fe00fcaebec3314bb54fc4f7b47c"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); deps = [ - self.by-version."bytes"."1.0.0" + self.by-version."type-is"."1.1.0" + self.by-version."raw-body"."1.1.4" self.by-version."qs"."0.6.6" - self.by-version."raw-body"."1.1.6" - self.by-version."type-is"."1.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "body-parser" ]; - }; - by-spec."body-parser"."~1.2.0" = - self.by-version."body-parser"."1.2.2"; - by-version."body-parser"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.2.2.tgz"; - name = "body-parser-1.2.2.tgz"; - sha1 = "6106373cc1d34d559ebcfdb582e4e37d4312acfb"; - }) - ]; - buildInputs = - (self.nativeDeps."body-parser" or []); - deps = [ - self.by-version."bytes"."1.0.0" - self.by-version."qs"."0.6.6" - self.by-version."raw-body"."1.1.6" - self.by-version."type-is"."1.2.0" ]; peerDependencies = [ ]; @@ -1497,14 +1354,14 @@ passthru.names = [ "boom" ]; }; by-spec."bower"."*" = - self.by-version."bower"."1.3.5"; - by-version."bower"."1.3.5" = lib.makeOverridable self.buildNodePackage { - name = "bower-1.3.5"; + self.by-version."bower"."1.3.2"; + by-version."bower"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "bower-1.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower/-/bower-1.3.5.tgz"; - name = "bower-1.3.5.tgz"; - sha1 = "36a749fa8d0ac4d96609f721d15c93834bdaf98b"; + url = "http://registry.npmjs.org/bower/-/bower-1.3.2.tgz"; + name = "bower-1.3.2.tgz"; + sha1 = "ae1eeea5c3ba9300e10e55b193e9d2fd5407fb7b"; }) ]; buildInputs = @@ -1512,55 +1369,55 @@ deps = [ self.by-version."abbrev"."1.0.5" self.by-version."archy"."0.0.2" - self.by-version."bower-config"."0.5.1" + self.by-version."bower-config"."0.5.0" self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-json"."0.4.0" self.by-version."bower-logger"."0.2.2" - self.by-version."bower-registry-client"."0.2.1" + self.by-version."bower-registry-client"."0.1.6" self.by-version."cardinal"."0.4.4" self.by-version."chalk"."0.4.0" self.by-version."chmodr"."0.1.0" - self.by-version."decompress-zip"."0.0.8" + self.by-version."decompress-zip"."0.0.6" self.by-version."fstream"."0.1.25" - self.by-version."fstream-ignore"."0.0.8" - self.by-version."glob"."3.2.11" + self.by-version."fstream-ignore"."0.0.7" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.3" self.by-version."handlebars"."1.3.0" self.by-version."inquirer"."0.4.1" - self.by-version."insight"."0.3.1" - self.by-version."is-root"."0.1.0" - self.by-version."junk"."0.3.0" - self.by-version."lockfile"."0.4.2" - self.by-version."lru-cache"."2.5.0" + self.by-version."junk"."0.2.2" self.by-version."mkdirp"."0.3.5" self.by-version."mout"."0.9.1" - self.by-version."nopt"."2.2.1" - self.by-version."opn"."0.1.2" + self.by-version."nopt"."2.1.2" + self.by-version."lru-cache"."2.5.0" + self.by-version."open"."0.0.5" self.by-version."osenv"."0.0.3" - self.by-version."p-throttler"."0.0.1" self.by-version."promptly"."0.2.0" self.by-version."q"."1.0.1" - self.by-version."request"."2.34.0" + self.by-version."request"."2.33.0" self.by-version."request-progress"."0.3.1" self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."semver"."2.2.1" - self.by-version."shell-quote"."1.4.1" - self.by-version."stringify-object"."0.2.1" + self.by-version."stringify-object"."0.2.0" self.by-version."tar"."0.1.19" self.by-version."tmp"."0.0.23" - self.by-version."update-notifier"."0.1.10" + self.by-version."update-notifier"."0.1.8" self.by-version."which"."1.0.5" + self.by-version."p-throttler"."0.0.1" + self.by-version."insight"."0.3.1" + self.by-version."is-root"."0.1.0" + self.by-version."shell-quote"."1.4.1" + self.by-version."lockfile"."0.4.2" ]; peerDependencies = [ ]; passthru.names = [ "bower" ]; }; - "bower" = self.by-version."bower"."1.3.5"; + "bower" = self.by-version."bower"."1.3.2"; by-spec."bower".">=0.9.0" = - self.by-version."bower"."1.3.5"; + self.by-version."bower"."1.3.2"; by-spec."bower".">=1.2.8 <2" = - self.by-version."bower"."1.3.5"; + self.by-version."bower"."1.3.2"; by-spec."bower"."~1.2.0" = self.by-version."bower"."1.2.8"; by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage { @@ -1577,7 +1434,7 @@ deps = [ self.by-version."abbrev"."1.0.5" self.by-version."archy"."0.0.2" - self.by-version."bower-config"."0.5.1" + self.by-version."bower-config"."0.5.0" self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-json"."0.4.0" self.by-version."bower-logger"."0.2.2" @@ -1585,10 +1442,10 @@ self.by-version."cardinal"."0.4.4" self.by-version."chalk"."0.2.1" self.by-version."chmodr"."0.1.0" - self.by-version."decompress-zip"."0.0.8" + self.by-version."decompress-zip"."0.0.6" self.by-version."fstream"."0.1.25" - self.by-version."fstream-ignore"."0.0.8" - self.by-version."glob"."3.2.11" + self.by-version."fstream-ignore"."0.0.7" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.3" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" @@ -1604,13 +1461,13 @@ self.by-version."request"."2.27.0" self.by-version."request-progress"."0.3.1" self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."semver"."2.1.0" 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" - self.by-version."update-notifier"."0.1.10" + self.by-version."update-notifier"."0.1.8" self.by-version."which"."1.0.5" self.by-version."p-throttler"."0.0.1" ]; @@ -1618,29 +1475,6 @@ ]; passthru.names = [ "bower" ]; }; - by-spec."bower-config"."^0.5.0" = - self.by-version."bower-config"."0.5.1"; - by-version."bower-config"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "node-bower-config-0.5.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.1.tgz"; - name = "bower-config-0.5.1.tgz"; - sha1 = "dbcfac40734f5e7c61c5c8353c1dfb0ed5f51ce1"; - }) - ]; - buildInputs = - (self.nativeDeps."bower-config" or []); - deps = [ - self.by-version."graceful-fs"."2.0.3" - self.by-version."mout"."0.9.1" - self.by-version."optimist"."0.6.1" - self.by-version."osenv"."0.0.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bower-config" ]; - }; 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 { @@ -1665,7 +1499,28 @@ passthru.names = [ "bower-config" ]; }; by-spec."bower-config"."~0.5.0" = - self.by-version."bower-config"."0.5.1"; + self.by-version."bower-config"."0.5.0"; + by-version."bower-config"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-bower-config-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz"; + name = "bower-config-0.5.0.tgz"; + sha1 = "d081d43008816b1beb876dee272219851dd4c89c"; + }) + ]; + buildInputs = + (self.nativeDeps."bower-config" or []); + deps = [ + self.by-version."graceful-fs"."2.0.3" + self.by-version."mout"."0.6.0" + self.by-version."optimist"."0.6.1" + self.by-version."osenv"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bower-config" ]; + }; 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 { @@ -1701,7 +1556,7 @@ buildInputs = (self.nativeDeps."bower-json" or []); deps = [ - self.by-version."deep-extend"."0.2.10" + self.by-version."deep-extend"."0.2.8" self.by-version."graceful-fs"."2.0.3" self.by-version."intersect"."0.0.3" ]; @@ -1771,34 +1626,7 @@ self.by-version."lru-cache"."2.3.1" self.by-version."request"."2.27.0" self.by-version."request-replay"."0.2.0" - self.by-version."rimraf"."2.2.8" - self.by-version."mkdirp"."0.3.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bower-registry-client" ]; - }; - by-spec."bower-registry-client"."~0.2.0" = - self.by-version."bower-registry-client"."0.2.1"; - by-version."bower-registry-client"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-bower-registry-client-0.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.1.tgz"; - name = "bower-registry-client-0.2.1.tgz"; - sha1 = "06fbff982f82a4a4045dc53ac9dcb1c43d9cd591"; - }) - ]; - buildInputs = - (self.nativeDeps."bower-registry-client" or []); - deps = [ - self.by-version."async"."0.2.10" - self.by-version."bower-config"."0.5.1" - self.by-version."graceful-fs"."2.0.3" - self.by-version."lru-cache"."2.3.1" - self.by-version."request"."2.27.0" - self.by-version."request-replay"."0.2.0" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."mkdirp"."0.3.5" ]; peerDependencies = [ @@ -1824,10 +1652,10 @@ self.by-version."bower-json"."0.4.0" self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" - self.by-version."bower"."1.3.5" + self.by-version."bower"."1.3.2" self.by-version."argparse"."0.1.15" self.by-version."clone"."0.1.11" - self.by-version."semver"."2.3.0" + self.by-version."semver"."2.2.1" self.by-version."fetch-bower"."2.0.0" ]; peerDependencies = [ @@ -1905,8 +1733,6 @@ }; by-spec."browser-resolve"."~1.2.2" = self.by-version."browser-resolve"."1.2.4"; - by-spec."browser-resolve"."~1.2.4" = - self.by-version."browser-resolve"."1.2.4"; by-spec."browserchannel"."*" = self.by-version."browserchannel"."1.2.0"; by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1922,8 +1748,8 @@ (self.nativeDeps."browserchannel" or []); deps = [ self.by-version."hat"."0.0.3" - self.by-version."connect"."2.19.4" - self.by-version."request"."2.36.0" + self.by-version."connect"."2.14.4" + self.by-version."request"."2.34.0" self.by-version."ascii-json"."0.2.0" ]; peerDependencies = [ @@ -1932,73 +1758,70 @@ }; "browserchannel" = self.by-version."browserchannel"."1.2.0"; by-spec."browserify"."*" = - self.by-version."browserify"."4.1.8"; - by-version."browserify"."4.1.8" = lib.makeOverridable self.buildNodePackage { - name = "browserify-4.1.8"; + self.by-version."browserify"."3.44.2"; + by-version."browserify"."3.44.2" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.44.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-4.1.8.tgz"; - name = "browserify-4.1.8.tgz"; - sha1 = "fe567fd8493e25c0ab33985eb62595bc9be66780"; + url = "http://registry.npmjs.org/browserify/-/browserify-3.44.2.tgz"; + name = "browserify-3.44.2.tgz"; + sha1 = "ffa2788d06e8073ffd734d94c3ae272ca3dd630a"; }) ]; buildInputs = (self.nativeDeps."browserify" or []); deps = [ - self.by-version."JSONStream"."0.7.4" + self.by-version."JSONStream"."0.7.2" self.by-version."assert"."1.1.1" self.by-version."browser-pack"."2.0.1" self.by-version."browser-resolve"."1.2.4" self.by-version."browserify-zlib"."0.1.4" - self.by-version."buffer"."2.3.2" - self.by-version."builtins"."0.0.4" + self.by-version."buffer"."2.1.13" + self.by-version."builtins"."0.0.3" self.by-version."commondir"."0.0.1" - self.by-version."concat-stream"."1.4.6" + self.by-version."concat-stream"."1.4.5" self.by-version."console-browserify"."1.0.3" self.by-version."constants-browserify"."0.0.1" self.by-version."crypto-browserify"."1.0.9" self.by-version."deep-equal"."0.1.2" self.by-version."defined"."0.0.0" - self.by-version."deps-sort"."0.1.2" + self.by-version."deps-sort"."0.1.1" self.by-version."derequire"."0.8.0" - self.by-version."domain-browser"."1.1.2" + self.by-version."domain-browser"."1.1.1" self.by-version."duplexer"."0.1.1" - self.by-version."events"."1.0.1" - self.by-version."glob"."3.2.11" + self.by-version."events"."1.0.0" + self.by-version."glob"."3.2.9" self.by-version."http-browserify"."1.3.2" self.by-version."https-browserify"."0.0.0" self.by-version."inherits"."2.0.1" - self.by-version."insert-module-globals"."6.0.0" - self.by-version."module-deps"."2.1.2" + self.by-version."insert-module-globals"."5.0.1" + self.by-version."module-deps"."1.10.0" self.by-version."os-browserify"."0.1.2" self.by-version."parents"."0.0.2" self.by-version."path-browserify"."0.0.0" self.by-version."punycode"."1.2.4" - self.by-version."querystring-es3"."0.2.1-0" - self.by-version."readable-stream"."1.1.13-1" + self.by-version."querystring-es3"."0.2.0" self.by-version."resolve"."0.6.3" self.by-version."shallow-copy"."0.0.1" self.by-version."shell-quote"."0.0.1" - self.by-version."stream-browserify"."1.0.0" + self.by-version."stream-browserify"."0.1.3" self.by-version."stream-combiner"."0.0.4" self.by-version."string_decoder"."0.0.1" self.by-version."subarg"."0.0.1" self.by-version."syntax-error"."1.1.0" - self.by-version."through2"."0.4.2" + self.by-version."through2"."0.4.1" self.by-version."timers-browserify"."1.0.1" self.by-version."tty-browserify"."0.0.0" - self.by-version."umd"."2.1.0" + self.by-version."umd"."2.0.0" self.by-version."url"."0.10.1" self.by-version."util"."0.10.3" self.by-version."vm-browserify"."0.0.4" - self.by-version."xtend"."3.0.0" - self.by-version."process"."0.7.0" ]; peerDependencies = [ ]; passthru.names = [ "browserify" ]; }; - "browserify" = self.by-version."browserify"."4.1.8"; + "browserify" = self.by-version."browserify"."3.44.2"; by-spec."browserify"."~3.38.0" = self.by-version."browserify"."3.38.1"; by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage { @@ -2013,25 +1836,25 @@ buildInputs = (self.nativeDeps."browserify" or []); deps = [ - self.by-version."JSONStream"."0.7.4" + self.by-version."JSONStream"."0.7.2" self.by-version."assert"."1.1.1" self.by-version."browser-pack"."2.0.1" self.by-version."browser-resolve"."1.2.4" self.by-version."buffer"."2.1.13" - self.by-version."builtins"."0.0.4" + self.by-version."builtins"."0.0.3" self.by-version."commondir"."0.0.1" - self.by-version."concat-stream"."1.4.6" + self.by-version."concat-stream"."1.4.5" self.by-version."console-browserify"."1.0.3" self.by-version."constants-browserify"."0.0.1" self.by-version."crypto-browserify"."1.0.9" self.by-version."deep-equal"."0.1.2" self.by-version."defined"."0.0.0" - self.by-version."deps-sort"."0.1.2" + self.by-version."deps-sort"."0.1.1" self.by-version."derequire"."0.8.0" - self.by-version."domain-browser"."1.1.2" + self.by-version."domain-browser"."1.1.1" self.by-version."duplexer"."0.1.1" - self.by-version."events"."1.0.1" - self.by-version."glob"."3.2.11" + self.by-version."events"."1.0.0" + self.by-version."glob"."3.2.9" self.by-version."http-browserify"."1.3.2" self.by-version."https-browserify"."0.0.0" self.by-version."inherits"."2.0.1" @@ -2050,7 +1873,7 @@ self.by-version."string_decoder"."0.0.1" self.by-version."subarg"."0.0.1" self.by-version."syntax-error"."1.1.0" - self.by-version."through2"."0.4.2" + self.by-version."through2"."0.4.1" self.by-version."timers-browserify"."1.0.1" self.by-version."tty-browserify"."0.0.0" self.by-version."umd"."2.0.0" @@ -2077,7 +1900,7 @@ buildInputs = (self.nativeDeps."browserify-zlib" or []); deps = [ - self.by-version."pako"."0.2.3" + self.by-version."pako"."0.2.0" ]; peerDependencies = [ ]; @@ -2140,47 +1963,26 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.8" = - self.by-version."bson"."0.2.8"; - by-version."bson"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "node-bson-0.2.8"; + by-spec."bson"."0.2.7" = + self.by-version."bson"."0.2.7"; + by-version."bson"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-bson-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.8.tgz"; - name = "bson-0.2.8.tgz"; - sha1 = "7ad6ddc15aafa63808942bd53c61387f825d64a1"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz"; + name = "bson-0.2.7.tgz"; + sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b"; }) ]; buildInputs = (self.nativeDeps."bson" or []); deps = [ - self.by-version."nan"."1.0.0" + self.by-version."nan"."0.8.0" ]; peerDependencies = [ ]; passthru.names = [ "bson" ]; }; - by-spec."buffer"."^2.3.0" = - self.by-version."buffer"."2.3.2"; - by-version."buffer"."2.3.2" = lib.makeOverridable self.buildNodePackage { - name = "node-buffer-2.3.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-2.3.2.tgz"; - name = "buffer-2.3.2.tgz"; - sha1 = "05f14d173c73d24f21045a9f83e1c396ae34d74b"; - }) - ]; - buildInputs = - (self.nativeDeps."buffer" or []); - deps = [ - self.by-version."base64-js"."0.0.7" - self.by-version."ieee754"."1.1.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "buffer" ]; - }; by-spec."buffer"."~2.1.4" = self.by-version."buffer"."2.1.13"; by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage { @@ -2195,7 +1997,7 @@ buildInputs = (self.nativeDeps."buffer" or []); deps = [ - self.by-version."base64-js"."0.0.7" + self.by-version."base64-js"."0.0.6" self.by-version."ieee754"."1.1.3" ]; peerDependencies = [ @@ -2301,14 +2103,14 @@ passthru.names = [ "buffertools" ]; }; by-spec."builtins"."~0.0.3" = - self.by-version."builtins"."0.0.4"; - by-version."builtins"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-builtins-0.0.4"; + self.by-version."builtins"."0.0.3"; + by-version."builtins"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-builtins-0.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/builtins/-/builtins-0.0.4.tgz"; - name = "builtins-0.0.4.tgz"; - sha1 = "ec6d4ca4ba5a3a173749f10146bdcda28ea6d65d"; + url = "http://registry.npmjs.org/builtins/-/builtins-0.0.3.tgz"; + name = "builtins-0.0.3.tgz"; + sha1 = "5d006166da71610bc2bcf73019f0f0cc43309755"; }) ]; buildInputs = @@ -2417,15 +2219,15 @@ ]; passthru.names = [ "bytes" ]; }; - by-spec."bytes"."1" = - self.by-version."bytes"."1.0.0"; - by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-bytes-1.0.0"; + by-spec."bytes"."0.3.0" = + self.by-version."bytes"."0.3.0"; + by-version."bytes"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-bytes-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; - name = "bytes-1.0.0.tgz"; - sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz"; + name = "bytes-0.3.0.tgz"; + sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935"; }) ]; buildInputs = @@ -2436,10 +2238,12 @@ ]; passthru.names = [ "bytes" ]; }; - by-spec."bytes"."1.0.0" = - self.by-version."bytes"."1.0.0"; + by-spec."bytes"."~0.2.0" = + self.by-version."bytes"."0.2.1"; by-spec."bytes"."~0.2.1" = self.by-version."bytes"."0.2.1"; + by-spec."bytes"."~0.3.0" = + self.by-version."bytes"."0.3.0"; by-spec."callsite"."~1.0.0" = self.by-version."callsite"."1.0.0"; by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -2609,25 +2413,6 @@ }; by-spec."chalk"."~0.4.0" = self.by-version."chalk"."0.4.0"; - by-spec."char-spinner"."~1.0.1" = - self.by-version."char-spinner"."1.0.1"; - by-version."char-spinner"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-char-spinner-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"; - name = "char-spinner-1.0.1.tgz"; - sha1 = "e6ea67bd247e107112983b7ab0479ed362800081"; - }) - ]; - buildInputs = - (self.nativeDeps."char-spinner" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "char-spinner" ]; - }; 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 { @@ -2647,29 +2432,6 @@ ]; passthru.names = [ "character-parser" ]; }; - by-spec."cheerio"."^0.16.0" = - self.by-version."cheerio"."0.16.0"; - by-version."cheerio"."0.16.0" = lib.makeOverridable self.buildNodePackage { - name = "node-cheerio-0.16.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.16.0.tgz"; - name = "cheerio-0.16.0.tgz"; - sha1 = "780ae472692ea85e1e0fe332e806bdba98c16d0a"; - }) - ]; - buildInputs = - (self.nativeDeps."cheerio" or []); - deps = [ - self.by-version."CSSselect"."0.4.1" - self.by-version."entities"."1.1.1" - self.by-version."htmlparser2"."3.7.2" - self.by-version."lodash"."2.4.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cheerio" ]; - }; by-spec."cheerio"."~0.12.0" = self.by-version."cheerio"."0.12.4"; by-version."cheerio"."0.12.4" = lib.makeOverridable self.buildNodePackage { @@ -2814,7 +2576,27 @@ ]; passthru.names = [ "chownr" ]; }; - by-spec."class-extend"."^0.1.0" = + by-spec."circular-json"."0.1.x" = + self.by-version."circular-json"."0.1.6"; + by-version."circular-json"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "node-circular-json-0.1.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/circular-json/-/circular-json-0.1.6.tgz"; + name = "circular-json-0.1.6.tgz"; + sha1 = "fd692b65f8bce4f2900bea14f74ad681ab294c7f"; + }) + ]; + buildInputs = + (self.nativeDeps."circular-json" or []); + deps = [ + self.by-version."wru"."0.2.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "circular-json" ]; + }; + 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 = "node-class-extend-0.1.1"; @@ -2834,10 +2616,6 @@ ]; passthru.names = [ "class-extend" ]; }; - by-spec."class-extend"."~0.1.0" = - self.by-version."class-extend"."0.1.1"; - by-spec."class-extend"."~0.1.1" = - self.by-version."class-extend"."0.1.1"; by-spec."clean-css"."2.1.x" = self.by-version."clean-css"."2.1.8"; by-version."clean-css"."2.1.8" = lib.makeOverridable self.buildNodePackage { @@ -2860,51 +2638,27 @@ }; by-spec."clean-css"."~2.1.0" = self.by-version."clean-css"."2.1.8"; - by-spec."cli"."0.6.x" = - self.by-version."cli"."0.6.3"; - by-version."cli"."0.6.3" = lib.makeOverridable self.buildNodePackage { - name = "node-cli-0.6.3"; + by-spec."cli"."0.4.x" = + self.by-version."cli"."0.4.5"; + by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-cli-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cli/-/cli-0.6.3.tgz"; - name = "cli-0.6.3.tgz"; - sha1 = "31418ed08d60a1b02cf180c6d6fee3204bfe65cd"; + url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; + name = "cli-0.4.5.tgz"; + sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; }) ]; buildInputs = (self.nativeDeps."cli" or []); deps = [ - self.by-version."glob"."3.2.11" - self.by-version."exit"."0.1.2" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "cli" ]; }; by-spec."cli-color"."*" = - self.by-version."cli-color"."0.3.2"; - by-version."cli-color"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cli-color-0.3.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz"; - name = "cli-color-0.3.2.tgz"; - sha1 = "75fa5f728c308cc4ac594b05e06cc5d80daccd86"; - }) - ]; - buildInputs = - (self.nativeDeps."cli-color" or []); - deps = [ - self.by-version."d"."0.1.1" - self.by-version."es5-ext"."0.10.4" - self.by-version."memoizee"."0.3.3" - self.by-version."timers-ext"."0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cli-color" ]; - }; - 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 = "node-cli-color-0.2.3"; @@ -2925,10 +2679,10 @@ ]; passthru.names = [ "cli-color" ]; }; + by-spec."cli-color"."~0.2.2" = + self.by-version."cli-color"."0.2.3"; by-spec."cli-color"."~0.2.3" = self.by-version."cli-color"."0.2.3"; - by-spec."cli-color"."~0.3.2" = - self.by-version."cli-color"."0.3.2"; by-spec."cli-log"."~0.0.8" = self.by-version."cli-log"."0.0.8"; by-version."cli-log"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -2943,7 +2697,7 @@ buildInputs = (self.nativeDeps."cli-log" or []); deps = [ - self.by-version."cli-color"."0.3.2" + self.by-version."cli-color"."0.2.3" ]; peerDependencies = [ ]; @@ -3137,7 +2891,7 @@ ]; passthru.names = [ "coffee-script-redux" ]; }; - by-spec."collections".">=2.0.1 <3.0.0" = + by-spec."collections"."^2.0.0" = self.by-version."collections"."2.0.1"; by-version."collections"."2.0.1" = lib.makeOverridable self.buildNodePackage { name = "node-collections-2.0.1"; @@ -3151,21 +2905,21 @@ buildInputs = (self.nativeDeps."collections" or []); deps = [ - self.by-version."weak-map"."1.0.5" + self.by-version."weak-map"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "collections" ]; }; - by-spec."color"."~0.6.0" = - self.by-version."color"."0.6.0"; - by-version."color"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "node-color-0.6.0"; + 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.6.0.tgz"; - name = "color-0.6.0.tgz"; - sha1 = "53f4b27698e1fe42a19423dc092dd8ee529b4267"; + url = "http://registry.npmjs.org/color/-/color-0.5.0.tgz"; + name = "color-0.5.0.tgz"; + sha1 = "4d283d8bfe4cbc7006de6b6d25a3c26f00e3ee6d"; }) ]; buildInputs = @@ -3280,7 +3034,7 @@ ]; passthru.names = [ "colour" ]; }; - by-spec."columnify"."~0.1.2" = + by-spec."columnify"."0.1.2" = self.by-version."columnify"."0.1.2"; by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "node-columnify-0.1.2"; @@ -3314,7 +3068,7 @@ (self.nativeDeps."combine-source-map" or []); deps = [ self.by-version."inline-source-map"."0.3.0" - self.by-version."convert-source-map"."0.3.4" + self.by-version."convert-source-map"."0.3.3" self.by-version."source-map"."0.1.33" ]; peerDependencies = [ @@ -3460,25 +3214,6 @@ }; by-spec."commander"."2.1.x" = self.by-version."commander"."2.1.0"; - by-spec."commander"."2.2.0" = - self.by-version."commander"."2.2.0"; - by-version."commander"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.2.0.tgz"; - name = "commander-2.2.0.tgz"; - sha1 = "175ad4b9317f3ff615f201c1e57224f55a3e91df"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; - }; by-spec."commander"."~0.6.1" = self.by-version."commander"."0.6.1"; by-spec."commander"."~2.1.0" = @@ -3502,34 +3237,15 @@ ]; passthru.names = [ "commondir" ]; }; - by-spec."component-emitter"."1.1.2" = - self.by-version."component-emitter"."1.1.2"; - by-version."component-emitter"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-component-emitter-1.1.2"; + by-spec."compressible"."1.0.0" = + self.by-version."compressible"."1.0.0"; + by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-compressible-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - name = "component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }) - ]; - buildInputs = - (self.nativeDeps."component-emitter" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "component-emitter" ]; - }; - by-spec."compressible"."1.0.1" = - self.by-version."compressible"."1.0.1"; - by-version."compressible"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-compressible-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/compressible/-/compressible-1.0.1.tgz"; - name = "compressible-1.0.1.tgz"; - sha1 = "8ed8224822c60c3c8dabcad34e913ed2952ad170"; + url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz"; + name = "compressible-1.0.0.tgz"; + sha1 = "f83e49c1cb61421753545125a8011d68b492427d"; }) ]; buildInputs = @@ -3540,45 +3256,44 @@ ]; passthru.names = [ "compressible" ]; }; - by-spec."compression"."1.0.6" = - self.by-version."compression"."1.0.6"; - by-version."compression"."1.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-compression-1.0.6"; + by-spec."compression"."1.0.0" = + self.by-version."compression"."1.0.0"; + by-version."compression"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-compression-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.0.6.tgz"; - name = "compression-1.0.6.tgz"; - sha1 = "efbc5c5870980e9d7e5a9d6e6d7437cccf6a9a8a"; + url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz"; + name = "compression-1.0.0.tgz"; + sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020"; }) ]; buildInputs = (self.nativeDeps."compression" or []); deps = [ - self.by-version."accepts"."1.0.2" - self.by-version."bytes"."1.0.0" - self.by-version."compressible"."1.0.1" - self.by-version."on-headers"."0.0.0" + self.by-version."bytes"."0.2.1" + self.by-version."negotiator"."0.3.0" + self.by-version."compressible"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "compression" ]; }; by-spec."concat-stream"."^1.4.1" = - self.by-version."concat-stream"."1.4.6"; - by-version."concat-stream"."1.4.6" = lib.makeOverridable self.buildNodePackage { - name = "node-concat-stream-1.4.6"; + self.by-version."concat-stream"."1.4.5"; + by-version."concat-stream"."1.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-concat-stream-1.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.6.tgz"; - name = "concat-stream-1.4.6.tgz"; - sha1 = "8cb736a556a32f020f1ddc82fa3448381c5e5cce"; + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.5.tgz"; + name = "concat-stream-1.4.5.tgz"; + sha1 = "cbf6ffd17c15d58f0baeacbb47d927cf566446a6"; }) ]; buildInputs = (self.nativeDeps."concat-stream" or []); deps = [ self.by-version."inherits"."2.0.1" - self.by-version."typedarray"."0.0.6" + self.by-version."typedarray"."0.0.5" self.by-version."readable-stream"."1.1.13-1" ]; peerDependencies = [ @@ -3586,9 +3301,7 @@ passthru.names = [ "concat-stream" ]; }; by-spec."concat-stream"."~1.4.1" = - self.by-version."concat-stream"."1.4.6"; - by-spec."concat-stream"."~1.4.5" = - self.by-version."concat-stream"."1.4.6"; + self.by-version."concat-stream"."1.4.5"; by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { @@ -3626,7 +3339,7 @@ (self.nativeDeps."config-chain" or []); deps = [ self.by-version."proto-list"."1.2.2" - self.by-version."ini"."1.2.1" + self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; @@ -3634,31 +3347,6 @@ }; by-spec."config-chain"."~1.1.8" = self.by-version."config-chain"."1.1.8"; - by-spec."configstore"."^0.3.0" = - self.by-version."configstore"."0.3.0"; - by-version."configstore"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-configstore-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/configstore/-/configstore-0.3.0.tgz"; - name = "configstore-0.3.0.tgz"; - sha1 = "9bf5a709e6a6df6559068dd0e7eab7d3c0c6791f"; - }) - ]; - buildInputs = - (self.nativeDeps."configstore" or []); - deps = [ - self.by-version."graceful-fs"."2.0.3" - self.by-version."js-yaml"."3.0.2" - self.by-version."mkdirp"."0.3.5" - self.by-version."object-assign"."0.2.2" - self.by-version."osenv"."0.0.3" - self.by-version."uuid"."1.4.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "configstore" ]; - }; by-spec."configstore"."~0.2.1" = self.by-version."configstore"."0.2.3"; by-version."configstore"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -3684,6 +3372,8 @@ ]; passthru.names = [ "configstore" ]; }; + by-spec."configstore"."~0.2.2" = + self.by-version."configstore"."0.2.3"; by-spec."connect"."1.x" = self.by-version."connect"."1.9.2"; by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage { @@ -3729,7 +3419,7 @@ self.by-version."fresh"."0.2.0" self.by-version."pause"."0.0.1" self.by-version."uid2"."0.0.3" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" self.by-version."methods"."0.0.1" self.by-version."raw-body"."0.0.3" self.by-version."negotiator"."0.3.0" @@ -3739,47 +3429,42 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.19.4" = - self.by-version."connect"."2.19.4"; - by-version."connect"."2.19.4" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-2.19.4"; + by-spec."connect"."2.14.1" = + self.by-version."connect"."2.14.1"; + by-version."connect"."2.14.1" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-2.14.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.19.4.tgz"; - name = "connect-2.19.4.tgz"; - sha1 = "01f8f103b2ec7c7f26fea65645d38f3c89d295f7"; + url = "http://registry.npmjs.org/connect/-/connect-2.14.1.tgz"; + name = "connect-2.14.1.tgz"; + sha1 = "e6fd676a5735ca703a89eb970f3d283fadecc2c7"; }) ]; buildInputs = (self.nativeDeps."connect" or []); deps = [ self.by-version."basic-auth-connect"."1.0.0" - self.by-version."body-parser"."1.3.0" - self.by-version."bytes"."1.0.0" - self.by-version."cookie"."0.1.2" - self.by-version."cookie-parser"."1.1.0" + self.by-version."cookie-parser"."1.0.1" self.by-version."cookie-signature"."1.0.3" - self.by-version."compression"."1.0.6" - self.by-version."connect-timeout"."1.1.0" - self.by-version."csurf"."1.2.0" - self.by-version."errorhandler"."1.0.2" - self.by-version."escape-html"."1.0.1" - self.by-version."express-session"."1.2.1" + self.by-version."compression"."1.0.0" + self.by-version."connect-timeout"."1.0.0" + self.by-version."csurf"."1.0.0" + self.by-version."errorhandler"."1.0.0" + self.by-version."express-session"."1.0.2" self.by-version."fresh"."0.2.2" - self.by-version."method-override"."2.0.2" - self.by-version."morgan"."1.1.1" - self.by-version."multiparty"."3.2.8" - self.by-version."on-headers"."0.0.0" - self.by-version."parseurl"."1.0.1" + self.by-version."method-override"."1.0.0" + self.by-version."morgan"."1.0.0" self.by-version."qs"."0.6.6" - self.by-version."response-time"."2.0.0" - self.by-version."serve-favicon"."2.0.1" - self.by-version."serve-index"."1.1.0" - self.by-version."serve-static"."1.2.1" - self.by-version."type-is"."1.2.0" + self.by-version."response-time"."1.0.0" + self.by-version."serve-index"."1.0.1" + self.by-version."serve-static"."1.0.2" + self.by-version."static-favicon"."1.0.0" self.by-version."vhost"."1.0.0" + self.by-version."bytes"."0.2.1" self.by-version."pause"."0.0.1" self.by-version."debug"."0.8.1" + self.by-version."raw-body"."1.1.3" + self.by-version."multiparty"."2.2.0" ]; peerDependencies = [ ]; @@ -3806,7 +3491,7 @@ self.by-version."bytes"."0.1.0" self.by-version."send"."0.0.3" self.by-version."fresh"."0.1.0" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -3835,7 +3520,7 @@ self.by-version."bytes"."0.2.0" self.by-version."fresh"."0.1.0" self.by-version."pause"."0.0.1" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -3864,14 +3549,54 @@ self.by-version."bytes"."0.2.0" self.by-version."fresh"."0.1.0" self.by-version."pause"."0.0.1" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.19.4"; + self.by-version."connect"."2.14.4"; + by-version."connect"."2.14.4" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-2.14.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.14.4.tgz"; + name = "connect-2.14.4.tgz"; + sha1 = "40e74de3947a5278035c12f21535604555609a5a"; + }) + ]; + buildInputs = + (self.nativeDeps."connect" or []); + deps = [ + self.by-version."basic-auth-connect"."1.0.0" + self.by-version."cookie-parser"."1.0.1" + self.by-version."cookie-signature"."1.0.3" + self.by-version."compression"."1.0.0" + self.by-version."connect-timeout"."1.0.0" + self.by-version."csurf"."1.1.0" + self.by-version."errorhandler"."1.0.0" + self.by-version."express-session"."1.0.2" + self.by-version."fresh"."0.2.2" + self.by-version."method-override"."1.0.0" + self.by-version."morgan"."1.0.0" + self.by-version."qs"."0.6.6" + self.by-version."response-time"."1.0.0" + self.by-version."setimmediate"."1.0.1" + self.by-version."serve-index"."1.0.1" + self.by-version."serve-static"."1.0.4" + self.by-version."static-favicon"."1.0.2" + self.by-version."vhost"."1.0.0" + self.by-version."bytes"."0.3.0" + self.by-version."pause"."0.0.1" + self.by-version."debug"."0.8.1" + self.by-version."raw-body"."1.1.3" + self.by-version."multiparty"."2.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "connect" ]; + }; by-spec."connect"."~2.12.0" = self.by-version."connect"."2.12.0"; by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { @@ -3967,14 +3692,14 @@ }; "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3"; by-spec."connect-mongo"."*" = - self.by-version."connect-mongo"."0.4.1"; - by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-mongo-0.4.1"; + self.by-version."connect-mongo"."0.4.0"; + by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-mongo-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz"; - name = "connect-mongo-0.4.1.tgz"; - sha1 = "01ed3e71558fb3f0fdc97b784ef974f9909ddd11"; + url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz"; + name = "connect-mongo-0.4.0.tgz"; + sha1 = "4cb33728334a8f10f2d9e43d31369dbc2f856336"; }) ]; buildInputs = @@ -3986,16 +3711,16 @@ ]; passthru.names = [ "connect-mongo" ]; }; - "connect-mongo" = self.by-version."connect-mongo"."0.4.1"; - by-spec."connect-timeout"."1.1.0" = - self.by-version."connect-timeout"."1.1.0"; - by-version."connect-timeout"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-timeout-1.1.0"; + "connect-mongo" = self.by-version."connect-mongo"."0.4.0"; + by-spec."connect-timeout"."1.0.0" = + self.by-version."connect-timeout"."1.0.0"; + by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-timeout-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.1.0.tgz"; - name = "connect-timeout-1.1.0.tgz"; - sha1 = "fc80615fc7a5b3863bd0319af2491d2d7fdc5f05"; + url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz"; + name = "connect-timeout-1.0.0.tgz"; + sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb"; }) ]; buildInputs = @@ -4026,21 +3751,20 @@ ]; passthru.names = [ "connection-parse" ]; }; - by-spec."console-browserify"."1.1.x" = - self.by-version."console-browserify"."1.1.0"; - by-version."console-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-console-browserify-1.1.0"; + 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 = "node-console-browserify-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; - name = "console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz"; + name = "console-browserify-0.1.6.tgz"; + sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c"; }) ]; buildInputs = (self.nativeDeps."console-browserify" or []); deps = [ - self.by-version."date-now"."0.1.4" ]; peerDependencies = [ ]; @@ -4127,14 +3851,14 @@ passthru.names = [ "constants-browserify" ]; }; by-spec."convert-source-map"."~0.3.0" = - self.by-version."convert-source-map"."0.3.4"; - by-version."convert-source-map"."0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "node-convert-source-map-0.3.4"; + self.by-version."convert-source-map"."0.3.3"; + by-version."convert-source-map"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-convert-source-map-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.4.tgz"; - name = "convert-source-map-0.3.4.tgz"; - sha1 = "9bfff1d4a21b9be94da60271ea2b5e6b5a761572"; + url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.3.tgz"; + name = "convert-source-map-0.3.3.tgz"; + sha1 = "f77f130ded4e611d313a1bcf78f988990831c69b"; }) ]; buildInputs = @@ -4202,6 +3926,25 @@ ]; passthru.names = [ "cookie" ]; }; + by-spec."cookie"."0.1.1" = + self.by-version."cookie"."0.1.1"; + by-version."cookie"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie/-/cookie-0.1.1.tgz"; + name = "cookie-0.1.1.tgz"; + sha1 = "cbd4b537aa65f800b6c66ead2520ba8d6afbdf54"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie" ]; + }; by-spec."cookie"."0.1.2" = self.by-version."cookie"."0.1.2"; by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -4259,29 +4002,29 @@ ]; passthru.names = [ "cookie-jar" ]; }; - by-spec."cookie-parser"."1.1.0" = - self.by-version."cookie-parser"."1.1.0"; - by-version."cookie-parser"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-parser-1.1.0"; + by-spec."cookie-parser"."1.0.1" = + self.by-version."cookie-parser"."1.0.1"; + by-version."cookie-parser"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-parser-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.1.0.tgz"; - name = "cookie-parser-1.1.0.tgz"; - sha1 = "2f8265aa3b55733a85eef207f0e2530c3e8cf705"; + url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz"; + name = "cookie-parser-1.0.1.tgz"; + sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0"; }) ]; buildInputs = (self.nativeDeps."cookie-parser" or []); deps = [ - self.by-version."cookie"."0.1.2" + self.by-version."cookie"."0.1.0" self.by-version."cookie-signature"."1.0.3" ]; peerDependencies = [ ]; passthru.names = [ "cookie-parser" ]; }; - by-spec."cookie-parser"."~1.1.0" = - self.by-version."cookie-parser"."1.1.0"; + by-spec."cookie-parser"."~1.0.1" = + self.by-version."cookie-parser"."1.0.1"; 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 { @@ -4358,54 +4101,35 @@ ]; passthru.names = [ "cookiejar" ]; }; - by-spec."cookiejar"."1.3.2" = - self.by-version."cookiejar"."1.3.2"; - by-version."cookiejar"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cookiejar-1.3.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz"; - name = "cookiejar-1.3.2.tgz"; - sha1 = "61d3229e2da20c859032233502958a9b7df58249"; - }) - ]; - buildInputs = - (self.nativeDeps."cookiejar" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "cookiejar" ]; - }; by-spec."cookies".">= 0.2.2" = - self.by-version."cookies"."0.4.1"; - by-version."cookies"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-cookies-0.4.1"; + 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.4.1.tgz"; - name = "cookies-0.4.1.tgz"; - sha1 = "7d43bd00583c985acc032258b97988b7d03b629e"; + 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.1" + self.by-version."keygrip"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "cookies" ]; }; by-spec."copy-paste"."~0.2.0" = - self.by-version."copy-paste"."0.2.2"; - by-version."copy-paste"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-copy-paste-0.2.2"; + self.by-version."copy-paste"."0.2.0"; + by-version."copy-paste"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-copy-paste-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.2.tgz"; - name = "copy-paste-0.2.2.tgz"; - sha1 = "036942c5ab735eec9a8e0a2308759e7feadb2625"; + url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.0.tgz"; + name = "copy-paste-0.2.0.tgz"; + sha1 = "6a83a3a073fc144adfa83cd03adb8db35953c424"; }) ]; buildInputs = @@ -4450,7 +4174,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = [ - self.by-version."request"."2.36.0" + self.by-version."request"."2.34.0" ]; peerDependencies = [ ]; @@ -4499,27 +4223,6 @@ ]; passthru.names = [ "crc" ]; }; - by-spec."crc32-stream"."~0.2.0" = - self.by-version."crc32-stream"."0.2.0"; - by-version."crc32-stream"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-crc32-stream-0.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz"; - name = "crc32-stream-0.2.0.tgz"; - sha1 = "5c80d480c8682f904b6f15530dbbe0b8c063dbbe"; - }) - ]; - buildInputs = - (self.nativeDeps."crc32-stream" or []); - deps = [ - self.by-version."readable-stream"."1.0.27-1" - self.by-version."buffer-crc32"."0.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "crc32-stream" ]; - }; by-spec."crossroads"."~0.12.0" = self.by-version."crossroads"."0.12.0"; by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage { @@ -4715,15 +4418,35 @@ ]; passthru.names = [ "css-stringify" ]; }; - by-spec."csurf"."1.2.0" = - self.by-version."csurf"."1.2.0"; - by-version."csurf"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-csurf-1.2.0"; + by-spec."csurf"."1.0.0" = + self.by-version."csurf"."1.0.0"; + by-version."csurf"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-csurf-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/csurf/-/csurf-1.2.0.tgz"; - name = "csurf-1.2.0.tgz"; - sha1 = "56d1d1e921a4027e6adf87f51e706b825c74ab13"; + url = "http://registry.npmjs.org/csurf/-/csurf-1.0.0.tgz"; + name = "csurf-1.0.0.tgz"; + sha1 = "a68d5718b988032e270abf1f4b34f272753d745b"; + }) + ]; + buildInputs = + (self.nativeDeps."csurf" or []); + deps = [ + self.by-version."uid2"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "csurf" ]; + }; + by-spec."csurf"."1.1.0" = + self.by-version."csurf"."1.1.0"; + by-version."csurf"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-csurf-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz"; + name = "csurf-1.1.0.tgz"; + sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2"; }) ]; buildInputs = @@ -4793,27 +4516,7 @@ ]; passthru.names = [ "cycle" ]; }; - by-spec."d"."~0.1.1" = - self.by-version."d"."0.1.1"; - by-version."d"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-d-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz"; - name = "d-0.1.1.tgz"; - sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309"; - }) - ]; - buildInputs = - (self.nativeDeps."d" or []); - deps = [ - self.by-version."es5-ext"."0.10.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "d" ]; - }; - by-spec."dargs"."^0.1.0" = + by-spec."dargs"."~0.1.0" = self.by-version."dargs"."0.1.0"; by-version."dargs"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "node-dargs-0.1.0"; @@ -4832,27 +4535,6 @@ ]; passthru.names = [ "dargs" ]; }; - by-spec."dargs"."~0.1.0" = - self.by-version."dargs"."0.1.0"; - by-spec."date-now"."^0.1.4" = - self.by-version."date-now"."0.1.4"; - by-version."date-now"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-date-now-0.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; - name = "date-now-0.1.4.tgz"; - sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; - }) - ]; - buildInputs = - (self.nativeDeps."date-now" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "date-now" ]; - }; 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 { @@ -4873,14 +4555,14 @@ passthru.names = [ "dateformat" ]; }; by-spec."dateformat"."~1.0.6" = - self.by-version."dateformat"."1.0.8-1.2.3"; - by-version."dateformat"."1.0.8-1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-dateformat-1.0.8-1.2.3"; + self.by-version."dateformat"."1.0.7-1.2.3"; + by-version."dateformat"."1.0.7-1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-dateformat-1.0.7-1.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.8-1.2.3.tgz"; - name = "dateformat-1.0.8-1.2.3.tgz"; - sha1 = "5d60c5d574dc778a7f98139156c6cfc9d851d1e7"; + url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz"; + name = "dateformat-1.0.7-1.2.3.tgz"; + sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c"; }) ]; buildInputs = @@ -4892,20 +4574,19 @@ passthru.names = [ "dateformat" ]; }; by-spec."debug"."*" = - self.by-version."debug"."1.0.1"; - by-version."debug"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-1.0.1"; + self.by-version."debug"."0.8.1"; + by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "node-debug-0.8.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-1.0.1.tgz"; - name = "debug-1.0.1.tgz"; - sha1 = "3c03d40462f0be20468e4f77dd3f2bf7a722cfb7"; + url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; + name = "debug-0.8.1.tgz"; + sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; }) ]; buildInputs = (self.nativeDeps."debug" or []); deps = [ - self.by-version."ms"."0.6.2" ]; peerDependencies = [ ]; @@ -4949,87 +4630,23 @@ ]; passthru.names = [ "debug" ]; }; - by-spec."debug"."0.8.0" = - self.by-version."debug"."0.8.0"; - by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-0.8.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz"; - name = "debug-0.8.0.tgz"; - sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; - }) - ]; - buildInputs = - (self.nativeDeps."debug" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; - by-spec."debug"."0.8.1" = - self.by-version."debug"."0.8.1"; - by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-0.8.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; - name = "debug-0.8.1.tgz"; - sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; - }) - ]; - buildInputs = - (self.nativeDeps."debug" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; - by-spec."debug"."1.0.0" = - self.by-version."debug"."1.0.0"; - by-version."debug"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-1.0.0.tgz"; - name = "debug-1.0.0.tgz"; - sha1 = "553678b67494cacc2d5330c24dfb2f275b1ceb5a"; - }) - ]; - buildInputs = - (self.nativeDeps."debug" or []); - deps = [ - self.by-version."ms"."0.6.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; by-spec."debug".">= 0.7.3 < 1" = self.by-version."debug"."0.8.1"; - by-spec."debug".">= 0.8.0 < 1" = - self.by-version."debug"."0.8.1"; - by-spec."debug"."^0.8.0" = - self.by-version."debug"."0.8.1"; by-spec."debug"."~0.7.0" = self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.2" = self.by-version."debug"."0.7.4"; by-spec."debug"."~0.8" = self.by-version."debug"."0.8.1"; - by-spec."debug"."~0.8.0" = - self.by-version."debug"."0.8.1"; by-spec."decompress"."^0.2.0" = - self.by-version."decompress"."0.2.4"; - by-version."decompress"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "decompress-0.2.4"; + self.by-version."decompress"."0.2.3"; + by-version."decompress"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "decompress-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress/-/decompress-0.2.4.tgz"; - name = "decompress-0.2.4.tgz"; - sha1 = "33d08cc3678d3f84cb0c7606242b4ff1faf8d45a"; + url = "http://registry.npmjs.org/decompress/-/decompress-0.2.3.tgz"; + name = "decompress-0.2.3.tgz"; + sha1 = "ad471a0fc51b7193b72f60c9e040ce1a7a4b9fcc"; }) ]; buildInputs = @@ -5038,10 +4655,10 @@ self.by-version."adm-zip"."0.4.4" self.by-version."extname"."0.1.2" self.by-version."get-stdin"."0.1.0" - self.by-version."map-key"."0.1.4" + self.by-version."map-key"."0.1.1" self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.2.1" - self.by-version."rimraf"."2.2.8" + self.by-version."nopt"."2.2.0" + self.by-version."rimraf"."2.2.6" self.by-version."stream-combiner"."0.0.4" self.by-version."tar"."0.1.19" self.by-version."tempfile"."0.1.3" @@ -5051,14 +4668,14 @@ passthru.names = [ "decompress" ]; }; by-spec."decompress-zip"."~0.0.3" = - self.by-version."decompress-zip"."0.0.8"; - by-version."decompress-zip"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "decompress-zip-0.0.8"; + self.by-version."decompress-zip"."0.0.6"; + by-version."decompress-zip"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "decompress-zip-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz"; - name = "decompress-zip-0.0.8.tgz"; - sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3"; + url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.6.tgz"; + name = "decompress-zip-0.0.6.tgz"; + sha1 = "263ef05b304cdcd1172858af453561c53ae017bb"; }) ]; buildInputs = @@ -5069,15 +4686,12 @@ self.by-version."binary"."0.3.0" self.by-version."touch"."0.0.2" self.by-version."readable-stream"."1.1.13-1" - self.by-version."nopt"."2.2.1" - self.by-version."graceful-fs"."3.0.1" + self.by-version."nopt"."2.2.0" ]; peerDependencies = [ ]; passthru.names = [ "decompress-zip" ]; }; - by-spec."decompress-zip"."~0.0.6" = - self.by-version."decompress-zip"."0.0.8"; 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 { @@ -5158,14 +4772,14 @@ passthru.names = [ "deep-equal" ]; }; by-spec."deep-extend"."~0.2.5" = - self.by-version."deep-extend"."0.2.10"; - by-version."deep-extend"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "node-deep-extend-0.2.10"; + 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.10.tgz"; - name = "deep-extend-0.2.10.tgz"; - sha1 = "8dd87f56835e91a7da57d07f3c5472165cf5d467"; + url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz"; + name = "deep-extend-0.2.8.tgz"; + sha1 = "6d2893a805286e46d8243137c32fb991b50f4299"; }) ]; buildInputs = @@ -5177,7 +4791,7 @@ passthru.names = [ "deep-extend" ]; }; by-spec."deep-extend"."~0.2.8" = - self.by-version."deep-extend"."0.2.10"; + self.by-version."deep-extend"."0.2.8"; by-spec."deepmerge"."*" = self.by-version."deepmerge"."0.2.7"; by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -5217,26 +4831,6 @@ ]; passthru.names = [ "defined" ]; }; - by-spec."deflate-crc32-stream"."~0.1.0" = - self.by-version."deflate-crc32-stream"."0.1.1"; - by-version."deflate-crc32-stream"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-deflate-crc32-stream-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.1.tgz"; - name = "deflate-crc32-stream-0.1.1.tgz"; - sha1 = "5df9e343174f56e7d6056e8ba1f91e5576c02160"; - }) - ]; - buildInputs = - (self.nativeDeps."deflate-crc32-stream" or []); - deps = [ - self.by-version."buffer-crc32"."0.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "deflate-crc32-stream" ]; - }; 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 { @@ -5257,14 +4851,14 @@ passthru.names = [ "delayed-stream" ]; }; by-spec."deps-sort"."~0.1.1" = - self.by-version."deps-sort"."0.1.2"; - by-version."deps-sort"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "deps-sort-0.1.2"; + self.by-version."deps-sort"."0.1.1"; + by-version."deps-sort"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "deps-sort-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz"; - name = "deps-sort-0.1.2.tgz"; - sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a"; + url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz"; + name = "deps-sort-0.1.1.tgz"; + sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6"; }) ]; buildInputs = @@ -5272,7 +4866,7 @@ deps = [ self.by-version."through"."2.3.4" self.by-version."JSONStream"."0.6.4" - self.by-version."minimist"."0.0.10" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; @@ -5359,7 +4953,7 @@ ]; passthru.names = [ "diff" ]; }; - by-spec."diff"."^1.0.4" = + by-spec."diff"."~1.0.3" = self.by-version."diff"."1.0.8"; by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage { name = "node-diff-1.0.8"; @@ -5378,8 +4972,6 @@ ]; passthru.names = [ "diff" ]; }; - by-spec."diff"."~1.0.3" = - self.by-version."diff"."1.0.8"; by-spec."diff"."~1.0.4" = self.by-version."diff"."1.0.8"; by-spec."diff"."~1.0.7" = @@ -5403,36 +4995,36 @@ ]; passthru.names = [ "director" ]; }; - by-spec."dkim-signer"."~0.1.1" = - self.by-version."dkim-signer"."0.1.2"; - by-version."dkim-signer"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-dkim-signer-0.1.2"; + 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 = "node-dkim-signer-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz"; - name = "dkim-signer-0.1.2.tgz"; - sha1 = "2ff5d61c87d8fbff5a8b131cffc5ec3ba1c25553"; + url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz"; + name = "dkim-signer-0.1.0.tgz"; + sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b"; }) ]; buildInputs = (self.nativeDeps."dkim-signer" or []); deps = [ self.by-version."punycode"."1.2.4" - self.by-version."mimelib"."0.2.16" + self.by-version."mimelib"."0.2.14" ]; peerDependencies = [ ]; passthru.names = [ "dkim-signer" ]; }; by-spec."domain-browser"."~1.1.0" = - self.by-version."domain-browser"."1.1.2"; - by-version."domain-browser"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-domain-browser-1.1.2"; + self.by-version."domain-browser"."1.1.1"; + by-version."domain-browser"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-domain-browser-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz"; - name = "domain-browser-1.1.2.tgz"; - sha1 = "5a21f30a29a9891533915061426974dc2f14e56b"; + url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz"; + name = "domain-browser-1.1.1.tgz"; + sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0"; }) ]; buildInputs = @@ -5482,6 +5074,26 @@ ]; passthru.names = [ "domhandler" ]; }; + by-spec."domhandler"."2.1" = + self.by-version."domhandler"."2.1.0"; + by-version."domhandler"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-domhandler-2.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz"; + name = "domhandler-2.1.0.tgz"; + sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"; + }) + ]; + buildInputs = + (self.nativeDeps."domhandler" or []); + deps = [ + self.by-version."domelementtype"."1.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "domhandler" ]; + }; by-spec."domhandler"."2.2" = self.by-version."domhandler"."2.2.0"; by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -5562,55 +5174,33 @@ ]; passthru.names = [ "domutils" ]; }; - by-spec."domutils"."1.5" = - self.by-version."domutils"."1.5.0"; - by-version."domutils"."1.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-domutils-1.5.0"; + by-spec."download"."~0.1.6" = + self.by-version."download"."0.1.16"; + by-version."download"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "download-0.1.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.5.0.tgz"; - name = "domutils-1.5.0.tgz"; - sha1 = "bfa4ceb8b7ab6f9423fe59154e04da6cc3ff3949"; - }) - ]; - buildInputs = - (self.nativeDeps."domutils" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domutils" ]; - }; - by-spec."download"."^0.1.6" = - self.by-version."download"."0.1.17"; - by-version."download"."0.1.17" = lib.makeOverridable self.buildNodePackage { - name = "download-0.1.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/download/-/download-0.1.17.tgz"; - name = "download-0.1.17.tgz"; - sha1 = "c2516c92b05d0447364e9a9e0ea060edef79dc3a"; + url = "http://registry.npmjs.org/download/-/download-0.1.16.tgz"; + name = "download-0.1.16.tgz"; + sha1 = "46783e7f590d1c0d49eb1915ab8941c74cb45e99"; }) ]; buildInputs = (self.nativeDeps."download" or []); deps = [ - self.by-version."decompress"."0.2.4" - self.by-version."each-async"."0.1.3" + self.by-version."decompress"."0.2.3" + self.by-version."each-async"."0.1.2" self.by-version."get-stdin"."0.1.0" - self.by-version."get-urls"."0.1.2" + self.by-version."get-urls"."0.1.1" self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.2.1" - self.by-version."request"."2.36.0" - self.by-version."through2"."0.4.2" + self.by-version."nopt"."2.2.0" + self.by-version."request"."2.34.0" + self.by-version."through2"."0.4.1" ]; peerDependencies = [ ]; passthru.names = [ "download" ]; }; - by-spec."download"."~0.1.6" = - self.by-version."download"."0.1.17"; by-spec."dox"."~0.4.4" = self.by-version."dox"."0.4.4"; by-version."dox"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -5632,25 +5222,6 @@ ]; passthru.names = [ "dox" ]; }; - by-spec."drawille"."0.0.3" = - self.by-version."drawille"."0.0.3"; - by-version."drawille"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-drawille-0.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/drawille/-/drawille-0.0.3.tgz"; - name = "drawille-0.0.3.tgz"; - sha1 = "182dda93748911f2583d37b423a1ad04f3337f91"; - }) - ]; - buildInputs = - (self.nativeDeps."drawille" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "drawille" ]; - }; 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 { @@ -5689,35 +5260,15 @@ ]; passthru.names = [ "duplexer" ]; }; - by-spec."duplexer2"."0.0.2" = - self.by-version."duplexer2"."0.0.2"; - by-version."duplexer2"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-duplexer2-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - name = "duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; - }) - ]; - buildInputs = - (self.nativeDeps."duplexer2" or []); - deps = [ - self.by-version."readable-stream"."1.1.13-1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "duplexer2" ]; - }; by-spec."each-async"."^0.1.1" = - self.by-version."each-async"."0.1.3"; - by-version."each-async"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-each-async-0.1.3"; + self.by-version."each-async"."0.1.2"; + by-version."each-async"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-each-async-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/each-async/-/each-async-0.1.3.tgz"; - name = "each-async-0.1.3.tgz"; - sha1 = "b436025b08da2f86608025519e3096763dedfca3"; + url = "http://registry.npmjs.org/each-async/-/each-async-0.1.2.tgz"; + name = "each-async-0.1.2.tgz"; + sha1 = "d5b900bd92705ed5b8cad3307a6536adb0f134c6"; }) ]; buildInputs = @@ -5785,7 +5336,26 @@ ]; passthru.names = [ "emitter-component" ]; }; - by-spec."encoding"."~0.1.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 = "node-emitter-component-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz"; + name = "emitter-component-1.0.0.tgz"; + sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f"; + }) + ]; + buildInputs = + (self.nativeDeps."emitter-component" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "emitter-component" ]; + }; + by-spec."encoding"."~0.1" = self.by-version."encoding"."0.1.7"; by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "node-encoding-0.1.7"; @@ -5805,26 +5375,6 @@ ]; passthru.names = [ "encoding" ]; }; - by-spec."end-of-stream"."~0.1.3" = - self.by-version."end-of-stream"."0.1.4"; - by-version."end-of-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-end-of-stream-0.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.4.tgz"; - name = "end-of-stream-0.1.4.tgz"; - sha1 = "4a69b38706ecaaed83c53d22b7f073848ca9a203"; - }) - ]; - buildInputs = - (self.nativeDeps."end-of-stream" or []); - deps = [ - self.by-version."once"."1.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "end-of-stream" ]; - }; by-spec."entities"."0.x" = self.by-version."entities"."0.5.0"; by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -5844,44 +5394,6 @@ ]; passthru.names = [ "entities" ]; }; - by-spec."entities"."1.0" = - self.by-version."entities"."1.0.0"; - by-version."entities"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-entities-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; - name = "entities-1.0.0.tgz"; - sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; - }) - ]; - buildInputs = - (self.nativeDeps."entities" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "entities" ]; - }; - by-spec."entities"."~1.1.1" = - self.by-version."entities"."1.1.1"; - by-version."entities"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-entities-1.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - name = "entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; - }) - ]; - buildInputs = - (self.nativeDeps."entities" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "entities" ]; - }; by-spec."envify"."~1.2.0" = self.by-version."envify"."1.2.1"; by-version."envify"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -5905,15 +5417,15 @@ ]; passthru.names = [ "envify" ]; }; - by-spec."errorhandler"."1.0.2" = - self.by-version."errorhandler"."1.0.2"; - by-version."errorhandler"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-errorhandler-1.0.2"; + by-spec."errorhandler"."1.0.0" = + self.by-version."errorhandler"."1.0.0"; + by-version."errorhandler"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-errorhandler-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.2.tgz"; - name = "errorhandler-1.0.2.tgz"; - sha1 = "587d47bbbbc48cffe132c3acda7215c902558108"; + url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz"; + name = "errorhandler-1.0.0.tgz"; + sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a"; }) ]; buildInputs = @@ -5924,29 +5436,6 @@ ]; passthru.names = [ "errorhandler" ]; }; - by-spec."es5-ext"."~0.10.2" = - self.by-version."es5-ext"."0.10.4"; - by-version."es5-ext"."0.10.4" = lib.makeOverridable self.buildNodePackage { - name = "node-es5-ext-0.10.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.4.tgz"; - name = "es5-ext-0.10.4.tgz"; - sha1 = "f4d7d85d45acfbe93379d4c0948fbae6466ec876"; - }) - ]; - buildInputs = - (self.nativeDeps."es5-ext" or []); - deps = [ - self.by-version."es6-iterator"."0.1.1" - self.by-version."es6-symbol"."0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "es5-ext" ]; - }; - by-spec."es5-ext"."~0.10.4" = - self.by-version."es5-ext"."0.10.4"; by-spec."es5-ext"."~0.9.2" = self.by-version."es5-ext"."0.9.2"; by-version."es5-ext"."0.9.2" = lib.makeOverridable self.buildNodePackage { @@ -5966,49 +5455,6 @@ ]; passthru.names = [ "es5-ext" ]; }; - by-spec."es6-iterator"."~0.1.1" = - self.by-version."es6-iterator"."0.1.1"; - by-version."es6-iterator"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-es6-iterator-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.1.tgz"; - name = "es6-iterator-0.1.1.tgz"; - sha1 = "5e136c899aa1c26296414f90859b73934812d275"; - }) - ]; - buildInputs = - (self.nativeDeps."es6-iterator" or []); - deps = [ - self.by-version."d"."0.1.1" - self.by-version."es5-ext"."0.10.4" - self.by-version."es6-symbol"."0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "es6-iterator" ]; - }; - by-spec."es6-symbol"."0.1.x" = - self.by-version."es6-symbol"."0.1.0"; - by-version."es6-symbol"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-es6-symbol-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.0.tgz"; - name = "es6-symbol-0.1.0.tgz"; - sha1 = "ba5878f37a652f6c713244716fc7b24d61d2dc39"; - }) - ]; - buildInputs = - (self.nativeDeps."es6-symbol" or []); - deps = [ - self.by-version."d"."0.1.1" - self.by-version."es5-ext"."0.10.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "es6-symbol" ]; - }; by-spec."escape-html"."*" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -6032,14 +5478,14 @@ by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; by-spec."escodegen"."1.3.x" = - self.by-version."escodegen"."1.3.3"; - by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.3.3"; + self.by-version."escodegen"."1.3.2"; + by-version."escodegen"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - name = "escodegen-1.3.3.tgz"; - sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.2.tgz"; + name = "escodegen-1.3.2.tgz"; + sha1 = "bb0f434dbd594f2060639a79b4b06259dd5372de"; }) ]; buildInputs = @@ -6101,8 +5547,6 @@ ]; passthru.names = [ "escodegen" ]; }; - by-spec."escodegen"."~1.3.1" = - self.by-version."escodegen"."1.3.3"; by-spec."escope"."~ 1.0.0" = self.by-version."escope"."1.0.1"; by-version."escope"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -6169,15 +5613,15 @@ ]; passthru.names = [ "esmangle" ]; }; - by-spec."esprima"."1.2.x" = - self.by-version."esprima"."1.2.2"; - by-version."esprima"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "esprima-1.2.2"; + by-spec."esprima"."1.1.x" = + self.by-version."esprima"."1.1.1"; + by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "esprima-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz"; - name = "esprima-1.2.2.tgz"; - sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b"; + url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; + name = "esprima-1.1.1.tgz"; + sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; }) ]; buildInputs = @@ -6213,23 +5657,6 @@ self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.1.1" = self.by-version."esprima"."1.1.1"; - by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "esprima-1.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - name = "esprima-1.1.1.tgz"; - sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; - }) - ]; - buildInputs = - (self.nativeDeps."esprima" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "esprima" ]; - }; by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage { @@ -6415,27 +5842,6 @@ ]; passthru.names = [ "event-emitter" ]; }; - by-spec."event-emitter"."~0.3.1" = - self.by-version."event-emitter"."0.3.1"; - by-version."event-emitter"."0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-event-emitter-0.3.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.1.tgz"; - name = "event-emitter-0.3.1.tgz"; - sha1 = "1425ca9c5649a1a31ba835bd9dba6bfad3880238"; - }) - ]; - buildInputs = - (self.nativeDeps."event-emitter" or []); - deps = [ - self.by-version."es5-ext"."0.10.4" - self.by-version."d"."0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "event-emitter" ]; - }; by-spec."event-stream"."~0.5" = self.by-version."event-stream"."0.5.3"; by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage { @@ -6496,34 +5902,15 @@ }; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.13"; - by-spec."eventemitter3"."*" = - self.by-version."eventemitter3"."0.1.2"; - by-version."eventemitter3"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-eventemitter3-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.2.tgz"; - name = "eventemitter3-0.1.2.tgz"; - sha1 = "4ede96d72b971a217987df4f1d4ca54dd8d20b79"; - }) - ]; - buildInputs = - (self.nativeDeps."eventemitter3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "eventemitter3" ]; - }; by-spec."events"."~1.0.0" = - self.by-version."events"."1.0.1"; - by-version."events"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-events-1.0.1"; + self.by-version."events"."1.0.0"; + by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-events-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/events/-/events-1.0.1.tgz"; - name = "events-1.0.1.tgz"; - sha1 = "386f6471cbb609e7925e7bfe7468634b9e069ac2"; + url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz"; + name = "events-1.0.0.tgz"; + sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0"; }) ]; buildInputs = @@ -6570,12 +5957,12 @@ self.by-version."oauth"."0.9.11" self.by-version."request"."2.9.203" self.by-version."connect"."2.3.9" - self.by-version."openid"."0.5.9" - self.by-version."xml2js"."0.4.4" + self.by-version."openid"."0.5.8" + self.by-version."xml2js"."0.4.2" self.by-version."node-swt"."0.1.1" self.by-version."node-wsfederation"."0.1.1" self.by-version."debug"."0.5.0" - self.by-version."express"."3.10.3" + self.by-version."express"."3.5.1" ]; peerDependencies = [ ]; @@ -6601,7 +5988,7 @@ ]; passthru.names = [ "execSync" ]; }; - by-spec."exit"."0.1.2" = + by-spec."exit"."0.1.x" = self.by-version."exit"."0.1.2"; by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "node-exit-0.1.2"; @@ -6620,40 +6007,37 @@ ]; passthru.names = [ "exit" ]; }; - by-spec."exit"."0.1.x" = - self.by-version."exit"."0.1.2"; by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."4.4.1"; - by-version."express"."4.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.4.1"; + self.by-version."express"."4.0.0"; + by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.4.1.tgz"; - name = "express-4.4.1.tgz"; - sha1 = "9e0364d1c74e076d7409d302429a384b10dfbd42"; + url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz"; + name = "express-4.0.0.tgz"; + sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."accepts"."1.0.2" - self.by-version."buffer-crc32"."0.2.1" - self.by-version."methods"."1.0.1" self.by-version."parseurl"."1.0.1" - self.by-version."proxy-addr"."1.0.0" + self.by-version."accepts"."1.0.0" + self.by-version."type-is"."1.0.0" self.by-version."range-parser"."1.0.0" - self.by-version."send"."0.4.1" - self.by-version."serve-static"."1.2.1" - self.by-version."type-is"."1.2.0" - self.by-version."cookie"."0.1.2" + self.by-version."cookie"."0.1.0" + self.by-version."buffer-crc32"."0.2.1" self.by-version."fresh"."0.2.2" + self.by-version."methods"."0.1.0" + self.by-version."send"."0.2.0" self.by-version."cookie-signature"."1.0.3" self.by-version."merge-descriptors"."0.0.2" self.by-version."utils-merge"."1.0.0" self.by-version."escape-html"."1.0.1" self.by-version."qs"."0.6.6" + self.by-version."serve-static"."1.0.1" self.by-version."path-to-regexp"."0.1.2" self.by-version."debug"."0.8.1" ]; @@ -6661,7 +6045,7 @@ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.4.1"; + "express" = self.by-version."express"."4.0.0"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -6709,7 +6093,7 @@ self.by-version."methods"."0.0.1" self.by-version."send"."0.1.0" self.by-version."cookie-signature"."1.0.1" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; @@ -6739,49 +6123,45 @@ self.by-version."methods"."0.1.0" self.by-version."send"."0.1.4" self.by-version."cookie-signature"."1.0.1" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.10.3"; - by-version."express"."3.10.3" = lib.makeOverridable self.buildNodePackage { - name = "express-3.10.3"; + self.by-version."express"."3.5.1"; + by-version."express"."3.5.1" = lib.makeOverridable self.buildNodePackage { + name = "express-3.5.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.10.3.tgz"; - name = "express-3.10.3.tgz"; - sha1 = "d669d5fa2d79fa6349af5fa6338d646bc346ada5"; + url = "http://registry.npmjs.org/express/-/express-3.5.1.tgz"; + name = "express-3.5.1.tgz"; + sha1 = "4b333e1117faca336a538f4c724140b9ce1a87e7"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."buffer-crc32"."0.2.1" - self.by-version."connect"."2.19.4" + self.by-version."connect"."2.14.1" self.by-version."commander"."1.3.2" - self.by-version."debug"."1.0.0" - self.by-version."escape-html"."1.0.1" - self.by-version."methods"."1.0.1" - self.by-version."mkdirp"."0.5.0" - self.by-version."parseurl"."1.0.1" - self.by-version."proxy-addr"."1.0.1" self.by-version."range-parser"."1.0.0" - self.by-version."send"."0.4.1" - self.by-version."vary"."0.1.0" - self.by-version."cookie"."0.1.2" + self.by-version."mkdirp"."0.3.5" + self.by-version."cookie"."0.1.1" + self.by-version."buffer-crc32"."0.2.1" self.by-version."fresh"."0.2.2" + self.by-version."methods"."0.1.0" + self.by-version."send"."0.2.0" self.by-version."cookie-signature"."1.0.3" self.by-version."merge-descriptors"."0.0.2" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; by-spec."express".">=3.0.0" = - self.by-version."express"."4.4.1"; + self.by-version."express"."4.0.0"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -6806,84 +6186,16 @@ self.by-version."methods"."0.0.1" self.by-version."send"."0.1.0" self.by-version."cookie-signature"."1.0.0" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - by-spec."express"."~4.0" = + by-spec."express"."~3.5" = + self.by-version."express"."3.5.1"; + by-spec."express"."~4.0.0-rc4" = self.by-version."express"."4.0.0"; - by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz"; - name = "express-4.0.0.tgz"; - sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = [ - self.by-version."parseurl"."1.0.1" - self.by-version."accepts"."1.0.0" - self.by-version."type-is"."1.0.0" - self.by-version."range-parser"."1.0.0" - self.by-version."cookie"."0.1.0" - self.by-version."buffer-crc32"."0.2.1" - self.by-version."fresh"."0.2.2" - self.by-version."methods"."0.1.0" - self.by-version."send"."0.2.0" - self.by-version."cookie-signature"."1.0.3" - self.by-version."merge-descriptors"."0.0.2" - self.by-version."utils-merge"."1.0.0" - self.by-version."escape-html"."1.0.1" - self.by-version."qs"."0.6.6" - self.by-version."serve-static"."1.0.1" - self.by-version."path-to-regexp"."0.1.2" - self.by-version."debug"."0.8.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; - by-spec."express"."~4.2.0" = - self.by-version."express"."4.2.0"; - by-version."express"."4.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.2.0.tgz"; - name = "express-4.2.0.tgz"; - sha1 = "3121993a45126693e8bf897aefb4dd783762dc60"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = [ - self.by-version."parseurl"."1.0.1" - self.by-version."accepts"."1.0.1" - self.by-version."type-is"."1.1.0" - self.by-version."range-parser"."1.0.0" - self.by-version."cookie"."0.1.2" - self.by-version."buffer-crc32"."0.2.1" - self.by-version."fresh"."0.2.2" - self.by-version."methods"."1.0.0" - self.by-version."send"."0.3.0" - self.by-version."cookie-signature"."1.0.3" - self.by-version."merge-descriptors"."0.0.2" - self.by-version."utils-merge"."1.0.0" - self.by-version."escape-html"."1.0.1" - self.by-version."qs"."0.6.6" - self.by-version."serve-static"."1.1.0" - self.by-version."path-to-regexp"."0.1.2" - self.by-version."debug"."0.8.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; by-spec."express-form"."*" = self.by-version."express-form"."0.12.2"; by-version."express-form"."0.12.2" = lib.makeOverridable self.buildNodePackage { @@ -6903,7 +6215,7 @@ self.by-version."async"."0.2.10" ]; peerDependencies = [ - self.by-version."express"."4.4.1" + self.by-version."express"."4.0.0" ]; passthru.names = [ "express-form" ]; }; @@ -6927,41 +6239,40 @@ ]; passthru.names = [ "express-partials" ]; }; - by-spec."express-session"."1.2.1" = - self.by-version."express-session"."1.2.1"; - by-version."express-session"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-express-session-1.2.1"; + by-spec."express-session"."1.0.2" = + self.by-version."express-session"."1.0.2"; + by-version."express-session"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-express-session-1.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.2.1.tgz"; - name = "express-session-1.2.1.tgz"; - sha1 = "2741a1661eb3a4a17a7db0a48049fbf05574e465"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz"; + name = "express-session-1.0.2.tgz"; + sha1 = "004478c742561774411ceb79733155a56b6d49eb"; }) ]; buildInputs = (self.nativeDeps."express-session" or []); deps = [ self.by-version."utils-merge"."1.0.0" - self.by-version."cookie"."0.1.2" + self.by-version."cookie"."0.1.0" self.by-version."cookie-signature"."1.0.3" - self.by-version."on-headers"."0.0.0" self.by-version."uid2"."0.0.3" self.by-version."buffer-crc32"."0.2.1" - self.by-version."debug"."0.8.1" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; passthru.names = [ "express-session" ]; }; - by-spec."express-session"."~1.1.0" = - self.by-version."express-session"."1.1.0"; - by-version."express-session"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-express-session-1.1.0"; + by-spec."express-session"."~1.0.2" = + self.by-version."express-session"."1.0.3"; + by-version."express-session"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-express-session-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.1.0.tgz"; - name = "express-session-1.1.0.tgz"; - sha1 = "8c010bf58109ea235a65566d2a96703b41ee6eae"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.0.3.tgz"; + name = "express-session-1.0.3.tgz"; + sha1 = "a45ec65dda263f74f3b5b9c6da0ac74c36ac0639"; }) ]; buildInputs = @@ -6972,7 +6283,7 @@ self.by-version."cookie-signature"."1.0.3" self.by-version."uid2"."0.0.3" self.by-version."buffer-crc32"."0.2.1" - self.by-version."debug"."0.8.1" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; @@ -7034,7 +6345,7 @@ (self.nativeDeps."extname" or []); deps = [ self.by-version."ext-list"."0.1.0" - self.by-version."map-key"."0.1.4" + self.by-version."map-key"."0.1.1" self.by-version."underscore.string"."2.3.3" ]; peerDependencies = [ @@ -7134,15 +6445,33 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = [ - self.by-version."websocket-driver"."0.3.4" + self.by-version."websocket-driver"."0.3.2" ]; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; "faye-websocket" = self.by-version."faye-websocket"."0.7.2"; - by-spec."faye-websocket"."0.7.2" = - self.by-version."faye-websocket"."0.7.2"; + by-spec."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 = "node-faye-websocket-0.7.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; + name = "faye-websocket-0.7.0.tgz"; + sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be"; + }) + ]; + buildInputs = + (self.nativeDeps."faye-websocket" or []); + deps = [ + self.by-version."websocket-driver"."0.3.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "faye-websocket" ]; + }; by-spec."fetch-bower"."*" = self.by-version."fetch-bower"."2.0.0"; by-version."fetch-bower"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -7159,8 +6488,8 @@ deps = [ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" - self.by-version."bower"."1.3.5" - self.by-version."glob"."3.2.11" + self.by-version."bower"."1.3.2" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -7191,32 +6520,6 @@ ]; passthru.names = [ "fields" ]; }; - by-spec."file-utils"."^0.2.0" = - self.by-version."file-utils"."0.2.0"; - by-version."file-utils"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-file-utils-0.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/file-utils/-/file-utils-0.2.0.tgz"; - name = "file-utils-0.2.0.tgz"; - sha1 = "0372c89b19bd96fc9a02a180c91fad29e4dbacaa"; - }) - ]; - buildInputs = - (self.nativeDeps."file-utils" or []); - deps = [ - self.by-version."lodash"."2.4.1" - self.by-version."iconv-lite"."0.2.11" - self.by-version."rimraf"."2.2.8" - self.by-version."glob"."3.2.11" - self.by-version."minimatch"."0.2.14" - self.by-version."findup-sync"."0.1.3" - self.by-version."isbinaryfile"."2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "file-utils" ]; - }; 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 { @@ -7233,8 +6536,8 @@ deps = [ self.by-version."lodash"."2.1.0" self.by-version."iconv-lite"."0.2.11" - self.by-version."rimraf"."2.2.8" - self.by-version."glob"."3.2.11" + self.by-version."rimraf"."2.2.6" + self.by-version."glob"."3.2.9" self.by-version."minimatch"."0.2.14" self.by-version."findup-sync"."0.1.3" self.by-version."isbinaryfile"."0.1.9" @@ -7243,8 +6546,8 @@ ]; passthru.names = [ "file-utils" ]; }; - by-spec."file-utils"."~0.2.0" = - self.by-version."file-utils"."0.2.0"; + 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 { @@ -7259,22 +6562,22 @@ buildInputs = (self.nativeDeps."fileset" or []); deps = [ - self.by-version."minimatch"."0.3.0" - self.by-version."glob"."3.2.11" + self.by-version."minimatch"."0.2.14" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "fileset" ]; }; by-spec."findit".">=1.1.0 <2.0.0" = - self.by-version."findit"."1.2.0"; - by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-findit-1.2.0"; + self.by-version."findit"."1.1.1"; + by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-findit-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz"; - name = "findit-1.2.0.tgz"; - sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8"; + url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz"; + name = "findit-1.1.1.tgz"; + sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a"; }) ]; buildInputs = @@ -7306,7 +6609,7 @@ ]; passthru.names = [ "findup" ]; }; - by-spec."findup-sync"."^0.1.2" = + by-spec."findup-sync"."~0.1.0" = self.by-version."findup-sync"."0.1.3"; by-version."findup-sync"."0.1.3" = lib.makeOverridable self.buildNodePackage { name = "node-findup-sync-0.1.3"; @@ -7320,36 +6623,15 @@ buildInputs = (self.nativeDeps."findup-sync" or []); deps = [ - self.by-version."glob"."3.2.11" + self.by-version."glob"."3.2.9" self.by-version."lodash"."2.4.1" ]; peerDependencies = [ ]; passthru.names = [ "findup-sync" ]; }; - by-spec."findup-sync"."~0.1.0" = - self.by-version."findup-sync"."0.1.3"; by-spec."findup-sync"."~0.1.2" = self.by-version."findup-sync"."0.1.3"; - by-spec."finished"."1.1.4" = - self.by-version."finished"."1.1.4"; - by-version."finished"."1.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-finished-1.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/finished/-/finished-1.1.4.tgz"; - name = "finished-1.1.4.tgz"; - sha1 = "4db9fe20f920bccc2e7126ffa84175c8fcacb5d9"; - }) - ]; - buildInputs = - (self.nativeDeps."finished" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "finished" ]; - }; by-spec."flatiron"."*" = self.by-version."flatiron"."0.3.11"; by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage { @@ -7416,34 +6698,15 @@ ]; passthru.names = [ "forEachAsync" ]; }; - by-spec."foreachasync"."3.x" = - self.by-version."foreachasync"."3.0.0"; - by-version."foreachasync"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-foreachasync-3.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; - name = "foreachasync-3.0.0.tgz"; - sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; - }) - ]; - buildInputs = - (self.nativeDeps."foreachasync" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "foreachasync" ]; - }; by-spec."forever"."*" = - self.by-version."forever"."0.11.1"; - by-version."forever"."0.11.1" = lib.makeOverridable self.buildNodePackage { - name = "forever-0.11.1"; + self.by-version."forever"."0.11.0"; + by-version."forever"."0.11.0" = lib.makeOverridable self.buildNodePackage { + name = "forever-0.11.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.11.1.tgz"; - name = "forever-0.11.1.tgz"; - sha1 = "50ac8744c0a6e0c266524c4746397f74d6b09c5b"; + url = "http://registry.npmjs.org/forever/-/forever-0.11.0.tgz"; + name = "forever-0.11.0.tgz"; + sha1 = "97de678915c64dacce2ccbfb94620723b308d44f"; }) ]; buildInputs = @@ -7466,7 +6729,7 @@ ]; passthru.names = [ "forever" ]; }; - "forever" = self.by-version."forever"."0.11.1"; + "forever" = self.by-version."forever"."0.11.0"; by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -7558,28 +6821,6 @@ }; by-spec."forever-monitor"."1.2.3" = self.by-version."forever-monitor"."1.2.3"; - by-spec."form-data"."0.1.2" = - self.by-version."form-data"."0.1.2"; - by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-form-data-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; - name = "form-data-0.1.2.tgz"; - sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; - }) - ]; - 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.10" - ]; - 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 { @@ -7603,14 +6844,14 @@ passthru.names = [ "form-data" ]; }; by-spec."form-data"."~0.1.0" = - self.by-version."form-data"."0.1.3"; - by-version."form-data"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-form-data-0.1.3"; + self.by-version."form-data"."0.1.2"; + by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-form-data-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - name = "form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; + name = "form-data-0.1.2.tgz"; + sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; }) ]; buildInputs = @@ -7618,7 +6859,7 @@ deps = [ self.by-version."combined-stream"."0.0.4" self.by-version."mime"."1.2.11" - self.by-version."async"."0.9.0" + self.by-version."async"."0.2.10" ]; peerDependencies = [ ]; @@ -7798,7 +7039,7 @@ self.by-version."ncp"."0.4.2" self.by-version."mkdirp"."0.3.5" self.by-version."jsonfile"."1.0.1" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" ]; peerDependencies = [ ]; @@ -7818,7 +7059,7 @@ buildInputs = (self.nativeDeps."fs-walk" or []); deps = [ - self.by-version."async"."0.9.0" + self.by-version."async"."0.7.0" ]; peerDependencies = [ ]; @@ -7883,7 +7124,7 @@ buildInputs = (self.nativeDeps."fstream" or []); deps = [ - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."mkdirp"."0.3.5" self.by-version."graceful-fs"."2.0.3" self.by-version."inherits"."2.0.1" @@ -7900,45 +7141,45 @@ self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.8" = self.by-version."fstream"."0.1.25"; - by-spec."fstream-ignore"."~0.0" = - self.by-version."fstream-ignore"."0.0.8"; - by-version."fstream-ignore"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-fstream-ignore-0.0.8"; + 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 = "node-fstream-ignore-0.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz"; - name = "fstream-ignore-0.0.8.tgz"; - sha1 = "cc4830fb9963178be5d9eb37569a4a0785cf9e53"; + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + name = "fstream-ignore-0.0.7.tgz"; + sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; }) ]; buildInputs = (self.nativeDeps."fstream-ignore" or []); deps = [ + self.by-version."minimatch"."0.2.14" self.by-version."fstream"."0.1.25" self.by-version."inherits"."2.0.1" - self.by-version."minimatch"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "fstream-ignore" ]; }; by-spec."fstream-ignore"."~0.0.6" = - self.by-version."fstream-ignore"."0.0.8"; - by-spec."fstream-npm"."~0.1.7" = - self.by-version."fstream-npm"."0.1.7"; - by-version."fstream-npm"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "node-fstream-npm-0.1.7"; + self.by-version."fstream-ignore"."0.0.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 = "node-fstream-npm-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.7.tgz"; - name = "fstream-npm-0.1.7.tgz"; - sha1 = "423dc5d1d1fcb7d878501f43c7e11a33292bd55f"; + url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz"; + name = "fstream-npm-0.1.6.tgz"; + sha1 = "1369323075d9bd85cfcc9409f33f0d6fe5be104d"; }) ]; buildInputs = (self.nativeDeps."fstream-npm" or []); deps = [ - self.by-version."fstream-ignore"."0.0.8" + self.by-version."fstream-ignore"."0.0.7" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ @@ -7946,47 +7187,45 @@ passthru.names = [ "fstream-npm" ]; }; by-spec."generator-angular"."*" = - self.by-version."generator-angular"."0.9.0-0"; - by-version."generator-angular"."0.9.0-0" = lib.makeOverridable self.buildNodePackage { - name = "node-generator-angular-0.9.0-0"; + self.by-version."generator-angular"."0.8.0"; + by-version."generator-angular"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-generator-angular-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.9.0-0.tgz"; - name = "generator-angular-0.9.0-0.tgz"; - sha1 = "f954bb283e570fba4e1ef1f30c497b56ffff522a"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.8.0.tgz"; + name = "generator-angular-0.8.0.tgz"; + sha1 = "c2115b1a7a304b884b7f8857cade77dc36b63d13"; }) ]; buildInputs = (self.nativeDeps."generator-angular" or []); deps = [ - self.by-version."wiredep"."1.7.3" - self.by-version."yeoman-generator"."0.16.0" - self.by-version."yosay"."0.2.1" self.by-version."chalk"."0.4.0" + self.by-version."wiredep"."1.0.0" + self.by-version."yeoman-generator"."0.16.0" ]; peerDependencies = [ - self.by-version."generator-karma"."0.8.2" + self.by-version."generator-karma"."0.7.0" self.by-version."yo"."1.1.2" ]; passthru.names = [ "generator-angular" ]; }; - "generator-angular" = self.by-version."generator-angular"."0.9.0-0"; - by-spec."generator-karma".">=0.8.2" = - self.by-version."generator-karma"."0.8.2"; - by-version."generator-karma"."0.8.2" = lib.makeOverridable self.buildNodePackage { - name = "node-generator-karma-0.8.2"; + "generator-angular" = self.by-version."generator-angular"."0.8.0"; + by-spec."generator-karma".">=0.6.0" = + self.by-version."generator-karma"."0.7.0"; + by-version."generator-karma"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-generator-karma-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.8.2.tgz"; - name = "generator-karma-0.8.2.tgz"; - sha1 = "46c6cd5fa3bf8ff54553f748a4fa75108ed0d74f"; + url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.7.0.tgz"; + name = "generator-karma-0.7.0.tgz"; + sha1 = "aaa2b6d8905b687343fe6a10b15279afd984048d"; }) ]; buildInputs = (self.nativeDeps."generator-karma" or []); deps = [ - self.by-version."underscore"."1.6.0" - self.by-version."yeoman-generator"."0.17.0" + self.by-version."yeoman-generator"."0.16.0" ]; peerDependencies = [ self.by-version."yo"."1.1.2" @@ -8059,14 +7298,14 @@ passthru.names = [ "get-stdin" ]; }; by-spec."get-urls"."^0.1.1" = - self.by-version."get-urls"."0.1.2"; - by-version."get-urls"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "get-urls-0.1.2"; + self.by-version."get-urls"."0.1.1"; + by-version."get-urls"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "get-urls-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.2.tgz"; - name = "get-urls-0.1.2.tgz"; - sha1 = "92a3e5ce2b9af2d2764ff5198681db373227b844"; + url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.1.tgz"; + name = "get-urls-0.1.1.tgz"; + sha1 = "f94aa79c9e5d99cb843e44c5f67e24954e08fb59"; }) ]; buildInputs = @@ -8134,14 +7373,14 @@ self.by-version."cli-color"."0.2.3" self.by-version."cli-log"."0.0.8" self.by-version."github"."0.1.16" - self.by-version."copy-paste"."0.2.2" + self.by-version."copy-paste"."0.2.0" self.by-version."handlebars"."1.3.0" self.by-version."inquirer"."0.4.1" self.by-version."moment"."2.5.1" - self.by-version."nopt"."2.2.1" + self.by-version."nopt"."2.2.0" self.by-version."open"."0.0.5" self.by-version."truncate"."1.0.2" - self.by-version."update-notifier"."0.1.10" + self.by-version."update-notifier"."0.1.8" self.by-version."userhome"."0.1.0" self.by-version."which"."1.0.5" self.by-version."wordwrap"."0.0.2" @@ -8210,15 +7449,15 @@ }; by-spec."github-url-from-git"."~1.1.1" = self.by-version."github-url-from-git"."1.1.1"; - by-spec."github-url-from-username-repo"."^0.1.0" = - self.by-version."github-url-from-username-repo"."0.1.0"; - by-version."github-url-from-username-repo"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-github-url-from-username-repo-0.1.0"; + 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 = "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.1.0.tgz"; - name = "github-url-from-username-repo-0.1.0.tgz"; - sha1 = "fe398af670692e91af7bcfc5ae1d99ff97b1df89"; + url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; + name = "github-url-from-username-repo-0.0.2.tgz"; + sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; }) ]; buildInputs = @@ -8229,43 +7468,22 @@ ]; passthru.names = [ "github-url-from-username-repo" ]; }; - by-spec."github-url-from-username-repo"."^0.2.0" = - self.by-version."github-url-from-username-repo"."0.2.0"; - by-version."github-url-from-username-repo"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-github-url-from-username-repo-0.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.2.0.tgz"; - name = "github-url-from-username-repo-0.2.0.tgz"; - sha1 = "7590b4fa605b7a6cbb7e06ffcd9d253210f9dbe1"; - }) - ]; - buildInputs = - (self.nativeDeps."github-url-from-username-repo" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "github-url-from-username-repo" ]; - }; - by-spec."github-url-from-username-repo"."~0.1.0" = - self.by-version."github-url-from-username-repo"."0.1.0"; by-spec."glob"."3" = - self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-3.2.11"; + self.by-version."glob"."3.2.9"; + by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage { + name = "node-glob-3.2.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz"; + name = "glob-3.2.9.tgz"; + sha1 = "56af2289aa43d07d7702666480373eb814d91d40"; }) ]; buildInputs = (self.nativeDeps."glob" or []); deps = [ + self.by-version."minimatch"."0.2.14" self.by-version."inherits"."2.0.1" - self.by-version."minimatch"."0.3.0" ]; peerDependencies = [ ]; @@ -8294,37 +7512,13 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3.2.x" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; by-spec."glob"."3.x" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; + by-spec."glob".">= 3.1.4" = + self.by-version."glob"."3.2.9"; by-spec."glob".">=3.2.7 <4" = - self.by-version."glob"."3.2.11"; - by-spec."glob"."^3.2.0" = - self.by-version."glob"."3.2.11"; - by-spec."glob"."^4.0.2" = - self.by-version."glob"."4.0.2"; - by-version."glob"."4.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-4.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.0.2.tgz"; - name = "glob-4.0.2.tgz"; - sha1 = "d57dbdf54984dd7635c8247d1f2ebde2e81f4ee1"; - }) - ]; - buildInputs = - (self.nativeDeps."glob" or []); - deps = [ - self.by-version."inherits"."2.0.1" - self.by-version."minimatch"."0.3.0" - self.by-version."once"."1.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - by-spec."glob"."~ 3.2.1" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.1.21" = self.by-version."glob"."3.1.21"; by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage { @@ -8348,19 +7542,17 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."~3.2.0" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.11"; - by-spec."glob"."~3.2.10" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.7" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.8" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.9" = - self.by-version."glob"."3.2.11"; + self.by-version."glob"."3.2.9"; by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.3"; by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage { @@ -8380,25 +7572,6 @@ ]; passthru.names = [ "graceful-fs" ]; }; - by-spec."graceful-fs"."2 || 3" = - self.by-version."graceful-fs"."3.0.1"; - by-version."graceful-fs"."3.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-graceful-fs-3.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.1.tgz"; - name = "graceful-fs-3.0.1.tgz"; - sha1 = "93352b5b951b009ef541271204122b612e46edaf"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; by-spec."graceful-fs"."~1" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -8439,25 +7612,23 @@ }; by-spec."graceful-fs"."~1.2.0" = self.by-version."graceful-fs"."1.2.3"; + by-spec."graceful-fs"."~2" = + self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.0" = self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.1" = self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.2" = self.by-version."graceful-fs"."2.0.3"; - by-spec."graceful-fs"."~2.0.3" = - self.by-version."graceful-fs"."2.0.3"; - by-spec."graceful-fs"."~3.0.0" = - self.by-version."graceful-fs"."3.0.1"; by-spec."gridfs-stream"."*" = - self.by-version."gridfs-stream"."0.5.1"; - by-version."gridfs-stream"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "node-gridfs-stream-0.5.1"; + 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.5.1.tgz"; - name = "gridfs-stream-0.5.1.tgz"; - sha1 = "5fd94b0da4df1a602f7b0a02fb2365460d91b90c"; + url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.1.tgz"; + name = "gridfs-stream-0.4.1.tgz"; + sha1 = "1bcccb1b05b57946363b5e53fbe2bc95dd8877bb"; }) ]; buildInputs = @@ -8468,28 +7639,7 @@ ]; passthru.names = [ "gridfs-stream" ]; }; - "gridfs-stream" = self.by-version."gridfs-stream"."0.5.1"; - by-spec."grouped-queue"."^0.2.1" = - self.by-version."grouped-queue"."0.2.1"; - by-version."grouped-queue"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-grouped-queue-0.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/grouped-queue/-/grouped-queue-0.2.1.tgz"; - name = "grouped-queue-0.2.1.tgz"; - sha1 = "ede20396d6c7f313b6d44e438d7d646153fca9a9"; - }) - ]; - buildInputs = - (self.nativeDeps."grouped-queue" or []); - deps = [ - self.by-version."lodash"."2.4.1" - self.by-version."setimmediate"."1.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "grouped-queue" ]; - }; + "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 { @@ -8510,14 +7660,14 @@ passthru.names = [ "growl" ]; }; by-spec."grunt"."0.4.x" = - self.by-version."grunt"."0.4.5"; - by-version."grunt"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-0.4.5"; + self.by-version."grunt"."0.4.4"; + by-version."grunt"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-0.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz"; - name = "grunt-0.4.5.tgz"; - sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0"; + url = "http://registry.npmjs.org/grunt/-/grunt-0.4.4.tgz"; + name = "grunt-0.4.4.tgz"; + sha1 = "f37fa46e2e52e37f9a0370542a74281c09c73f53"; }) ]; buildInputs = @@ -8534,28 +7684,27 @@ self.by-version."iconv-lite"."0.2.11" self.by-version."minimatch"."0.2.14" self.by-version."nopt"."1.0.10" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."lodash"."0.9.2" self.by-version."underscore.string"."2.2.1" self.by-version."which"."1.0.5" self.by-version."js-yaml"."2.0.5" self.by-version."exit"."0.1.2" self.by-version."getobject"."0.1.0" - self.by-version."grunt-legacy-util"."0.2.0" - self.by-version."grunt-legacy-log"."0.1.1" + self.by-version."grunt-legacy-util"."0.1.2" ]; peerDependencies = [ ]; passthru.names = [ "grunt" ]; }; by-spec."grunt"."^0.4.0" = - self.by-version."grunt"."0.4.5"; + self.by-version."grunt"."0.4.4"; by-spec."grunt"."~0.4" = - self.by-version."grunt"."0.4.5"; + self.by-version."grunt"."0.4.4"; by-spec."grunt"."~0.4.0" = - self.by-version."grunt"."0.4.5"; + self.by-version."grunt"."0.4.4"; by-spec."grunt"."~0.4.1" = - self.by-version."grunt"."0.4.5"; + self.by-version."grunt"."0.4.4"; 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 { @@ -8626,7 +7775,7 @@ self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ - self.by-version."grunt"."0.4.5" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-cssmin" ]; }; @@ -8645,63 +7794,63 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.by-version."jshint"."2.5.1" + self.by-version."jshint"."2.5.0" self.by-version."hooker"."0.2.3" ]; peerDependencies = [ - self.by-version."grunt"."0.4.5" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-jshint" ]; }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.10.0"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.11.1"; - by-version."grunt-contrib-less"."0.11.1" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-less-0.11.1"; + self.by-version."grunt-contrib-less"."0.11.0"; + by-version."grunt-contrib-less"."0.11.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-less-0.11.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.1.tgz"; - name = "grunt-contrib-less-0.11.1.tgz"; - sha1 = "0671654e491a5c783893c2b49471c24992aca34e"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.0.tgz"; + name = "grunt-contrib-less-0.11.0.tgz"; + sha1 = "601cbdda0591f7fde7fe50278cd904fedede90ed"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-less" or []); deps = [ - self.by-version."less"."1.7.1" + self.by-version."less"."1.7.0" self.by-version."chalk"."0.4.0" self.by-version."maxmin"."0.1.0" self.by-version."lodash"."2.4.1" self.by-version."async"."0.2.10" ]; peerDependencies = [ - self.by-version."grunt"."0.4.5" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.1"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.0"; by-spec."grunt-contrib-requirejs"."*" = - self.by-version."grunt-contrib-requirejs"."0.4.4"; - by-version."grunt-contrib-requirejs"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-requirejs-0.4.4"; + self.by-version."grunt-contrib-requirejs"."0.4.3"; + by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-requirejs-0.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz"; - name = "grunt-contrib-requirejs-0.4.4.tgz"; - sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972"; + url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.3.tgz"; + name = "grunt-contrib-requirejs-0.4.3.tgz"; + sha1 = "ac243dc312af5c85cd095169da1b3177bfe89c59"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-requirejs" or []); deps = [ - self.by-version."requirejs"."2.1.14" + self.by-version."requirejs"."2.1.11" ]; peerDependencies = [ - self.by-version."grunt"."0.4.5" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-requirejs" ]; }; - "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4"; + "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3"; by-spec."grunt-contrib-uglify"."*" = self.by-version."grunt-contrib-uglify"."0.4.0"; by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -8721,20 +7870,20 @@ self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ - self.by-version."grunt"."0.4.5" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-uglify" ]; }; "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0"; by-spec."grunt-karma"."*" = - self.by-version."grunt-karma"."0.8.3"; - by-version."grunt-karma"."0.8.3" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-karma-0.8.3"; + self.by-version."grunt-karma"."0.8.2"; + by-version."grunt-karma"."0.8.2" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-karma-0.8.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.3.tgz"; - name = "grunt-karma-0.8.3.tgz"; - sha1 = "e9ecf718153af1914aa53602a37f85de04310e7f"; + url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.2.tgz"; + name = "grunt-karma-0.8.2.tgz"; + sha1 = "0f422d357e4556fb96ab68c6d9a2be46908f1c84"; }) ]; buildInputs = @@ -8743,44 +7892,21 @@ self.by-version."lodash"."2.4.1" ]; peerDependencies = [ - self.by-version."grunt"."0.4.5" - self.by-version."karma"."0.12.16" + self.by-version."grunt"."0.4.4" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "grunt-karma" ]; }; - "grunt-karma" = self.by-version."grunt-karma"."0.8.3"; - by-spec."grunt-legacy-log"."~0.1.0" = - self.by-version."grunt-legacy-log"."0.1.1"; - by-version."grunt-legacy-log"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-legacy-log-0.1.1"; + "grunt-karma" = self.by-version."grunt-karma"."0.8.2"; + by-spec."grunt-legacy-util"."~0.1.2" = + self.by-version."grunt-legacy-util"."0.1.2"; + by-version."grunt-legacy-util"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-legacy-util-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz"; - name = "grunt-legacy-log-0.1.1.tgz"; - sha1 = "d41f1a6abc9b0b1256a2b5ff02f4c3298dfcd57a"; - }) - ]; - buildInputs = - (self.nativeDeps."grunt-legacy-log" or []); - deps = [ - self.by-version."hooker"."0.2.3" - self.by-version."lodash"."2.4.1" - self.by-version."underscore.string"."2.3.3" - self.by-version."colors"."0.6.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "grunt-legacy-log" ]; - }; - by-spec."grunt-legacy-util"."~0.2.0" = - self.by-version."grunt-legacy-util"."0.2.0"; - by-version."grunt-legacy-util"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-legacy-util-0.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"; - name = "grunt-legacy-util-0.2.0.tgz"; - sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b"; + url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.1.2.tgz"; + name = "grunt-legacy-util-0.1.2.tgz"; + sha1 = "be84d337ef4a0137dc8566092a46528fd8957ebd"; }) ]; buildInputs = @@ -8815,32 +7941,11 @@ self.by-version."replace"."0.2.9" ]; peerDependencies = [ - self.by-version."grunt"."0.4.5" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-sed" ]; }; "grunt-sed" = self.by-version."grunt-sed"."0.1.1"; - by-spec."gruntfile-editor"."^0.1.0" = - self.by-version."gruntfile-editor"."0.1.0"; - by-version."gruntfile-editor"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-gruntfile-editor-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/gruntfile-editor/-/gruntfile-editor-0.1.0.tgz"; - name = "gruntfile-editor-0.1.0.tgz"; - sha1 = "b6cd84776dbf0681c16c95a8fce1f8ebb1b4e49e"; - }) - ]; - buildInputs = - (self.nativeDeps."gruntfile-editor" or []); - deps = [ - self.by-version."ast-query"."0.2.4" - self.by-version."lodash"."2.4.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "gruntfile-editor" ]; - }; by-spec."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = self.by-version."guifi-earth"."0.2.1"; by-version."guifi-earth"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -8857,8 +7962,8 @@ deps = [ self.by-version."coffee-script"."1.7.1" self.by-version."jade"."1.3.1" - self.by-version."q"."2.0.2" - self.by-version."xml2js"."0.4.4" + self.by-version."q"."2.0.1" + self.by-version."xml2js"."0.4.2" self.by-version."msgpack"."0.2.3" ]; peerDependencies = [ @@ -8880,7 +7985,7 @@ buildInputs = (self.nativeDeps."gzip-size" or []); deps = [ - self.by-version."concat-stream"."1.4.6" + self.by-version."concat-stream"."1.4.5" self.by-version."zlib-browserify"."0.0.3" ]; peerDependencies = [ @@ -8901,7 +8006,7 @@ buildInputs = (self.nativeDeps."gzippo" or []); deps = [ - self.by-version."send"."0.4.1" + self.by-version."send"."0.2.0" ]; peerDependencies = [ ]; @@ -9101,45 +8206,44 @@ passthru.names = [ "he" ]; }; by-spec."hipache"."*" = - self.by-version."hipache"."0.3.1"; - by-version."hipache"."0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "hipache-0.3.1"; + self.by-version."hipache"."0.2.9"; + by-version."hipache"."0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "hipache-0.2.9"; src = [ - (fetchurl { - url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz"; - name = "hipache-0.3.1.tgz"; - sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/hipache/-/hipache-0.2.9.tgz"; + name = "hipache-0.2.9.tgz"; + sha1 = "48a7fa7170be328b264d6e413bfb76d130e03b2a"; }) ]; buildInputs = (self.nativeDeps."hipache" or []); deps = [ - self.by-version."http-proxy"."1.0.2" - self.by-version."redis"."0.10.3" - self.by-version."lru-cache"."2.5.0" - self.by-version."minimist"."0.0.8" + self.by-version."http-proxy"."0.10.3" + self.by-version."redis"."0.8.6" + self.by-version."lru-cache"."2.2.4" + self.by-version."optimist"."0.3.7" ]; peerDependencies = [ ]; passthru.names = [ "hipache" ]; }; - "hipache" = self.by-version."hipache"."0.3.1"; + "hipache" = self.by-version."hipache"."0.2.9"; by-spec."hiredis"."*" = - self.by-version."hiredis"."0.1.17"; - by-version."hiredis"."0.1.17" = lib.makeOverridable self.buildNodePackage { - name = "node-hiredis-0.1.17"; + self.by-version."hiredis"."0.1.16"; + by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "node-hiredis-0.1.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz"; - name = "hiredis-0.1.17.tgz"; - sha1 = "60a33a968efc9a974e7ebb832f33aa965d3d354e"; + url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz"; + name = "hiredis-0.1.16.tgz"; + sha1 = "f6cee1add2589b8b71cef3c4d3936a9fcd638640"; }) ]; buildInputs = (self.nativeDeps."hiredis" or []); deps = [ self.by-version."bindings"."1.2.0" - self.by-version."nan"."1.1.2" ]; peerDependencies = [ ]; @@ -9221,25 +8325,6 @@ ]; passthru.names = [ "hooks" ]; }; - by-spec."hooks"."0.3.2" = - self.by-version."hooks"."0.3.2"; - by-version."hooks"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "node-hooks-0.3.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hooks/-/hooks-0.3.2.tgz"; - name = "hooks-0.3.2.tgz"; - sha1 = "a31f060c2026cea6cf1ca3eb178430e718e1c4a3"; - }) - ]; - buildInputs = - (self.nativeDeps."hooks" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "hooks" ]; - }; by-spec."htmlparser2"."3.1.4" = self.by-version."htmlparser2"."3.1.4"; by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage { @@ -9263,25 +8348,24 @@ ]; passthru.names = [ "htmlparser2" ]; }; - by-spec."htmlparser2"."3.7.x" = - self.by-version."htmlparser2"."3.7.2"; - by-version."htmlparser2"."3.7.2" = lib.makeOverridable self.buildNodePackage { - name = "node-htmlparser2-3.7.2"; + by-spec."htmlparser2"."3.3.x" = + self.by-version."htmlparser2"."3.3.0"; + by-version."htmlparser2"."3.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-htmlparser2-3.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.2.tgz"; - name = "htmlparser2-3.7.2.tgz"; - sha1 = "5f959dbc97e84a8418a9877c20f5f6f02a6482b0"; + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz"; + name = "htmlparser2-3.3.0.tgz"; + sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe"; }) ]; buildInputs = (self.nativeDeps."htmlparser2" or []); deps = [ - self.by-version."domhandler"."2.2.0" - self.by-version."domutils"."1.5.0" + 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.1.13-1" - self.by-version."entities"."1.0.0" + self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -9310,8 +8394,6 @@ ]; passthru.names = [ "htmlparser2" ]; }; - by-spec."htmlparser2"."~3.7.0" = - self.by-version."htmlparser2"."3.7.2"; 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 { @@ -9354,21 +8436,24 @@ ]; passthru.names = [ "http-browserify" ]; }; - by-spec."http-proxy"."1.0.2" = - self.by-version."http-proxy"."1.0.2"; - by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-http-proxy-1.0.2"; + by-spec."http-proxy"."git+https://github.com/samalba/node-http-proxy.git" = + self.by-version."http-proxy"."0.10.3"; + by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { + name = "http-proxy-0.10.3"; src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz"; - name = "http-proxy-1.0.2.tgz"; - sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254"; + (fetchgit { + url = "https://github.com/samalba/node-http-proxy.git"; + rev = "8e277989d2d05edaee65e524fb4fba9142c52aa5"; + sha256 = "8ce0e05c73e517eefc6d9bf8b61349351aee119c2fb60763f23170607cc0e41f"; }) ]; buildInputs = (self.nativeDeps."http-proxy" or []); deps = [ - self.by-version."eventemitter3"."0.1.2" + self.by-version."colors"."0.6.2" + self.by-version."optimist"."0.3.7" + self.by-version."pkginfo"."0.2.3" + self.by-version."utile"."0.1.7" ]; peerDependencies = [ ]; @@ -9499,26 +8584,26 @@ passthru.names = [ "i" ]; }; by-spec."i18next"."*" = - self.by-version."i18next"."1.7.4"; - by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage { - name = "node-i18next-1.7.4"; + self.by-version."i18next"."1.7.3"; + by-version."i18next"."1.7.3" = lib.makeOverridable self.buildNodePackage { + name = "node-i18next-1.7.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz"; - name = "i18next-1.7.4.tgz"; - sha1 = "b61629c9de95a5c076acb2f954f8a882ac0772af"; + url = "http://registry.npmjs.org/i18next/-/i18next-1.7.3.tgz"; + name = "i18next-1.7.3.tgz"; + sha1 = "8a064866c8e6e87b4664a32fe81b9be34b4a3894"; }) ]; buildInputs = (self.nativeDeps."i18next" or []); deps = [ - self.by-version."cookies"."0.4.1" + self.by-version."cookies"."0.4.0" ]; peerDependencies = [ ]; passthru.names = [ "i18next" ]; }; - "i18next" = self.by-version."i18next"."1.7.4"; + "i18next" = self.by-version."i18next"."1.7.3"; by-spec."ibrik"."~1.1.1" = self.by-version."ibrik"."1.1.1"; by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -9535,7 +8620,7 @@ deps = [ self.by-version."lodash"."2.4.1" self.by-version."coffee-script-redux"."2.0.0-beta8" - self.by-version."istanbul"."0.2.10" + self.by-version."istanbul"."0.2.7" self.by-version."estraverse"."1.5.0" self.by-version."escodegen"."1.1.0" self.by-version."which"."1.0.5" @@ -9546,7 +8631,7 @@ ]; passthru.names = [ "ibrik" ]; }; - by-spec."iconv-lite"."^0.2.10" = + 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 = "node-iconv-lite-0.2.11"; @@ -9565,8 +8650,6 @@ ]; passthru.names = [ "iconv-lite" ]; }; - by-spec."iconv-lite"."~0.2.10" = - self.by-version."iconv-lite"."0.2.11"; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; by-spec."ieee754"."~1.1.1" = @@ -9607,26 +8690,6 @@ ]; passthru.names = [ "indexof" ]; }; - by-spec."inflight"."~1.0.1" = - self.by-version."inflight"."1.0.1"; - by-version."inflight"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inflight-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz"; - name = "inflight-1.0.1.tgz"; - sha1 = "01f6911821535243c790ac0f998f54e9023ffb6f"; - }) - ]; - buildInputs = - (self.nativeDeps."inflight" or []); - deps = [ - self.by-version."once"."1.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "inflight" ]; - }; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -9676,29 +8739,6 @@ by-spec."inherits"."~2.0.1" = self.by-version."inherits"."2.0.1"; by-spec."ini"."1" = - self.by-version."ini"."1.2.1"; - by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-ini-1.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz"; - name = "ini-1.2.1.tgz"; - sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3"; - }) - ]; - buildInputs = - (self.nativeDeps."ini" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ini" ]; - }; - by-spec."ini"."1.x.x" = - self.by-version."ini"."1.2.1"; - by-spec."ini"."^1.2.0" = - self.by-version."ini"."1.2.1"; - by-spec."ini"."~1.1.0" = self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "node-ini-1.1.0"; @@ -9717,27 +8757,29 @@ ]; passthru.names = [ "ini" ]; }; - by-spec."ini"."~1.2.0" = - self.by-version."ini"."1.2.1"; - by-spec."init-package-json"."0.0.17" = - self.by-version."init-package-json"."0.0.17"; - by-version."init-package-json"."0.0.17" = lib.makeOverridable self.buildNodePackage { - name = "node-init-package-json-0.0.17"; + by-spec."ini"."1.x.x" = + self.by-version."ini"."1.1.0"; + by-spec."ini"."~1.1.0" = + self.by-version."ini"."1.1.0"; + by-spec."init-package-json"."0.0.15" = + self.by-version."init-package-json"."0.0.15"; + by-version."init-package-json"."0.0.15" = lib.makeOverridable self.buildNodePackage { + name = "node-init-package-json-0.0.15"; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.17.tgz"; - name = "init-package-json-0.0.17.tgz"; - sha1 = "395f2cb8d1c5af93ba6ec19dafa64717047f90c3"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.15.tgz"; + name = "init-package-json-0.0.15.tgz"; + sha1 = "d40f0201e4de6aa2b3fdc4208ae162766703ebed"; }) ]; buildInputs = (self.nativeDeps."init-package-json" or []); deps = [ - self.by-version."promzard"."0.2.2" + self.by-version."promzard"."0.2.1" self.by-version."read"."1.0.5" - self.by-version."read-package-json"."1.2.2" - self.by-version."semver"."2.3.0" - self.by-version."glob"."3.2.11" + self.by-version."read-package-json"."1.1.8" + self.by-version."semver"."2.2.1" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -9763,32 +8805,6 @@ ]; passthru.names = [ "inline-source-map" ]; }; - by-spec."inquirer"."^0.5.0" = - self.by-version."inquirer"."0.5.1"; - by-version."inquirer"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inquirer-0.5.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.5.1.tgz"; - name = "inquirer-0.5.1.tgz"; - sha1 = "e9f2cd1ee172c7a32e054b78a03d4ddb0d7707f1"; - }) - ]; - buildInputs = - (self.nativeDeps."inquirer" or []); - deps = [ - self.by-version."async"."0.8.0" - self.by-version."cli-color"."0.3.2" - self.by-version."lodash"."2.4.1" - self.by-version."mute-stream"."0.0.4" - self.by-version."readline2"."0.1.0" - self.by-version."through"."2.3.4" - self.by-version."chalk"."0.4.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "inquirer" ]; - }; by-spec."inquirer"."~0.3.0" = self.by-version."inquirer"."0.3.5"; by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -9855,8 +8871,8 @@ buildInputs = (self.nativeDeps."insert-module-globals" or []); deps = [ - self.by-version."JSONStream"."0.7.4" - self.by-version."concat-stream"."1.4.6" + self.by-version."JSONStream"."0.7.2" + self.by-version."concat-stream"."1.4.5" self.by-version."lexical-scope"."1.1.0" self.by-version."process"."0.6.0" self.by-version."through"."2.3.4" @@ -9865,31 +8881,6 @@ ]; passthru.names = [ "insert-module-globals" ]; }; - by-spec."insert-module-globals"."~6.0.0" = - self.by-version."insert-module-globals"."6.0.0"; - by-version."insert-module-globals"."6.0.0" = lib.makeOverridable self.buildNodePackage { - name = "insert-module-globals-6.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.0.0.tgz"; - name = "insert-module-globals-6.0.0.tgz"; - sha1 = "ee8aeb9dee16819e33aa14588a558824af0c15dc"; - }) - ]; - buildInputs = - (self.nativeDeps."insert-module-globals" or []); - deps = [ - self.by-version."JSONStream"."0.7.4" - self.by-version."concat-stream"."1.4.6" - self.by-version."lexical-scope"."1.1.0" - self.by-version."process"."0.6.0" - self.by-version."through"."2.3.4" - self.by-version."xtend"."3.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "insert-module-globals" ]; - }; by-spec."insight"."~0.3.0" = self.by-version."insight"."0.3.1"; by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -9935,25 +8926,6 @@ ]; passthru.names = [ "intersect" ]; }; - by-spec."ipaddr.js"."0.1.2" = - self.by-version."ipaddr.js"."0.1.2"; - by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ipaddr.js-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; - name = "ipaddr.js-0.1.2.tgz"; - sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; - }) - ]; - buildInputs = - (self.nativeDeps."ipaddr.js" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ipaddr.js" ]; - }; by-spec."ironhorse"."*" = self.by-version."ironhorse"."0.0.9"; by-version."ironhorse"."0.0.9" = lib.makeOverridable self.buildNodePackage { @@ -9972,18 +8944,18 @@ self.by-version."winston"."0.7.3" self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" - self.by-version."async"."0.9.0" - self.by-version."express"."4.4.1" + self.by-version."async"."0.7.0" + self.by-version."express"."4.0.0" self.by-version."jade"."1.3.1" self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" self.by-version."js-yaml"."3.0.2" - self.by-version."mongoose"."3.9.0" - self.by-version."gridfs-stream"."0.5.1" - self.by-version."temp"."0.8.0" - self.by-version."kue"."0.7.9" - self.by-version."redis"."0.10.3" - self.by-version."hiredis"."0.1.17" + self.by-version."mongoose"."3.8.8" + self.by-version."gridfs-stream"."0.4.1" + self.by-version."temp"."0.7.0" + self.by-version."kue"."0.7.5" + self.by-version."redis"."0.10.1" + self.by-version."hiredis"."0.1.16" ]; peerDependencies = [ ]; @@ -9991,14 +8963,14 @@ }; "ironhorse" = self.by-version."ironhorse"."0.0.9"; by-spec."is-promise"."~1" = - self.by-version."is-promise"."1.0.1"; - by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-is-promise-1.0.1"; + self.by-version."is-promise"."1.0.0"; + by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-is-promise-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; - name = "is-promise-1.0.1.tgz"; - sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; + url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz"; + name = "is-promise-1.0.0.tgz"; + sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f"; }) ]; buildInputs = @@ -10047,25 +9019,6 @@ ]; passthru.names = [ "isarray" ]; }; - by-spec."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.1.tgz"; - name = "isbinaryfile-2.0.1.tgz"; - sha1 = "b92369bfdaf616027133e077c5ba145f36699d55"; - }) - ]; - buildInputs = - (self.nativeDeps."isbinaryfile" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "isbinaryfile" ]; - }; by-spec."isbinaryfile"."~0.1.8" = self.by-version."isbinaryfile"."0.1.9"; by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage { @@ -10089,28 +9042,45 @@ self.by-version."isbinaryfile"."0.1.9"; by-spec."isbinaryfile"."~2.0.0" = self.by-version."isbinaryfile"."2.0.1"; - by-spec."istanbul"."*" = - self.by-version."istanbul"."0.2.10"; - by-version."istanbul"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.2.10"; + by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-isbinaryfile-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.10.tgz"; - name = "istanbul-0.2.10.tgz"; - sha1 = "40b922b7a0dd4917609b9c26bb9a0bef5f98013a"; + url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.1.tgz"; + name = "isbinaryfile-2.0.1.tgz"; + sha1 = "b92369bfdaf616027133e077c5ba145f36699d55"; + }) + ]; + buildInputs = + (self.nativeDeps."isbinaryfile" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "isbinaryfile" ]; + }; + by-spec."istanbul"."*" = + self.by-version."istanbul"."0.2.7"; + by-version."istanbul"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.2.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.7.tgz"; + name = "istanbul-0.2.7.tgz"; + sha1 = "bb482e1d06a0fea00993a10b2ee266fc740642bc"; }) ]; buildInputs = (self.nativeDeps."istanbul" or []); deps = [ - self.by-version."esprima"."1.2.2" - self.by-version."escodegen"."1.3.3" + self.by-version."esprima"."1.1.1" + self.by-version."escodegen"."1.3.2" self.by-version."handlebars"."1.3.0" - self.by-version."mkdirp"."0.5.0" - self.by-version."nopt"."2.2.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.2.0" self.by-version."fileset"."0.1.5" self.by-version."which"."1.0.5" - self.by-version."async"."0.8.0" + self.by-version."async"."0.2.10" self.by-version."abbrev"."1.0.5" self.by-version."wordwrap"."0.0.2" self.by-version."resolve"."0.6.3" @@ -10120,11 +9090,11 @@ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.2.10"; - by-spec."istanbul"."~0.2.10" = - self.by-version."istanbul"."0.2.10"; + "istanbul" = self.by-version."istanbul"."0.2.7"; + by-spec."istanbul"."~0.2.3" = + self.by-version."istanbul"."0.2.7"; by-spec."istanbul"."~0.2.4" = - self.by-version."istanbul"."0.2.10"; + self.by-version."istanbul"."0.2.7"; by-spec."jade"."*" = self.by-version."jade"."1.3.1"; by-version."jade"."1.3.1" = lib.makeOverridable self.buildNodePackage { @@ -10399,35 +9369,35 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.5.1"; - by-version."jshint"."2.5.1" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.5.1"; + self.by-version."jshint"."2.5.0"; + by-version."jshint"."2.5.0" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.5.1.tgz"; - name = "jshint-2.5.1.tgz"; - sha1 = "8e96d27377806767d40f16676fbec113d33520ec"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.5.0.tgz"; + name = "jshint-2.5.0.tgz"; + sha1 = "82fd1a235ffce75fad1b40b2a38bef47beac8c54"; }) ]; buildInputs = (self.nativeDeps."jshint" or []); deps = [ - self.by-version."shelljs"."0.3.0" - self.by-version."underscore"."1.6.0" - self.by-version."cli"."0.6.3" - self.by-version."minimatch"."0.3.0" - self.by-version."htmlparser2"."3.7.2" - self.by-version."console-browserify"."1.1.0" + self.by-version."shelljs"."0.1.4" + self.by-version."underscore"."1.4.4" + self.by-version."cli"."0.4.5" + self.by-version."minimatch"."0.2.14" + self.by-version."htmlparser2"."3.3.0" + self.by-version."console-browserify"."0.1.6" self.by-version."exit"."0.1.2" - self.by-version."strip-json-comments"."0.1.3" + self.by-version."strip-json-comments"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.5.1"; + "jshint" = self.by-version."jshint"."2.5.0"; by-spec."jshint"."~2.5.0" = - self.by-version."jshint"."2.5.1"; + self.by-version."jshint"."2.5.0"; 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 { @@ -10625,47 +9595,28 @@ ]; passthru.names = [ "junk" ]; }; - by-spec."junk"."~0.3.0" = - self.by-version."junk"."0.3.0"; - by-version."junk"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-junk-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/junk/-/junk-0.3.0.tgz"; - name = "junk-0.3.0.tgz"; - sha1 = "6c89c636f6e99898d8efbfc50430db40be71e10c"; - }) - ]; - buildInputs = - (self.nativeDeps."junk" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "junk" ]; - }; by-spec."karma"."*" = - self.by-version."karma"."0.12.16"; - by-version."karma"."0.12.16" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.12.16"; + self.by-version."karma"."0.12.9"; + by-version."karma"."0.12.9" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.12.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.12.16.tgz"; - name = "karma-0.12.16.tgz"; - sha1 = "631bca7582b8b773162111708fcab69f8e2c5a37"; + url = "http://registry.npmjs.org/karma/-/karma-0.12.9.tgz"; + name = "karma-0.12.9.tgz"; + sha1 = "9431735e50fcbd8ca04963a0e4da0b6550b41998"; }) ]; buildInputs = (self.nativeDeps."karma" or []); deps = [ self.by-version."di"."0.0.1" - self.by-version."socket.io"."0.9.17" + self.by-version."socket.io"."0.9.16" self.by-version."chokidar"."0.8.2" - self.by-version."glob"."3.2.11" + self.by-version."glob"."3.2.9" self.by-version."minimatch"."0.2.14" self.by-version."http-proxy"."0.10.4" self.by-version."optimist"."0.6.1" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."q"."0.9.7" self.by-version."colors"."0.6.2" self.by-version."lodash"."2.4.1" @@ -10680,24 +9631,24 @@ ]; passthru.names = [ "karma" ]; }; - "karma" = self.by-version."karma"."0.12.16"; + "karma" = self.by-version."karma"."0.12.9"; by-spec."karma".">=0.11.11" = - self.by-version."karma"."0.12.16"; + self.by-version."karma"."0.12.9"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.12.16"; + self.by-version."karma"."0.12.9"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.12.16"; + self.by-version."karma"."0.12.9"; by-spec."karma"."~0.12.0" = - self.by-version."karma"."0.12.16"; + self.by-version."karma"."0.12.9"; by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.4"; - by-version."karma-chrome-launcher"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-chrome-launcher-0.1.4"; + self.by-version."karma-chrome-launcher"."0.1.3"; + by-version."karma-chrome-launcher"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-chrome-launcher-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.4.tgz"; - name = "karma-chrome-launcher-0.1.4.tgz"; - sha1 = "492f6b8ceed3dacb829b147514c9106660f1b185"; + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.3.tgz"; + name = "karma-chrome-launcher-0.1.3.tgz"; + sha1 = "b7f82dd9c83c84d26355bf31159739706973a3ec"; }) ]; buildInputs = @@ -10705,36 +9656,35 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.16" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "karma-chrome-launcher" ]; }; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.4"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.3"; by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.2.4"; - by-version."karma-coverage"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-coverage-0.2.4"; + self.by-version."karma-coverage"."0.2.1"; + by-version."karma-coverage"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-coverage-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.4.tgz"; - name = "karma-coverage-0.2.4.tgz"; - sha1 = "5d9c3da5ab1ad27f6aaaa11796e6235dd37a0757"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.1.tgz"; + name = "karma-coverage-0.2.1.tgz"; + sha1 = "3b1bce268711a631e008e108930906eceae0a623"; }) ]; buildInputs = (self.nativeDeps."karma-coverage" or []); deps = [ - self.by-version."istanbul"."0.2.10" + self.by-version."istanbul"."0.2.7" self.by-version."ibrik"."1.1.1" - self.by-version."dateformat"."1.0.8-1.2.3" - self.by-version."minimatch"."0.3.0" + self.by-version."dateformat"."1.0.7-1.2.3" ]; peerDependencies = [ - self.by-version."karma"."0.12.16" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.2.4"; + "karma-coverage" = self.by-version."karma-coverage"."0.2.1"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.2"; by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -10752,7 +9702,7 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.12.16" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -10773,21 +9723,21 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.16" - self.by-version."mocha"."1.20.1" + self.by-version."karma"."0.12.9" + self.by-version."mocha"."1.18.2" ]; passthru.names = [ "karma-mocha" ]; }; "karma-mocha" = self.by-version."karma-mocha"."0.1.3"; by-spec."karma-requirejs"."*" = - self.by-version."karma-requirejs"."0.2.2"; - by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-requirejs-0.2.2"; + self.by-version."karma-requirejs"."0.2.1"; + by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-requirejs-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz"; - name = "karma-requirejs-0.2.2.tgz"; - sha1 = "e497ca0868e2e09a9b8e3f646745c31a935fe8b6"; + url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz"; + name = "karma-requirejs-0.2.1.tgz"; + sha1 = "7f3ac5df67bccd9d832a928ec658d733ec983c5d"; }) ]; buildInputs = @@ -10795,46 +9745,46 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.12.16" - self.by-version."requirejs"."2.1.14" + self.by-version."karma"."0.12.9" + self.by-version."requirejs"."2.1.11" ]; passthru.names = [ "karma-requirejs" ]; }; - "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2"; + "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1"; by-spec."karma-sauce-launcher"."*" = - self.by-version."karma-sauce-launcher"."0.2.8"; - by-version."karma-sauce-launcher"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-sauce-launcher-0.2.8"; + self.by-version."karma-sauce-launcher"."0.2.7"; + by-version."karma-sauce-launcher"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-sauce-launcher-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.8.tgz"; - name = "karma-sauce-launcher-0.2.8.tgz"; - sha1 = "3d80015d93cae8a1d041ae2f5568ef646ea7125d"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.7.tgz"; + name = "karma-sauce-launcher-0.2.7.tgz"; + sha1 = "a87a0b2e3612b298f3f6c2a96839940af85ac849"; }) ]; buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.2.27" + self.by-version."wd"."0.2.19" self.by-version."sauce-connect-launcher"."0.4.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" ]; peerDependencies = [ - self.by-version."karma"."0.12.16" + self.by-version."karma"."0.12.9" ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.8"; - by-spec."keen.io"."~0.1.2" = - self.by-version."keen.io"."0.1.2"; - by-version."keen.io"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-keen.io-0.1.2"; + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.7"; + 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.1.2.tgz"; - name = "keen.io-0.1.2.tgz"; - sha1 = "a55b9d1d8b4354a8845f2a224eb3a6f7271378b2"; + url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.4.tgz"; + name = "keen.io-0.0.4.tgz"; + sha1 = "041caa79371a6bec51288e222f3bb2e05c7e6b25"; }) ]; buildInputs = @@ -10905,14 +9855,14 @@ passthru.names = [ "kew" ]; }; by-spec."keygrip"."~1.0.0" = - self.by-version."keygrip"."1.0.1"; - by-version."keygrip"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-keygrip-1.0.1"; + 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.1.tgz"; - name = "keygrip-1.0.1.tgz"; - sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9"; + url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.0.tgz"; + name = "keygrip-1.0.0.tgz"; + sha1 = "b771120e8e697b8692b76866a84cdff3912fc379"; }) ]; buildInputs = @@ -10964,14 +9914,14 @@ passthru.names = [ "knockout" ]; }; by-spec."knox"."*" = - self.by-version."knox"."0.8.10"; - by-version."knox"."0.8.10" = lib.makeOverridable self.buildNodePackage { - name = "node-knox-0.8.10"; + self.by-version."knox"."0.8.9"; + by-version."knox"."0.8.9" = lib.makeOverridable self.buildNodePackage { + name = "node-knox-0.8.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/knox/-/knox-0.8.10.tgz"; - name = "knox-0.8.10.tgz"; - sha1 = "6a2edcdac1d2ae379d1e1994d559b95c283b2588"; + url = "http://registry.npmjs.org/knox/-/knox-0.8.9.tgz"; + name = "knox-0.8.9.tgz"; + sha1 = "b96ec0b4ec1be75d8006f80cb302bfa818d7001c"; }) ]; buildInputs = @@ -10986,22 +9936,22 @@ ]; passthru.names = [ "knox" ]; }; - "knox" = self.by-version."knox"."0.8.10"; + "knox" = self.by-version."knox"."0.8.9"; by-spec."kue"."*" = - self.by-version."kue"."0.7.9"; - by-version."kue"."0.7.9" = lib.makeOverridable self.buildNodePackage { - name = "node-kue-0.7.9"; + self.by-version."kue"."0.7.5"; + by-version."kue"."0.7.5" = lib.makeOverridable self.buildNodePackage { + name = "node-kue-0.7.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/kue/-/kue-0.7.9.tgz"; - name = "kue-0.7.9.tgz"; - sha1 = "7c4478db567fb45dbfe893a59699f0ef2fa0c935"; + url = "http://registry.npmjs.org/kue/-/kue-0.7.5.tgz"; + name = "kue-0.7.5.tgz"; + sha1 = "d815a8a35b22dd28df3f54f0b874403a257dc807"; }) ]; buildInputs = (self.nativeDeps."kue" or []); deps = [ - self.by-version."redis"."0.10.3" + self.by-version."redis"."0.10.1" self.by-version."express"."3.1.2" self.by-version."jade"."1.1.5" self.by-version."stylus"."0.42.2" @@ -11012,7 +9962,7 @@ ]; passthru.names = [ "kue" ]; }; - "kue" = self.by-version."kue"."0.7.9"; + "kue" = self.by-version."kue"."0.7.5"; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -11085,7 +10035,7 @@ buildInputs = (self.nativeDeps."lcov-result-merger" or []); deps = [ - self.by-version."glob"."3.2.11" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -11093,20 +10043,19 @@ }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; by-spec."less"."*" = - self.by-version."less"."1.7.1"; - by-version."less"."1.7.1" = lib.makeOverridable self.buildNodePackage { - name = "less-1.7.1"; + self.by-version."less"."1.7.0"; + by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage { + name = "less-1.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.7.1.tgz"; - name = "less-1.7.1.tgz"; - sha1 = "6f5580029b52c3ac590e85e2b079827a66f6cc74"; + url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz"; + name = "less-1.7.0.tgz"; + sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84"; }) ]; buildInputs = (self.nativeDeps."less" or []); deps = [ - self.by-version."graceful-fs"."2.0.3" self.by-version."mime"."1.2.11" self.by-version."request"."2.34.0" self.by-version."mkdirp"."0.3.5" @@ -11117,11 +10066,11 @@ ]; passthru.names = [ "less" ]; }; - "less" = self.by-version."less"."1.7.1"; + "less" = self.by-version."less"."1.7.0"; by-spec."less"."^1.7.0" = - self.by-version."less"."1.7.1"; + self.by-version."less"."1.7.0"; by-spec."less"."~1.7.0" = - self.by-version."less"."1.7.1"; + self.by-version."less"."1.7.0"; by-spec."lexical-scope"."~1.1.0" = self.by-version."lexical-scope"."1.1.0"; by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -11696,8 +10645,6 @@ ]; passthru.names = [ "lru-cache" ]; }; - by-spec."lru-cache"."2.5.x" = - self.by-version."lru-cache"."2.5.0"; by-spec."lru-cache"."~1.0.2" = self.by-version."lru-cache"."1.0.6"; by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage { @@ -11738,26 +10685,6 @@ }; by-spec."lru-cache"."~2.5.0" = self.by-version."lru-cache"."2.5.0"; - by-spec."lru-queue"."0.1.x" = - self.by-version."lru-queue"."0.1.0"; - by-version."lru-queue"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-lru-queue-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"; - name = "lru-queue-0.1.0.tgz"; - sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; - }) - ]; - buildInputs = - (self.nativeDeps."lru-queue" or []); - deps = [ - self.by-version."es5-ext"."0.10.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lru-queue" ]; - }; by-spec."lsmod"."~0.0.3" = self.by-version."lsmod"."0.0.3"; by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -11778,46 +10705,45 @@ passthru.names = [ "lsmod" ]; }; by-spec."mailcomposer".">= 0.1.27" = - self.by-version."mailcomposer"."0.2.11"; - by-version."mailcomposer"."0.2.11" = lib.makeOverridable self.buildNodePackage { - name = "node-mailcomposer-0.2.11"; + self.by-version."mailcomposer"."0.2.9"; + by-version."mailcomposer"."0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "node-mailcomposer-0.2.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.11.tgz"; - name = "mailcomposer-0.2.11.tgz"; - sha1 = "37ddfdb63aa2e37481c001ab5bb17aaa5c234c89"; + url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.9.tgz"; + name = "mailcomposer-0.2.9.tgz"; + sha1 = "2b6417a4fb5de8ffcaf1a27e1b024463903f908e"; }) ]; buildInputs = (self.nativeDeps."mailcomposer" or []); deps = [ - self.by-version."mimelib"."0.2.16" + self.by-version."mimelib"."0.2.14" self.by-version."mime"."1.2.11" self.by-version."he"."0.3.6" self.by-version."punycode"."1.2.4" self.by-version."follow-redirects"."0.0.3" - self.by-version."dkim-signer"."0.1.2" + self.by-version."dkim-signer"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "mailcomposer" ]; }; by-spec."map-key"."^0.1.1" = - self.by-version."map-key"."0.1.4"; - by-version."map-key"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-map-key-0.1.4"; + self.by-version."map-key"."0.1.1"; + by-version."map-key"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-map-key-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/map-key/-/map-key-0.1.4.tgz"; - name = "map-key-0.1.4.tgz"; - sha1 = "4cfae88e90b663d2c588ca5a6852f89ae049ad6b"; + url = "http://registry.npmjs.org/map-key/-/map-key-0.1.1.tgz"; + name = "map-key-0.1.1.tgz"; + sha1 = "cf0d6ad80ae145477d25904c9eb44b23ac471c8b"; }) ]; buildInputs = (self.nativeDeps."map-key" or []); deps = [ - self.by-version."lodash"."2.4.1" - self.by-version."underscore.string"."2.3.3" + self.by-version."mout"."0.9.1" ]; peerDependencies = [ ]; @@ -11858,7 +10784,7 @@ (self.nativeDeps."maxmin" or []); deps = [ self.by-version."gzip-size"."0.1.1" - self.by-version."pretty-bytes"."0.1.1" + self.by-version."pretty-bytes"."0.1.0" self.by-version."chalk"."0.4.0" ]; peerDependencies = [ @@ -11893,31 +10819,6 @@ passthru.names = [ "meat" ]; }; "meat" = self.by-version."meat"."0.2.5"; - by-spec."memoizee"."0.3.x" = - self.by-version."memoizee"."0.3.3"; - by-version."memoizee"."0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-memoizee-0.3.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.3.tgz"; - name = "memoizee-0.3.3.tgz"; - sha1 = "1e1abceea17b733b495212449ef9a26fe022d2b6"; - }) - ]; - buildInputs = - (self.nativeDeps."memoizee" or []); - deps = [ - self.by-version."d"."0.1.1" - self.by-version."es5-ext"."0.10.4" - self.by-version."event-emitter"."0.3.1" - self.by-version."lru-queue"."0.1.0" - self.by-version."next-tick"."0.2.2" - self.by-version."timers-ext"."0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "memoizee" ]; - }; by-spec."memoizee"."~0.2.5" = self.by-version."memoizee"."0.2.6"; by-version."memoizee"."0.2.6" = lib.makeOverridable self.buildNodePackage { @@ -11959,28 +10860,45 @@ ]; passthru.names = [ "merge-descriptors" ]; }; - by-spec."method-override"."2.0.2" = - self.by-version."method-override"."2.0.2"; - by-version."method-override"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-method-override-2.0.2"; + by-spec."method-override"."1.0.0" = + self.by-version."method-override"."1.0.0"; + by-version."method-override"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-method-override-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/method-override/-/method-override-2.0.2.tgz"; - name = "method-override-2.0.2.tgz"; - sha1 = "00531278c79789640bf27e97e26a3a5a1f7cca73"; + url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz"; + name = "method-override-1.0.0.tgz"; + sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61"; }) ]; buildInputs = (self.nativeDeps."method-override" or []); deps = [ - self.by-version."methods"."1.0.1" - self.by-version."parseurl"."1.0.1" - self.by-version."vary"."0.1.0" + self.by-version."methods"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "method-override" ]; }; + by-spec."methods"."*" = + self.by-version."methods"."0.1.0"; + by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-methods-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + name = "methods-0.1.0.tgz"; + sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + }) + ]; + buildInputs = + (self.nativeDeps."methods" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "methods" ]; + }; by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -12002,61 +10920,6 @@ }; by-spec."methods"."0.1.0" = self.by-version."methods"."0.1.0"; - by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-methods-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; - name = "methods-0.1.0.tgz"; - sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; - }) - ]; - buildInputs = - (self.nativeDeps."methods" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "methods" ]; - }; - by-spec."methods"."1.0.0" = - self.by-version."methods"."1.0.0"; - by-version."methods"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-methods-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz"; - name = "methods-1.0.0.tgz"; - sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3"; - }) - ]; - buildInputs = - (self.nativeDeps."methods" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "methods" ]; - }; - by-spec."methods"."1.0.1" = - self.by-version."methods"."1.0.1"; - by-version."methods"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-methods-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - name = "methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; - }) - ]; - buildInputs = - (self.nativeDeps."methods" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "methods" ]; - }; by-spec."mime"."*" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { @@ -12154,9 +11017,9 @@ ]; passthru.names = [ "mime" ]; }; - by-spec."mime".">= 0.0.1" = + by-spec."mime"."1.2.x" = self.by-version."mime"."1.2.11"; - by-spec."mime"."^1.2.9" = + by-spec."mime".">= 0.0.1" = self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; @@ -12166,15 +11029,15 @@ self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mimelib"."~0.2.15" = - self.by-version."mimelib"."0.2.16"; - by-version."mimelib"."0.2.16" = lib.makeOverridable self.buildNodePackage { - name = "node-mimelib-0.2.16"; + by-spec."mimelib"."~0.2.14" = + self.by-version."mimelib"."0.2.14"; + by-version."mimelib"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "node-mimelib-0.2.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.16.tgz"; - name = "mimelib-0.2.16.tgz"; - sha1 = "2df4fc292c381b662d81d0b926f6795e6aa1c4f4"; + url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; + name = "mimelib-0.2.14.tgz"; + sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; }) ]; buildInputs = @@ -12188,14 +11051,14 @@ passthru.names = [ "mimelib" ]; }; by-spec."minimatch"."0" = - self.by-version."minimatch"."0.3.0"; - by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-minimatch-0.3.0"; + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "node-minimatch-0.2.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - name = "minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; }) ]; buildInputs = @@ -12230,46 +11093,25 @@ }; by-spec."minimatch"."0.2.x" = self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "node-minimatch-0.2.14"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = [ - self.by-version."lru-cache"."2.5.0" - self.by-version."sigmund"."1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimatch"."0.3" = - self.by-version."minimatch"."0.3.0"; by-spec."minimatch"."0.x" = - self.by-version."minimatch"."0.3.0"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."0.x.x" = - self.by-version."minimatch"."0.3.0"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch".">=0.2.4" = - self.by-version."minimatch"."0.3.0"; - by-spec."minimatch"."^0.3.0" = - self.by-version."minimatch"."0.3.0"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2" = self.by-version."minimatch"."0.2.14"; + by-spec."minimatch"."~0.2.0" = + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.11" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.12" = self.by-version."minimatch"."0.2.14"; + by-spec."minimatch"."~0.2.14" = + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.14"; - by-spec."minimatch"."~0.3.0" = - self.by-version."minimatch"."0.3.0"; - by-spec."minimist"."0.0.8" = + by-spec."minimist"."~0.0.1" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { name = "node-minimist-0.0.8"; @@ -12288,78 +11130,19 @@ ]; passthru.names = [ "minimist" ]; }; - by-spec."minimist"."0.0.9" = - self.by-version."minimist"."0.0.9"; - by-version."minimist"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.9.tgz"; - name = "minimist-0.0.9.tgz"; - sha1 = "04e6034ffbf572be2fe42cf1da2c696be0901917"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; - by-spec."minimist"."^0.1.0" = - self.by-version."minimist"."0.1.0"; - by-version."minimist"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; - name = "minimist-0.1.0.tgz"; - sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; - by-spec."minimist"."~0.0.1" = - self.by-version."minimist"."0.0.10"; - by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - name = "minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; by-spec."minimist"."~0.0.5" = - self.by-version."minimist"."0.0.10"; + self.by-version."minimist"."0.0.8"; by-spec."minimist"."~0.0.7" = - self.by-version."minimist"."0.0.10"; - by-spec."minimist"."~0.0.9" = - self.by-version."minimist"."0.0.10"; + self.by-version."minimist"."0.0.8"; by-spec."ministyle"."~0.1.3" = - self.by-version."ministyle"."0.1.4"; - by-version."ministyle"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-ministyle-0.1.4"; + self.by-version."ministyle"."0.1.3"; + by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-ministyle-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz"; - name = "ministyle-0.1.4.tgz"; - sha1 = "b10481eb16aa8f7b6cd983817393a44da0e5a0cd"; + url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz"; + name = "ministyle-0.1.3.tgz"; + sha1 = "d7a639f29e9450b9d5ebf2255d1fa8d1d9d89900"; }) ]; buildInputs = @@ -12391,29 +11174,6 @@ passthru.names = [ "miniwrite" ]; }; by-spec."mkdirp"."*" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = [ - self.by-version."minimist"."0.0.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - "mkdirp" = self.by-version."mkdirp"."0.5.0"; - by-spec."mkdirp"."0" = - self.by-version."mkdirp"."0.5.0"; - by-spec."mkdirp"."0.3" = self.by-version."mkdirp"."0.3.5"; by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { name = "node-mkdirp-0.3.5"; @@ -12432,6 +11192,11 @@ ]; passthru.names = [ "mkdirp" ]; }; + "mkdirp" = self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."0" = + self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."0.3" = + self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."0.3.0" = self.by-version."mkdirp"."0.3.0"; by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -12455,24 +11220,16 @@ self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."0.3.x" = self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."0.5.0" = - self.by-version."mkdirp"."0.5.0"; - by-spec."mkdirp"."0.5.x" = - self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp"."0.x.x" = - self.by-version."mkdirp"."0.5.0"; + self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."^0.3.5" = self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."^0.5.0" = - self.by-version."mkdirp"."0.5.0"; by-spec."mkdirp"."~0.3.3" = self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.3.4" = self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.3.5" = self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."~0.5.0" = - self.by-version."mkdirp"."0.5.0"; by-spec."mkpath"."~0.1.0" = self.by-version."mkpath"."0.1.0"; by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -12493,14 +11250,14 @@ passthru.names = [ "mkpath" ]; }; by-spec."mocha"."*" = - self.by-version."mocha"."1.20.1"; - by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.20.1"; + self.by-version."mocha"."1.18.2"; + by-version."mocha"."1.18.2" = lib.makeOverridable self.buildNodePackage { + name = "mocha-1.18.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz"; - name = "mocha-1.20.1.tgz"; - sha1 = "f343832d9fe0c7d97c64fc70448f5136df9fed5b"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.18.2.tgz"; + name = "mocha-1.18.2.tgz"; + sha1 = "800848f8f7884c61eefcfa2a27304ba9e5446d0b"; }) ]; buildInputs = @@ -12510,7 +11267,7 @@ self.by-version."growl"."1.7.0" self.by-version."jade"."0.26.3" self.by-version."diff"."1.0.7" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.3" ]; @@ -12518,7 +11275,7 @@ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.20.1"; + "mocha" = self.by-version."mocha"."1.18.2"; by-spec."mocha"."1.13.x" = self.by-version."mocha"."1.13.0"; by-version."mocha"."1.13.0" = lib.makeOverridable self.buildNodePackage { @@ -12537,7 +11294,7 @@ self.by-version."growl"."1.7.0" self.by-version."jade"."0.26.3" self.by-version."diff"."1.0.7" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.3" ]; @@ -12546,14 +11303,14 @@ passthru.names = [ "mocha" ]; }; by-spec."mocha-phantomjs"."*" = - self.by-version."mocha-phantomjs"."3.4.1"; - by-version."mocha-phantomjs"."3.4.1" = lib.makeOverridable self.buildNodePackage { - name = "mocha-phantomjs-3.4.1"; + self.by-version."mocha-phantomjs"."3.3.2"; + by-version."mocha-phantomjs"."3.3.2" = lib.makeOverridable self.buildNodePackage { + name = "mocha-phantomjs-3.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.4.1.tgz"; - name = "mocha-phantomjs-3.4.1.tgz"; - sha1 = "c48fc97b993a0f89be30baa3732050f14cdf1036"; + url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.3.2.tgz"; + name = "mocha-phantomjs-3.3.2.tgz"; + sha1 = "2d7cc9926f0fbbeb341697d7f2a031151c601722"; }) ]; buildInputs = @@ -12561,13 +11318,13 @@ deps = [ self.by-version."mocha"."1.13.0" self.by-version."commander"."1.2.0" + self.by-version."which"."1.0.5" ]; peerDependencies = [ - self.by-version."phantomjs"."1.9.7-8" ]; passthru.names = [ "mocha-phantomjs" ]; }; - "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.4.1"; + "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.3.2"; 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 { @@ -12585,13 +11342,40 @@ self.by-version."jsesc"."0.4.3" self.by-version."unfunk-diff"."0.0.2" self.by-version."miniwrite"."0.1.3" - self.by-version."ministyle"."0.1.4" + self.by-version."ministyle"."0.1.3" ]; peerDependencies = [ ]; passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; + by-spec."module-deps"."~1.10.0" = + self.by-version."module-deps"."1.10.0"; + by-version."module-deps"."1.10.0" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.10.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.10.0.tgz"; + name = "module-deps-1.10.0.tgz"; + sha1 = "57a9cac9dbd092428ec5249f6cf37fb249d77db6"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = [ + self.by-version."JSONStream"."0.7.2" + self.by-version."browser-resolve"."1.2.4" + self.by-version."concat-stream"."1.4.5" + self.by-version."detective"."3.1.0" + self.by-version."minimist"."0.0.8" + self.by-version."parents"."0.0.2" + self.by-version."resolve"."0.6.3" + self.by-version."through"."2.3.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; by-spec."module-deps"."~1.8.0" = self.by-version."module-deps"."1.8.1"; by-version."module-deps"."1.8.1" = lib.makeOverridable self.buildNodePackage { @@ -12606,11 +11390,11 @@ buildInputs = (self.nativeDeps."module-deps" or []); deps = [ - self.by-version."JSONStream"."0.7.4" + self.by-version."JSONStream"."0.7.2" self.by-version."browser-resolve"."1.2.4" - self.by-version."concat-stream"."1.4.6" + self.by-version."concat-stream"."1.4.5" self.by-version."detective"."3.1.0" - self.by-version."minimist"."0.0.10" + self.by-version."minimist"."0.0.8" self.by-version."parents"."0.0.2" self.by-version."resolve"."0.6.3" self.by-version."through"."2.3.4" @@ -12619,38 +11403,6 @@ ]; passthru.names = [ "module-deps" ]; }; - by-spec."module-deps"."~2.1.1" = - self.by-version."module-deps"."2.1.2"; - by-version."module-deps"."2.1.2" = lib.makeOverridable self.buildNodePackage { - name = "module-deps-2.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-2.1.2.tgz"; - name = "module-deps-2.1.2.tgz"; - sha1 = "9cfb8cc4f2b13d648c5baa553d0cbc79692967c5"; - }) - ]; - buildInputs = - (self.nativeDeps."module-deps" or []); - deps = [ - self.by-version."JSONStream"."0.7.4" - self.by-version."browser-resolve"."1.2.4" - self.by-version."concat-stream"."1.4.6" - self.by-version."detective"."3.1.0" - self.by-version."duplexer2"."0.0.2" - self.by-version."inherits"."2.0.1" - self.by-version."minimist"."0.0.10" - self.by-version."parents"."0.0.2" - self.by-version."resolve"."0.6.3" - self.by-version."stream-combiner"."0.1.0" - self.by-version."through2"."0.4.2" - self.by-version."readable-stream"."1.1.13-1" - self.by-version."subarg"."0.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "module-deps" ]; - }; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -12708,48 +11460,28 @@ ]; passthru.names = [ "moment" ]; }; - by-spec."moment"."~2.6.0" = - self.by-version."moment"."2.6.0"; - by-version."moment"."2.6.0" = lib.makeOverridable self.buildNodePackage { - name = "node-moment-2.6.0"; + by-spec."mongodb"."*" = + self.by-version."mongodb"."1.4.2"; + by-version."mongodb"."1.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-mongodb-1.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; - name = "moment-2.6.0.tgz"; - sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; - }) - ]; - buildInputs = - (self.nativeDeps."moment" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "moment" ]; - }; - by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.5"; - by-version."mongodb"."1.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-mongodb-1.4.5"; - src = [ - (self.patchSource fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.5.tgz"; - name = "mongodb-1.4.5.tgz"; - sha1 = "efde318ef9739cf92466c38e35e3104f4a051e57"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.2.tgz"; + name = "mongodb-1.4.2.tgz"; + sha1 = "68b5a5ac7ee146dcbdf17d01f60ffe88e61e76aa"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = [ - self.by-version."bson"."0.2.8" + self.by-version."bson"."0.2.7" self.by-version."kerberos"."0.0.3" - self.by-version."readable-stream"."1.1.13-1" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.5"; + "mongodb" = self.by-version."mongodb"."1.4.2"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -12791,7 +11523,7 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.3.x" = + by-spec."mongodb"."1.3.23" = self.by-version."mongodb"."1.3.23"; by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage { name = "node-mongodb-1.3.23"; @@ -12812,31 +11544,31 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.4.5" = - self.by-version."mongodb"."1.4.5"; + by-spec."mongodb"."1.3.x" = + self.by-version."mongodb"."1.3.23"; by-spec."mongoose"."*" = - self.by-version."mongoose"."3.9.0"; - by-version."mongoose"."3.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-mongoose-3.9.0"; + self.by-version."mongoose"."3.8.8"; + by-version."mongoose"."3.8.8" = lib.makeOverridable self.buildNodePackage { + name = "node-mongoose-3.8.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.9.0.tgz"; - name = "mongoose-3.9.0.tgz"; - sha1 = "e888b414025ee1fd4ce1eeef48031ceed896fc30"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.8.tgz"; + name = "mongoose-3.8.8.tgz"; + sha1 = "ab046f1fa17b0bdf090a04b6d034d87d240a47c2"; }) ]; buildInputs = (self.nativeDeps."mongoose" or []); deps = [ - self.by-version."hooks"."0.3.2" - self.by-version."mongodb"."1.4.5" + self.by-version."hooks"."0.2.1" + self.by-version."mongodb"."1.3.23" self.by-version."ms"."0.1.0" self.by-version."sliced"."0.0.5" self.by-version."muri"."0.3.1" - self.by-version."mpromise"."0.5.0" + 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.7.0" + self.by-version."mquery"."0.5.3" ]; peerDependencies = [ ]; @@ -12976,26 +11708,45 @@ ]; passthru.names = [ "monocle" ]; }; - by-spec."morgan"."1.1.1" = - self.by-version."morgan"."1.1.1"; - by-version."morgan"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-morgan-1.1.1"; + by-spec."morgan"."1.0.0" = + self.by-version."morgan"."1.0.0"; + by-version."morgan"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-morgan-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/morgan/-/morgan-1.1.1.tgz"; - name = "morgan-1.1.1.tgz"; - sha1 = "cde45d2e807ebcc439745846ea80392e69098146"; + url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz"; + name = "morgan-1.0.0.tgz"; + sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d"; }) ]; buildInputs = (self.nativeDeps."morgan" or []); deps = [ - self.by-version."bytes"."1.0.0" + self.by-version."bytes"."0.2.1" ]; peerDependencies = [ ]; passthru.names = [ "morgan" ]; }; + by-spec."mout"."^0.9.0" = + self.by-version."mout"."0.9.1"; + by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-mout-0.9.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz"; + name = "mout-0.9.1.tgz"; + sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477"; + }) + ]; + buildInputs = + (self.nativeDeps."mout" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mout" ]; + }; by-spec."mout"."~0.6.0" = self.by-version."mout"."0.6.0"; by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -13036,25 +11787,6 @@ }; by-spec."mout"."~0.9.0" = self.by-version."mout"."0.9.1"; - by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-mout-0.9.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz"; - name = "mout-0.9.1.tgz"; - sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477"; - }) - ]; - buildInputs = - (self.nativeDeps."mout" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mout" ]; - }; - by-spec."mout"."~0.9.1" = - self.by-version."mout"."0.9.1"; by-spec."mpath"."0.1.1" = self.by-version."mpath"."0.1.1"; by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -13094,15 +11826,15 @@ ]; passthru.names = [ "mpromise" ]; }; - by-spec."mpromise"."0.5.0" = - self.by-version."mpromise"."0.5.0"; - by-version."mpromise"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-mpromise-0.5.0"; + by-spec."mpromise"."0.4.3" = + self.by-version."mpromise"."0.4.3"; + by-version."mpromise"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-mpromise-0.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mpromise/-/mpromise-0.5.0.tgz"; - name = "mpromise-0.5.0.tgz"; - sha1 = "8ff8f6aba6534bffa6fff296e13348cd065091b5"; + url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz"; + name = "mpromise-0.4.3.tgz"; + sha1 = "edc47a75a2a177b0e9382735db52dbec3808cc33"; }) ]; buildInputs = @@ -13113,15 +11845,15 @@ ]; passthru.names = [ "mpromise" ]; }; - by-spec."mquery"."0.7.0" = - self.by-version."mquery"."0.7.0"; - by-version."mquery"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-mquery-0.7.0"; + by-spec."mquery"."0.5.3" = + self.by-version."mquery"."0.5.3"; + by-version."mquery"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "node-mquery-0.5.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mquery/-/mquery-0.7.0.tgz"; - name = "mquery-0.7.0.tgz"; - sha1 = "2d205abe097aff0f898d3ad9e43bd031031cdb1e"; + url = "http://registry.npmjs.org/mquery/-/mquery-0.5.3.tgz"; + name = "mquery-0.5.3.tgz"; + sha1 = "b8a04d096ecf90bf17a81cc39b80dd4e5abcecec"; }) ]; buildInputs = @@ -13154,25 +11886,6 @@ ]; passthru.names = [ "ms" ]; }; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ms-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }) - ]; - buildInputs = - (self.nativeDeps."ms" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ms" ]; - }; by-spec."msgpack".">= 0.0.1" = self.by-version."msgpack"."0.2.3"; by-version."msgpack"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -13213,27 +11926,6 @@ ]; passthru.names = [ "multiparty" ]; }; - by-spec."multiparty"."3.2.8" = - self.by-version."multiparty"."3.2.8"; - by-version."multiparty"."3.2.8" = lib.makeOverridable self.buildNodePackage { - name = "node-multiparty-3.2.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/multiparty/-/multiparty-3.2.8.tgz"; - name = "multiparty-3.2.8.tgz"; - sha1 = "bde21301dad294286e155b2b60710c6ae04ae64f"; - }) - ]; - buildInputs = - (self.nativeDeps."multiparty" or []); - deps = [ - self.by-version."readable-stream"."1.1.13-1" - self.by-version."stream-counter"."0.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "multiparty" ]; - }; by-spec."muri"."0.3.1" = self.by-version."muri"."0.3.1"; by-version."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -13312,25 +12004,6 @@ ]; passthru.names = [ "mv" ]; }; - by-spec."nan".">=1.0.0" = - self.by-version."nan"."1.2.0"; - by-version."nan"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-nan-1.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz"; - name = "nan-1.2.0.tgz"; - sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef"; - }) - ]; - buildInputs = - (self.nativeDeps."nan" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "nan" ]; - }; by-spec."nan"."~0.3.0" = self.by-version."nan"."0.3.2"; by-version."nan"."0.3.2" = lib.makeOverridable self.buildNodePackage { @@ -13388,44 +12061,6 @@ ]; passthru.names = [ "nan" ]; }; - by-spec."nan"."~1.0.0" = - self.by-version."nan"."1.0.0"; - by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-nan-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; - name = "nan-1.0.0.tgz"; - sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; - }) - ]; - buildInputs = - (self.nativeDeps."nan" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "nan" ]; - }; - by-spec."nan"."~1.1.0" = - self.by-version."nan"."1.1.2"; - by-version."nan"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-nan-1.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz"; - name = "nan-1.1.2.tgz"; - sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b"; - }) - ]; - buildInputs = - (self.nativeDeps."nan" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "nan" ]; - }; by-spec."natural"."0.1.17" = self.by-version."natural"."0.1.17"; by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage { @@ -13463,7 +12098,7 @@ (self.nativeDeps."nconf" or []); deps = [ self.by-version."async"."0.2.9" - self.by-version."ini"."1.2.1" + self.by-version."ini"."1.1.0" self.by-version."optimist"."0.6.0" ]; peerDependencies = [ @@ -13555,15 +12190,15 @@ ]; passthru.names = [ "negotiator" ]; }; - by-spec."negotiator"."0.4.5" = - self.by-version."negotiator"."0.4.5"; - by-version."negotiator"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-negotiator-0.4.5"; + by-spec."negotiator"."0.4.2" = + self.by-version."negotiator"."0.4.2"; + by-version."negotiator"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-negotiator-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.5.tgz"; - name = "negotiator-0.4.5.tgz"; - sha1 = "0e738eb225e3a166ee7d69ebcfdc702ba236a77b"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz"; + name = "negotiator-0.4.2.tgz"; + sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37"; }) ]; buildInputs = @@ -13576,8 +12211,6 @@ }; by-spec."negotiator"."~0.3.0" = self.by-version."negotiator"."0.3.0"; - by-spec."negotiator"."~0.4.0" = - self.by-version."negotiator"."0.4.5"; 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 { @@ -13617,25 +12250,6 @@ ]; passthru.names = [ "next-tick" ]; }; - by-spec."next-tick"."~0.2.2" = - self.by-version."next-tick"."0.2.2"; - by-version."next-tick"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-next-tick-0.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz"; - name = "next-tick-0.2.2.tgz"; - sha1 = "75da4a927ee5887e39065880065b7336413b310d"; - }) - ]; - buildInputs = - (self.nativeDeps."next-tick" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "next-tick" ]; - }; by-spec."nib"."0.5.0" = self.by-version."nib"."0.5.0"; by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -13712,14 +12326,14 @@ passthru.names = [ "node-appc" ]; }; by-spec."node-expat"."*" = - self.by-version."node-expat"."2.2.0"; - by-version."node-expat"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-node-expat-2.2.0"; + self.by-version."node-expat"."2.1.4"; + by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-node-expat-2.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.2.0.tgz"; - name = "node-expat-2.2.0.tgz"; - sha1 = "8e946c2707c11fbd52516bbe7e14190665adfef9"; + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz"; + name = "node-expat-2.1.4.tgz"; + sha1 = "e55a82249b71afbce09ffa880705ec37553c5121"; }) ]; buildInputs = @@ -13731,31 +12345,31 @@ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.2.0"; + "node-expat" = self.by-version."node-expat"."2.1.4"; by-spec."node-gyp"."*" = - self.by-version."node-gyp"."0.13.1"; - by-version."node-gyp"."0.13.1" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.13.1"; + self.by-version."node-gyp"."0.13.0"; + by-version."node-gyp"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.13.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz"; - name = "node-gyp-0.13.1.tgz"; - sha1 = "5a484dd2dc13d5b894a8fe781a250c07eae7bffa"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz"; + name = "node-gyp-0.13.0.tgz"; + sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e"; }) ]; buildInputs = (self.nativeDeps."node-gyp" or []); deps = [ - self.by-version."glob"."3.2.11" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.3" self.by-version."fstream"."0.1.25" - self.by-version."minimatch"."0.3.0" - self.by-version."mkdirp"."0.5.0" - self.by-version."nopt"."2.2.1" - self.by-version."npmlog"."0.1.0" - self.by-version."osenv"."0.1.0" - self.by-version."request"."2.36.0" - self.by-version."rimraf"."2.2.8" + self.by-version."minimatch"."0.2.14" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.2.0" + self.by-version."npmlog"."0.0.6" + self.by-version."osenv"."0.0.3" + self.by-version."request"."2.34.0" + self.by-version."rimraf"."2.2.6" self.by-version."semver"."2.2.1" self.by-version."tar"."0.1.19" self.by-version."which"."1.0.5" @@ -13764,61 +12378,59 @@ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.by-version."node-gyp"."0.13.1"; + "node-gyp" = self.by-version."node-gyp"."0.13.0"; by-spec."node-gyp"."~0.13.0" = - self.by-version."node-gyp"."0.13.1"; + self.by-version."node-gyp"."0.13.0"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.4"; - by-version."node-inspector"."0.7.4" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.4"; + self.by-version."node-inspector"."0.7.3"; + by-version."node-inspector"."0.7.3" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz"; - name = "node-inspector-0.7.4.tgz"; - sha1 = "3d07234f0834e7f1e21a1669eceaa224a7be43f2"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.3.tgz"; + name = "node-inspector-0.7.3.tgz"; + sha1 = "988317f9a7e645d1bb78e40bb2289db82a077e73"; }) ]; buildInputs = (self.nativeDeps."node-inspector" or []); deps = [ - self.by-version."express"."4.0.0" - self.by-version."async"."0.8.0" - self.by-version."glob"."3.2.11" + self.by-version."express"."3.5.1" + self.by-version."async"."0.4.1" + self.by-version."glob"."3.2.9" self.by-version."rc"."0.3.5" self.by-version."strong-data-uri"."0.1.1" self.by-version."debug"."0.8.1" self.by-version."ws"."0.4.31" self.by-version."opener"."1.3.0" - self.by-version."yargs"."1.2.2" + self.by-version."yargs"."1.1.3" self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.4"; + "node-inspector" = self.by-version."node-inspector"."0.7.3"; by-spec."node-protobuf"."*" = - self.by-version."node-protobuf"."1.1.0"; - by-version."node-protobuf"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-node-protobuf-1.1.0"; + self.by-version."node-protobuf"."1.0.10"; + by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage { + name = "node-node-protobuf-1.0.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.1.0.tgz"; - name = "node-protobuf-1.1.0.tgz"; - sha1 = "9d30eabb363efb1855c2dfeb2d2e5246c115589d"; + url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.10.tgz"; + name = "node-protobuf-1.0.10.tgz"; + sha1 = "a8a02d55129efe1776bc3e038d7e6c676c001fcd"; }) ]; buildInputs = (self.nativeDeps."node-protobuf" or []); deps = [ - self.by-version."bindings"."1.2.0" - self.by-version."nan"."1.2.0" ]; peerDependencies = [ ]; passthru.names = [ "node-protobuf" ]; }; - "node-protobuf" = self.by-version."node-protobuf"."1.1.0"; + "node-protobuf" = self.by-version."node-protobuf"."1.0.10"; 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 { @@ -13969,7 +12581,7 @@ buildInputs = (self.nativeDeps."node-wsfederation" or []); deps = [ - self.by-version."xml2js"."0.4.4" + self.by-version."xml2js"."0.4.2" ]; peerDependencies = [ ]; @@ -14008,8 +12620,8 @@ buildInputs = (self.nativeDeps."nodemailer" or []); deps = [ - self.by-version."mailcomposer"."0.2.11" - self.by-version."simplesmtp"."0.3.32" + self.by-version."mailcomposer"."0.2.9" + self.by-version."simplesmtp"."0.3.25" self.by-version."optimist"."0.6.1" ]; peerDependencies = [ @@ -14017,28 +12629,27 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.2.0"; - by-version."nodemon"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.2.0"; + self.by-version."nodemon"."1.0.17"; + by-version."nodemon"."1.0.17" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.0.17"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.0.tgz"; - name = "nodemon-1.2.0.tgz"; - sha1 = "fd64fbbd2730c828fe897026ada53ab5ae42727c"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.17.tgz"; + name = "nodemon-1.0.17.tgz"; + sha1 = "910a3f3cb66c06a3499498455cf4e0119f75799c"; }) ]; buildInputs = (self.nativeDeps."nodemon" or []); deps = [ - self.by-version."update-notifier"."0.1.10" - self.by-version."minimatch"."0.3.0" - self.by-version."ps-tree"."0.0.3" + self.by-version."update-notifier"."0.1.8" + self.by-version."minimatch"."0.2.14" ]; peerDependencies = [ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.2.0"; + "nodemon" = self.by-version."nodemon"."1.0.17"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -14061,34 +12672,14 @@ passthru.names = [ "nomnom" ]; }; by-spec."nopt"."2" = - self.by-version."nopt"."2.2.1"; - by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.2.1"; + self.by-version."nopt"."2.2.0"; + by-version."nopt"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "nopt-2.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - name = "nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; - }) - ]; - buildInputs = - (self.nativeDeps."nopt" or []); - deps = [ - self.by-version."abbrev"."1.0.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "nopt" ]; - }; - by-spec."nopt"."2 || 3" = - self.by-version."nopt"."3.0.0"; - by-version."nopt"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "nopt-3.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-3.0.0.tgz"; - name = "nopt-3.0.0.tgz"; - sha1 = "4fcf4bf09123d5ee6b2f70214a4d95789b875c79"; + url = "http://registry.npmjs.org/nopt/-/nopt-2.2.0.tgz"; + name = "nopt-2.2.0.tgz"; + sha1 = "3d106676f3607ac466af9bf82bd707b1501d3bd5"; }) ]; buildInputs = @@ -14121,11 +12712,9 @@ passthru.names = [ "nopt" ]; }; by-spec."nopt"."2.2.x" = - self.by-version."nopt"."2.2.1"; + self.by-version."nopt"."2.2.0"; by-spec."nopt"."^2.2.0" = - self.by-version."nopt"."2.2.1"; - by-spec."nopt"."^2.2.1" = - self.by-version."nopt"."2.2.1"; + self.by-version."nopt"."2.2.0"; by-spec."nopt"."~1.0.10" = self.by-version."nopt"."1.0.10"; by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage { @@ -14169,62 +12758,38 @@ by-spec."nopt"."~2.1.2" = self.by-version."nopt"."2.1.2"; by-spec."nopt"."~2.2.0" = - self.by-version."nopt"."2.2.1"; - by-spec."nopt"."~2.2.1" = - self.by-version."nopt"."2.2.1"; - by-spec."normalize-package-data"."^0.2.13" = - self.by-version."normalize-package-data"."0.2.13"; - by-version."normalize-package-data"."0.2.13" = lib.makeOverridable self.buildNodePackage { - name = "node-normalize-package-data-0.2.13"; + self.by-version."nopt"."2.2.0"; + by-spec."normalize-package-data"."~0.2.9" = + self.by-version."normalize-package-data"."0.2.12"; + by-version."normalize-package-data"."0.2.12" = lib.makeOverridable self.buildNodePackage { + name = "node-normalize-package-data-0.2.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.13.tgz"; - name = "normalize-package-data-0.2.13.tgz"; - sha1 = "50f9fd9e77b1c8411cd231db2962e73963de774d"; + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.12.tgz"; + name = "normalize-package-data-0.2.12.tgz"; + sha1 = "c8284cf0cb0466ea60ee64276b9070722c1da768"; }) ]; buildInputs = (self.nativeDeps."normalize-package-data" or []); deps = [ + self.by-version."semver"."2.2.1" self.by-version."github-url-from-git"."1.1.1" - self.by-version."github-url-from-username-repo"."0.1.0" - self.by-version."semver"."2.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "normalize-package-data" ]; - }; - by-spec."normalize-package-data"."^0.3.0" = - self.by-version."normalize-package-data"."0.3.0"; - by-version."normalize-package-data"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-normalize-package-data-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.3.0.tgz"; - name = "normalize-package-data-0.3.0.tgz"; - sha1 = "70ea9e5b6caf69faa9d83e42f71489642372d815"; - }) - ]; - buildInputs = - (self.nativeDeps."normalize-package-data" or []); - deps = [ - self.by-version."github-url-from-git"."1.1.1" - self.by-version."github-url-from-username-repo"."0.2.0" - self.by-version."semver"."2.3.0" + self.by-version."github-url-from-username-repo"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.4.14"; - by-version."npm"."1.4.14" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.4.14"; + self.by-version."npm"."1.4.7"; + by-version."npm"."1.4.7" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.4.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.4.14.tgz"; - name = "npm-1.4.14.tgz"; - sha1 = "b779a930fb7a1260f9784fb1e04b1e6898653bd9"; + url = "http://registry.npmjs.org/npm/-/npm-1.4.7.tgz"; + name = "npm-1.4.7.tgz"; + sha1 = "7e3c4385973ffb58c9bf15eebe2668c0ce3fafe0"; }) ]; buildInputs = @@ -14236,7 +12801,6 @@ self.by-version."ansistyles"."0.1.3" self.by-version."archy"."0.0.2" self.by-version."block-stream"."0.0.7" - self.by-version."char-spinner"."1.0.1" self.by-version."child-process-close"."0.1.1" self.by-version."chmodr"."0.1.0" self.by-version."chownr"."0.0.1" @@ -14244,38 +12808,36 @@ self.by-version."columnify"."0.1.2" self.by-version."editor"."0.0.5" self.by-version."fstream"."0.1.25" - self.by-version."fstream-npm"."0.1.7" + self.by-version."fstream-npm"."0.1.6" self.by-version."github-url-from-git"."1.1.1" - self.by-version."github-url-from-username-repo"."0.1.0" - self.by-version."glob"."3.2.11" + self.by-version."github-url-from-username-repo"."0.0.2" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.3" - self.by-version."inflight"."1.0.1" - self.by-version."ini"."1.2.1" - self.by-version."init-package-json"."0.0.17" + self.by-version."ini"."1.1.0" + self.by-version."init-package-json"."0.0.15" self.by-version."lockfile"."0.4.2" self.by-version."lru-cache"."2.5.0" - self.by-version."minimatch"."0.3.0" + self.by-version."minimatch"."0.2.14" self.by-version."mkdirp"."0.3.5" - self.by-version."node-gyp"."0.13.1" - self.by-version."nopt"."2.2.1" - self.by-version."npm-cache-filename"."1.0.1" - self.by-version."npm-install-checks"."1.0.2" - self.by-version."npm-registry-client"."1.0.1" - self.by-version."npm-user-validate"."0.1.0" - self.by-version."npmconf"."1.0.2" + self.by-version."node-gyp"."0.13.0" + self.by-version."nopt"."2.2.0" + self.by-version."npm-install-checks"."1.0.0" + self.by-version."npm-registry-client"."0.4.7" + self.by-version."npm-user-validate"."0.0.3" + self.by-version."npmconf"."0.1.14" self.by-version."npmlog"."0.0.6" self.by-version."once"."1.3.0" self.by-version."opener"."1.3.0" - self.by-version."osenv"."0.1.0" + self.by-version."osenv"."0.0.3" self.by-version."path-is-inside"."1.0.1" self.by-version."read"."1.0.5" - self.by-version."read-installed"."2.0.5" - self.by-version."read-package-json"."1.1.9" + self.by-version."read-installed"."2.0.2" + self.by-version."read-package-json"."1.1.8" self.by-version."request"."2.30.0" self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.8" - self.by-version."semver"."2.3.0" - self.by-version."sha"."1.2.4" + self.by-version."rimraf"."2.2.6" + self.by-version."semver"."2.2.1" + self.by-version."sha"."1.2.3" self.by-version."slide"."1.1.5" self.by-version."sorted-object"."1.0.0" self.by-version."tar"."0.1.19" @@ -14287,44 +12849,23 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.4.14"; - by-spec."npm-cache-filename"."^1.0.0" = - self.by-version."npm-cache-filename"."1.0.1"; - by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-cache-filename-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"; - name = "npm-cache-filename-1.0.1.tgz"; - sha1 = "9b640f0c1a5ba1145659685372a9ff71f70c4323"; - }) - ]; - buildInputs = - (self.nativeDeps."npm-cache-filename" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "npm-cache-filename" ]; - }; - by-spec."npm-cache-filename"."~1.0.1" = - self.by-version."npm-cache-filename"."1.0.1"; + "npm" = self.by-version."npm"."1.4.7"; by-spec."npm-install-checks"."~1.0.0" = - self.by-version."npm-install-checks"."1.0.2"; - by-version."npm-install-checks"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-install-checks-1.0.2"; + self.by-version."npm-install-checks"."1.0.0"; + by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-install-checks-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.2.tgz"; - name = "npm-install-checks-1.0.2.tgz"; - sha1 = "ebba769753fc8551308333ef411920743a6809f6"; + url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.0.tgz"; + name = "npm-install-checks-1.0.0.tgz"; + sha1 = "7e1469b5e0c693b2ae2a8830b5fc4e7bf76c88fd"; }) ]; buildInputs = (self.nativeDeps."npm-install-checks" or []); deps = [ - self.by-version."npmlog"."0.1.0" - self.by-version."semver"."2.3.0" + self.by-version."npmlog"."0.0.6" + self.by-version."semver"."2.2.1" ]; peerDependencies = [ ]; @@ -14344,59 +12885,58 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.36.0" + self.by-version."request"."2.34.0" self.by-version."graceful-fs"."2.0.3" self.by-version."semver"."2.0.11" self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."retry"."0.6.0" self.by-version."couch-login"."0.1.20" - self.by-version."npmlog"."0.1.0" + self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~1.0.0" = - self.by-version."npm-registry-client"."1.0.1"; - by-version."npm-registry-client"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-registry-client-1.0.1"; + by-spec."npm-registry-client"."~0.4.7" = + self.by-version."npm-registry-client"."0.4.7"; + by-version."npm-registry-client"."0.4.7" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-registry-client-0.4.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-1.0.1.tgz"; - name = "npm-registry-client-1.0.1.tgz"; - sha1 = "c5f6a87d285f2005a35d3f67d9c724bce551b0f1"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.7.tgz"; + name = "npm-registry-client-0.4.7.tgz"; + sha1 = "f4369b59890da7882527eb7c427dd95d43707afb"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."chownr"."0.0.1" + self.by-version."request"."2.34.0" self.by-version."graceful-fs"."2.0.3" - self.by-version."mkdirp"."0.3.5" - self.by-version."npm-cache-filename"."1.0.1" - self.by-version."request"."2.36.0" - self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.8" - self.by-version."semver"."2.3.0" + self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" - self.by-version."npmlog"."0.1.0" + self.by-version."chownr"."0.0.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."rimraf"."2.2.6" + self.by-version."retry"."0.6.0" + self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-user-validate"."~0.1.0" = - self.by-version."npm-user-validate"."0.1.0"; - by-version."npm-user-validate"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-user-validate-0.1.0"; + 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 = "node-npm-user-validate-0.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.0.tgz"; - name = "npm-user-validate-0.1.0.tgz"; - sha1 = "358a5b5148ed3f79771d980388c6e34c4a61f638"; + url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"; + name = "npm-user-validate-0.0.3.tgz"; + sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e"; }) ]; buildInputs = @@ -14421,14 +12961,14 @@ buildInputs = (self.nativeDeps."npm2nix" or []); deps = [ - self.by-version."semver"."2.3.0" + self.by-version."semver"."2.2.1" self.by-version."argparse"."0.1.15" self.by-version."npm-registry-client"."0.2.27" self.by-version."npmconf"."0.1.1" self.by-version."tar"."0.1.17" self.by-version."temp"."0.6.0" self.by-version."fs.extra"."1.2.1" - self.by-version."findit"."1.2.0" + self.by-version."findit"."1.1.1" ]; peerDependencies = [ ]; @@ -14454,7 +12994,7 @@ self.by-version."once"."1.1.1" self.by-version."mkdirp"."0.3.5" self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.2.1" + self.by-version."nopt"."2.2.0" self.by-version."semver"."1.1.4" self.by-version."ini"."1.1.0" ]; @@ -14481,94 +13021,46 @@ self.by-version."once"."1.1.1" self.by-version."mkdirp"."0.3.5" self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.2.1" - self.by-version."semver"."2.3.0" + self.by-version."nopt"."2.2.0" + self.by-version."semver"."2.2.1" self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; + by-spec."npmconf"."~0.1.13" = + self.by-version."npmconf"."0.1.14"; + by-version."npmconf"."0.1.14" = lib.makeOverridable self.buildNodePackage { + name = "node-npmconf-0.1.14"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.14.tgz"; + name = "npmconf-0.1.14.tgz"; + sha1 = "aea4bc12c5a84191a32cd350e325da4fe8b127e7"; + }) + ]; + buildInputs = + (self.nativeDeps."npmconf" or []); + deps = [ + self.by-version."config-chain"."1.1.8" + self.by-version."inherits"."2.0.1" + self.by-version."once"."1.3.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."osenv"."0.0.3" + self.by-version."nopt"."2.2.0" + self.by-version."semver"."2.2.1" + self.by-version."ini"."1.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "npmconf" ]; + }; + by-spec."npmconf"."~0.1.14" = + self.by-version."npmconf"."0.1.14"; by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.16"; - by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage { - name = "node-npmconf-0.1.16"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; - name = "npmconf-0.1.16.tgz"; - sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; - }) - ]; - buildInputs = - (self.nativeDeps."npmconf" or []); - deps = [ - self.by-version."config-chain"."1.1.8" - self.by-version."inherits"."2.0.1" - self.by-version."once"."1.3.0" - self.by-version."mkdirp"."0.3.5" - self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.2.1" - self.by-version."semver"."2.3.0" - self.by-version."ini"."1.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npmconf" ]; - }; - by-spec."npmconf"."~1.0.0" = - self.by-version."npmconf"."1.0.2"; - by-version."npmconf"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-npmconf-1.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-1.0.2.tgz"; - name = "npmconf-1.0.2.tgz"; - sha1 = "161a11fe5605f667edbf1aad797fd2d04c8c44e4"; - }) - ]; - buildInputs = - (self.nativeDeps."npmconf" or []); - deps = [ - self.by-version."config-chain"."1.1.8" - self.by-version."inherits"."2.0.1" - self.by-version."ini"."1.2.1" - self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."3.0.0" - self.by-version."once"."1.3.0" - self.by-version."osenv"."0.0.3" - self.by-version."semver"."2.3.0" - self.by-version."uid-number"."0.0.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npmconf" ]; - }; - by-spec."npmconf"."~1.0.1" = - self.by-version."npmconf"."1.0.2"; + self.by-version."npmconf"."0.1.14"; by-spec."npmlog"."*" = - self.by-version."npmlog"."0.1.0"; - by-version."npmlog"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-npmlog-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.0.tgz"; - name = "npmlog-0.1.0.tgz"; - sha1 = "c88336df9426979b86d848d35357f4e6a558bd90"; - }) - ]; - buildInputs = - (self.nativeDeps."npmlog" or []); - deps = [ - self.by-version."ansi"."0.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npmlog" ]; - }; - by-spec."npmlog"."0" = - self.by-version."npmlog"."0.1.0"; - by-spec."npmlog"."0.0.6" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { name = "node-npmlog-0.0.6"; @@ -14588,8 +13080,10 @@ ]; passthru.names = [ "npmlog" ]; }; - by-spec."npmlog"."0.1" = - self.by-version."npmlog"."0.1.0"; + by-spec."npmlog"."0" = + self.by-version."npmlog"."0.0.6"; + by-spec."npmlog"."0.0.6" = + self.by-version."npmlog"."0.0.6"; by-spec."nssocket"."~0.5.1" = self.by-version."nssocket"."0.5.1"; by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -14639,7 +13133,7 @@ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; name = "oauth-0.9.11.tgz"; - sha256 = "71c7d2bd27de05fb0d6f233672c53765ecc028f100b5f1d4e7845f4637f47db4"; + sha256 = "14cc7a064e3eda0948ac8db72fae140cb7b0fdbe031375d02cd6d0359c8b8faa"; }) ]; buildInputs = @@ -14728,25 +13222,6 @@ }; by-spec."object-assign"."~0.1.2" = self.by-version."object-assign"."0.1.2"; - by-spec."object-assign"."~0.2.1" = - self.by-version."object-assign"."0.2.2"; - by-version."object-assign"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-object-assign-0.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/object-assign/-/object-assign-0.2.2.tgz"; - name = "object-assign-0.2.2.tgz"; - sha1 = "e0a78bc56af9c092051167f6b8f23249e7dde1a6"; - }) - ]; - buildInputs = - (self.nativeDeps."object-assign" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "object-assign" ]; - }; 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 { @@ -14766,25 +13241,6 @@ ]; passthru.names = [ "object-keys" ]; }; - by-spec."on-headers"."0.0.0" = - self.by-version."on-headers"."0.0.0"; - by-version."on-headers"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-on-headers-0.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/on-headers/-/on-headers-0.0.0.tgz"; - name = "on-headers-0.0.0.tgz"; - sha1 = "ee2817f8344325785cd9c2df2b242bbc17caf4c4"; - }) - ]; - buildInputs = - (self.nativeDeps."on-headers" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "on-headers" ]; - }; by-spec."once"."1.1.1" = self.by-version."once"."1.1.1"; by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -14804,7 +13260,9 @@ ]; passthru.names = [ "once" ]; }; - by-spec."once"."^1.3.0" = + by-spec."once"."~1.1.1" = + self.by-version."once"."1.1.1"; + by-spec."once"."~1.3.0" = self.by-version."once"."1.3.0"; by-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage { name = "node-once-1.3.0"; @@ -14823,10 +13281,6 @@ ]; passthru.names = [ "once" ]; }; - by-spec."once"."~1.1.1" = - self.by-version."once"."1.1.1"; - by-spec."once"."~1.3.0" = - self.by-version."once"."1.3.0"; by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -14886,8 +13340,6 @@ }; by-spec."open"."~0.0.4" = self.by-version."open"."0.0.5"; - by-spec."open"."~0.0.5" = - self.by-version."open"."0.0.5"; by-spec."opener"."~1.3.0" = self.by-version."opener"."1.3.0"; by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -14908,14 +13360,14 @@ passthru.names = [ "opener" ]; }; by-spec."openid".">=0.2.0" = - self.by-version."openid"."0.5.9"; - by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage { - name = "node-openid-0.5.9"; + self.by-version."openid"."0.5.8"; + by-version."openid"."0.5.8" = lib.makeOverridable self.buildNodePackage { + name = "node-openid-0.5.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz"; - name = "openid-0.5.9.tgz"; - sha1 = "f44dd2609764c458c65fb22c03db068579e4bfa8"; + url = "http://registry.npmjs.org/openid/-/openid-0.5.8.tgz"; + name = "openid-0.5.8.tgz"; + sha1 = "e1e3b26235cb8964ef850c074529b9d031550e85"; }) ]; buildInputs = @@ -14926,25 +13378,6 @@ ]; passthru.names = [ "openid" ]; }; - by-spec."opn"."~0.1.1" = - self.by-version."opn"."0.1.2"; - by-version."opn"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "opn-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/opn/-/opn-0.1.2.tgz"; - name = "opn-0.1.2.tgz"; - sha1 = "c527832cfd964d52096b524d0035ecaece51db4f"; - }) - ]; - buildInputs = - (self.nativeDeps."opn" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "opn" ]; - }; by-spec."optimist"."*" = self.by-version."optimist"."0.6.1"; by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -14960,7 +13393,7 @@ (self.nativeDeps."optimist" or []); deps = [ self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.10" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; @@ -14987,30 +13420,7 @@ ]; passthru.names = [ "optimist" ]; }; - by-spec."optimist"."0.6.0" = - self.by-version."optimist"."0.6.0"; - by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "node-optimist-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; - name = "optimist-0.6.0.tgz"; - sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = [ - self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.10" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - by-spec."optimist"."0.6.x" = - self.by-version."optimist"."0.6.1"; - by-spec."optimist"."~0.3" = + by-spec."optimist"."0.3.x" = self.by-version."optimist"."0.3.7"; by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage { name = "node-optimist-0.3.7"; @@ -15030,6 +13440,31 @@ ]; passthru.names = [ "optimist" ]; }; + by-spec."optimist"."0.6.0" = + self.by-version."optimist"."0.6.0"; + by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-optimist-0.6.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + name = "optimist-0.6.0.tgz"; + sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; + }) + ]; + buildInputs = + (self.nativeDeps."optimist" or []); + deps = [ + self.by-version."wordwrap"."0.0.2" + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "optimist" ]; + }; + by-spec."optimist"."0.6.x" = + self.by-version."optimist"."0.6.1"; + by-spec."optimist"."~0.3" = + self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.3.5" = self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.6.0" = @@ -15115,45 +13550,7 @@ ]; passthru.names = [ "os-browserify" ]; }; - by-spec."os-utils"."0.0.14" = - self.by-version."os-utils"."0.0.14"; - by-version."os-utils"."0.0.14" = lib.makeOverridable self.buildNodePackage { - name = "node-os-utils-0.0.14"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/os-utils/-/os-utils-0.0.14.tgz"; - name = "os-utils-0.0.14.tgz"; - sha1 = "29e511697b1982b8c627722175fe39797ef64156"; - }) - ]; - buildInputs = - (self.nativeDeps."os-utils" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "os-utils" ]; - }; by-spec."osenv"."0" = - self.by-version."osenv"."0.1.0"; - by-version."osenv"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-osenv-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"; - name = "osenv-0.1.0.tgz"; - sha1 = "61668121eec584955030b9f470b1d2309504bfcb"; - }) - ]; - buildInputs = - (self.nativeDeps."osenv" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "osenv" ]; - }; - by-spec."osenv"."0.0.3" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "node-osenv-0.0.3"; @@ -15172,6 +13569,8 @@ ]; passthru.names = [ "osenv" ]; }; + by-spec."osenv"."0.0.3" = + self.by-version."osenv"."0.0.3"; by-spec."osenv"."~0.0.3" = self.by-version."osenv"."0.0.3"; by-spec."owl-deepcopy"."*" = @@ -15216,34 +13615,15 @@ ]; passthru.names = [ "p-throttler" ]; }; - by-spec."pad-component"."0.0.1" = - self.by-version."pad-component"."0.0.1"; - by-version."pad-component"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-pad-component-0.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; - name = "pad-component-0.0.1.tgz"; - sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; - }) - ]; - buildInputs = - (self.nativeDeps."pad-component" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "pad-component" ]; - }; by-spec."pako"."~0.2.0" = - self.by-version."pako"."0.2.3"; - by-version."pako"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-pako-0.2.3"; + self.by-version."pako"."0.2.0"; + by-version."pako"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-pako-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/pako/-/pako-0.2.3.tgz"; - name = "pako-0.2.3.tgz"; - sha1 = "da97260282d270c43f210d9e9bf9abdf54072641"; + url = "http://registry.npmjs.org/pako/-/pako-0.2.0.tgz"; + name = "pako-0.2.0.tgz"; + sha1 = "bb93787e8c60587c8b13cd3cd8802e9d6f5dd8d5"; }) ]; buildInputs = @@ -15480,14 +13860,14 @@ passthru.names = [ "pause" ]; }; by-spec."phantomjs"."*" = - self.by-version."phantomjs"."1.9.7-8"; - by-version."phantomjs"."1.9.7-8" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.7-8"; + self.by-version."phantomjs"."1.9.7-4"; + by-version."phantomjs"."1.9.7-4" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.7-4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-8.tgz"; - name = "phantomjs-1.9.7-8.tgz"; - sha1 = "f1858d1626bb62f8bbb2a06e733ea95c50c2deb5"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-4.tgz"; + name = "phantomjs-1.9.7-4.tgz"; + sha1 = "975b84f17b4b3bb28161d28303cb793b98c9d0dd"; }) ]; buildInputs = @@ -15498,19 +13878,16 @@ self.by-version."ncp"."0.4.2" self.by-version."npmconf"."0.0.24" self.by-version."mkdirp"."0.3.5" - self.by-version."request"."2.36.0" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "phantomjs" ]; }; - "phantomjs" = self.by-version."phantomjs"."1.9.7-8"; - by-spec."phantomjs"."~1.9.1" = - self.by-version."phantomjs"."1.9.7-8"; - by-spec."phantomjs"."~1.9.7" = - self.by-version."phantomjs"."1.9.7-8"; + "phantomjs" = self.by-version."phantomjs"."1.9.7-4"; + by-spec."phantomjs"."~1.9.1-2" = + self.by-version."phantomjs"."1.9.7-4"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -15633,14 +14010,14 @@ passthru.names = [ "posix-getopt" ]; }; by-spec."pretty-bytes"."^0.1.0" = - self.by-version."pretty-bytes"."0.1.1"; - by-version."pretty-bytes"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "pretty-bytes-0.1.1"; + self.by-version."pretty-bytes"."0.1.0"; + by-version."pretty-bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "pretty-bytes-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.1.tgz"; - name = "pretty-bytes-0.1.1.tgz"; - sha1 = "c99fc780053e49397155295f2fd1a196e8c3937a"; + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz"; + name = "pretty-bytes-0.1.0.tgz"; + sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e"; }) ]; buildInputs = @@ -15651,25 +14028,6 @@ ]; passthru.names = [ "pretty-bytes" ]; }; - by-spec."process"."^0.7.0" = - self.by-version."process"."0.7.0"; - by-version."process"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-process-0.7.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/process/-/process-0.7.0.tgz"; - name = "process-0.7.0.tgz"; - sha1 = "c52208161a34adf3812344ae85d3e6150469389d"; - }) - ]; - buildInputs = - (self.nativeDeps."process" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "process" ]; - }; by-spec."process"."~0.5.1" = self.by-version."process"."0.5.2"; by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage { @@ -15722,7 +14080,7 @@ buildInputs = (self.nativeDeps."promise" or []); deps = [ - self.by-version."is-promise"."1.0.1" + self.by-version."is-promise"."1.0.0" ]; peerDependencies = [ ]; @@ -15744,7 +14102,7 @@ deps = [ self.by-version."pkginfo"."0.3.0" self.by-version."read"."1.0.5" - self.by-version."revalidator"."0.1.8" + self.by-version."revalidator"."0.1.7" self.by-version."utile"."0.2.1" self.by-version."winston"."0.6.2" ]; @@ -15773,14 +14131,14 @@ passthru.names = [ "promptly" ]; }; by-spec."promzard"."~0.2.0" = - self.by-version."promzard"."0.2.2"; - by-version."promzard"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-promzard-0.2.2"; + self.by-version."promzard"."0.2.1"; + by-version."promzard"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-promzard-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz"; - name = "promzard-0.2.2.tgz"; - sha1 = "918b9f2b29458cb001781a8856502e4a79b016e0"; + url = "http://registry.npmjs.org/promzard/-/promzard-0.2.1.tgz"; + name = "promzard-0.2.1.tgz"; + sha1 = "c4c7cbe5182465c13b43540be9daf47098b4e75b"; }) ]; buildInputs = @@ -15812,14 +14170,14 @@ passthru.names = [ "proto-list" ]; }; by-spec."protobufjs".">= 1.1.4" = - self.by-version."protobufjs"."2.2.1"; - by-version."protobufjs"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "protobufjs-2.2.1"; + self.by-version."protobufjs"."2.0.5"; + by-version."protobufjs"."2.0.5" = lib.makeOverridable self.buildNodePackage { + name = "protobufjs-2.0.5"; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.2.1.tgz"; - name = "protobufjs-2.2.1.tgz"; - sha1 = "ce22d3f51f6685b8e783a7d7c2e956ada6147495"; + url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz"; + name = "protobufjs-2.0.5.tgz"; + sha1 = "7f351178c959b333d2327b773325ca4b2627a242"; }) ]; buildInputs = @@ -15832,46 +14190,6 @@ ]; passthru.names = [ "protobufjs" ]; }; - by-spec."proxy-addr"."1.0.0" = - self.by-version."proxy-addr"."1.0.0"; - by-version."proxy-addr"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-proxy-addr-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.0.tgz"; - name = "proxy-addr-1.0.0.tgz"; - sha1 = "478617ab0fba70e0c3dae9cf57469e36dd2febaf"; - }) - ]; - buildInputs = - (self.nativeDeps."proxy-addr" or []); - deps = [ - self.by-version."ipaddr.js"."0.1.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "proxy-addr" ]; - }; - by-spec."proxy-addr"."1.0.1" = - self.by-version."proxy-addr"."1.0.1"; - by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-proxy-addr-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; - name = "proxy-addr-1.0.1.tgz"; - sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; - }) - ]; - buildInputs = - (self.nativeDeps."proxy-addr" or []); - deps = [ - self.by-version."ipaddr.js"."0.1.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "proxy-addr" ]; - }; 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 { @@ -15892,8 +14210,6 @@ ]; passthru.names = [ "ps-tree" ]; }; - by-spec."ps-tree"."~0.0.3" = - self.by-version."ps-tree"."0.0.3"; by-spec."punycode"."1.2.4" = self.by-version."punycode"."1.2.4"; by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -15936,8 +14252,6 @@ }; by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.4"; - by-spec."punycode"."~1.2.4" = - self.by-version."punycode"."1.2.4"; by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" = self.by-version."pure-css"."0.5.0-rc-1"; by-version."pure-css"."0.5.0-rc-1" = lib.makeOverridable self.buildNodePackage { @@ -15959,14 +14273,14 @@ }; "pure-css" = self.by-version."pure-css"."0.5.0-rc-1"; by-spec."q".">= 0.0.1" = - self.by-version."q"."2.0.2"; - by-version."q"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-q-2.0.2"; + self.by-version."q"."2.0.1"; + by-version."q"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-q-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz"; - name = "q-2.0.2.tgz"; - sha1 = "4629e6cc668ff8554cfa775dab5aba50bad8f56d"; + url = "http://registry.npmjs.org/q/-/q-2.0.1.tgz"; + name = "q-2.0.1.tgz"; + sha1 = "ae9dc1edd970e72820a1ca716ecc1b0fc96c1c5a"; }) ]; buildInputs = @@ -16164,6 +14478,8 @@ self.by-version."qs"."0.5.6"; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; + by-spec."qs"."~0.6.6" = + self.by-version."qs"."0.6.6"; by-spec."querystring".">=0.1.0 <0.2.0" = self.by-version."querystring"."0.1.0"; by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -16202,34 +14518,15 @@ ]; passthru.names = [ "querystring-es3" ]; }; - by-spec."querystring-es3"."~0.2.0" = - self.by-version."querystring-es3"."0.2.1-0"; - by-version."querystring-es3"."0.2.1-0" = lib.makeOverridable self.buildNodePackage { - name = "node-querystring-es3-0.2.1-0"; + by-spec."rai"."~0.1" = + self.by-version."rai"."0.1.9"; + by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "node-rai-0.1.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1-0.tgz"; - name = "querystring-es3-0.2.1-0.tgz"; - sha1 = "bd38cbd701040e7ef66c94a93db4a5b45be39565"; - }) - ]; - buildInputs = - (self.nativeDeps."querystring-es3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "querystring-es3" ]; - }; - by-spec."rai"."~0.1.11" = - self.by-version."rai"."0.1.11"; - by-version."rai"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "node-rai-0.1.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz"; - name = "rai-0.1.11.tgz"; - sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228"; + url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz"; + name = "rai-0.1.9.tgz"; + sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc"; }) ]; buildInputs = @@ -16342,21 +14639,41 @@ ]; passthru.names = [ "raw-body" ]; }; - by-spec."raw-body"."1.1.6" = - self.by-version."raw-body"."1.1.6"; - by-version."raw-body"."1.1.6" = lib.makeOverridable self.buildNodePackage { - name = "node-raw-body-1.1.6"; + by-spec."raw-body"."1.1.3" = + self.by-version."raw-body"."1.1.3"; + by-version."raw-body"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-raw-body-1.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.6.tgz"; - name = "raw-body-1.1.6.tgz"; - sha1 = "98e9df9a7e2df994931b7cdb4b2a6b9694a74f02"; + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.3.tgz"; + name = "raw-body-1.1.3.tgz"; + sha1 = "3d2f91e2449259cc67b8c3ce9f061db5b987935b"; }) ]; buildInputs = (self.nativeDeps."raw-body" or []); deps = [ - self.by-version."bytes"."1.0.0" + self.by-version."bytes"."0.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "raw-body" ]; + }; + by-spec."raw-body"."~1.1.2" = + self.by-version."raw-body"."1.1.4"; + by-version."raw-body"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-raw-body-1.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz"; + name = "raw-body-1.1.4.tgz"; + sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d"; + }) + ]; + buildInputs = + (self.nativeDeps."raw-body" or []); + deps = [ + self.by-version."bytes"."0.3.0" ]; peerDependencies = [ ]; @@ -16415,15 +14732,15 @@ buildInputs = (self.nativeDeps."rc" or []); deps = [ - self.by-version."minimist"."0.0.10" - self.by-version."deep-extend"."0.2.10" + self.by-version."minimist"."0.0.8" + self.by-version."deep-extend"."0.2.8" self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.5" = + by-spec."rc"."~0.3.4" = self.by-version."rc"."0.3.5"; by-spec."react"."*" = self.by-version."react"."0.10.0"; @@ -16466,107 +14783,61 @@ ]; passthru.names = [ "read" ]; }; - by-spec."read"."1.0.5" = - self.by-version."read"."1.0.5"; by-spec."read"."1.0.x" = self.by-version."read"."1.0.5"; by-spec."read"."~1.0.1" = self.by-version."read"."1.0.5"; by-spec."read"."~1.0.4" = self.by-version."read"."1.0.5"; - by-spec."read-installed"."~2.0.4" = - self.by-version."read-installed"."2.0.5"; - by-version."read-installed"."2.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-read-installed-2.0.5"; + by-spec."read-installed"."~2.0.1" = + self.by-version."read-installed"."2.0.2"; + by-version."read-installed"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-read-installed-2.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.5.tgz"; - name = "read-installed-2.0.5.tgz"; - sha1 = "761eda1fd2dc322f8e77844a8bf1ddedbcfc754b"; + url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.2.tgz"; + name = "read-installed-2.0.2.tgz"; + sha1 = "e69e7e1946af932b2fa454465639ebea4d63773c"; }) ]; buildInputs = (self.nativeDeps."read-installed" or []); deps = [ - self.by-version."read-package-json"."1.2.2" - self.by-version."semver"."2.3.0" + self.by-version."read-package-json"."1.1.8" + self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" self.by-version."util-extend"."1.0.1" - self.by-version."graceful-fs"."3.0.1" + self.by-version."graceful-fs"."2.0.3" ]; peerDependencies = [ ]; passthru.names = [ "read-installed" ]; }; by-spec."read-package-json"."1" = - self.by-version."read-package-json"."1.2.2"; - by-version."read-package-json"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-read-package-json-1.2.2"; + self.by-version."read-package-json"."1.1.8"; + by-version."read-package-json"."1.1.8" = lib.makeOverridable self.buildNodePackage { + name = "node-read-package-json-1.1.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.2.tgz"; - name = "read-package-json-1.2.2.tgz"; - sha1 = "545fc9044d135bf5fe0a67c6eab368c3186cbafe"; + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.8.tgz"; + name = "read-package-json-1.1.8.tgz"; + sha1 = "234928819444283fd63f9d93ce03ba00668e94f9"; }) ]; buildInputs = (self.nativeDeps."read-package-json" or []); deps = [ - self.by-version."glob"."4.0.2" + self.by-version."glob"."3.2.9" self.by-version."lru-cache"."2.5.0" - self.by-version."normalize-package-data"."0.3.0" - self.by-version."graceful-fs"."3.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read-package-json" ]; - }; - by-spec."read-package-json"."~1.1.9" = - self.by-version."read-package-json"."1.1.9"; - by-version."read-package-json"."1.1.9" = lib.makeOverridable self.buildNodePackage { - name = "node-read-package-json-1.1.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.9.tgz"; - name = "read-package-json-1.1.9.tgz"; - sha1 = "9c319185e5f8461661c01f8d4e5e80b468aa18ee"; - }) - ]; - buildInputs = - (self.nativeDeps."read-package-json" or []); - deps = [ - self.by-version."glob"."3.2.11" - self.by-version."lru-cache"."2.5.0" - self.by-version."normalize-package-data"."0.2.13" + self.by-version."normalize-package-data"."0.2.12" self.by-version."graceful-fs"."2.0.3" ]; peerDependencies = [ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."readable-stream"."*" = - self.by-version."readable-stream"."1.1.13-1"; - by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.1.13-1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz"; - name = "readable-stream-1.1.13-1.tgz"; - sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream" or []); - deps = [ - self.by-version."core-util-is"."1.0.1" - self.by-version."isarray"."0.0.1" - self.by-version."string_decoder"."0.10.25" - self.by-version."inherits"."2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; + by-spec."read-package-json"."~1.1.8" = + self.by-version."read-package-json"."1.1.8"; by-spec."readable-stream"."1.0" = self.by-version."readable-stream"."1.0.27-1"; by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage { @@ -16590,22 +14861,35 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."1.0.27-1" = - self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.13-1"; - by-spec."readable-stream"."^1.0.27-1" = - self.by-version."readable-stream"."1.1.13-1"; + by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.1.13-1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz"; + name = "readable-stream-1.1.13-1.tgz"; + sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46"; + }) + ]; + buildInputs = + (self.nativeDeps."readable-stream" or []); + deps = [ + self.by-version."core-util-is"."1.0.1" + self.by-version."isarray"."0.0.1" + self.by-version."string_decoder"."0.10.25" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "readable-stream" ]; + }; by-spec."readable-stream"."~1.0.17" = self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.0.2" = self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.0.24" = self.by-version."readable-stream"."1.0.27-1"; - by-spec."readable-stream"."~1.0.26" = - self.by-version."readable-stream"."1.0.27-1"; - by-spec."readable-stream"."~1.0.26-4" = - self.by-version."readable-stream"."1.0.27-1"; by-spec."readable-stream"."~1.1.8" = self.by-version."readable-stream"."1.1.13-1"; by-spec."readable-stream"."~1.1.9" = @@ -16624,7 +14908,7 @@ buildInputs = (self.nativeDeps."readdirp" or []); deps = [ - self.by-version."minimatch"."0.3.0" + self.by-version."minimatch"."0.2.14" ]; peerDependencies = [ ]; @@ -16692,14 +14976,14 @@ passthru.names = [ "redeyed" ]; }; by-spec."redis"."*" = - self.by-version."redis"."0.10.3"; - by-version."redis"."0.10.3" = lib.makeOverridable self.buildNodePackage { - name = "node-redis-0.10.3"; + self.by-version."redis"."0.10.1"; + by-version."redis"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "node-redis-0.10.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - name = "redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + url = "http://registry.npmjs.org/redis/-/redis-0.10.1.tgz"; + name = "redis-0.10.1.tgz"; + sha1 = "4f09258931d961377239fdbd495e1d99a263a8ec"; }) ]; buildInputs = @@ -16710,9 +14994,7 @@ ]; passthru.names = [ "redis" ]; }; - "redis" = self.by-version."redis"."0.10.3"; - by-spec."redis"."0.10.x" = - self.by-version."redis"."0.10.3"; + "redis" = self.by-version."redis"."0.10.1"; by-spec."redis"."0.7.2" = self.by-version."redis"."0.7.2"; by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -16727,7 +15009,7 @@ buildInputs = (self.nativeDeps."redis" or []); deps = [ - self.by-version."hiredis"."0.1.17" + self.by-version."hiredis"."0.1.16" ]; peerDependencies = [ ]; @@ -16752,8 +15034,27 @@ ]; passthru.names = [ "redis" ]; }; + by-spec."redis"."0.8.x" = + self.by-version."redis"."0.8.6"; + by-version."redis"."0.8.6" = lib.makeOverridable self.buildNodePackage { + name = "node-redis-0.8.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz"; + name = "redis-0.8.6.tgz"; + sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8"; + }) + ]; + buildInputs = + (self.nativeDeps."redis" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "redis" ]; + }; by-spec."redis"."~0.10.0" = - self.by-version."redis"."0.10.3"; + self.by-version."redis"."0.10.1"; by-spec."reds"."~0.2.4" = self.by-version."reds"."0.2.4"; by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -16836,14 +15137,14 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.36.0"; - by-version."request"."2.36.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.36.0"; + self.by-version."request"."2.34.0"; + by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.34.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz"; - name = "request-2.36.0.tgz"; - sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; + url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; + name = "request-2.34.0.tgz"; + sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; }) ]; buildInputs = @@ -16851,12 +15152,12 @@ deps = [ self.by-version."qs"."0.6.6" self.by-version."json-stringify-safe"."5.0.0" - self.by-version."mime"."1.2.11" self.by-version."forever-agent"."0.5.2" self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" self.by-version."tough-cookie"."0.12.1" - self.by-version."form-data"."0.1.3" - self.by-version."tunnel-agent"."0.4.0" + self.by-version."form-data"."0.1.2" + self.by-version."tunnel-agent"."0.3.0" self.by-version."http-signature"."0.10.0" self.by-version."oauth-sign"."0.3.0" self.by-version."hawk"."1.0.0" @@ -16867,9 +15168,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.36.0"; + self.by-version."request"."2.34.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.36.0"; + self.by-version."request"."2.34.0"; by-spec."request"."2.16.2" = self.by-version."request"."2.16.2"; by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { @@ -16930,8 +15231,6 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."2.36.0" = - self.by-version."request"."2.36.0"; by-spec."request"."2.9.x" = self.by-version."request"."2.9.203"; by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage { @@ -16951,12 +15250,12 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request".">=2.33.0" = + self.by-version."request"."2.34.0"; by-spec."request"."^2.34.0" = - self.by-version."request"."2.36.0"; - by-spec."request"."^2.36.0" = - self.by-version."request"."2.36.0"; + self.by-version."request"."2.34.0"; by-spec."request"."~2" = - self.by-version."request"."2.36.0"; + self.by-version."request"."2.34.0"; by-spec."request"."~2.27.0" = self.by-version."request"."2.27.0"; by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { @@ -16982,7 +15281,7 @@ 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.1.3" + self.by-version."form-data"."0.1.2" ]; peerDependencies = [ ]; @@ -17008,7 +15307,7 @@ self.by-version."node-uuid"."1.4.1" self.by-version."mime"."1.2.11" self.by-version."tough-cookie"."0.9.15" - self.by-version."form-data"."0.1.3" + self.by-version."form-data"."0.1.2" self.by-version."tunnel-agent"."0.3.0" self.by-version."http-signature"."0.10.0" self.by-version."oauth-sign"."0.3.0" @@ -17019,15 +15318,15 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.34.0" = - self.by-version."request"."2.34.0"; - by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.34.0"; + by-spec."request"."~2.33.0" = + self.by-version."request"."2.33.0"; + by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.33.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; - name = "request-2.34.0.tgz"; - sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; + url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; + name = "request-2.33.0.tgz"; + sha1 = "5167878131726070ec633752ea230a2379dc65ff"; }) ]; buildInputs = @@ -17039,7 +15338,7 @@ self.by-version."node-uuid"."1.4.1" self.by-version."mime"."1.2.11" self.by-version."tough-cookie"."0.12.1" - self.by-version."form-data"."0.1.3" + self.by-version."form-data"."0.1.2" self.by-version."tunnel-agent"."0.3.0" self.by-version."http-signature"."0.10.0" self.by-version."oauth-sign"."0.3.0" @@ -17050,8 +15349,6 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.36.0" = - self.by-version."request"."2.36.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 { @@ -17093,14 +15390,14 @@ passthru.names = [ "request-replay" ]; }; by-spec."requirejs"."~2.1" = - self.by-version."requirejs"."2.1.14"; - by-version."requirejs"."2.1.14" = lib.makeOverridable self.buildNodePackage { - name = "requirejs-2.1.14"; + self.by-version."requirejs"."2.1.11"; + by-version."requirejs"."2.1.11" = lib.makeOverridable self.buildNodePackage { + name = "requirejs-2.1.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.14.tgz"; - name = "requirejs-2.1.14.tgz"; - sha1 = "de00290aa526192ff8df4dc0ba9370ce399a76b0"; + url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.11.tgz"; + name = "requirejs-2.1.11.tgz"; + sha1 = "0eafaa6b46ca9b5b1e13406f119c020190a24442"; }) ]; buildInputs = @@ -17112,7 +15409,7 @@ passthru.names = [ "requirejs" ]; }; by-spec."requirejs"."~2.1.0" = - self.by-version."requirejs"."2.1.14"; + self.by-version."requirejs"."2.1.11"; by-spec."resolve"."0.6.3" = self.by-version."resolve"."0.6.3"; by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage { @@ -17159,23 +15456,20 @@ self.by-version."resolve"."0.6.3"; by-spec."resolve"."~0.6.1" = self.by-version."resolve"."0.6.3"; - by-spec."resolve"."~0.6.3" = - self.by-version."resolve"."0.6.3"; - by-spec."response-time"."2.0.0" = - self.by-version."response-time"."2.0.0"; - by-version."response-time"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-response-time-2.0.0"; + by-spec."response-time"."1.0.0" = + self.by-version."response-time"."1.0.0"; + by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-response-time-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/response-time/-/response-time-2.0.0.tgz"; - name = "response-time-2.0.0.tgz"; - sha1 = "65cb39fd50de2f4ffdbdd285f1855966bd6fcb36"; + url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz"; + name = "response-time-1.0.0.tgz"; + sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9"; }) ]; buildInputs = (self.nativeDeps."response-time" or []); deps = [ - self.by-version."on-headers"."0.0.0" ]; peerDependencies = [ ]; @@ -17218,26 +15512,26 @@ passthru.names = [ "restify" ]; }; by-spec."rethinkdb"."*" = - self.by-version."rethinkdb"."1.12.0-1"; - by-version."rethinkdb"."1.12.0-1" = lib.makeOverridable self.buildNodePackage { - name = "node-rethinkdb-1.12.0-1"; + self.by-version."rethinkdb"."1.12.0-0"; + by-version."rethinkdb"."1.12.0-0" = lib.makeOverridable self.buildNodePackage { + name = "node-rethinkdb-1.12.0-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-1.tgz"; - name = "rethinkdb-1.12.0-1.tgz"; - sha1 = "c6dfb03a0ca179d0bf798b8de0c13938b9d64595"; + url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-0.tgz"; + name = "rethinkdb-1.12.0-0.tgz"; + sha1 = "cad01e869bd12dcd09f235c5ec8f5ccf26cc6f81"; }) ]; buildInputs = (self.nativeDeps."rethinkdb" or []); deps = [ - self.by-version."protobufjs"."2.2.1" + self.by-version."protobufjs"."2.0.5" ]; peerDependencies = [ ]; passthru.names = [ "rethinkdb" ]; }; - "rethinkdb" = self.by-version."rethinkdb"."1.12.0-1"; + "rethinkdb" = self.by-version."rethinkdb"."1.12.0-0"; by-spec."retry"."0.6.0" = self.by-version."retry"."0.6.0"; by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -17260,14 +15554,14 @@ by-spec."retry"."~0.6.0" = self.by-version."retry"."0.6.0"; by-spec."revalidator"."0.1.x" = - self.by-version."revalidator"."0.1.8"; - by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "node-revalidator-0.1.8"; + self.by-version."revalidator"."0.1.7"; + by-version."revalidator"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "node-revalidator-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; - name = "revalidator-0.1.8.tgz"; - sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.7.tgz"; + name = "revalidator-0.1.7.tgz"; + sha1 = "f0b68b01bc5c5e0e9e6d864154d7098f24fec1db"; }) ]; buildInputs = @@ -17321,14 +15615,14 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; + self.by-version."rimraf"."2.2.6"; + by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz"; + name = "rimraf-2.2.6.tgz"; + sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c"; }) ]; buildInputs = @@ -17340,13 +15634,11 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2.x.x" = - self.by-version."rimraf"."2.2.8"; - by-spec."rimraf"."^2.2.0" = - self.by-version."rimraf"."2.2.8"; + self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."^2.2.2" = - self.by-version."rimraf"."2.2.8"; + self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2" = - self.by-version."rimraf"."2.2.8"; + self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2.0.2" = self.by-version."rimraf"."2.0.3"; by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage { @@ -17388,15 +15680,13 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."~2.2.0" = - self.by-version."rimraf"."2.2.8"; + self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2.2.2" = - self.by-version."rimraf"."2.2.8"; + self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2.2.5" = - self.by-version."rimraf"."2.2.8"; + self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2.2.6" = - self.by-version."rimraf"."2.2.8"; - by-spec."rimraf"."~2.2.8" = - self.by-version."rimraf"."2.2.8"; + self.by-version."rimraf"."2.2.6"; by-spec."ruglify"."~1.0.0" = self.by-version."ruglify"."1.0.0"; by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -17482,7 +15772,7 @@ self.by-version."lodash"."1.3.1" self.by-version."async"."0.2.10" self.by-version."adm-zip"."0.4.4" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" ]; peerDependencies = [ ]; @@ -17526,7 +15816,7 @@ ]; passthru.names = [ "sax" ]; }; - by-spec."sax"."0.6.x" = + by-spec."sax".">=0.4.2" = self.by-version."sax"."0.6.0"; by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "node-sax-0.6.0"; @@ -17545,8 +15835,6 @@ ]; passthru.names = [ "sax" ]; }; - by-spec."sax".">=0.4.2" = - self.by-version."sax"."0.6.0"; by-spec."scmp"."~0.0.3" = self.by-version."scmp"."0.0.3"; by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -17567,14 +15855,14 @@ passthru.names = [ "scmp" ]; }; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.42.0"; - by-version."selenium-webdriver"."2.42.0" = lib.makeOverridable self.buildNodePackage { - name = "node-selenium-webdriver-2.42.0"; + self.by-version."selenium-webdriver"."2.41.0"; + by-version."selenium-webdriver"."2.41.0" = lib.makeOverridable self.buildNodePackage { + name = "node-selenium-webdriver-2.41.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.42.0.tgz"; - name = "selenium-webdriver-2.42.0.tgz"; - sha1 = "a7ec4ca8779378f6b2627ba342f529c8d1187195"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.41.0.tgz"; + name = "selenium-webdriver-2.41.0.tgz"; + sha1 = "d084dfbc73bdf33aedc7d731eaab028affad7f16"; }) ]; buildInputs = @@ -17585,16 +15873,16 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.42.0"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.41.0"; by-spec."semver"."*" = - self.by-version."semver"."2.3.0"; - by-version."semver"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.3.0"; + self.by-version."semver"."2.2.1"; + by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.3.0.tgz"; - name = "semver-2.3.0.tgz"; - sha1 = "d31b2903ebe2a1806c05b8e763916a7183108a15"; + url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; + sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; }) ]; buildInputs = @@ -17605,7 +15893,7 @@ ]; passthru.names = [ "semver" ]; }; - "semver" = self.by-version."semver"."2.3.0"; + "semver" = self.by-version."semver"."2.2.1"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -17645,17 +15933,15 @@ passthru.names = [ "semver" ]; }; by-spec."semver"."2" = - self.by-version."semver"."2.3.0"; - by-spec."semver"."2 >=2.2.1" = - self.by-version."semver"."2.3.0"; + self.by-version."semver"."2.2.1"; by-spec."semver"."2.x" = - self.by-version."semver"."2.3.0"; + self.by-version."semver"."2.2.1"; by-spec."semver".">=2.0.10 <3.0.0" = - self.by-version."semver"."2.3.0"; + self.by-version."semver"."2.2.1"; by-spec."semver".">=2.2.1 <3" = - self.by-version."semver"."2.3.0"; - by-spec."semver"."^2.3.0" = - self.by-version."semver"."2.3.0"; + self.by-version."semver"."2.2.1"; + by-spec."semver"."^2.2.1" = + self.by-version."semver"."2.2.1"; by-spec."semver"."~1.1.0" = self.by-version."semver"."1.1.4"; by-spec."semver"."~1.1.4" = @@ -17700,43 +15986,23 @@ }; by-spec."semver"."~2.2.1" = self.by-version."semver"."2.2.1"; - by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; - name = "semver-2.2.1.tgz"; - sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; - }) - ]; - buildInputs = - (self.nativeDeps."semver" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - by-spec."semver"."~2.3.0" = - self.by-version."semver"."2.3.0"; by-spec."send"."*" = - self.by-version."send"."0.4.1"; - by-version."send"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.4.1"; + 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.4.1.tgz"; - name = "send-0.4.1.tgz"; - sha1 = "6e9a5d41cb9c0fb3514226446fa319aed46d433d"; + url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz"; + name = "send-0.2.0.tgz"; + sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58"; }) ]; buildInputs = (self.nativeDeps."send" or []); deps = [ self.by-version."debug"."0.8.1" - self.by-version."finished"."1.1.4" - self.by-version."fresh"."0.2.2" self.by-version."mime"."1.2.11" + self.by-version."fresh"."0.2.2" self.by-version."range-parser"."1.0.0" ]; peerDependencies = [ @@ -17757,7 +16023,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -17780,7 +16046,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -17803,7 +16069,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" self.by-version."mime"."1.2.11" self.by-version."fresh"."0.2.0" self.by-version."range-parser"."0.0.4" @@ -17814,53 +16080,6 @@ }; by-spec."send"."0.2.0" = 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.2.0.tgz"; - name = "send-0.2.0.tgz"; - sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58"; - }) - ]; - buildInputs = - (self.nativeDeps."send" or []); - deps = [ - self.by-version."debug"."1.0.1" - self.by-version."mime"."1.2.11" - self.by-version."fresh"."0.2.2" - self.by-version."range-parser"."1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "send" ]; - }; - by-spec."send"."0.3.0" = - self.by-version."send"."0.3.0"; - by-version."send"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz"; - name = "send-0.3.0.tgz"; - sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7"; - }) - ]; - buildInputs = - (self.nativeDeps."send" or []); - deps = [ - self.by-version."buffer-crc32"."0.2.1" - self.by-version."debug"."0.8.0" - self.by-version."fresh"."0.2.2" - self.by-version."mime"."1.2.11" - self.by-version."range-parser"."1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "send" ]; - }; - by-spec."send"."0.4.1" = - self.by-version."send"."0.4.1"; by-spec."sequence"."2.2.1" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -17882,42 +16101,22 @@ }; by-spec."sequence"."2.x" = self.by-version."sequence"."2.2.1"; - by-spec."serve-favicon"."2.0.1" = - self.by-version."serve-favicon"."2.0.1"; - by-version."serve-favicon"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-favicon-2.0.1"; + by-spec."serve-index"."1.0.1" = + self.by-version."serve-index"."1.0.1"; + by-version."serve-index"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-index-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz"; - name = "serve-favicon-2.0.1.tgz"; - sha1 = "4826975d9f173ca3a4158e9698161f75dec7afec"; - }) - ]; - buildInputs = - (self.nativeDeps."serve-favicon" or []); - deps = [ - self.by-version."fresh"."0.2.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "serve-favicon" ]; - }; - by-spec."serve-index"."1.1.0" = - self.by-version."serve-index"."1.1.0"; - by-version."serve-index"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-index-1.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.1.0.tgz"; - name = "serve-index-1.1.0.tgz"; - sha1 = "4843b22d78eae51406adb8fa370c373b9499501d"; + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz"; + name = "serve-index-1.0.1.tgz"; + sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6"; }) ]; buildInputs = (self.nativeDeps."serve-index" or []); deps = [ - self.by-version."accepts"."1.0.2" self.by-version."batch"."0.5.0" + self.by-version."negotiator"."0.4.2" ]; peerDependencies = [ ]; @@ -17943,60 +16142,58 @@ ]; passthru.names = [ "serve-static" ]; }; - by-spec."serve-static"."1.1.0" = - self.by-version."serve-static"."1.1.0"; - by-version."serve-static"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.1.0"; + by-spec."serve-static"."1.0.2" = + self.by-version."serve-static"."1.0.2"; + by-version."serve-static"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz"; - name = "serve-static-1.1.0.tgz"; - sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.2.tgz"; + name = "serve-static-1.0.2.tgz"; + sha1 = "4129f6727b09fb031134fa6d185683e30bfbef54"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-static" or []); + deps = [ + self.by-version."send"."0.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "serve-static" ]; + }; + by-spec."serve-static"."1.0.4" = + self.by-version."serve-static"."1.0.4"; + by-version."serve-static"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.4.tgz"; + name = "serve-static-1.0.4.tgz"; + sha1 = "426fedebe77bad21f373f1efcae09746639fba06"; }) ]; buildInputs = (self.nativeDeps."serve-static" or []); deps = [ self.by-version."parseurl"."1.0.1" - self.by-version."send"."0.3.0" + self.by-version."send"."0.2.0" ]; peerDependencies = [ ]; passthru.names = [ "serve-static" ]; }; - by-spec."serve-static"."1.2.1" = - self.by-version."serve-static"."1.2.1"; - by-version."serve-static"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.2.1"; + by-spec."serve-static"."~1.0.3" = + self.by-version."serve-static"."1.0.4"; + by-spec."setimmediate"."1.0.1" = + self.by-version."setimmediate"."1.0.1"; + by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-setimmediate-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.2.1.tgz"; - name = "serve-static-1.2.1.tgz"; - sha1 = "a800a9de23dbd1ffb1258edb986128ee4a4ea03d"; - }) - ]; - buildInputs = - (self.nativeDeps."serve-static" or []); - deps = [ - self.by-version."escape-html"."1.0.1" - self.by-version."parseurl"."1.0.1" - self.by-version."send"."0.4.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "serve-static" ]; - }; - by-spec."serve-static"."~1.1.0" = - self.by-version."serve-static"."1.1.0"; - by-spec."setimmediate"."~1.0.1" = - self.by-version."setimmediate"."1.0.2"; - by-version."setimmediate"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-setimmediate-1.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"; - name = "setimmediate-1.0.2.tgz"; - sha1 = "d8221c4fdfeb2561556c5184fa05fb7ce0af73bd"; + url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz"; + name = "setimmediate-1.0.1.tgz"; + sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7"; }) ]; buildInputs = @@ -18008,20 +16205,20 @@ passthru.names = [ "setimmediate" ]; }; by-spec."sha"."~1.2.1" = - self.by-version."sha"."1.2.4"; - by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-sha-1.2.4"; + self.by-version."sha"."1.2.3"; + by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-sha-1.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz"; - name = "sha-1.2.4.tgz"; - sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d"; + url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz"; + name = "sha-1.2.3.tgz"; + sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329"; }) ]; buildInputs = (self.nativeDeps."sha" or []); deps = [ - self.by-version."graceful-fs"."3.0.1" + self.by-version."graceful-fs"."2.0.3" self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ @@ -18090,30 +16287,6 @@ passthru.names = [ "shell-quote" ]; }; by-spec."shelljs"."*" = - self.by-version."shelljs"."0.3.0"; - by-version."shelljs"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "shelljs-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; - name = "shelljs-0.3.0.tgz"; - sha1 = "3596e6307a781544f591f37da618360f31db57b1"; - }) - ]; - buildInputs = - (self.nativeDeps."shelljs" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "shelljs" ]; - }; - "shelljs" = self.by-version."shelljs"."0.3.0"; - by-spec."shelljs"."0.3.x" = - self.by-version."shelljs"."0.3.0"; - by-spec."shelljs"."^0.3.0" = - self.by-version."shelljs"."0.3.0"; - by-spec."shelljs"."~0.2.6" = self.by-version."shelljs"."0.2.6"; by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage { name = "shelljs-0.2.6"; @@ -18132,15 +16305,37 @@ ]; passthru.names = [ "shelljs" ]; }; - by-spec."should"."*" = - self.by-version."should"."4.0.3"; - by-version."should"."4.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-should-4.0.3"; + "shelljs" = self.by-version."shelljs"."0.2.6"; + by-spec."shelljs"."0.1.x" = + self.by-version."shelljs"."0.1.4"; + by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "shelljs-0.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-4.0.3.tgz"; - name = "should-4.0.3.tgz"; - sha1 = "2711897494e7b0eb429aad16cc88c9594f9c230e"; + url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"; + name = "shelljs-0.1.4.tgz"; + sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e"; + }) + ]; + buildInputs = + (self.nativeDeps."shelljs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shelljs" ]; + }; + by-spec."shelljs"."~0.2.6" = + self.by-version."shelljs"."0.2.6"; + by-spec."should"."*" = + self.by-version."should"."3.3.1"; + by-version."should"."3.3.1" = lib.makeOverridable self.buildNodePackage { + name = "node-should-3.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/should/-/should-3.3.1.tgz"; + name = "should-3.3.1.tgz"; + sha1 = "28c93a522ba001146af96078f0a88bf5ac929522"; }) ]; buildInputs = @@ -18151,7 +16346,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."4.0.3"; + "should" = self.by-version."should"."3.3.1"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -18214,20 +16409,20 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.32"; - by-version."simplesmtp"."0.3.32" = lib.makeOverridable self.buildNodePackage { - name = "node-simplesmtp-0.3.32"; + self.by-version."simplesmtp"."0.3.25"; + by-version."simplesmtp"."0.3.25" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.25"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.32.tgz"; - name = "simplesmtp-0.3.32.tgz"; - sha1 = "b3589b4cbf90624e712ab0ec1a7480ec14fd1c12"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.25.tgz"; + name = "simplesmtp-0.3.25.tgz"; + sha1 = "09b6ac292b7dae8053cfba11da09a0458eb8af39"; }) ]; buildInputs = (self.nativeDeps."simplesmtp" or []); deps = [ - self.by-version."rai"."0.1.11" + self.by-version."rai"."0.1.9" self.by-version."xoauth2"."0.1.8" ]; peerDependencies = [ @@ -18235,14 +16430,14 @@ passthru.names = [ "simplesmtp" ]; }; by-spec."sinon"."*" = - self.by-version."sinon"."1.10.2"; - by-version."sinon"."1.10.2" = lib.makeOverridable self.buildNodePackage { - name = "node-sinon-1.10.2"; + self.by-version."sinon"."1.9.1"; + by-version."sinon"."1.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-sinon-1.9.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sinon/-/sinon-1.10.2.tgz"; - name = "sinon-1.10.2.tgz"; - sha1 = "a33a1b902ee080da2bdca19781993a03c78bb5cc"; + url = "http://registry.npmjs.org/sinon/-/sinon-1.9.1.tgz"; + name = "sinon-1.9.1.tgz"; + sha1 = "0dac622bd3f0e6f9662a7431baf65f58c3459d69"; }) ]; buildInputs = @@ -18255,7 +16450,7 @@ ]; passthru.names = [ "sinon" ]; }; - "sinon" = self.by-version."sinon"."1.10.2"; + "sinon" = self.by-version."sinon"."1.9.1"; by-spec."slasp"."*" = self.by-version."slasp"."0.0.3"; by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -18471,14 +16666,14 @@ passthru.names = [ "socket.io" ]; }; by-spec."socket.io"."~0.9.13" = - self.by-version."socket.io"."0.9.17"; - by-version."socket.io"."0.9.17" = lib.makeOverridable self.buildNodePackage { - name = "node-socket.io-0.9.17"; + self.by-version."socket.io"."0.9.16"; + by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage { + name = "node-socket.io-0.9.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz"; - name = "socket.io-0.9.17.tgz"; - sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec"; + url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; + name = "socket.io-0.9.16.tgz"; + sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76"; }) ]; buildInputs = @@ -18494,7 +16689,7 @@ passthru.names = [ "socket.io" ]; }; by-spec."socket.io"."~0.9.16" = - self.by-version."socket.io"."0.9.17"; + self.by-version."socket.io"."0.9.16"; 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 { @@ -18542,27 +16737,27 @@ passthru.names = [ "socket.io-client" ]; }; by-spec."sockjs"."*" = - self.by-version."sockjs"."0.3.9"; - by-version."sockjs"."0.3.9" = lib.makeOverridable self.buildNodePackage { - name = "node-sockjs-0.3.9"; + self.by-version."sockjs"."0.3.8"; + by-version."sockjs"."0.3.8" = lib.makeOverridable self.buildNodePackage { + name = "node-sockjs-0.3.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.9.tgz"; - name = "sockjs-0.3.9.tgz"; - sha1 = "5ae2c732dac07f6d7e9e8a9a60ec86ec4fc3ffc7"; + url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz"; + name = "sockjs-0.3.8.tgz"; + sha1 = "c083cb0505db1ea1a949d3bd12d8a1ea385a456c"; }) ]; buildInputs = (self.nativeDeps."sockjs" or []); deps = [ self.by-version."node-uuid"."1.3.3" - self.by-version."faye-websocket"."0.7.2" + self.by-version."faye-websocket"."0.7.0" ]; peerDependencies = [ ]; passthru.names = [ "sockjs" ]; }; - "sockjs" = self.by-version."sockjs"."0.3.9"; + "sockjs" = self.by-version."sockjs"."0.3.8"; by-spec."sorted-object"."~1.0.0" = self.by-version."sorted-object"."1.0.0"; by-version."sorted-object"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -18757,14 +16952,14 @@ passthru.names = [ "stack-trace" ]; }; by-spec."stackdriver-statsd-backend"."*" = - self.by-version."stackdriver-statsd-backend"."0.2.2"; - by-version."stackdriver-statsd-backend"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-stackdriver-statsd-backend-0.2.2"; + self.by-version."stackdriver-statsd-backend"."0.2.1"; + by-version."stackdriver-statsd-backend"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-stackdriver-statsd-backend-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.2.tgz"; - name = "stackdriver-statsd-backend-0.2.2.tgz"; - sha1 = "15bdc95adf083cfbfa20d7ff8f67277d7eba38f8"; + url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.1.tgz"; + name = "stackdriver-statsd-backend-0.2.1.tgz"; + sha1 = "3109661288821e79259b4d750a25d7159265dd8e"; }) ]; buildInputs = @@ -18775,7 +16970,45 @@ ]; passthru.names = [ "stackdriver-statsd-backend" ]; }; - "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.2"; + "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.1"; + by-spec."static-favicon"."1.0.0" = + self.by-version."static-favicon"."1.0.0"; + by-version."static-favicon"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-static-favicon-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.0.tgz"; + name = "static-favicon-1.0.0.tgz"; + sha1 = "2e58dcfe58957a2d53337ef7a38cf9ad6c13c0d0"; + }) + ]; + buildInputs = + (self.nativeDeps."static-favicon" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "static-favicon" ]; + }; + by-spec."static-favicon"."1.0.2" = + self.by-version."static-favicon"."1.0.2"; + by-version."static-favicon"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-static-favicon-1.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz"; + name = "static-favicon-1.0.2.tgz"; + sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f"; + }) + ]; + buildInputs = + (self.nativeDeps."static-favicon" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "static-favicon" ]; + }; by-spec."statsd"."*" = self.by-version."statsd"."0.7.1"; by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage { @@ -18819,27 +17052,6 @@ passthru.names = [ "statsd-librato-backend" ]; }; "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2"; - by-spec."stream-browserify"."^1.0.0" = - self.by-version."stream-browserify"."1.0.0"; - by-version."stream-browserify"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-stream-browserify-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"; - name = "stream-browserify-1.0.0.tgz"; - sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193"; - }) - ]; - buildInputs = - (self.nativeDeps."stream-browserify" or []); - deps = [ - self.by-version."inherits"."2.0.1" - self.by-version."readable-stream"."1.1.13-1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "stream-browserify" ]; - }; by-spec."stream-browserify"."~0.1.0" = self.by-version."stream-browserify"."0.1.3"; by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -18883,27 +17095,6 @@ }; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; - by-spec."stream-combiner"."~0.1.0" = - self.by-version."stream-combiner"."0.1.0"; - by-version."stream-combiner"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-stream-combiner-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.1.0.tgz"; - name = "stream-combiner-0.1.0.tgz"; - sha1 = "0dc389a3c203f8f4d56368f95dde52eb9269b5be"; - }) - ]; - buildInputs = - (self.nativeDeps."stream-combiner" or []); - deps = [ - self.by-version."duplexer"."0.1.1" - self.by-version."through"."2.3.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "stream-combiner" ]; - }; 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 { @@ -19042,14 +17233,14 @@ passthru.names = [ "stringify-object" ]; }; by-spec."stringify-object"."~0.2.0" = - self.by-version."stringify-object"."0.2.1"; - by-version."stringify-object"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-stringify-object-0.2.1"; + self.by-version."stringify-object"."0.2.0"; + by-version."stringify-object"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-stringify-object-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.1.tgz"; - name = "stringify-object-0.2.1.tgz"; - sha1 = "b58be50b3ff5f371038c545d4332656bfded5620"; + url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.0.tgz"; + name = "stringify-object-0.2.0.tgz"; + sha1 = "832996ea55ab2aaa7570cc9bc0d5774adfc2c585"; }) ]; buildInputs = @@ -19080,14 +17271,14 @@ passthru.names = [ "strip-ansi" ]; }; by-spec."strip-json-comments"."0.1.x" = - self.by-version."strip-json-comments"."0.1.3"; - by-version."strip-json-comments"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "strip-json-comments-0.1.3"; + self.by-version."strip-json-comments"."0.1.1"; + by-version."strip-json-comments"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "strip-json-comments-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; - name = "strip-json-comments-0.1.3.tgz"; - sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54"; + url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.1.tgz"; + name = "strip-json-comments-0.1.1.tgz"; + sha1 = "eb5a750bd4e8dc82817295a115dc11b63f01d4b0"; }) ]; buildInputs = @@ -19119,14 +17310,14 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.46.2"; - by-version."stylus"."0.46.2" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.46.2"; + self.by-version."stylus"."0.44.0-beta3"; + by-version."stylus"."0.44.0-beta3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.44.0-beta3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.46.2.tgz"; - name = "stylus-0.46.2.tgz"; - sha1 = "9e6723aac7b582a9de6a0d1eacef20967c02e70b"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.44.0-beta3.tgz"; + name = "stylus-0.44.0-beta3.tgz"; + sha1 = "a602b30f57f1692cf0f1fb664e60a14e26102cff"; }) ]; buildInputs = @@ -19134,15 +17325,16 @@ deps = [ self.by-version."css-parse"."1.7.0" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" self.by-version."sax"."0.5.8" - self.by-version."glob"."3.2.11" + self.by-version."glob"."3.2.9" + self.by-version."circular-json"."0.1.6" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.46.2"; + "stylus" = self.by-version."stylus"."0.44.0-beta3"; by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { @@ -19159,9 +17351,9 @@ deps = [ self.by-version."css-parse"."1.7.0" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."1.0.1" + self.by-version."debug"."0.8.1" self.by-version."sax"."0.5.8" - self.by-version."glob"."3.2.11" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -19181,7 +17373,7 @@ buildInputs = (self.nativeDeps."subarg" or []); deps = [ - self.by-version."minimist"."0.0.10" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; @@ -19227,31 +17419,29 @@ ]; passthru.names = [ "sudo-block" ]; }; - by-spec."superagent"."0.18.0" = - self.by-version."superagent"."0.18.0"; - by-version."superagent"."0.18.0" = lib.makeOverridable self.buildNodePackage { - name = "node-superagent-0.18.0"; + by-spec."superagent"."0.17.0" = + self.by-version."superagent"."0.17.0"; + by-version."superagent"."0.17.0" = lib.makeOverridable self.buildNodePackage { + name = "node-superagent-0.17.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz"; - name = "superagent-0.18.0.tgz"; - sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz"; + name = "superagent-0.17.0.tgz"; + sha1 = "aadcd50fbe5a93e71991118d79bf0714d625bba8"; }) ]; buildInputs = (self.nativeDeps."superagent" or []); deps = [ - self.by-version."qs"."0.6.6" + self.by-version."qs"."0.6.5" self.by-version."formidable"."1.0.14" self.by-version."mime"."1.2.5" - self.by-version."component-emitter"."1.1.2" + self.by-version."emitter-component"."1.0.0" self.by-version."methods"."0.0.1" - self.by-version."cookiejar"."1.3.2" + self.by-version."cookiejar"."1.3.0" self.by-version."debug"."0.7.4" self.by-version."reduce-component"."1.0.1" self.by-version."extend"."1.2.1" - self.by-version."form-data"."0.1.2" - self.by-version."readable-stream"."1.0.27-1" ]; peerDependencies = [ ]; @@ -19282,30 +17472,30 @@ ]; passthru.names = [ "superagent" ]; }; - by-spec."superagent"."~0.18.0" = - self.by-version."superagent"."0.18.0"; + by-spec."superagent"."~0.17.0" = + self.by-version."superagent"."0.17.0"; by-spec."supertest"."*" = - self.by-version."supertest"."0.13.0"; - by-version."supertest"."0.13.0" = lib.makeOverridable self.buildNodePackage { - name = "node-supertest-0.13.0"; + self.by-version."supertest"."0.11.0"; + by-version."supertest"."0.11.0" = lib.makeOverridable self.buildNodePackage { + name = "node-supertest-0.11.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz"; - name = "supertest-0.13.0.tgz"; - sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.11.0.tgz"; + name = "supertest-0.11.0.tgz"; + sha1 = "f8496b9f05cac1ea2fcec1d21adeca7167f42460"; }) ]; buildInputs = (self.nativeDeps."supertest" or []); deps = [ - self.by-version."superagent"."0.18.0" - self.by-version."methods"."1.0.0" + self.by-version."superagent"."0.17.0" + self.by-version."methods"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "supertest" ]; }; - "supertest" = self.by-version."supertest"."0.13.0"; + "supertest" = self.by-version."supertest"."0.11.0"; by-spec."swig"."0.14.x" = self.by-version."swig"."0.14.0"; by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage { @@ -19443,49 +17633,27 @@ self.by-version."tar"."0.1.19"; by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.19"; - by-spec."tar-stream"."~0.3.0" = - self.by-version."tar-stream"."0.3.3"; - by-version."tar-stream"."0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-tar-stream-0.3.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.3.3.tgz"; - name = "tar-stream-0.3.3.tgz"; - sha1 = "23ca53bd738b8702272a80e26cc938bc4b84b87b"; - }) - ]; - buildInputs = - (self.nativeDeps."tar-stream" or []); - deps = [ - self.by-version."bl"."0.6.0" - self.by-version."end-of-stream"."0.1.4" - self.by-version."readable-stream"."1.0.27-1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "tar-stream" ]; - }; by-spec."temp"."*" = - self.by-version."temp"."0.8.0"; - by-version."temp"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-temp-0.8.0"; + self.by-version."temp"."0.7.0"; + by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-temp-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.8.0.tgz"; - name = "temp-0.8.0.tgz"; - sha1 = "3a642f54ab725c8fb6125a284b119480314b3e32"; + url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz"; + name = "temp-0.7.0.tgz"; + sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f"; }) ]; buildInputs = (self.nativeDeps."temp" or []); deps = [ - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" ]; peerDependencies = [ ]; passthru.names = [ "temp" ]; }; - "temp" = self.by-version."temp"."0.8.0"; + "temp" = self.by-version."temp"."0.7.0"; by-spec."temp"."0.6.0" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -19531,24 +17699,6 @@ self.by-version."temp"."0.6.0"; by-spec."temp"."~0.7.0" = self.by-version."temp"."0.7.0"; - by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-temp-0.7.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz"; - name = "temp-0.7.0.tgz"; - sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f"; - }) - ]; - buildInputs = - (self.nativeDeps."temp" or []); - deps = [ - self.by-version."rimraf"."2.2.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "temp" ]; - }; by-spec."tempfile"."^0.1.2" = self.by-version."tempfile"."0.1.3"; by-version."tempfile"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -19569,7 +17719,7 @@ ]; passthru.names = [ "tempfile" ]; }; - by-spec."text-table"."^0.2.0" = + 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 = "node-text-table-0.2.0"; @@ -19588,8 +17738,6 @@ ]; passthru.names = [ "text-table" ]; }; - by-spec."text-table"."~0.2.0" = - self.by-version."text-table"."0.2.0"; by-spec."throttleit"."~0.0.2" = self.by-version."throttleit"."0.0.2"; by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -19650,14 +17798,14 @@ by-spec."through"."~2.3.4" = self.by-version."through"."2.3.4"; by-spec."through2"."^0.4.0" = - self.by-version."through2"."0.4.2"; - by-version."through2"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-through2-0.4.2"; + 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.2.tgz"; - name = "through2-0.4.2.tgz"; - sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; + url = "http://registry.npmjs.org/through2/-/through2-0.4.1.tgz"; + name = "through2-0.4.1.tgz"; + sha1 = "afd849c65af513c2541a98a7cfbcfec3a15a9686"; }) ]; buildInputs = @@ -19671,7 +17819,7 @@ passthru.names = [ "through2" ]; }; by-spec."through2"."~0.4.1" = - self.by-version."through2"."0.4.2"; + self.by-version."through2"."0.4.1"; by-spec."timers-browserify"."~1.0.1" = self.by-version."timers-browserify"."1.0.1"; by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -19692,27 +17840,6 @@ ]; passthru.names = [ "timers-browserify" ]; }; - by-spec."timers-ext"."0.1.x" = - self.by-version."timers-ext"."0.1.0"; - by-version."timers-ext"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-timers-ext-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz"; - name = "timers-ext-0.1.0.tgz"; - sha1 = "00345a2ca93089d1251322054389d263e27b77e2"; - }) - ]; - buildInputs = - (self.nativeDeps."timers-ext" or []); - deps = [ - self.by-version."es5-ext"."0.10.4" - self.by-version."next-tick"."0.2.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "timers-ext" ]; - }; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -19733,14 +17860,14 @@ passthru.names = [ "timespan" ]; }; by-spec."timezone"."*" = - self.by-version."timezone"."0.0.32"; - by-version."timezone"."0.0.32" = lib.makeOverridable self.buildNodePackage { - name = "node-timezone-0.0.32"; + self.by-version."timezone"."0.0.30"; + by-version."timezone"."0.0.30" = lib.makeOverridable self.buildNodePackage { + name = "node-timezone-0.0.30"; src = [ (fetchurl { - url = "http://registry.npmjs.org/timezone/-/timezone-0.0.32.tgz"; - name = "timezone-0.0.32.tgz"; - sha1 = "3d5972876fffe0dbef77ab4f9a60ab242c8b0f18"; + url = "http://registry.npmjs.org/timezone/-/timezone-0.0.30.tgz"; + name = "timezone-0.0.30.tgz"; + sha1 = "f83e46d35c017a33a684a4d8bb8fac3debed49bf"; }) ]; buildInputs = @@ -19751,7 +17878,7 @@ ]; passthru.names = [ "timezone" ]; }; - "timezone" = self.by-version."timezone"."0.0.32"; + "timezone" = self.by-version."timezone"."0.0.30"; by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -19926,25 +18053,6 @@ ]; passthru.names = [ "traverse" ]; }; - by-spec."traverse"."~0.6.6" = - self.by-version."traverse"."0.6.6"; - by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "node-traverse-0.6.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - name = "traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; - }) - ]; - buildInputs = - (self.nativeDeps."traverse" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "traverse" ]; - }; by-spec."truncate"."~1.0.2" = self.by-version."truncate"."1.0.2"; by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -20021,25 +18129,6 @@ ]; passthru.names = [ "tunnel-agent" ]; }; - by-spec."tunnel-agent"."~0.4.0" = - self.by-version."tunnel-agent"."0.4.0"; - by-version."tunnel-agent"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-tunnel-agent-0.4.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"; - name = "tunnel-agent-0.4.0.tgz"; - sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550"; - }) - ]; - buildInputs = - (self.nativeDeps."tunnel-agent" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "tunnel-agent" ]; - }; 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 { @@ -20079,7 +18168,7 @@ ]; passthru.names = [ "type-is" ]; }; - by-spec."type-is"."1.1.0" = + by-spec."type-is"."~1.1.0" = self.by-version."type-is"."1.1.0"; by-version."type-is"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "node-type-is-1.1.0"; @@ -20099,26 +18188,6 @@ ]; passthru.names = [ "type-is" ]; }; - by-spec."type-is"."1.2.0" = - self.by-version."type-is"."1.2.0"; - by-version."type-is"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-type-is-1.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.2.0.tgz"; - name = "type-is-1.2.0.tgz"; - sha1 = "a9aaa3f2014850d4813663f6c714cf6318195138"; - }) - ]; - buildInputs = - (self.nativeDeps."type-is" or []); - deps = [ - self.by-version."mime"."1.2.11" - ]; - peerDependencies = [ - ]; - passthru.names = [ "type-is" ]; - }; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -20139,14 +18208,14 @@ passthru.names = [ "typechecker" ]; }; by-spec."typedarray"."~0.0.5" = - self.by-version."typedarray"."0.0.6"; - by-version."typedarray"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-typedarray-0.0.6"; + self.by-version."typedarray"."0.0.5"; + by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-typedarray-0.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - name = "typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz"; + name = "typedarray-0.0.5.tgz"; + sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664"; }) ]; buildInputs = @@ -20378,29 +18447,6 @@ ]; passthru.names = [ "umd" ]; }; - by-spec."umd"."~2.1.0" = - self.by-version."umd"."2.1.0"; - by-version."umd"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "umd-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz"; - name = "umd-2.1.0.tgz"; - sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf"; - }) - ]; - buildInputs = - (self.nativeDeps."umd" or []); - deps = [ - self.by-version."rfile"."1.0.0" - self.by-version."ruglify"."1.0.0" - self.by-version."through"."2.3.4" - self.by-version."uglify-js"."2.4.13" - ]; - peerDependencies = [ - ]; - passthru.names = [ "umd" ]; - }; by-spec."underscore"."*" = self.by-version."underscore"."1.6.0"; by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage { @@ -20421,17 +18467,7 @@ passthru.names = [ "underscore" ]; }; "underscore" = self.by-version."underscore"."1.6.0"; - by-spec."underscore"."1.6.x" = - self.by-version."underscore"."1.6.0"; - by-spec."underscore".">=1.1.7" = - self.by-version."underscore"."1.6.0"; - by-spec."underscore".">=1.3.1" = - self.by-version."underscore"."1.6.0"; - by-spec."underscore".">=1.5.0" = - self.by-version."underscore"."1.6.0"; - by-spec."underscore"."^1.6.0" = - self.by-version."underscore"."1.6.0"; - by-spec."underscore"."~1.4" = + by-spec."underscore"."1.4.x" = self.by-version."underscore"."1.4.4"; by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { name = "node-underscore-1.4.4"; @@ -20450,6 +18486,14 @@ ]; passthru.names = [ "underscore" ]; }; + by-spec."underscore".">=1.1.7" = + self.by-version."underscore"."1.6.0"; + by-spec."underscore".">=1.3.1" = + self.by-version."underscore"."1.6.0"; + by-spec."underscore".">=1.5.0" = + self.by-version."underscore"."1.6.0"; + by-spec."underscore"."~1.4" = + self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.4.3" = self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.4.4" = @@ -20475,27 +18519,6 @@ }; by-spec."underscore"."~1.5.2" = self.by-version."underscore"."1.5.2"; - 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 = "node-underscore.string-2.3.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; - name = "underscore.string-2.3.3.tgz"; - sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore.string" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore.string" ]; - }; - by-spec."underscore.string"."^2.3.3" = - self.by-version."underscore.string"."2.3.3"; 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 { @@ -20517,6 +18540,23 @@ }; 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 = "node-underscore.string-2.3.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + name = "underscore.string-2.3.3.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore.string" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore.string" ]; + }; by-spec."underscore.string"."~2.3.3" = self.by-version."underscore.string"."2.3.3"; by-spec."unfunk-diff"."~0.0.1" = @@ -20535,94 +18575,92 @@ deps = [ self.by-version."diff"."1.0.8" self.by-version."jsesc"."0.4.3" - self.by-version."ministyle"."0.1.4" + self.by-version."ministyle"."0.1.3" ]; peerDependencies = [ ]; passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.8.1"; - by-version."ungit"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.8.1"; + self.by-version."ungit"."0.8.0"; + by-version."ungit"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.8.1.tgz"; - name = "ungit-0.8.1.tgz"; - sha1 = "41b07535b2239f8a31adfcce45bd59a20b575b2f"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.8.0.tgz"; + name = "ungit-0.8.0.tgz"; + sha1 = "ca1f166ee65fbfe54469459d51f77ca502f1c6a4"; }) ]; buildInputs = (self.nativeDeps."ungit" or []); deps = [ - self.by-version."express"."4.2.0" - self.by-version."superagent"."0.18.0" + self.by-version."express"."4.0.0" + self.by-version."superagent"."0.17.0" self.by-version."lodash"."2.4.1" self.by-version."temp"."0.7.0" - self.by-version."socket.io"."0.9.17" - self.by-version."moment"."2.6.0" - self.by-version."async"."0.9.0" + self.by-version."socket.io"."0.9.16" + self.by-version."moment"."2.5.1" + self.by-version."async"."0.6.2" self.by-version."rc"."0.3.5" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.3" self.by-version."passport"."0.2.0" self.by-version."passport-local"."1.0.0" - self.by-version."semver"."2.3.0" + self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" - self.by-version."open"."0.0.5" + self.by-version."open"."0.0.4" self.by-version."optimist"."0.6.1" self.by-version."crossroads"."0.12.0" 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.6.0" - self.by-version."keen.io"."0.1.2" + 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.10" + self.by-version."deep-extend"."0.2.8" self.by-version."raven"."0.6.3" self.by-version."knockout"."3.1.0" - self.by-version."npm-registry-client"."1.0.1" - self.by-version."npmconf"."1.0.2" - self.by-version."mkdirp"."0.5.0" - self.by-version."less"."1.7.1" + self.by-version."npm-registry-client"."0.4.7" + self.by-version."npmconf"."0.1.14" + self.by-version."mkdirp"."0.3.5" + self.by-version."less"."1.7.0" self.by-version."browserify"."3.38.1" - self.by-version."body-parser"."1.2.2" - self.by-version."cookie-parser"."1.1.0" - self.by-version."express-session"."1.1.0" - self.by-version."serve-static"."1.1.0" + self.by-version."body-parser"."1.0.2" + self.by-version."cookie-parser"."1.0.1" + self.by-version."express-session"."1.0.3" + self.by-version."serve-static"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.8.1"; + "ungit" = self.by-version."ungit"."0.8.0"; by-spec."update-notifier"."~0.1.3" = - self.by-version."update-notifier"."0.1.10"; - by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage { - name = "node-update-notifier-0.1.10"; + self.by-version."update-notifier"."0.1.8"; + by-version."update-notifier"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "node-update-notifier-0.1.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.10.tgz"; - name = "update-notifier-0.1.10.tgz"; - sha1 = "215cbe1053369f0d4a44f84b51eba7cb80484695"; + url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.8.tgz"; + name = "update-notifier-0.1.8.tgz"; + sha1 = "ebf5c698375f5c232031a419634fab66cc0322a6"; }) ]; buildInputs = (self.nativeDeps."update-notifier" or []); deps = [ + self.by-version."request"."2.27.0" + self.by-version."configstore"."0.2.3" + self.by-version."semver"."2.1.0" self.by-version."chalk"."0.4.0" - self.by-version."configstore"."0.3.0" - self.by-version."request"."2.36.0" - self.by-version."semver"."2.3.0" ]; peerDependencies = [ ]; passthru.names = [ "update-notifier" ]; }; by-spec."update-notifier"."~0.1.7" = - self.by-version."update-notifier"."0.1.10"; - by-spec."update-notifier"."~0.1.8" = - self.by-version."update-notifier"."0.1.10"; + self.by-version."update-notifier"."0.1.8"; by-spec."url"."~0.10.1" = self.by-version."url"."0.10.1"; by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage { @@ -20801,7 +18839,7 @@ self.by-version."async"."0.1.22" self.by-version."deep-equal"."0.2.1" self.by-version."i"."0.3.2" - self.by-version."mkdirp"."0.5.0" + self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.2.7" self.by-version."rimraf"."1.0.9" ]; @@ -20826,9 +18864,9 @@ 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.5.0" + self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.4.2" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" ]; peerDependencies = [ ]; @@ -20836,6 +18874,8 @@ }; by-spec."utile"."0.2.x" = self.by-version."utile"."0.2.1"; + by-spec."utile"."~0.1.7" = + self.by-version."utile"."0.1.7"; by-spec."utile"."~0.2.1" = self.by-version."utile"."0.2.1"; by-spec."utils-merge"."1.0.0" = @@ -20918,25 +18958,6 @@ ]; passthru.names = [ "vargs" ]; }; - by-spec."vary"."0.1.0" = - self.by-version."vary"."0.1.0"; - by-version."vary"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-vary-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; - name = "vary-0.1.0.tgz"; - sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176"; - }) - ]; - buildInputs = - (self.nativeDeps."vary" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "vary" ]; - }; by-spec."vasync"."1.3.3" = self.by-version."vasync"."1.3.3"; by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -21098,52 +19119,27 @@ ]; passthru.names = [ "vows" ]; }; - by-spec."vtop"."*" = - self.by-version."vtop"."0.1.6"; - by-version."vtop"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "vtop-0.1.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/vtop/-/vtop-0.1.6.tgz"; - name = "vtop-0.1.6.tgz"; - sha1 = "eda5437e0e724e39055ec66b8884a5345f727492"; - }) - ]; - buildInputs = - (self.nativeDeps."vtop" or []); - deps = [ - self.by-version."drawille"."0.0.3" - self.by-version."os-utils"."0.0.14" - self.by-version."read"."1.0.5" - self.by-version."blessed"."0.0.33" - self.by-version."commander"."2.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "vtop" ]; - }; - "vtop" = self.by-version."vtop"."0.1.6"; by-spec."walk"."*" = - self.by-version."walk"."2.3.3"; - by-version."walk"."2.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-walk-2.3.3"; + 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.3.tgz"; - name = "walk-2.3.3.tgz"; - sha1 = "b4c0e8c42464c16dbbe1d71666765eac07819e5f"; + 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"."3.0.0" + self.by-version."forEachAsync"."2.2.1" ]; peerDependencies = [ ]; passthru.names = [ "walk" ]; }; - "walk" = self.by-version."walk"."2.3.3"; + "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 { @@ -21203,40 +19199,40 @@ passthru.names = [ "watch" ]; }; by-spec."wd"."~0.2.12" = - self.by-version."wd"."0.2.27"; - by-version."wd"."0.2.27" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.2.27"; + self.by-version."wd"."0.2.19"; + by-version."wd"."0.2.19" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.2.27.tgz"; - name = "wd-0.2.27.tgz"; - sha1 = "db25a671e14d76e4886a0c5014606acde065f4cf"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.19.tgz"; + name = "wd-0.2.19.tgz"; + sha1 = "347ae75adebc15ad642baec118742344d749f169"; }) ]; buildInputs = (self.nativeDeps."wd" or []); deps = [ - self.by-version."archiver"."0.10.0" - self.by-version."async"."0.9.0" - self.by-version."lodash"."2.4.1" - self.by-version."q"."1.0.1" - self.by-version."request"."2.36.0" - self.by-version."underscore.string"."2.3.3" + self.by-version."async"."0.2.10" self.by-version."vargs"."0.1.0" + self.by-version."q"."1.0.1" + 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 = [ ]; passthru.names = [ "wd" ]; }; by-spec."weak-map"."^1.0.4" = - self.by-version."weak-map"."1.0.5"; - by-version."weak-map"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-weak-map-1.0.5"; + self.by-version."weak-map"."1.0.4"; + by-version."weak-map"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-weak-map-1.0.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; - name = "weak-map-1.0.5.tgz"; - sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; + url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.4.tgz"; + name = "weak-map-1.0.4.tgz"; + sha1 = "1acddee2cc90eb30950860b7415c79cefc5f07c9"; }) ]; buildInputs = @@ -21248,14 +19244,14 @@ passthru.names = [ "weak-map" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.41.0-0"; - by-version."webdrvr"."2.41.0-0" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.41.0-0"; + self.by-version."webdrvr"."2.40.0"; + by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.40.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.41.0-0.tgz"; - name = "webdrvr-2.41.0-0.tgz"; - sha1 = "c74f22b27f0778d0c2b7e5cbda1edd113d782884"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz"; + name = "webdrvr-2.40.0.tgz"; + sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42"; }) ]; buildInputs = @@ -21264,8 +19260,8 @@ self.by-version."adm-zip"."0.4.4" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.16" - self.by-version."phantomjs"."1.9.7-8" + self.by-version."npmconf"."0.1.14" + self.by-version."phantomjs"."1.9.7-4" self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" ]; @@ -21273,16 +19269,16 @@ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.41.0-0"; - by-spec."websocket-driver".">=0.3.1" = - self.by-version."websocket-driver"."0.3.4"; - by-version."websocket-driver"."0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "node-websocket-driver-0.3.4"; + "webdrvr" = self.by-version."webdrvr"."2.40.0"; + 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 = "node-websocket-driver-0.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.4.tgz"; - name = "websocket-driver-0.3.4.tgz"; - sha1 = "f37ab303f6a602c4b0dbcaa1cdd771e442b04ea7"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.2.tgz"; + name = "websocket-driver-0.3.2.tgz"; + sha1 = "f177ef6611390e2401ae47f35e8386dda987daca"; }) ]; buildInputs = @@ -21293,6 +19289,8 @@ ]; passthru.names = [ "websocket-driver" ]; }; + by-spec."websocket-driver".">=0.3.1" = + self.by-version."websocket-driver"."0.3.2"; by-spec."when"."~3.1.0" = self.by-version."when"."3.1.0"; by-version."when"."3.1.0" = lib.makeOverridable self.buildNodePackage { @@ -21441,26 +19439,23 @@ self.by-version."winston"."0.7.3"; by-spec."winston"."~0.7.3" = self.by-version."winston"."0.7.3"; - by-spec."wiredep"."^1.0.0" = - self.by-version."wiredep"."1.7.3"; - by-version."wiredep"."1.7.3" = lib.makeOverridable self.buildNodePackage { - name = "wiredep-1.7.3"; + by-spec."wiredep"."~1.0.0" = + self.by-version."wiredep"."1.0.0"; + by-version."wiredep"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-wiredep-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wiredep/-/wiredep-1.7.3.tgz"; - name = "wiredep-1.7.3.tgz"; - sha1 = "854c1482fa5c57fe2033ba655b49aa613f60fe3f"; + url = "http://registry.npmjs.org/wiredep/-/wiredep-1.0.0.tgz"; + name = "wiredep-1.0.0.tgz"; + sha1 = "2e570465657b97e7494abf62978a3e52fc37ac52"; }) ]; buildInputs = (self.nativeDeps."wiredep" or []); deps = [ - self.by-version."bower-config"."0.5.1" - self.by-version."chalk"."0.1.1" - self.by-version."glob"."3.2.11" self.by-version."lodash"."1.3.1" - self.by-version."minimist"."0.1.0" - self.by-version."through2"."0.4.2" + self.by-version."chalk"."0.1.1" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -21526,25 +19521,6 @@ ]; passthru.names = [ "with" ]; }; - by-spec."word-wrap"."^0.1.2" = - self.by-version."word-wrap"."0.1.3"; - by-version."word-wrap"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-word-wrap-0.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/word-wrap/-/word-wrap-0.1.3.tgz"; - name = "word-wrap-0.1.3.tgz"; - sha1 = "745523aa741b12bf23144d293795c6197b33eb1e"; - }) - ]; - buildInputs = - (self.nativeDeps."word-wrap" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "word-wrap" ]; - }; by-spec."wordwrap"."0.0.x" = self.by-version."wordwrap"."0.0.2"; by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -21608,6 +19584,25 @@ }; by-spec."wrench"."~1.5.4" = self.by-version."wrench"."1.5.8"; + by-spec."wru".">= 0.0.0" = + self.by-version."wru"."0.2.7"; + by-version."wru"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "wru-0.2.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/wru/-/wru-0.2.7.tgz"; + name = "wru-0.2.7.tgz"; + sha1 = "f6fa4fc7d54f44bec19d55c66c4667078d73062d"; + }) + ]; + buildInputs = + (self.nativeDeps."wru" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "wru" ]; + }; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { @@ -21714,20 +19709,20 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">= 0.0.1" = - self.by-version."xml2js"."0.4.4"; - by-version."xml2js"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-xml2js-0.4.4"; + self.by-version."xml2js"."0.4.2"; + by-version."xml2js"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-xml2js-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz"; - name = "xml2js-0.4.4.tgz"; - sha1 = "3111010003008ae19240eba17497b57c729c555d"; + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.2.tgz"; + name = "xml2js-0.4.2.tgz"; + sha1 = "93911c393c4a332a2dce1222801eb571453b2f90"; }) ]; buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.6.0" + self.by-version."sax"."0.5.8" self.by-version."xmlbuilder"."2.2.1" ]; peerDependencies = [ @@ -21735,7 +19730,7 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">=0.1.7" = - self.by-version."xml2js"."0.4.4"; + self.by-version."xml2js"."0.4.2"; by-spec."xmlbuilder"."0.4.2" = self.by-version."xmlbuilder"."0.4.2"; by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -21755,7 +19750,7 @@ ]; passthru.names = [ "xmlbuilder" ]; }; - by-spec."xmlbuilder".">=1.0.0" = + by-spec."xmlbuilder".">=0.4.2" = self.by-version."xmlbuilder"."2.2.1"; by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage { name = "node-xmlbuilder-2.2.1"; @@ -21813,7 +19808,7 @@ ]; passthru.names = [ "xmlhttprequest" ]; }; - by-spec."xoauth2"."~0.1.8" = + by-spec."xoauth2"."~0.1" = self.by-version."xoauth2"."0.1.8"; by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage { name = "node-xoauth2-0.1.8"; @@ -21832,25 +19827,6 @@ ]; passthru.names = [ "xoauth2" ]; }; - by-spec."xtend"."^3.0.0" = - self.by-version."xtend"."3.0.0"; - by-version."xtend"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-xtend-3.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; - name = "xtend-3.0.0.tgz"; - sha1 = "5cce7407baf642cba7becda568111c493f59665a"; - }) - ]; - buildInputs = - (self.nativeDeps."xtend" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "xtend" ]; - }; by-spec."xtend"."~2.1.1" = self.by-version."xtend"."2.1.2"; by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage { @@ -21873,111 +19849,26 @@ }; by-spec."xtend"."~2.1.2" = self.by-version."xtend"."2.1.2"; - by-spec."yargs"."~1.2.1" = - self.by-version."yargs"."1.2.2"; - by-version."yargs"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-yargs-1.2.2"; + by-spec."yargs"."~1.1.2" = + self.by-version."yargs"."1.1.3"; + by-version."yargs"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-yargs-1.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yargs/-/yargs-1.2.2.tgz"; - name = "yargs-1.2.2.tgz"; - sha1 = "36b364c8d72d1213b4f720d5cf716dfde4f0a113"; + url = "http://registry.npmjs.org/yargs/-/yargs-1.1.3.tgz"; + name = "yargs-1.1.3.tgz"; + sha1 = "c44ed2bb9c86d55b557f2179fea7c7013fe4c42a"; }) ]; buildInputs = (self.nativeDeps."yargs" or []); deps = [ - self.by-version."minimist"."0.0.10" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; passthru.names = [ "yargs" ]; }; - 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 = "node-yeoman-generator-0.16.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz"; - name = "yeoman-generator-0.16.0.tgz"; - sha1 = "0d1b655ea31660ab66837af1e686b795eae57c59"; - }) - ]; - buildInputs = - (self.nativeDeps."yeoman-generator" or []); - deps = [ - self.by-version."cheerio"."0.13.1" - self.by-version."rimraf"."2.2.8" - self.by-version."diff"."1.0.8" - self.by-version."mime"."1.2.11" - self.by-version."underscore.string"."2.3.3" - self.by-version."lodash"."2.4.1" - self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.11" - self.by-version."debug"."0.7.4" - self.by-version."isbinaryfile"."2.0.1" - self.by-version."dargs"."0.1.0" - self.by-version."async"."0.2.10" - self.by-version."inquirer"."0.4.1" - self.by-version."iconv-lite"."0.2.11" - self.by-version."shelljs"."0.2.6" - self.by-version."findup-sync"."0.1.3" - self.by-version."chalk"."0.4.0" - self.by-version."text-table"."0.2.0" - self.by-version."download"."0.1.17" - self.by-version."request"."2.30.0" - self.by-version."file-utils"."0.1.5" - self.by-version."class-extend"."0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "yeoman-generator" ]; - }; - by-spec."yeoman-generator"."^0.17.0" = - self.by-version."yeoman-generator"."0.17.0"; - by-version."yeoman-generator"."0.17.0" = lib.makeOverridable self.buildNodePackage { - name = "node-yeoman-generator-0.17.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.17.0.tgz"; - name = "yeoman-generator-0.17.0.tgz"; - sha1 = "f005250770c01a60d1eb5b9a5b980af689b1517c"; - }) - ]; - buildInputs = - (self.nativeDeps."yeoman-generator" or []); - deps = [ - self.by-version."async"."0.9.0" - self.by-version."chalk"."0.4.0" - self.by-version."cheerio"."0.16.0" - self.by-version."class-extend"."0.1.1" - self.by-version."dargs"."0.1.0" - self.by-version."debug"."0.8.1" - self.by-version."diff"."1.0.8" - self.by-version."download"."0.1.17" - self.by-version."file-utils"."0.2.0" - self.by-version."findup-sync"."0.1.3" - self.by-version."glob"."3.2.11" - self.by-version."grouped-queue"."0.2.1" - self.by-version."gruntfile-editor"."0.1.0" - self.by-version."iconv-lite"."0.2.11" - self.by-version."inquirer"."0.5.1" - self.by-version."isbinaryfile"."2.0.1" - self.by-version."lodash"."2.4.1" - self.by-version."mime"."1.2.11" - self.by-version."mkdirp"."0.5.0" - self.by-version."nopt"."2.2.1" - self.by-version."request"."2.36.0" - self.by-version."rimraf"."2.2.8" - self.by-version."shelljs"."0.3.0" - self.by-version."text-table"."0.2.0" - self.by-version."underscore.string"."2.3.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "yeoman-generator" ]; - }; 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 { @@ -21993,13 +19884,13 @@ (self.nativeDeps."yeoman-generator" or []); deps = [ self.by-version."cheerio"."0.12.4" - self.by-version."rimraf"."2.2.8" + self.by-version."rimraf"."2.2.6" self.by-version."diff"."1.0.8" self.by-version."mime"."1.2.11" self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."2.2.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.11" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -22010,7 +19901,7 @@ self.by-version."findup-sync"."0.1.3" self.by-version."chalk"."0.3.0" self.by-version."text-table"."0.2.0" - self.by-version."download"."0.1.17" + self.by-version."download"."0.1.16" self.by-version."request"."2.27.0" self.by-version."file-utils"."0.1.5" ]; @@ -22020,6 +19911,45 @@ }; 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 = "node-yeoman-generator-0.16.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz"; + name = "yeoman-generator-0.16.0.tgz"; + sha1 = "0d1b655ea31660ab66837af1e686b795eae57c59"; + }) + ]; + buildInputs = + (self.nativeDeps."yeoman-generator" or []); + deps = [ + self.by-version."cheerio"."0.13.1" + self.by-version."rimraf"."2.2.6" + self.by-version."diff"."1.0.8" + self.by-version."mime"."1.2.11" + self.by-version."underscore.string"."2.3.3" + self.by-version."lodash"."2.4.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."glob"."3.2.9" + self.by-version."debug"."0.7.4" + self.by-version."isbinaryfile"."2.0.1" + self.by-version."dargs"."0.1.0" + self.by-version."async"."0.2.10" + self.by-version."inquirer"."0.4.1" + self.by-version."iconv-lite"."0.2.11" + self.by-version."shelljs"."0.2.6" + self.by-version."findup-sync"."0.1.3" + self.by-version."chalk"."0.4.0" + self.by-version."text-table"."0.2.0" + self.by-version."download"."0.1.16" + self.by-version."request"."2.30.0" + self.by-version."file-utils"."0.1.5" + self.by-version."class-extend"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yeoman-generator" ]; + }; by-spec."yo"."*" = self.by-version."yo"."1.1.2"; by-version."yo"."1.1.2" = lib.makeOverridable self.buildNodePackage { @@ -22037,7 +19967,7 @@ self.by-version."yeoman-generator"."0.16.0" self.by-version."nopt"."2.1.2" self.by-version."lodash"."2.4.1" - self.by-version."update-notifier"."0.1.10" + self.by-version."update-notifier"."0.1.8" self.by-version."insight"."0.3.1" self.by-version."sudo-block"."0.3.0" self.by-version."async"."0.2.10" @@ -22048,7 +19978,7 @@ ]; peerDependencies = [ self.by-version."grunt-cli"."0.1.13" - self.by-version."bower"."1.3.5" + self.by-version."bower"."1.3.2" ]; passthru.names = [ "yo" ]; }; @@ -22057,29 +19987,6 @@ self.by-version."yo"."1.1.2"; by-spec."yo".">=1.0.0-rc.1.1" = self.by-version."yo"."1.1.2"; - by-spec."yosay"."^0.2.0" = - self.by-version."yosay"."0.2.1"; - by-version."yosay"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "yosay-0.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yosay/-/yosay-0.2.1.tgz"; - name = "yosay-0.2.1.tgz"; - sha1 = "01381b2165c8ef717610e073ecfa266dde195ae9"; - }) - ]; - buildInputs = - (self.nativeDeps."yosay" or []); - deps = [ - self.by-version."pad-component"."0.0.1" - self.by-version."word-wrap"."0.1.3" - self.by-version."chalk"."0.4.0" - self.by-version."minimist"."0.0.9" - ]; - peerDependencies = [ - ]; - passthru.names = [ "yosay" ]; - }; by-spec."zeparser"."0.0.5" = self.by-version."zeparser"."0.0.5"; by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -22099,26 +20006,22 @@ ]; passthru.names = [ "zeparser" ]; }; - by-spec."zip-stream"."~0.3.0" = - self.by-version."zip-stream"."0.3.4"; - by-version."zip-stream"."0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "node-zip-stream-0.3.4"; + by-spec."zip-stream"."~0.1.0" = + self.by-version."zip-stream"."0.1.4"; + by-version."zip-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-zip-stream-0.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.3.4.tgz"; - name = "zip-stream-0.3.4.tgz"; - sha1 = "1b7dc01591300032d69699fe66962bf52a0de91c"; + url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz"; + name = "zip-stream-0.1.4.tgz"; + sha1 = "fe5b565bc366b8d73d5d4c1606e07c8947de1654"; }) ]; buildInputs = (self.nativeDeps."zip-stream" or []); deps = [ - self.by-version."crc32-stream"."0.2.0" - self.by-version."deflate-crc32-stream"."0.1.1" self.by-version."readable-stream"."1.0.27-1" self.by-version."lodash.defaults"."2.4.1" - self.by-version."buffer-crc32"."0.2.1" - self.by-version."debug"."0.8.1" ]; peerDependencies = [ ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index a27dce115531..4d220a008290 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -131,5 +131,4 @@ , "sinon" , "shelljs" , "typescript" -, "vtop" ] From 86d19319d63e8ac8ae30f1e89a09370e2f565245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 11 Jun 2014 19:29:34 +0200 Subject: [PATCH 331/424] t1utils: new package t1utils is a collection of simple Type 1 font manipulation programs. --- pkgs/tools/misc/t1utils/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/t1utils/default.nix diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix new file mode 100644 index 000000000000..607674051549 --- /dev/null +++ b/pkgs/tools/misc/t1utils/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "t1utils-1.38"; + + src = fetchurl { + url = "http://www.lcdf.org/type/${name}.tar.gz"; + sha256 = "1pnxpjabjyzfjrp319wsq4acxw99c8nnsaalbz7nwamj8kkim7zw"; + }; + + meta = with stdenv.lib; { + description = "Collection of simple Type 1 font manipulation programs"; + longDescription = '' + t1utils is a collection of simple type-1 font manipulation programs. + Together, they allow you to convert between PFA (ASCII) and PFB (binary) + formats, disassemble PFA or PFB files into human-readable form, + reassemble them into PFA or PFB format. Additionally you can extract font + resources from a Macintosh font file or create a Macintosh Type 1 font + file from a PFA or PFB font. + ''; + homepage = http://www.lcdf.org/type/; + # README from tarball says "BSD-like" and points to non-existing LICENSE + # file... + license = "BSD-like"; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65390f09a424..14a6cde1bf7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2114,6 +2114,8 @@ let privoxy = callPackage ../tools/networking/privoxy { }; + t1utils = callPackage ../tools/misc/t1utils { }; + tarsnap = callPackage ../tools/backup/tarsnap { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; From 68a6c0e3e9cf3870aeda89685b4d2509120d5bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 11 Jun 2014 21:11:04 +0200 Subject: [PATCH 332/424] lilypond: unbreak build by adding t1utils to buildInputs lilypond needs the 't1asm' tool from t1utils to build. t1asm used to be provided by texlive-core, but does no more (since texlive-core-2014 update). --- pkgs/misc/lilypond/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 859b74b8c0aa..3f1c1a9a57b1 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile , python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff -, fetchsvn, makeWrapper }: +, fetchsvn, makeWrapper, t1utils +}: stdenv.mkDerivation rec{ majorVersion="2.16"; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec{ buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm python gettext flex perl bison pkgconfig texLive fontconfig freetype pango - fontforge help2man groff makeWrapper + fontforge help2man groff makeWrapper t1utils ]; meta = { From 845b0e3ebc2b6e5ac30ed7f4c26405168aedc5f6 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Wed, 14 May 2014 17:46:33 +0200 Subject: [PATCH 333/424] qt5,qtcreator: update to qt-5.2.1 and qtcreator-3.1. Close #2643. Testing parallel build of qt5: fine on @vcunat's 8-core (just this single task). We'll see on Hydra. --- pkgs/development/libraries/qt-5/default.nix | 6 +++--- .../libraries/qt-5/dlopen-absolute-paths.patch | 16 ++++++++-------- pkgs/development/qtcreator/default.nix | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index be028e89ce84..d33c7e0329fe 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let - v_maj = "5.1"; + v_maj = "5.2"; v_min = "1"; ver = "${v_maj}.${v_min}"; in @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz"; - sha256 = "4c05742db52325e96b1d610a2388140dcc1e3d03d93faea2b2d3791015b186f6"; + sha256 = "18bxrnyis7xbhpxpf7w42i54hs4qr062b1wx4c0dpmja3lc29sc4"; }; # The version property must be kept because it will be included into the QtSDK package name @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri ''; - #enableParallelBuilding = true; # often fails on Hydra, as well as qt4 + enableParallelBuilding = true; # often fails on Hydra, as well as qt4 meta = { homepage = http://qt-project.org; diff --git a/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch index 65b817a2b141..3163e235d02c 100644 --- a/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch +++ b/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch @@ -1,15 +1,15 @@ diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp --- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-08-25 20:03:35.000000000 +0200 +++ qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-09-25 17:43:14.047015411 +0200 -@@ -93,7 +93,7 @@ - static void resolveLibrary() - { - #if !defined(QT_NO_LIBRARY) && !defined(Q_OS_QNX) -- QLibrary lib(QLatin1String("resolv")); -+ QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); +@@ -103,7 +103,7 @@ if (!lib.load()) - return; - + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp --- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-08-25 20:03:35.000000000 +0200 +++ qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-09-25 17:51:29.834674976 +0200 diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index b12f81db9c4c..2b0410f0874e 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -3,8 +3,8 @@ with stdenv.lib; let - baseVersion = "2.8"; - revision = "1"; + baseVersion = "3.1"; + revision = "0"; version = "${baseVersion}.${revision}"; in @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { + optionalString sdkBuild "-qt-${qtLib.version}"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz"; - sha256 = "d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9"; + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; + sha256 = "c8c648f4988b707393e0f1958a8868718f27e59263f05f3b6599fa62290c2bbf"; }; # This property can be used in a nix development environment to refer to the Qt package From 34091bf2654a7b9fb0dea9fa30fa9a8507aaec8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 11 Jun 2014 21:32:13 +0200 Subject: [PATCH 334/424] cudatoolkit: fix multiple outputs (close #2466) --- pkgs/development/compilers/cudatoolkit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index af93cb13d37a..99f0828012fa 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out $sdk perl ./install-linux.pl --prefix="$out" + rm $out/tools/CUDA_Occupancy_Calculator.xls perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" ''; From 22b030697691eb1b07d237d298a64e4f61ebbc53 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 11 Jun 2014 22:55:53 +0900 Subject: [PATCH 335/424] thunderbird-bin: update to version 24.6.0 --- .../mailreaders/thunderbird-bin/default.nix | 231 +++++++++--------- .../thunderbird-bin/generate_nix.rb | 210 ++++++++++++++++ 2 files changed, 326 insertions(+), 115 deletions(-) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index c801c0f69b0d..13facc906901 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,3 +1,8 @@ +# This file is generated from generate_nix.rb +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_nix.rb > default.nix + { stdenv, fetchurl, config , gconf , alsaLib @@ -33,121 +38,118 @@ }: let - version = "24.5.0"; - + version = "24.6.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha256 = "a5d7a95ed93277c5e7191f868df343d1a1d14e6c692cac1e6069fd9ee7177273"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "b3100ead31d208968edd5b8545b641d0db9692d31a63e07fa9c391dca61de8a4"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "059ed2a01afabebc7bd28cc79841debcaaa0bf015f28145c719396d4e612f535"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "75874c6fcabb21332095562b9f86b7c6b668efdfb09904b83fa20743e1740790"; } - { locale = "be"; arch = "linux-i686"; sha256 = "7eda8e02a15284a0e6814072a0212457a25bcfef5058e1c376fc22facb2970f1"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "9fb0150098810b152ecf95e0826a3bac1dbffdfd2f8f2ce400841cb4981e3f3d"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "6929e9c0580e62cffb3bfffb1398f35b7ac59dcc3d76a4a5c49a20cfb72e6d60"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "19e2098131a6e280f1f8e8bae7c623ebe1081b0ea0dea81ebbaea51111774729"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "30f95bf5d5974ab417ff5a24fad78687b88b3f16e2337a3a4a22dd4f1d670c7a"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "85000f577549ccf35b2a43dc3a79264b78d100dce1e0cfd3418a0ec1f87cff90"; } - { locale = "br"; arch = "linux-i686"; sha256 = "ef31dbfc1cc4528ee762e384d5e12fb6383f57ea34d4d1625975a2341d5004da"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "d2f8330081a203477c6fc6007230f3893290c17aab4ba9e8ed591ddc337dd73c"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "86be66b6f8075cd85470e60a1e278fb7992fbd130b6481f0ebc21e9ad46c647f"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "a2b19e3ce3a747e4b1e5b52d463e3f5822e8e120a7e043d83057746552fa9867"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "632ece525a79537acad192f8ec37fbb1e3423bcf64b1af5d18da34f1410ffbae"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "f45e4701d4b81e4a5a052b5759616540317b9e89e241dc97ad1ffc39b18abaed"; } - { locale = "da"; arch = "linux-i686"; sha256 = "9befe92c296b57c7a7b97ecb6eb23803c93949056177df72bc111c6e18d497f0"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "343ef548a102a63a96b1a10745ff7866f30ac6524d4f7a2ced1be3cb3bd9f64c"; } - { locale = "de"; arch = "linux-i686"; sha256 = "010c9225f56a3d9f552f77502daf2e70e88e45f85b39f183907741ad773cf811"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "ed60c8dd0abda8c8cabdf34fcb96d39463cde9cdf1247af44438da7586490120"; } - { locale = "el"; arch = "linux-i686"; sha256 = "03affa186bb66fabd9b61d0e53cb7f75aa13702a58fd2dd551e6da1b6e9cfd87"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "d60419e5ebeec445e8efc8d9db59d093060be86af140605c8019a8f24680c4bb"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "e1b6c1f3f30ea522410f947c9cf331e3d580a1620af63401186d435707a041d8"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "6d873704a2cbeb2549dd2e55b8c915292b7167ce2f5022defd3bb2c0ad29da58"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "6441f90eda22808c37bca023748efee7735cf9b18b1d21ce75878c10da8baad7"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "a54afdf7dcadb94bfe2bc6ea3d6232d311568a74ed3fd93becff9cd57063ff0c"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "989f400b587a75160a4ef1b6913819e0bd2c8b0689753b233943e61412bdba4d"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "c294e1a4173dd14222d0edba31c529a3f9005412de728b1a17602e2a89c84af8"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "f6eac1108efaaa0c5f34c4856e7db5236c60b8aba7c99558b32b4e60f1df3dea"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "74132bc1e0fbe03c462399860168928bb1bca20ee1b0bf9a80262538ce320f57"; } - { locale = "et"; arch = "linux-i686"; sha256 = "09fea4be7480ae51d7d68bc4b044c4d4a79e405893c4952ae083a8f417b99b85"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "c8c5d621d975cfeb22695e589dd69a360d1b1dc6a4d0f52afc3b778835fbdb55"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "19af889a9205d99080aa1a0afc7c75d0c43a970f864d4cefb956cc37c618b7d7"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "0074802e84cab6ad21de7d960709ba15531705f4ff60bf141a917edb5295c201"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "ae301f557be17b60290ee0910053fc99ab367fd6a68b4f0c27e1e80316fea95d"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "567009788743148001e842418bfa520275ae6ed39857fd99da90ea37f6635008"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "0491d2760611a5709c23df1a3ae618b4bc069c4af5ce2b2b7ae491bac390c058"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "64e4cfe3e899cbd71ac3c3b6052d742bae4215704eeffb51f27c93f98ec7f3cb"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "9d72a5fdc02ce45030bf44d7d8b31274cfb3579efc93d064824e6909fef2ed81"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "f04d7404ce637abd3d807484422970852db0253da3da0a0654f3bea213f352a3"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "853112a5c6fda45afed60a9c9f2d5f9fe972d21b092ae83cc4a3796f1be90b91"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "36b0cef0ba9e483b13ce5f9fd12e7bc11e2bd0270b5b34e5b2690e79248724b5"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "fcb07754340c2558e94ce44ac6e1577fb4cd155577b6bece74ceb61b2bf204b1"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "cc842860d7abfc114c0db47d832508a70ea1ff0bc726fc58ccb875c245689d2b"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "325e8a27d49b1748ac7b5c2070d32df0d66c8d9b1b651136d500d2bb4bfefe14"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "dd4c6aad88ac32d6175320bd82026ae6b1c4f7b44fe04904743c7e7e3d270642"; } - { locale = "he"; arch = "linux-i686"; sha256 = "cbf801085b4a7a3b2ac84790b176fbea8e254b13776bd19413d4c5b6522645ea"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "9d60e3a8b5756bc3d3a9148dee458c28bed9bf1fac29587bd7e95318a78f59d8"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "4361a3dc02a0dc8a26716a96aa47f0c529e0942658fcd16b472d03ae1f0f50d7"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "b23b33c823ee55daa5a3f90a9f1f616fb8ea67be912182b6118521541f7039fa"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "3d2e37fbdd5af291bc90666460258b61e4b499007ad9bba5e6e48b3b3f9cb068"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "a7b904317bcf046f9139c415f1c453b66e355b31291211dc8dac76200902ac11"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "8802522b5db21a9230ae856f90013d80a466a8c2caed35079318ece7028120cd"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "43e899856a625d8dea84c79c0c7d1dfa15f286da628cec9f99c351139de1831e"; } - { locale = "id"; arch = "linux-i686"; sha256 = "6ff994c056189d13a0c36cde5925e45ba3ba52ccab61486b338a1753eafc09c8"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "287e89ba01280eb778b1cf1f2fd9859610b46f2abfe369fe54d4af8cc1f675ac"; } - { locale = "is"; arch = "linux-i686"; sha256 = "5ee6ea3e48d526af3ef29ef374b40a0cafb299d32c1d6af4684382b8b171f88c"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "aae33e6b2e75a9db69d17d356bc49e026bf39199cd1612ce42aa41a102a1ac03"; } - { locale = "it"; arch = "linux-i686"; sha256 = "3a54ac3fc738e02c8ed9b7a730624497fab15dee4f9f82e84a526dd5600e300a"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "cc99d99214e6d847fc885af036783fe3c1b2a55b04c758bbb2fd5bd0a39463ff"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "804485d204392b52b4bfdbb28804f729614c53fa692a89e58f97161c89809bf0"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "8bdce5e6f97c2747ff209acee7fad24f2dc0e07801ee30754370bb0450d383f7"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "61ab133865b2c62ea88154917ddf1383a3157b96ac3b073568e392036874f5d7"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "695ef59b94626f03151c8bd68ea799b0ae5e879a57f8185af5557799211bda1f"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "014e8604790af3fa4af504986b86dc0de4bd2e53267548c01bb85e48bc90ffc5"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "8c803b613526d39618c8e82d9f981293ebb6799136697488ef4d10eb2a485808"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "bfc828d3882588a9909fef1d6731a6bc1636eaf53342a57d56e3fbc975133869"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "f25bc7dacd28fd2c907565ab608d504abcc2896118e4cd8813de28c75d26c569"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "cb94f869fa63215686465bb29a8c05f80611cd60a82d7cbded6ddf55577172e1"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "ecb185013de3d55cfafaa156821308453a90a123b99d122ea4ef7a29e7d7fab5"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "8719216b8cc0293d8aa23c04e2d663dfef515a7bc1b6e06a5f03bed3d6fb3b6a"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "f6617cf98b49d28ae7fa8e7d022587c6ed8138c758ff088c5abc78f7bdd52613"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "b0e57d139f359850558f40bad00b2c4e69da8e9d73ec9aa7d180b9f33d970449"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "2efcfe4b366f7ff5dc95c45cb229aeed316315fe4554651e5d0239985cd64fdb"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "3d579ed8e18d98c446a5f069d6d2e94a3ee234c75feffbaf99f561ef7bd45a2e"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "04090e4b4b412f79d1879340c36e36c65e4f23fde5dc545b4d855c8497ca47f7"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9d202dd10b626ed9753ac5e243c14f6b1eee76e8edd40389f56003c4e8816c83"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "3b82124d8956e83657b30347ef3b5e44cf3813c1b02998b197c817c6528423c0"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "65ebb88e9e544c38a9d85a70a1920ed9c6ec03452762f98cb2fe104912074b44"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "fba7f18daee4832b9851615a0597dbde98a5271c5882d56ab4c1e0cb6d8c4783"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "e0ffc4b23cbf4a92768eff507335dffb92fad26d02662adf77e0ccff4f4b6c8b"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "555e30eaa6942543c7b1cd3569a6480016be5826a474a76c2ba8e2078d6d5b83"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "38bf63ae8365fbe1ca88b683d94c21cd5620a7397b3b344c0e4e938287311ec3"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "328cb7395e61924240f8e29399bf1d64179bce5bb911595cda422b741d9b6f34"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "8df9749d8dbe4218910026a8e4c4145b1f155903e577a16758d15eefbc2715f9"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "99cd036facc18242e5ab5df00a480e5c7c779b50fa95eac191bbebfa7343a270"; } - { locale = "si"; arch = "linux-i686"; sha256 = "4ce33a17b148329334e596186d274b9c262a779e7190f9777dd0673df12f7b4c"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "c22cd896e651b2e664128411710a80a33471319951f5aff3cfc86ff86de39a86"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "30351a15f43f905bf69e578d9ce14506ade61e805e34097f81bf8ac50f1f9ee9"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "c8930d6ebff4f7429af5daf72648651162543fa000acad0fb63179c2c3f150e6"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "10c61d7e3bc592f23811d5a06fcdc892a088cbef7fc3298e8ed9937dc7518b37"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "81483f6bdc85eb244904d3a8328d81391be24ea2ae7604cb00bbf922025afd89"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "8ac202a6eb0a3f08e9c34502b26b0cf1a85ab43850658cce7042f0afd5f9f50a"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "23fc8634b6dfa984c530292f7f01f9a2d43b196a8092f93cc435abd7a8d131de"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "9c96c0935b7a0124059caea758ba3319cc3a5977e542965f663d2daa54f5a32e"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "2d64f970c70f34bd726296b8aa2db243c245d2c36167a36de7032ae17fc1ccb2"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "1b0d6476248896b9224c5c69a944084677df45e273508bf8d629eb14b57662a9"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "05977173bdd460eab1ff5a7065067b4074417297e38dbc70c6cceedca0c933b5"; } - { locale = "ta-LK"; arch = "linux-i686"; sha256 = "3ef8950e8aa9f130aa66a1ad2cfdd21c2ba9572ef3e0d868d7a8fbf1ef8e3291"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "be101ca34d96577ccc6ba715235eefa9dd065f04a651e9a35786f9edb6278a98"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "d5b35faa3e0e09af778aebec4b33f39bbce98465a39edb2da15197671b777abe"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "995c1abcd5357cfda831d07ad6e0b762fbabda61601a58122acc2e8942fb944a"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "6c5b0df0a1448fcf1cebc8d82072d5653cb0432e2f787179526bae4cef774352"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "86f3ce21bc863eb8f3e0099d9386e0f38ad8b2c8e29a79e47bfda37acecd991f"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "0a21d13abb629549df74d956cc1c5f99c879980fbee2d269e1532610aebb404c"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "29cbf72f4990eb55d30a85a767d01c8077ab89af69eba3b7299d43871aaa165e"; } - { locale = "xpi"; arch = "linux-i686"; sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; } - { locale = "xpi"; arch = "linux-x86_64"; sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "1527b8e9f245c96d0104f0b7d5c8dc696036fbb80067d14a1eee9a423ddd9368"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "ae294571b8433b646b5d65a0cb1ab7f42295b17369f5ec82c2383c654df28e20"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "98e5c8f912d1a03f5c0a2f14b63f350823d15f1253e15a318b61227ba82fec0e"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "49ee58ad3978113e10de520eb094fc9c0f4d740ca6c0a0e07d5743e313163d0f"; } + { locale = "id"; arch = "linux-i686"; sha256 = "e19f6f5b8f19178350ec68386afd2ab7e5900b8c1fdb7bf81928fedcfcea5cbe"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "ece7445451150b2776f5debc818e288b9037dac1f2da9c7f7db584b6d2b73d34"; } + { locale = "he"; arch = "linux-i686"; sha256 = "0ff30ffc7ffe087056b0e72d66d2bc264c1060e3abb65e0c4d53d976855f436f"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "dd41d433644f7790ace1f246ec6703c060456260716710fc4318ca834ecd758b"; } + { locale = "el"; arch = "linux-i686"; sha256 = "eb6d53c00a6cd912279b56c5322d65b94fdd2a021c9ea2c854f664e476ae89e2"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "b0fdf2dc2de7ba5296f69694908aef4954b24b4c3092bddbec8995bf838bb817"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "71f4f7738540445dc64399368bb63bf48ede79f055d6647ba9ed4d274040d623"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "2be714b598bf8f1a3c6c9a13141d370c4d29bfec3e4053eb6f1c8a6a7988a96b"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "8b2c3b83f4f88e33ac31b07dfb64e83fd1b2cce9ad877c8bb5715a0e6299ce6f"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "93cd2c5c6c2ac05af3bb55a723bf3f02234d55064b5ea7cba6289bd07cca7647"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "2f11b85055fa21b4e2677b92fef34a769ed56bdbd877fefb86599edb5dd39932"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "d47057633c0ec5e785a723c45c5b8b0168e3d3fabe4aaedb4ca1adbff29a4dcd"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "902274548b7308e75c465f71912a7d1e5539e92420ffa17c80a2ac20d02d8630"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "044494d6bfc07b9cbeaa325dab3c1f0c5e554a05f1a050d960c39fbe093d9482"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "e453a06a64c35ed81e661c67fbd4241a7c5494b1f3d2bf5ace7543798feb338c"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "e8006f0e89153424c809de41ec1a714b91011b5a2a9601c1893a6ff30dcbd2ac"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "fed414783f8e9bba5be6d4cb90ef04f274aabab34f3b4351a329d5c5ae7ae8f0"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "e8f0203bf90bc30c89380c417921139f7b92ef1d38b3d95d292acee3be4e93c3"; } + { locale = "br"; arch = "linux-i686"; sha256 = "0948d002df401b9aaedbf8e3277ce312edeb635baa57b1bdf5de87cc13dd36cb"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "733e09671f00c693e13a726fa597b4705822e693ddce8a0494c57fde1de3cb56"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "c160c17e4b9b0e3d579a01b5973d142c711d4f87b03fd542d073d816ced9a9c9"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0c281e6430a233aca5c6130e907e08c7d05aed8851214063546aff5a5df82232"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "5d85eb78f01e1d52e733d4abf8d33281ec2c4adf9a9c65f50c6d6e2b6acf3d1d"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "a7bb71bb08ccfc01f8e91b47b6ee0ac4592976e964454304da493e0582d262d1"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "a63e060eac9efb27b4166e05ff6a035afd51cd29d45ddf69e5226e08441ac53c"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "8a5f45352e180e984c7f1bc37f0e7602cbc6085a3dcdcac2d74f493941fd9f0e"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "ef70e1ff3ff3ce2fd9ecbe62ed010c06e63b410b843cdc3aa3c93fda2bf56708"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "af33cba52556057abf17df0e92c11ecbf39382bbf92c66b137113e5503ae170b"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "f87eac6641ebccf018c76275adcba03976b9c62b9fa51533ec67ab0d2a5a91b9"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "009b53f10bd785a799026dab028fbb7fa46c154569eba98db2673af12f6c19c4"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "ae2243346546cc2c768a9c24fc296013a45459637ab65477537f9d08d5ae193c"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "5cb2af1ec854e12b91bdf7f2fe88b56bfb45bf7144cf5cc3f0e307259d767a43"; } + { locale = "is"; arch = "linux-i686"; sha256 = "bf3a2e4efd86b1e73ac38ef3dc880ce2cee3102d2844b17ebf31aa6528040a92"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "d36f8d321d2952310dcb19a288f36f6496ca24e7f49fb483882c270c1c96571d"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "e05f63d1f978029169a91719551b6e399be0e0d37310921168904d188e41f50d"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "b8025a7a724a0d98c4f706e7ce59aae8c0f7bcd0082733ce6bee73a1d243feef"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "26ded9a3ebea58bcf80ca47759d4fdb86fe91aea8dcf56afdbaf7a32d548ee66"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "fd8321d5d6adaae042651d911df6ef587afda19ee82bdcfce98814144282b54d"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "94b94517072901f34ab28b6cf3a2fd8852867f147ab4b47f34f7d9ae16fbd603"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "e38f493ea1b8c0b183bad2f2627eb166e75e875a62b33704f50f8f831fd552ec"; } + { locale = "si"; arch = "linux-i686"; sha256 = "319ae8256ecf3d7623195e474040fffffff230cd612571872a38b52b608c0507"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "f776b8a9efad41f5c2f8770452a0bd053a3ba9ed4b74da3e3f24214c69e9779e"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "f6aea954d3ba2334411a7ce9e7e1da926b0039935c5db3a5480f0fbda583b849"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "9fef811764441b2b16e408808f4608e17cd21175cf45774162b3bce8b8612491"; } + { locale = "it"; arch = "linux-i686"; sha256 = "71df4de89a1eff632339dbaf48ce41182f7a20f7e55a223f6816ef86d3465443"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "076332c97a5c854b2313bd9f2138a6660d8e04fbddc3f8beb89acf071efd4c86"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "1a45f7d1d8817f6c724dff556886edc3f2d0ee62ff45bea8d6b7ef63f7f92928"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "8aa25320126052c9ebc3496e8731224e30fbd45ee2679f4d87f7f2050a01c312"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "83a31a94eeb95e28612eeb1e696ed387b6793da350efda439de11833e0ea1173"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "8c1647f8bfb210f7da8aa164777ef412bf3d4459ce53c95ee2211b4b5df440dc"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "e5bb99de119fd6496674fb9cc8432f146e684afc652dec2861108d1ef20b49d7"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "f35e62031154a32da68ea3d6960da8807f0de7ade7071526fafd6ace48c88976"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "0826595dddc981b64d4f1a59cd71411c34ccd0aeac182925709abeedff8461fc"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "b5b8d30251fc482861518e1c86001aa5eca6b53a65e14a8c6ff9e61eaf651044"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "a9b2138cacc983142353ec09a5c4226fc731501da4c0200cc86026e6b28ca10c"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "6c9a2ce8a8d3b4815475827caf89a3fee8371c422aa6c4984bb03f56728b682c"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "813260cf5ab06e55c563e015e0172ce0192ccdd894a352ef6d4f439252032619"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c879fe62db6952f91c51ec7c172bc67d5351f55e99ab6df5cdd8639206f3444a"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "33888c19b7e5e57155748d7372ad2b0e61f522ee96913f8846c754c3361fcb4a"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "d5487588cf07cbd2b02b1c566b6515d087cf8fe9d528890b1dd5a0de53ab1d8c"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "72b3a36269de70bd627589bad817e7702a4c83fff9b460e4f787486fa4bf15c7"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "d458ed4b62f65ce7c3787930549cbee42842ae87a846e5d1565c1881b3bc17e8"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3155a71e847020b2806f6b31acbaa702ccf20f8bd805c2aedb0c9c415f75b88f"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "b56beb864d247685cd9ba6820e5a8a143be28ff95440e38670c8963d2c769738"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "74b7059580a4f389278b1059d80308101ffcfd0a738c6d614e56560ce116db34"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "a351421c230f6629de0125a30767ff10d541264f6249f6fa2568eae76189398f"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "d26ba336a555276c36f9a003df9bc3e0df1c40dd4da7062d1cd8b3a6cba6d52c"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "078e5878f823b2d19568af8bda095e6ab46097a680b209bae9242d7658377abf"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "c9aaab25dabdba0708459a82882b926155b475314d72463633af10c27d9e5dfb"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "9a9fc61875f0427c26107b96ee3a6f7d71717c0d4aa6e41cc7b1b56bff2131e7"; } + { locale = "be"; arch = "linux-i686"; sha256 = "afc862a2a1054f08cffa0ec4facb2e9098fb042f7e4dab85c2ace7f30a384426"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "50353005857df556840fab0b18e8784dc18cbcdc5c45f4fc1f68f6b78b58048c"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "4876fcda18fd01b51f392a56085ebfcb97cefd69355666f42d58ffe53b9eb8e9"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "ef90a31aa408c6c86f3103d7bc82e3e8b5ac7bc9956d431ef46e1f44156b7dbf"; } + { locale = "ta-LK"; arch = "linux-i686"; sha256 = "ee4a961e76e63a79d08118e2355e37b1b2a1e0260613532ac6dc7c9a9e86caf1"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "9a1233c0ee7a72f8b1c071a6cd507d870d34bd64c71f7f960c00cf2e840ea5b1"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "00bf471763ca98d7c7e0243f5bbc75230b6cf8cea9c5dab17464c47544d102de"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "61e474bd0c930b9d6bcc553a87c07e415e1fe037dd033a6a97f9137d4fc73f49"; } + { locale = "de"; arch = "linux-i686"; sha256 = "e93520901aa59938e1c51c9943225dded88c668a91da6660de9f41714114ac8b"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "008156ddb73f4eb91d801d8bc35685e517328b5e5f13a4ed39873df471d01c67"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "20b3b10e12238238737fa0da3dce5e2fdff1161594b415c5872dd7416001482b"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "79f854469ac1a6fb0768934dc20ebc511a01904c71f321ed31ebe400ab88f4d8"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "61cec7fef6e75ecd7d459e973b258c5b62af0dbfd175b7000484594e63ead2e4"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "83b3761bfd949e3890c7006ba9610e858fab25815cd6e2f3f293ca707086a78c"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "f36321189ed80130b9e4a3a6e387531c48745f4c109f35afe928cf2d44e1b424"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "81da71b2ce832788213ed60f801fd79e61205a98c44e9082a35f2195af314de8"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "b759d93d78964eb8b9ce5aaad37d652fa425cfb5d6049f58a31c2492e3aa475d"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "62b32a8a4e7455c42bbf8cc5029919a64ca2ff61e06f535dd628a8dd612a15d9"; } + { locale = "da"; arch = "linux-i686"; sha256 = "4ad6ede882e973b37627105812619d2e8c804d50d496d96f68554bf75ca093fe"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "9fd6ce0edef1a8c8eb7d811afa39600a2c946f9ed87610a9e98a971d4cf31b08"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "35254ef736865d1a7c368e62c9cba68fa64b7f017aca4d9569aeb18b5f559717"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "6ff8a5b4ebfb9217b37afdfc4d5cab01f1ce66387010d2105a51bed486eea52c"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "eb4af3ff107f6827d0288bd68486b8eef174c5dc6e9b5313099d99b2e695db0d"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "80a6bf800a53af0cc9445c632546ce7cefcf5bd819e6e5e35e662330d58d757c"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "ba35f578095f79582341e988ce7c5e07f489833f7a309756c80caf4f56367987"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "09c193e865e90b6d2c547c17d10add7d43e8b89b630a8a490323d4ed391c924d"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "57610296c564291a8432fdb9215bcfbab6f09792c47e5606c1619bb203c7f5de"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "c702acf69957ffd1c4774f42d4f28dc239a4c5bcf6e003c236952167bf9e7e9f"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "56ae2d38af2988791163e6b118c781d55e2c545097aa5afccc72998705312888"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "c5386f149831aa2f48b65391f31f8f2e0a9c3b7a8bcaae67420a5819e80315ec"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "8409401c0b87be071d081c03eb34e3338cb62e80669045f5d268f8da60d96bce"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "4f93e9b0688e30586b3d372944ae5579f7249220733d6045e6bca3830e7f121a"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "ae1608b9e15862f82d15c5acbcd9f65775efc4368588bc685ebff523ff93e2d6"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "2466f020209de610f429315e0b090b43cf42c9ce540c6bc51e7ad11f5a3449f5"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "76cbcf31388cbe72ebbf3fa3be66a0cfe20cd572febf062f3a58a9c50313aa03"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "e4aa9dd8bb21f3d79ce5f9cfc907fc8a355fef349dcdec30403d534bf3cfbdf6"; } + { locale = "et"; arch = "linux-i686"; sha256 = "06561fa96d5166bfbe8eb492ebc08b3d2a768a8a7a251b357dec89ad33f3825e"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "85e663261cc6722c25dd36e1c0a15b7a82a3a6aaca54191effe8ea09ccb8c43e"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "d80f116d39e48b42a767fbda5b6e765be4bc3d210cf95d80bb014606785be3e6"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "c2e124736d63581a3034e60fe3d40bfef9458a712853ab5c8c5d391a9d3af6a9"; } ]; arch = if stdenv.system == "i686-linux" @@ -263,4 +265,3 @@ stdenv.mkDerivation { platforms = platforms.linux; }; } - diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb new file mode 100644 index 000000000000..e19425c8e175 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_nix.rb @@ -0,0 +1,210 @@ +version = if ARGV.empty? + "latest" + else + ARGV[0] + end + +base_path = "download-installer.cdn.mozilla.net/pub/thunderbird/releases" + +arches = ["linux-i686", "linux-x86_64"] + +arches.each do |arch| + system("wget", "--recursive", "--continue", "--no-parent", "--reject-regex", ".*\\?.*", "--reject", "xpi", "http://#{base_path}/#{version}/#{arch}/") +end + +locales = Dir.glob("#{base_path}/#{version}/#{arches[0]}/*").map do |path| + File.basename(path) +end + +locales.delete("index.html") +locales.delete("xpi") + +real_version = Dir.glob("#{base_path}/#{version}/#{arches[0]}/#{locales[0]}/thunderbird-*")[0].match(/thunderbird-([0-9.]*)/)[1][0..-2] + +locale_arch_path_tuples = locales.flat_map do |locale| + arches.map do |arch| + path = Dir.glob("#{base_path}/#{version}/#{arch}/#{locale}/thunderbird-*")[0] + + [locale, arch, path] + end +end + +paths = locale_arch_path_tuples.map do |tuple| tuple[2] end + +hashes = IO.popen(["sha256sum", "--binary", *paths]) do |input| + input.each_line.map do |line| + $stderr.puts(line) + + line.match(/^[0-9a-f]*/)[0] + end +end + + +puts(<<"EOH") +# This file is generated from generate_nix.rb +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_nix.rb > default.nix + +{ stdenv, fetchurl, config +, gconf +, alsaLib +, at_spi2_atk +, atk +, cairo +, cups +, curl +, dbus_glib +, dbus_libs +, fontconfig +, freetype +, gdk_pixbuf +, glib +, glibc +, gst_plugins_base +, gstreamer +, gtk +, kerberos +, libX11 +, libXScrnSaver +, libXext +, libXinerama +, libXrender +, libXt +, libcanberra +, libgnome +, libgnomeui +, mesa +, nspr +, nss +, pango +}: + +let + version = "#{real_version}"; + sources = [ +EOH + +locale_arch_path_tuples.zip(hashes) do |tuple, hash| + locale, arch, path = tuple + + puts(%Q| { locale = "#{locale}"; arch = "#{arch}"; sha256 = "#{hash}"; }|) +end + +puts(<<'EOF') + ]; + + arch = if stdenv.system == "i686-linux" + then "linux-i686" + else "linux-x86_64"; + + isPrefixOf = prefix: string: + builtins.substring 0 (builtins.stringLength prefix) string == prefix; + + sourceMatches = locale: source: + (isPrefixOf source.locale locale) && source.arch == arch; + + systemLocale = config.i18n.defaultLocale or "en-US"; + + defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + + source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + +in + +stdenv.mkDerivation { + name = "thunderbird-bin-${version}"; + + src = fetchurl { + url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; + inherit (source) sha256; + }; + + phases = "unpackPhase installPhase"; + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.gcc.gcc + gconf + alsaLib + at_spi2_atk + atk + cairo + cups + curl + dbus_glib + dbus_libs + fontconfig + freetype + gdk_pixbuf + glib + glibc + gst_plugins_base + gstreamer + gtk + kerberos + libX11 + libXScrnSaver + libXext + libXinerama + libXrender + libXt + libcanberra + libgnome + libgnomeui + mesa + nspr + nss + pango + ] + ":" + stdenv.lib.makeSearchPath "lib64" [ + stdenv.gcc.gcc + ]; + + installPhase = + '' + mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" + cp -r * "$prefix/usr/lib/thunderbird-bin-${version}" + + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/" + + for executable in \ + thunderbird mozilla-xremote-client thunderbird-bin plugin-container \ + updater + do + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + "$out/usr/lib/thunderbird-bin-${version}/$executable" + done + + for executable in \ + thunderbird mozilla-xremote-client thunderbird-bin plugin-container \ + updater libxul.so + do + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/thunderbird-bin-${version}/$executable" + done + + # Create a desktop item. + mkdir -p $out/share/applications + cat > $out/share/applications/thunderbird.desktop < Date: Wed, 11 Jun 2014 13:50:47 -0700 Subject: [PATCH 336/424] nspr: update to 4.10.6 Required for Firefox 30.0. --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index f6848ae58602..0355ce25c62c 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.5"; in +let version = "4.10.6"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "891de2b62ad42f9b38808a0aa58c95e8cbd5c9a9"; + sha1 = "3hzcslcfql1rg7drvcn4nmrigy7jfgwz"; }; preConfigure = "cd nspr"; From 9e46a0d748e4ac5816013635035714327a5fcf93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 11 Jun 2014 23:03:35 +0200 Subject: [PATCH 337/424] gvfs: add more supported protocols in gnome 3.10. Closes #2880 This change has been successfully tested on gnome 3.12 (thanks @lethalman!). Now bring it to gnome 3.10, which currently is the default gnome3 version in NixOS. I've build and run tested it (success: smb:// protocol now work in Nautilus). --- pkgs/desktops/gnome-3/3.10/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index e2b8f414206e..4376493c95b0 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -106,7 +106,7 @@ rec { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; }; + gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; lightWeight = false; }; eog = callPackage ./core/eog { }; From af3d448d335cd22355b6b84857520cfa5cfb380e Mon Sep 17 00:00:00 2001 From: Daniel Bergey Date: Fri, 6 Jun 2014 01:22:24 +0000 Subject: [PATCH 338/424] pass(word-store): add option to include xclip in PATH xclip is necessary for pass(word-store) to send passwords to the clipboard / X-selection, rather than echoing to the terminal. The option currently defaults to false, because someone may not want the dependency on X libraries and also pass is really quick to build (it's just a shell script). --- pkgs/tools/security/pass/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 505bdd2efc86..d3e2c50991a1 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchurl , coreutils, gnused, getopt, pwgen, git, tree, gnupg -, makeWrapper }: +, makeWrapper +, withX ? false, xclip ? null +}: + +assert withX -> xclip != null; stdenv.mkDerivation rec { version = "1.6.2"; @@ -51,6 +55,6 @@ stdenv.mkDerivation rec { # Ensure all dependencies are in PATH wrapProgram $out/bin/pass \ - --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin" + --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin${if withX then ":${xclip}/bin" else ""}" ''; } From 837d1f406bddbe10e3dbbb2668b4de5da6c322ed Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Thu, 12 Jun 2014 13:16:05 +0800 Subject: [PATCH 339/424] Update haskell-hspec2 to version 0.3.1 --- .../libraries/haskell/hspec2/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index be49f612aaac..92e89063938d 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -1,24 +1,22 @@ { cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths -, hspecExpectations, hspecMeta, HUnit, ioMemoize, QuickCheck -, quickcheckIo, random, setenv, silently, tfRandom, time -, transformers +, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo +, random, setenv, silently, tfRandom, time, transformers }: cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.3.0"; - sha256 = "0ia19jraz2di31c48lh0kswkb2573jxm7msf33i8d5a5yq8y9wwp"; + version = "0.3.1"; + sha256 = "09zzlq3gy10y2bdsmmbdylkscfa3vlwgbc0h0g113rk6zs1l1qs6"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal async deepseq filepath hspecExpectations HUnit - ioMemoize QuickCheck quickcheckIo random setenv tfRandom time - transformers + QuickCheck quickcheckIo random setenv tfRandom time transformers ]; testDepends = [ ansiTerminal async deepseq doctest filepath ghcPaths - hspecExpectations hspecMeta HUnit ioMemoize QuickCheck quickcheckIo - random setenv silently tfRandom time transformers + hspecExpectations hspecMeta HUnit QuickCheck quickcheckIo random + setenv silently tfRandom time transformers ]; meta = { homepage = "http://hspec.github.io/"; From d7491e429ab6447f18e3eaf500f1dc668f8605cd Mon Sep 17 00:00:00 2001 From: Anders Claesson Date: Thu, 12 Jun 2014 01:01:06 +0100 Subject: [PATCH 340/424] pass: install bash completion script --- pkgs/tools/security/pass/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index d3e2c50991a1..f9bc01715924 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { }; installPhase = '' + mkdir -p "$out/share/bash-completion/completions" mkdir -p "$out/share/zsh/site-functions" mkdir -p "$out/share/fish/completions" From 22a45575e4db42f0cce7eee867074a157ee634d0 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Thu, 12 Jun 2014 14:25:22 +0800 Subject: [PATCH 341/424] Update haskell-hspec2 to version 0.3.3 (fixes broken Haddocks) --- pkgs/development/libraries/haskell/hspec2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index 92e89063938d..88ecd25ce016 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.3.1"; - sha256 = "09zzlq3gy10y2bdsmmbdylkscfa3vlwgbc0h0g113rk6zs1l1qs6"; + version = "0.3.3"; + sha256 = "0rza34smm30h6jfdb4f4is45j5bp59nq8bn34l1bmv3aiw9kjbmz"; isLibrary = true; isExecutable = true; buildDepends = [ From 1bcc2aa2162fb7fe46f6724f7dfb4f6caa10e88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 12 Jun 2014 09:05:12 +0200 Subject: [PATCH 342/424] fix licenCe typos --- pkgs/tools/graphics/nifskope/default.nix | 2 +- pkgs/tools/misc/tmpwatch/default.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 32410caeeff7..13dc27921a43 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; - licence = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index befe517c225c..c19d58b98162 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; - meta = { + meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."; - licence = "GPLv2"; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + maintainers = with maintainers; [ vlstill ]; + platforms = platforms.unix; }; } From 0dfd7efd36d857176ead616711d3887e2014fd1d Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Sat, 3 May 2014 09:32:36 +0200 Subject: [PATCH 343/424] calibre: upgrade from 1.31.0 to 1.35.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index c2d8e7979e45..6c25a67147af 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.31.0"; + name = "calibre-1.35.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1fl42y8ppw8s51v66dqsrg1ib28yi6z5779r9wfvdbl9v1clilfc"; + sha256 = "0pzxp1f9d4pw7vksdfkdz6fdgrb8jfwgh4fckjfrarqs039422bi"; }; inherit python; From 58cbfedc5d0237831280c9752ea1b77c73c46b2b Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Sat, 3 May 2014 11:27:12 +0200 Subject: [PATCH 344/424] scummvm: upgrade from 1.2.1 to 1.6.0 --- pkgs/games/scummvm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 9c51db1ac987..ca72ac506d78 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }: -stdenv.mkDerivation { - name = "scummvm-1.2.1"; +stdenv.mkDerivation rec { + name = "scummvm-1.6.0"; src = fetchurl { - url = mirror://sourceforge/scummvm/scummvm-1.2.1.tar.bz2; - sha256 = "029abzvpz85accwk7x79w255wr83gnkqg3yc5n6ryl28zg00z3j8"; + url = "mirror://sourceforge/scummvm/${name}.tar.bz2"; + sha256 = "1i3ywpq8csi58gdibdn51329vlj800l2laaw0lw18fcgdbd60q1r"; }; buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ]; From 5becd182034acc2c49eaf7aad8aff6820331b841 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 10:03:32 +0200 Subject: [PATCH 345/424] haskell-cabal2nix: update to version 1.63 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 7ad20ee066b2..2201040efe1e 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.61"; - sha256 = "058bwswkhsj3rbxl42n23ri79smmhkaj6wid4c6x02yl3m8l7xsy"; + version = "1.63"; + sha256 = "12frnhm86w5i6rmhghrdngdv658332bh9j5nr04ql439yysvkypj"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 187e4803291aa9313811a8881294b0b290c50315 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 10:32:11 +0200 Subject: [PATCH 346/424] haskell-crypto-numbers: disable the test suite to avoid spurious build failures https://github.com/vincenthz/hs-crypto-numbers/issues/8 --- pkgs/development/libraries/haskell/crypto-numbers/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index 7633c479e7c0..b3f0b205af5b 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { byteable cryptoRandom HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 vector ]; + doCheck = false; meta = { homepage = "http://github.com/vincenthz/hs-crypto-numbers"; description = "Cryptographic numbers: functions and algorithms"; From e59c465103db779bba9259c5aa228773ed99d42a Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Thu, 12 Jun 2014 11:14:44 +0200 Subject: [PATCH 347/424] nsd: add package version 4.0.3 --- pkgs/servers/dns/nsd/default.nix | 34 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/servers/dns/nsd/default.nix diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix new file mode 100644 index 000000000000..7279aa6d4ef8 --- /dev/null +++ b/pkgs/servers/dns/nsd/default.nix @@ -0,0 +1,34 @@ +{ config, stdenv, fetchurl, libevent, openssl +}: + +stdenv.mkDerivation rec { + name = "nsd-4.0.3"; + + src = fetchurl { + url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; + sha256 = "4bf05f2234e1b41899198aa1070f409201fc3c4980feef6567cd92c7074c4a8b"; + }; + + buildInputs = [ libevent openssl ]; + + configureFlags = + let flag = state: flags: if state then map (x: "--enable-${x}") flags + else map (x: "--disable-${x}") flags; + in flag (config.nsd.bind8Stats or false) [ "bind8-stats" ] + ++ flag (config.nsd.checking or false) [ "checking" ] + ++ flag (config.nsd.ipv6 or true) [ "ipv6" ] + ++ flag (config.nsd.mmap or false) [ "mmap" ] + ++ flag (config.nsd.minimalResponses or true) [ "minimal-responses" ] + ++ flag (config.nsd.nsec3 or true) [ "nsec3" ] + ++ flag (config.nsd.ratelimit or false) [ "ratelimit" ] + ++ flag (config.nsd.recvmmsg or false) [ "recvmmsg" ] + ++ flag (config.nsd.rootServer or false) [ "root-server" ] + ++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ]; + + meta = { + description = "Authoritative only, high performance, simple and open source name server."; + license = "BSD"; + homepage = http://www.nlnetlabs.nl; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14a6cde1bf7d..0adca2cd1b3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6679,6 +6679,8 @@ let ngircd = callPackage ../servers/irc/ngircd { }; + nsd = callPackage ../servers/dns/nsd { }; + opensmtpd = callPackage ../servers/mail/opensmtpd { }; petidomo = callPackage ../servers/mail/petidomo { }; From 8daaa28ac8d4aa1d84b9e6c1c23b3e6eac9ffac3 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Thu, 12 Jun 2014 11:20:43 +0200 Subject: [PATCH 348/424] nsd-service: add service module for nsd --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/nsd.nix | 751 ++++++++++++++++++++++ 3 files changed, 754 insertions(+) create mode 100644 nixos/modules/services/networking/nsd.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index db50a010e7da..f1028a479dff 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -133,6 +133,7 @@ spiped = 123; teamspeak = 124; influxdb = 125; + nsd = 126; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -240,6 +241,7 @@ spiped = 123; teamspeak = 124; influxdb = 125; + nsd = 126; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cae2e61c2cf2..f4f1abba4de4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -207,6 +207,7 @@ ./services/networking/networkmanager.nix ./services/networking/ngircd.nix ./services/networking/notbit.nix + ./services/networking/nsd.nix ./services/networking/ntopng.nix ./services/networking/ntpd.nix ./services/networking/oidentd.nix diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix new file mode 100644 index 000000000000..adfee1caec58 --- /dev/null +++ b/nixos/modules/services/networking/nsd.nix @@ -0,0 +1,751 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + cfg = config.services.nsd; + + username = "nsd"; + stateDir = "/var/lib/nsd"; + pidFile = stateDir + "/var/nsd.pid"; + + zoneFiles = pkgs.stdenv.mkDerivation { + preferLocalBuild = true; + name = "nsd-env"; + buildCommand = concatStringsSep "\n" + [ "mkdir -p $out" + (concatStrings (mapAttrsToList (zoneName: zoneOptions: '' + cat > "$out/${zoneName}" <<_EOF_ + ${zoneOptions.data} + _EOF_ + '') zoneConfigs)) + ]; + }; + + configFile = pkgs.writeText "nsd.conf" '' + server: + username: ${username} + chroot: "${stateDir}" + + # The directory for zonefile: files. The daemon chdirs here. + zonesdir: "${stateDir}" + + # the list of dynamically added zones. + zonelistfile: "${stateDir}/var/zone.list" + database: "${stateDir}/var/nsd.db" + logfile: "${stateDir}/var/nsd.log" + pidfile: "${pidFile}" + xfrdfile: "${stateDir}/var/xfrd.state" + xfrdir: "${stateDir}/tmp" + + # interfaces + ${forEach " ip-address: " cfg.interfaces} + + server-count: ${toString cfg.serverCount} + ip-transparent: ${yesOrNo cfg.ipTransparent} + do-ip4: ${yesOrNo cfg.ipv4} + do-ip6: ${yesOrNo cfg.ipv6} + port: ${toString cfg.port} + verbosity: ${toString cfg.verbosity} + hide-version: ${yesOrNo cfg.hideVersion} + identity: "${cfg.identity}" + ${maybeString "nsid: " cfg.nsid} + tcp-count: ${toString cfg.tcpCount} + tcp-query-count: ${toString cfg.tcpQueryCount} + tcp-timeout: ${toString cfg.tcpTimeout} + ipv4-edns-size: ${toString cfg.ipv4EDNSSize} + ipv6-edns-size: ${toString cfg.ipv6EDNSSize} + ${if cfg.statistics == null then "" else "statistics: ${toString cfg.statistics}"} + xfrd-reload-timeout: ${toString cfg.xfrdReloadTimeout} + zonefiles-check: ${yesOrNo cfg.zonefilesCheck} + + rrl-size: ${toString cfg.ratelimit.size} + rrl-ratelimit: ${toString cfg.ratelimit.ratelimit} + rrl-whitelist-ratelimit: ${toString cfg.ratelimit.whitelistRatelimit} + ${maybeString "rrl-slip: " cfg.ratelimit.slip} + ${maybeString "rrl-ipv4-prefix-length: " cfg.ratelimit.ipv4PrefixLength} + ${maybeString "rrl-ipv6-prefix-length: " cfg.ratelimit.ipv6PrefixLength} + + ${keyConfigFile} + + remote-control: + control-enable: ${yesOrNo cfg.remoteControl.enable} + ${forEach " control-interface: " cfg.remoteControl.interfaces} + control-port: ${toString cfg.port} + server-key-file: "${cfg.remoteControl.serverKeyFile}" + server-cert-file: "${cfg.remoteControl.serverCertFile}" + control-key-file: "${cfg.remoteControl.controlKeyFile}" + control-cert-file: "${cfg.remoteControl.controlCertFile}" + + # zone files reside in "${zoneFiles}" linked to "${stateDir}/zones" + ${concatStrings (mapAttrsToList zoneConfigFile zoneConfigs)} + + ${cfg.extraConfig} + ''; + + yesOrNo = b: if b then "yes" else "no"; + maybeString = pre: s: if s == null then "" else ''${pre} "${s}"''; + forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; + + + keyConfigFile = concatStrings (mapAttrsToList (keyName: keyOptions: '' + key: + name: "${keyName}" + algorithm: "${keyOptions.algorithm}" + include: "${stateDir}/private/${keyName}" + '') cfg.keys); + + copyKeys = concatStrings (mapAttrsToList (keyName: keyOptions: '' + secret=$(cat "${keyOptions.keyFile}") + dest="${stateDir}/private/${keyName}" + echo " secret: \"$secret\"" > "$dest" + ${pkgs.coreutils}/bin/chown ${username}:${username} "$dest" + ${pkgs.coreutils}/bin/chmod 0400 "$dest" + '') cfg.keys); + + + zoneConfigFile = name: zone: '' + zone: + name: "${name}" + zonefile: "${stateDir}/zones/${name}" + ${maybeString "outgoing-interface: " zone.outgoingInterface} + ${forEach " rrl-whitelist: " zone.rrlWhitelist} + + ${forEach " allow-notify: " zone.allowNotify} + ${forEach " request-xfr: " zone.requestXFR} + allow-axfr-fallback: ${yesOrNo zone.allowAXFRFallback} + + ${forEach " notify: " zone.notify} + notify-retry: ${toString zone.notifyRetry} + ${forEach " provide-xfr: " zone.provideXFR} + + ''; + + zoneConfigs = zoneConfigs' {} "" { children = cfg.zones; }; + + zoneConfigs' = parent: name: zone: + if !(zone ? children) || zone.children == null || zone.children == { } + # leaf -> actual zone + then listToAttrs [ (nameValuePair name (parent // zone)) ] + + # fork -> pattern + else zipAttrsWith (name: head) ( + mapAttrsToList (name: child: zoneConfigs' (parent // zone // { children = {}; }) name child) + zone.children + ); + + # fighting infinite recursion + zoneOptions = zoneOptionsRaw // childConfig zoneOptions1 true; + zoneOptions1 = zoneOptionsRaw // childConfig zoneOptions2 false; + zoneOptions2 = zoneOptionsRaw // childConfig zoneOptions3 false; + zoneOptions3 = zoneOptionsRaw // childConfig zoneOptions4 false; + zoneOptions4 = zoneOptionsRaw // childConfig zoneOptions5 false; + zoneOptions5 = zoneOptionsRaw // childConfig zoneOptions6 false; + zoneOptions6 = zoneOptionsRaw // childConfig null false; + + childConfig = x: v: { options.children = { type = types.attrsOf x; visible = v; }; }; + + zoneOptionsRaw = types.submodule ( + { options, ... }: + { options = { + children = mkOption { + default = {}; + description = '' + Children zones inherit all options of their parents. Attributes + defined in a child will overwrite the ones of its parent. Only + leaf zones will be actually served. This way it's possible to + define maybe zones which share most attributes without + duplicating everything. This mechanism replaces nsd's patterns + in a save and functional way. + ''; + }; + + allowNotify = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name" + "10.0.3.4&255.255.0.0 BLOCKED" + ]; + description = '' + Listed primary servers are allowed to notify this secondary server. + + + either a plain IPv4/IPv6 address or range. Valid patters for ranges: + * 10.0.0.0/24 # via subnet size + * 10.0.0.0&255.255.255.0 # via subnet mask + * 10.0.0.1-10.0.0.254 # via range + + A optional port number could be added with a '@': + * 2001:1234::1@1234 + + + * will use the specified TSIG key + * NOKEY no TSIG signature is required + * BLOCKED notifies from non-listed or blocked IPs will be ignored + * ]]> + ''; + }; + + requestXFR = mkOption { + type = types.listOf types.str; + default = []; + example = []; + description = '' + Format: [AXFR|UDP] <ip-address> <key-name | NOKEY> + ''; + }; + + allowAXFRFallback = mkOption { + type = types.bool; + default = true; + description = '' + If NSD as secondary server should be allowed to AXFR if the primary + server does not allow IXFR. + ''; + }; + + notify = mkOption { + type = types.listOf types.str; + default = []; + example = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ]; + description = '' + This primary server will notify all given secondary servers about + zone changes. + + + a plain IPv4/IPv6 address with on optional port number (ip@port) + + + * sign notifies with the specified key + * NOKEY don't sign notifies + ]]> + ''; + }; + + notifyRetry = mkOption { + type = types.int; + default = 5; + description = '' + Specifies the number of retries for failed notifies. Set this along with notify. + ''; + }; + + provideXFR = mkOption { + type = types.listOf types.str; + default = []; + example = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ]; + description = '' + Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED + address range 192.0.2.0/24, 1.2.3.4&255.255.0.0, 3.0.2.20-3.0.2.40 + ''; + }; + + outgoingInterface = mkOption { + type = types.nullOr types.str; + default = null; + example = "2000::1@1234"; + description = '' + This address will be used for zone-transfere requests if configured + as a secondary server or notifications in case of a primary server. + Supply either a plain IPv4 or IPv6 address with an optional port + number (ip@port). + ''; + }; + + rrlWhitelist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Whitelists the given rrl-types. + The RRL classification types are: nxdomain, error, referral, any, + rrsig, wildcard, nodata, dnskey, positive, all + ''; + }; + + data = mkOption { + type = types.str; + default = ""; + example = ""; + description = '' + The actual zone data. This is the content of your zone file. + Use imports or pkgs.lib.readFile if you don't want this data in your config file. + ''; + }; + + }; + } + ); + +in +{ + options = { + services.nsd = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the NSD authoritative domain name server. + ''; + }; + + rootServer = mkOption { + type = types.bool; + default = false; + description = '' + Wheter if this server will be a root server (a DNS root server, you + usually don't want that). + ''; + }; + + interfaces = mkOption { + type = types.listOf types.str; + default = [ "127.0.0.0" "::1" ]; + description = '' + What addresses the server should listen to. + ''; + }; + + serverCount = mkOption { + type = types.int; + default = 1; + description = '' + Number of NSD servers to fork. Put the number of CPUs to use here. + ''; + }; + + ipTransparent = mkOption { + type = types.bool; + default = false; + description = '' + Allow binding to non local addresses. + ''; + }; + + ipv4 = mkOption { + type = types.bool; + default = true; + description = '' + Wheter to listen on IPv4 connections. + ''; + }; + + ipv6 = mkOption { + type = types.bool; + default = true; + description = '' + Wheter to listen on IPv6 connections. + ''; + }; + + port = mkOption { + type = types.int; + default = 53; + description = '' + Port the service should bind do. + ''; + }; + + verbosity = mkOption { + type = types.int; + default = 0; + description = '' + Verbosity level. + ''; + }; + + hideVersion = mkOption { + type = types.bool; + default = true; + description = '' + Wheter NSD should answer VERSION.BIND and VERSION.SERVER CHAOS class queries. + ''; + }; + + identity = mkOption { + type = types.str; + default = "unidentified server"; + description = '' + Identify the server (CH TXT ID.SERVER entry). + ''; + }; + + nsid = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + NSID identity (hex string, or "ascii_somestring"). + ''; + }; + + tcpCount = mkOption { + type = types.int; + default = 100; + description = '' + Maximum number of concurrent TCP connections per server. + ''; + }; + + tcpQueryCount = mkOption { + type = types.int; + default = 0; + description = '' + Maximum number of queries served on a single TCP connection. + 0 means no maximum. + ''; + }; + + tcpTimeout = mkOption { + type = types.int; + default = 120; + description = '' + TCP timeout in seconds. + ''; + }; + + ipv4EDNSSize = mkOption { + type = types.int; + default = 4096; + description = '' + Preferred EDNS buffer size for IPv4. + ''; + }; + + ipv6EDNSSize = mkOption { + type = types.int; + default = 4096; + description = '' + Preferred EDNS buffer size for IPv6. + ''; + }; + + statistics = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Statistics are produced every number of seconds. Prints to log. + If null no statistics are logged. + ''; + }; + + xfrdReloadTimeout = mkOption { + type = types.int; + default = 1; + description = '' + Number of seconds between reloads triggered by xfrd. + ''; + }; + + zonefilesCheck = mkOption { + type = types.bool; + default = true; + description = '' + Wheter to check mtime of all zone files on start and sighup. + ''; + }; + + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Extra nsd config. + ''; + }; + + + ratelimit = mkOption { + type = types.submodule ( + { options, ... }: + { options = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable ratelimit capabilities. + ''; + }; + + size = mkOption { + type = types.int; + default = 1000000; + description = '' + Size of the hashtable. More buckets use more memory but lower + the chance of hash hash collisions. + ''; + }; + + ratelimit = mkOption { + type = types.int; + default = 200; + description = '' + Max qps allowed from any query source. + 0 means unlimited. With an verbosity of 2 blocked and + unblocked subnets will be logged. + ''; + }; + + whitelistRatelimit = mkOption { + type = types.int; + default = 2000; + description = '' + Max qps allowed from whitelisted sources. + 0 means unlimited. Set the rrl-whitelist option for specific + queries to apply this limit instead of the default to them. + ''; + }; + + slip = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Number of packets that get discarded before replying a SLIP response. + 0 disables SLIP responses. 1 will make every response a SLIP response. + ''; + }; + + ipv4PrefixLength = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + IPv4 prefix length. Addresses are grouped by netblock. + ''; + }; + + ipv6PrefixLength = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + IPv6 prefix length. Addresses are grouped by netblock. + ''; + }; + + }; + }); + default = { + }; + example = {}; + description = '' + ''; + }; + + + remoteControl = mkOption { + type = types.submodule ( + { config, options, ... }: + { options = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Wheter to enable remote control via nsd-control(8). + ''; + }; + + interfaces = mkOption { + type = types.listOf types.str; + default = [ "127.0.0.1" "::1" ]; + description = '' + Which interfaces NSD should bind to for remote control. + ''; + }; + + port = mkOption { + type = types.int; + default = 8952; + description = '' + Port number for remote control operations (uses TLS over TCP). + ''; + }; + + serverKeyFile = mkOption { + type = types.path; + default = "/etc/nsd/nsd_server.key"; + description = '' + Path to the server private key, which is used by the server + but not by nsd-control. This file is generated by nsd-control-setup. + ''; + }; + + serverCertFile = mkOption { + type = types.path; + default = "/etc/nsd/nsd_server.pem"; + description = '' + Path to the server self signed certificate, which is used by the server + but and by nsd-control. This file is generated by nsd-control-setup. + ''; + }; + + controlKeyFile = mkOption { + type = types.path; + default = "/etc/nsd/nsd_control.key"; + description = '' + Path to the client private key, which is used by nsd-control + but not by the server. This file is generated by nsd-control-setup. + ''; + }; + + controlCertFile = mkOption { + type = types.path; + default = "/etc/nsd/nsd_control.pem"; + description = '' + Path to the client certificate signed with the server certificate. + This file is used by nsd-control and generated by nsd-control-setup. + ''; + }; + + }; + + }); + default = { + }; + example = {}; + description = '' + ''; + }; + + + keys = mkOption { + type = types.attrsOf (types.submodule ( + { options, ... }: + { options = { + + algorithm = mkOption { + type = types.str; + default = "hmac-sha256"; + description = '' + Authentication algorithm for this key. + ''; + }; + + keyFile = mkOption { + type = types.path; + description = '' + Path to the file which contains the actual base64 encoded + key. The key will be copied into "${stateDir}/private" before + NSD starts. The copied file is only accessibly by the NSD + user. + ''; + }; + + }; + })); + default = { + }; + example = { + "tsig.example.org" = { + algorithm = "hmac-md5"; + secret = "aaaaaabbbbbbccccccdddddd"; + }; + }; + description = '' + Define your TSIG keys here. + ''; + }; + + zones = mkOption { + type = types.attrsOf zoneOptions; + default = {}; + example = { + "serverGroup1" = { + provideXFR = [ "10.1.2.3 NOKEY" ]; + children = { + "example.com." = { + data = '' + $ORIGIN example.com. + $TTL 86400 + @ IN SOA a.ns.example.com. admin.example.com. ( + ... + ''; + }; + "example.org." = { + data = '' + $ORIGIN example.org. + $TTL 86400 + @ IN SOA a.ns.example.com. admin.example.com. ( + ... + ''; + }; + }; + }; + + "example.net." = { + provideXFR = [ "10.3.2.1 NOKEY" ]; + data = ''...''; + }; + }; + description = '' + Define your zones here. Zones can cascade other zones and therefore + inherit settings from parent zones. Look at the definition of + children to learn about inheritance and child zones. + The given example will define 3 zones (example.(com|org|net).). Both + example.com. and example.org. inherit their configuration from + serverGroup1. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + # this is not working :( + nixpkgs.config.nsd = { + ipv6 = cfg.ipv6; + ratelimit = cfg.ratelimit.enable; + rootServer = cfg.rootServer; + }; + + users.extraGroups = singleton { + name = username; + gid = config.ids.gids.nsd; + }; + + users.extraUsers = singleton { + name = username; + description = "NSD service user"; + home = stateDir; + createHome = true; + uid = config.ids.uids.nsd; + group = username; + }; + + systemd.services.nsd = { + description = "NSD authoritative only domain name service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + Type = "forking"; + PIDFile = pidFile; + Restart = "always"; + ExecStart = "${pkgs.nsd}/sbin/nsd -c ${configFile}"; + }; + + preStart = '' + ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/private" + ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/tmp" + ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/var" + + ${pkgs.coreutils}/bin/touch "${stateDir}/don't touch anything in here" + + ${pkgs.coreutils}/bin/rm -f "${stateDir}/private/"* + ${pkgs.coreutils}/bin/rm -f "${stateDir}/tmp/"* + + ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/private" + ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/tmp" + ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/var" + + ${pkgs.coreutils}/bin/rm -rf "${stateDir}/zones" + ${pkgs.coreutils}/bin/cp -r "${zoneFiles}" "${stateDir}/zones" + + ${copyKeys} + ''; + }; + + }; +} From 80b701ca94a8b781adb2b08aea0e1308c3a140a2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 12 Jun 2014 15:02:39 +0400 Subject: [PATCH 349/424] Put a correct Dia persistence file in ~/.dia unless such a file exists. Fixes #1691. --- pkgs/applications/graphics/dia/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index c7582fd6c33f..1ec9e1d1c0d1 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurlGnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext +{stdenv, fetchurl, fetchurlGnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl , withGNOME ? false, libgnomeui }: @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1qgawm7rrf4wd1yc0fp39ywv8gbz4ry1s16k00dzg5w6p67lfqd7"; }; + correctPersistence = fetchurl { + url = https://launchpadlibrarian.net/132677658/persistence; + sha256 = "1rv6zv9i03bna4bdp1wzn72lg7kdwi900y1izdq0imibi54nxjsk"; + }; + buildInputs = [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl @@ -24,7 +29,16 @@ stdenv.mkDerivation rec { # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command # It have no reasons to exist in a redistribuable package - postInstall = "rm $out/share/icons/hicolor/icon-theme.cache"; + postInstall = '' + rm $out/share/icons/hicolor/icon-theme.cache + + cd "$out"/bin/ + mv dia .dia-wrapped + echo '#! ${stdenv.shell}' >> dia + echo 'test -f "$HOME/.dia/persistence" || cp ${correctPersistence} "$HOME/.dia/persistence" ' >> dia + echo '.dia-wrapped "$@"' >> dia + chmod a+x dia + ''; meta = { description = "Gnome Diagram drawing software"; From bbdadcd8c6748dd0c8f3de43da4fb9e21b9e25e8 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 12 Jun 2014 14:36:26 +0100 Subject: [PATCH 350/424] haskellPackages.hedis: New expression --- .../libraries/haskell/BoundedChan/default.nix | 12 ++++++++++ .../libraries/haskell/hedis/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/haskell/BoundedChan/default.nix create mode 100644 pkgs/development/libraries/haskell/hedis/default.nix diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix new file mode 100644 index 000000000000..0ce294c2258c --- /dev/null +++ b/pkgs/development/libraries/haskell/BoundedChan/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "BoundedChan"; + version = "1.0.1.0"; + sha256 = "1v4lmp3j8lzk1m2pv5l90j80y0c6yxm6gb1ww9ffsz2jxfzz8vd8"; + meta = { + description = "Implementation of bounded channels"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hedis/default.nix b/pkgs/development/libraries/haskell/hedis/default.nix new file mode 100644 index 000000000000..c4e34b2d3612 --- /dev/null +++ b/pkgs/development/libraries/haskell/hedis/default.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsec, BoundedChan, bytestringLexing, HUnit, mtl +, network, resourcePool, testFramework, testFrameworkHunit, time +, vector +}: + +cabal.mkDerivation (self: { + pname = "hedis"; + version = "0.6.5"; + sha256 = "1kn8i49yxms1bpjwpy4m8vyycgi755zvy4zc66w068nmnd1kiykh"; + buildDepends = [ + attoparsec BoundedChan bytestringLexing mtl network resourcePool + time vector + ]; + testDepends = [ HUnit mtl testFramework testFrameworkHunit time ]; + meta = { + homepage = "https://github.com/informatikr/hedis"; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + doCheck = false; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b1ea4059da50..ddc483e66bbe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -286,6 +286,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {}; boundingboxes = self.boundingboxes_0_2; + BoundedChan = callPackage ../development/libraries/haskell/BoundedChan {}; + brainfuck = callPackage ../development/libraries/haskell/brainfuck {}; bson = callPackage ../development/libraries/haskell/bson {}; @@ -1002,6 +1004,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hcltest = callPackage ../development/libraries/haskell/hcltest {}; + hedis = callPackage ../development/libraries/haskell/hedis {}; + heredoc = callPackage ../development/libraries/haskell/heredoc {}; hexpat = callPackage ../development/libraries/haskell/hexpat {}; From 6cc799b24cad4aabb72c4b1afa06933f2c9e62de Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 12 Jun 2014 15:05:40 +0100 Subject: [PATCH 351/424] haskellPackages.snapletRedis: New expression This needs to be jailbroken until a new version reaches Hackage. --- .../haskell/snaplet-redis/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/snaplet-redis/default.nix diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix new file mode 100644 index 000000000000..83a82ac80ce1 --- /dev/null +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -0,0 +1,19 @@ +{ cabal, configurator, hedis, lens, mtl, network, snap +, transformers +}: + +cabal.mkDerivation (self: { + pname = "snaplet-redis"; + version = "0.1.3.1"; + sha256 = "1aprz9rxs01a86vfr8s7mjydafdfljg89grl7i43vmsw927izc6k"; + buildDepends = [ + configurator hedis lens mtl network snap transformers + ]; + meta = { + homepage = "https://github.com/dzhus/snaplet-redis/"; + description = "Redis support for Snap Framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + jailbreak = true; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ddc483e66bbe..1c29ca4b1fc8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1972,6 +1972,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {}; + snapletRedis = callPackage ../development/libraries/haskell/snaplet-redis {}; + snapletStripe = callPackage ../development/libraries/haskell/snaplet-stripe {}; snapBlaze = callPackage ../development/libraries/haskell/snap-blaze/default.nix {}; From aff4394be6287b7d553f4eb1b3990c457cd07275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 12 Jun 2014 21:18:21 +0200 Subject: [PATCH 352/424] nixos-generate-config: fix nix-env example command An escape char is needed to prevent "$ nix" from being evaluated and expanded to an empty string. With this change the resulting text is $ nix-env -qaP | grep wget instead of -env -qaP | grep wget --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index ab058efc7094..66a8152a3a6c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -466,7 +466,7 @@ $bootLoaderConfig # }; # List packages installed in system profile. To search by name, run: - # $ nix-env -qaP | grep wget + # \$ nix-env -qaP | grep wget # environment.systemPackages = with pkgs; [ # wget # ]; From 7dc09de565bf5797000500fe1195df349f607819 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 12 Jun 2014 22:11:07 +0200 Subject: [PATCH 353/424] libvirt: Update from 1.2.4 to 1.2.5 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c69d787b0860..4027bd8a84e0 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,14 +4,14 @@ , dnsmasq, libnl }: -let version = "1.2.4"; in +let version = "1.2.5"; in stdenv.mkDerivation rec { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "0xg8m7x4a3dqrg2b9pqcikaghdp6jyl07gkp2z8grsmsnbvcafp4"; + sha256 = "0igd74wkksgv24i2xaa8wx51iqpgjp1v7820pk93m0jv8gipvscf"; }; buildInputs = [ From 6b35f37005eeb9ba5813f66338fc7040a4671617 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 13 Jun 2014 01:22:44 +0400 Subject: [PATCH 354/424] Fix dia when run not from $PATH --- pkgs/applications/graphics/dia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 1ec9e1d1c0d1..126ade61c19d 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { mv dia .dia-wrapped echo '#! ${stdenv.shell}' >> dia echo 'test -f "$HOME/.dia/persistence" || cp ${correctPersistence} "$HOME/.dia/persistence" ' >> dia - echo '.dia-wrapped "$@"' >> dia + echo "\"$out/bin/"'.dia-wrapped" "$@"' >> dia chmod a+x dia ''; From ed7b509fbfd4b1e69ebf92b8e277acc25d2ef579 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 13 Jun 2014 01:33:18 +0400 Subject: [PATCH 355/424] Oops. Fix the permissions on initialized persistence file for Dia --- pkgs/applications/graphics/dia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 126ade61c19d..da6838880630 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { mv dia .dia-wrapped echo '#! ${stdenv.shell}' >> dia echo 'test -f "$HOME/.dia/persistence" || cp ${correctPersistence} "$HOME/.dia/persistence" ' >> dia + echo 'chmod u+rw "$HOME/.dia/persistence" ' >> dia echo "\"$out/bin/"'.dia-wrapped" "$@"' >> dia chmod a+x dia ''; From 0e9741df81063ba6c007023ee7295f6dcd409170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 13 Jun 2014 00:02:45 +0200 Subject: [PATCH 356/424] libvirt-python: update to to 1.2.5 (must be kept in sync with libvirt!) libvirt was recently updated to 1.2.5, breaking libvirt-python. This unbreaks it. --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bca0a468809a..23b927cb8cba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9083,11 +9083,11 @@ rec { libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0zi1mxjcv9dz5hy54lwgk9j4i8r20hhijbxxn843h2w7p1ch1wx2"; + sha256 = "0r0v48nkkxfagckizbcf67xkmyd1bnq36d30b58zmhvl0abryz7p"; }; buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ]; From 4a2dd52b54e3377b397894f5bc9f13e19e6502ce Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Thu, 12 Jun 2014 21:27:32 -0400 Subject: [PATCH 357/424] add ShellCheck Signed-off-by: Ricky Elrod --- .../tools/misc/ShellCheck/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/tools/misc/ShellCheck/default.nix diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix new file mode 100644 index 000000000000..328cba4145f5 --- /dev/null +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -0,0 +1,16 @@ +{ cabal, json, mtl, parsec, regexCompat }: + +cabal.mkDerivation (self: { + pname = "ShellCheck"; + version = "0.3.3"; + sha256 = "15lmc7cbi6s852qhd6h9asgz7ss1khfhq7wj4sgblr5mgppldg93"; + isLibrary = true; + isExecutable = true; + buildDepends = [ json mtl parsec regexCompat ]; + meta = { + homepage = "http://www.shellcheck.net/"; + description = "Shell script analysis tool"; + license = self.stdenv.lib.licenses.agpl3Plus; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1c29ca4b1fc8..a4b9069575d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2662,6 +2662,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hslogger = callPackage ../development/tools/haskell/hslogger {}; + ShellCheck = callPackage ../development/tools/misc/ShellCheck { }; + tar = callPackage ../development/libraries/haskell/tar {}; threadscope = callPackage ../development/tools/haskell/threadscope {}; From 2deb3ca0aa3b47e9c5190eb034878a70beff2e73 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Fri, 13 Jun 2014 14:21:53 +1200 Subject: [PATCH 358/424] Update tor to 0.2.4.22 and tor browser to 3.6.2 --- pkgs/tools/security/tor/default.nix | 4 ++-- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 5062d26595ea..57c4a9c56621 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.4.21"; + name = "tor-0.2.4.22"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "1kpijqapml7y4sl54qgyrzppxxhmy4xgk2y7wkqwjxn7q24g97d1"; + sha256 = "0k39ppcvld6p08yaf4rpspb34z4f5863j0d605yrm4dqjcp99xvb"; }; buildInputs = [ libevent openssl zlib ]; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 8ee33272eda5..7be7c79888ea 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "1461l54zc7xgx2zcmi8wra38dknjyy8d2xk84chrwl6ckn2dfzv3" else - "183a1wf4a88sijfqr3m6gmvncq8w60i2rkymccg422n7q96j7hqs"; + "1rfv59k9mia6hr1z1k4im20dy59ir7i054cgf78sfj1zsh08q7hf" else + "1klkk1k5r51pcx44r1z3sw08fqcl2f2v5iblf4yh83js482c37r8"; }; patchPhase = '' From 64274e9981a225b670ccbf979ba5a26494e6c7ee Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 13 Jun 2014 13:29:52 +0400 Subject: [PATCH 359/424] MuPDF: Add an auto-updater script and update to the latest version. --- pkgs/applications/misc/mupdf/default.nix | 6 ++++-- pkgs/applications/misc/mupdf/default.upstream | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/misc/mupdf/default.upstream diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index ebf3d52ea61d..a56460827f50 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg , libX11, libXext }: stdenv.mkDerivation rec { - name = "mupdf-1.4"; + version = "1.5"; + name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; - sha256 = "08pc6fv42sb9k9dzjs8ph32nixzrzmr08yxh7arkpsdm42asp2q1"; + sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4"; }; buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; @@ -67,5 +68,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; + inherit version; }; } diff --git a/pkgs/applications/misc/mupdf/default.upstream b/pkgs/applications/misc/mupdf/default.upstream new file mode 100644 index 000000000000..07cafdb0c2a4 --- /dev/null +++ b/pkgs/applications/misc/mupdf/default.upstream @@ -0,0 +1,7 @@ +url http://mupdf.com/downloads/archive/ +do_overwrite(){ + ensure_hash + ensure_version + set_var_value version $CURRENT_VERSION + set_var_value sha256 $CURRENT_HASH +} From 258040a93969016b4f4b034fa5d445b3977a4239 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 13 Jun 2014 13:35:00 +0400 Subject: [PATCH 360/424] Add a function to overwrite just the version and sha256 by grepping them --- pkgs/build-support/upstream-updater/update-walker.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index 5743a289a4cf..bc58f935f815 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -246,6 +246,12 @@ do_overwrite () { mv "$1.new.tmp" "$1" } +do_overwrite_just_version () { + ensure_hash + set_var_value version $CURRENT_VERSION + set_var_value sha256 $CURRENT_HASH +} + process_config () { CONFIG_DIR="$(directory_of "$1")" CONFIG_NAME="$(basename "$1")" From 566ef0e31a3a0530c08e38a88237e214cafd23f2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 13 Jun 2014 13:36:56 +0400 Subject: [PATCH 361/424] Adding an auto-updater script for qiv and updating it to 2.3.1 --- pkgs/applications/graphics/qiv/default.nix | 10 ++++++---- pkgs/applications/graphics/qiv/default.upstream | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/graphics/qiv/default.upstream diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index df18c6d1520c..86891f2cb937 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file } : +{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { - name = "qiv-2.2.4"; + version = "2.3.1"; + name = "qiv-${version}"; src = fetchurl { url = "http://spiegl.de/qiv/download/${name}.tgz"; - sha256 = "ed6078dc550c1dc2fe35c1e0f46463c13589a24b83d4f7101b71a7485e51abb7"; + sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; - buildInputs = [ pkgconfig gtk imlib2 file ]; + buildInputs = [ pkgconfig gtk imlib2 file lcms2 libexif ]; preBuild='' substituteInPlace Makefile --replace /usr/local "$out" @@ -18,5 +19,6 @@ stdenv.mkDerivation (rec { meta = { description = "qiv (quick image viewer)"; homepage = http://spiegl.de/qiv/; + inherit version; }; }) diff --git a/pkgs/applications/graphics/qiv/default.upstream b/pkgs/applications/graphics/qiv/default.upstream new file mode 100644 index 000000000000..e6c7ef2408e8 --- /dev/null +++ b/pkgs/applications/graphics/qiv/default.upstream @@ -0,0 +1,3 @@ +url http://spiegl.de/qiv/download/ +version_link '[.]tgz$' +do_overwrite() { do_overwrite_just_version; } From 1777724a3397ee82d0bcf0dae3c680d6d8395c5f Mon Sep 17 00:00:00 2001 From: Anders Claesson Date: Fri, 13 Jun 2014 11:11:27 +0100 Subject: [PATCH 362/424] Fix trivial spelling mistake in docs --- doc/release-notes.xml | 2 +- doc/stdenv.xml | 4 ++-- nixos/doc/manual/configuration.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/release-notes.xml b/doc/release-notes.xml index 2a1fb9f31091..a50ee877acdd 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -446,7 +446,7 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix stdenv; the formed changes the C compiler, and the latter adds additional packages to the front of stdenv’s initial PATH, allowing - tools to be overriden. + tools to be overridden. For instance, the package strategoxt doesn’t build with the GNU Make in stdenv diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 74eb63b4b498..28e7b7d89f4b 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -56,7 +56,7 @@ details.) Often it is necessary to override or modify some aspect of the build. To make this easier, the standard environment breaks the package build into a number of phases, all of -which can be overriden or modified individually: unpacking the +which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. (There are some others; see .) For instance, a package that doesn’t supply a makefile but instead has @@ -233,7 +233,7 @@ specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm. -Each phase can be overriden in its entirety either by setting +Each phase can be overridden in its entirety either by setting the environment variable namePhase to a string containing some shell commands to be executed, or by redefining the diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index 803a3393d156..98686a19f1eb 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -873,7 +873,7 @@ Any package in Nixpkgs that depends on emacs will be passed your customised instance. (However, the value pkgs.emacs in nixpkgs.config.packageOverrides refers to the -original rather than overriden instance, to prevent an infinite +original rather than overridden instance, to prevent an infinite recursion.) From 1ecb9b8de8b823addcc50035636f263caae4ea34 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 13 Jun 2014 13:27:53 +0200 Subject: [PATCH 363/424] elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307 --- pkgs/servers/search/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index c6939ce5f7a4..b227832ad734 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, makeWrapper, jre, utillinux }: stdenv.mkDerivation rec { - name = "elasticsearch-1.0.1"; + name = "elasticsearch-1.2.1"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "0nwv7llw7gk94alfcpxxy0lybhnw7fggv30v7ylsxn20id9g7kba"; + sha256 = "11lirxl0hb0xfd57accsgldq1adrlv9pak2520jll2sj5gg71cmj"; }; patches = [ ./es-home.patch ]; From 40566790d3afa96d220a3d83054b25123a3e8195 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 13 Jun 2014 13:42:52 +0200 Subject: [PATCH 364/424] elasticsearch: run preStart as root, to allow creating the necessary directories. --- nixos/modules/services/search/elasticsearch.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index b7a3566f95d9..0ba4ff86abe7 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -106,6 +106,7 @@ in { serviceConfig = { ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -f -Des.path.conf=${configDir}"; User = "elasticsearch"; + PermissionsStartOnly = true; }; preStart = '' mkdir -m 0700 -p ${cfg.dataDir} From 61384f5627060fca90805a07af24467e5aeca5b4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 13 Jun 2014 13:55:57 +0200 Subject: [PATCH 365/424] Revert "elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307" Was accidentally pushed. This reverts commit 1ecb9b8de8b823addcc50035636f263caae4ea34. --- pkgs/servers/search/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index b227832ad734..c6939ce5f7a4 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, makeWrapper, jre, utillinux }: stdenv.mkDerivation rec { - name = "elasticsearch-1.2.1"; + name = "elasticsearch-1.0.1"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "11lirxl0hb0xfd57accsgldq1adrlv9pak2520jll2sj5gg71cmj"; + sha256 = "0nwv7llw7gk94alfcpxxy0lybhnw7fggv30v7ylsxn20id9g7kba"; }; patches = [ ./es-home.patch ]; From 2c918c654550a746c0732e9cb0840435d3c4f1c5 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 13 Jun 2014 14:00:26 +0200 Subject: [PATCH 366/424] Revert "Revert "elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307"" This reverts commit 61384f5627060fca90805a07af24467e5aeca5b4. --- pkgs/servers/search/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index c6939ce5f7a4..b227832ad734 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, makeWrapper, jre, utillinux }: stdenv.mkDerivation rec { - name = "elasticsearch-1.0.1"; + name = "elasticsearch-1.2.1"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "0nwv7llw7gk94alfcpxxy0lybhnw7fggv30v7ylsxn20id9g7kba"; + sha256 = "11lirxl0hb0xfd57accsgldq1adrlv9pak2520jll2sj5gg71cmj"; }; patches = [ ./es-home.patch ]; From 98d6ff9cec03e03122ad894bc65f2888bfbf6b32 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 13 Jun 2014 14:00:55 +0200 Subject: [PATCH 367/424] Remove -f from elasticsearch ExecStart, not valid anymore. --- nixos/modules/services/search/elasticsearch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 0ba4ff86abe7..0d604850d42b 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -104,7 +104,7 @@ in { after = [ "network-interfaces.target" ]; environment = { ES_HOME = cfg.dataDir; }; serviceConfig = { - ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -f -Des.path.conf=${configDir}"; + ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -Des.path.conf=${configDir}"; User = "elasticsearch"; PermissionsStartOnly = true; }; From 19110c9a53eff51e4f43079d5b0241b8a5c34c53 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 13 Jun 2014 14:21:39 +0200 Subject: [PATCH 368/424] Update org-mode from 8.2.6 to 8.2.7 and add myself as a maintainer. --- pkgs/applications/editors/emacs-modes/org/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 9af7c24e8008..768444008ad4 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, emacs, texinfo, which, texLive }: stdenv.mkDerivation rec { - name = "org-8.2.6"; + name = "org-8.2.7"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "0f196r0n9m2np123sjabsqdw68h9qp6qr7l5v257am8qs7rj0jm1"; + sha256 = "1n864hnjvx5n2gfi7n0xbwvb1k8l5rdh4a3vpbhw23hy8rx3bvaw"; }; buildInputs = [ emacs ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; platforms = stdenv.lib.platforms.gnu; }; } From a5509026ece5ad28b15ca5f92fa3866fa41fcde9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 13 Jun 2014 17:41:34 +0400 Subject: [PATCH 369/424] Add Squid 3.4.5 and enable its SSL features. --- pkgs/servers/squid/squids.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 18778aa80db6..642b713daaab 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -39,5 +39,16 @@ rec { libtool openssl]; }; - latest = squid32; + squid34 = squid30.merge rec { + name = "squid-3.4.5"; + src = args.fetchurl { + url = "http://www.squid-cache.org/Versions/v3/3.4/${name}.tar.bz2"; + sha256 = "1d17l27bszdxnvdr78l7yry8ka38cq7g4774m5876q25ny1q1bmr"; + }; + buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2 + libtool openssl]; + configureFlags = ["--enable-ssl" "--enable-ssl-crtd"]; + }; + + latest = squid34; } From e9bbb1ede974470552b260cc6035e376f008ea63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:32:46 +0200 Subject: [PATCH 370/424] haskell-idris: update to version 0.9.13.1 --- pkgs/development/compilers/idris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 0c3c1c0fba8c..27dcf9f03a6e 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.13"; - sha256 = "0bpp8b19s1przycndvl542ar9dc285ccnwm7cic33ym1lcqil86n"; + version = "0.9.13.1"; + sha256 = "09528c2zxriw3l8c7dd2k5db9j1qmqhs6nbqwc7dkskzqv9snz7n"; isLibrary = true; isExecutable = true; buildDepends = [ From c4d3a0acabf8226a7a8408278cffeb99e0790604 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:03 +0200 Subject: [PATCH 371/424] haskell-wai-conduit: add version 3.0.0 --- .../libraries/haskell/wai-conduit/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wai-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix new file mode 100644 index 000000000000..10517e13d9c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, blazeBuilder, conduit, httpTypes, transformers, wai }: + +cabal.mkDerivation (self: { + pname = "wai-conduit"; + version = "3.0.0"; + sha256 = "0v92jyxkigq7yj3hzy7kg360036nav986ny7b558l6j7zc90jsdg"; + buildDepends = [ blazeBuilder conduit httpTypes transformers wai ]; + meta = { + homepage = "https://github.com/yesodweb/wai"; + description = "conduit wrappers for WAI"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a4b9069575d8..daea93d3aa7d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2420,6 +2420,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in waiAppStatic = callPackage ../development/libraries/haskell/wai-app-static {}; + waiConduit = callPackage ../development/libraries/haskell/wai-conduit {}; + waiExtra = callPackage ../development/libraries/haskell/wai-extra {}; waiHandlerLaunch = callPackage ../development/libraries/haskell/wai-handler-launch {}; From 5c05c0cdf40d30a9b45aba1c988d5ac4275d269b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:12 +0200 Subject: [PATCH 372/424] haskell-blaze-builder-enumerator: update to version 0.2.0.6 --- .../libraries/haskell/blaze-builder-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index f751126f142a..d08edb48b0ed 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-enumerator"; - version = "0.2.0.5"; - sha256 = "0bbbv9wwzw9ss3d02mszdzxzhg6pcrnpwir9bvby7xkmfqpyffaa"; + version = "0.2.0.6"; + sha256 = "0pdw18drvikb465qh43b8wjyvpqj3wcilyczc21fri5ma4mxdkyp"; buildDepends = [ blazeBuilder enumerator transformers ]; jailbreak = true; meta = { From 33526446231d5736df6256fee61f4433282d20a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:14 +0200 Subject: [PATCH 373/424] haskell-cabal-cargs: update to version 0.7 --- pkgs/development/libraries/haskell/cabal-cargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index 34759c9b8926..9ba31d333bb6 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-cargs"; - version = "0.6.1"; - sha256 = "1bf903kgs16f054crwq0yyp6ijch80qn3d5ksy4j0fnyxxrdqvsa"; + version = "0.7"; + sha256 = "1dzmvwmb9sxwdgkzszhk9d5qvq2alnqmprx83dlb17sdi6f9jns1"; isLibrary = true; isExecutable = true; buildDepends = [ From 0b0ace748a2f040dfd1f8e9a7bfec4eda48222a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:15 +0200 Subject: [PATCH 374/424] haskell-cabal-lenses: update to version 0.2 --- pkgs/development/libraries/haskell/cabal-lenses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index 39c0eeb1dd16..bd14dd1c0895 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal-lenses"; - version = "0.1"; - sha256 = "0jss4h7crh7mndl5ghbpziy37cg9i29cc64fgxvxb63hpk0q2m17"; + version = "0.2"; + sha256 = "1wfr4rh7ba1hsvi0v7mzpab7fi5k93lz27v8qdfjqzkyybhjglv4"; buildDepends = [ Cabal lens unorderedContainers ]; jailbreak = true; meta = { From 8bc8dd90af7a237c7518f8b5b3260b2e3bb2e62f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:17 +0200 Subject: [PATCH 375/424] haskell-event-list: update to version 0.1.1 --- .../libraries/haskell/event-list/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix index 16b73d9bfb36..4b36ef2c6be0 100644 --- a/pkgs/development/libraries/haskell/event-list/default.nix +++ b/pkgs/development/libraries/haskell/event-list/default.nix @@ -1,12 +1,14 @@ -{ cabal, nonNegative, QuickCheck, transformers, utilityHt }: +{ cabal, nonNegative, QuickCheck, random, transformers, utilityHt +}: cabal.mkDerivation (self: { pname = "event-list"; - version = "0.1.0.2"; - sha256 = "01j48871nijhkbqdsfvbvq01yr9b5a056fn03ccgazikfsd368ri"; - isLibrary = true; - isExecutable = true; + version = "0.1.1"; + sha256 = "1qv7a4np8cr0chbvlz0kmcrvc95w1z7fqs2pq0mkwx22hnslsh5l"; buildDepends = [ nonNegative QuickCheck transformers utilityHt ]; + testDepends = [ + nonNegative QuickCheck random transformers utilityHt + ]; meta = { homepage = "http://code.haskell.org/~thielema/event-list/"; description = "Event lists with relative or absolute time stamps"; From 6f78a87b6f0350b69bee745b699e8bea2321ac6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:19 +0200 Subject: [PATCH 376/424] haskell-ghc-vis: update to version 0.7.2.3 --- pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 40700b52f61d..a15ed9d1c47c 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.2.2"; - sha256 = "0abk76cy9qiblyways1r7jfsj996sj4laawzaz1j9p546plfkbnj"; + version = "0.7.2.3"; + sha256 = "1gl059n85yxksnq8y7i1vrsjdg4al6himzpdmw95v61y59bbs6c2"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot From e76486c66273e6f62412fae9814e1ab8924f9b12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:20 +0200 Subject: [PATCH 377/424] haskell-hourglass: update to version 0.2.1 --- pkgs/development/libraries/haskell/hourglass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix index 7a5cf59b3283..8615cefca28a 100644 --- a/pkgs/development/libraries/haskell/hourglass/default.nix +++ b/pkgs/development/libraries/haskell/hourglass/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hourglass"; - version = "0.2.0"; - sha256 = "13zphy3gfj9p7vsa477qy30968fnz5kq7d0lzb1pyg5hxkx44rim"; + version = "0.2.1"; + sha256 = "0xb5g10mm427yagv5hzg5wgxpjjr6s9my675ik8rh5k1is4zr500"; buildDepends = [ deepseq ]; testDepends = [ deepseq mtl tasty tastyHunit tastyQuickcheck time From ca3f416e8db948439fba29d026c6f329a53e036d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:22 +0200 Subject: [PATCH 378/424] haskell-hsimport: update to version 0.4 --- pkgs/development/libraries/haskell/hsimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index ca2808e5aba0..fdb3304ccd86 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.3"; - sha256 = "124dimaa8v4x6vlh51v2r7569d8122l42q19bpzgqih33vw2djcs"; + version = "0.4"; + sha256 = "1pkj6cfdfyrcrm6gr4a43y6s4qhwpli6zgnlx4ycmhs3yh5kay60"; isLibrary = true; isExecutable = true; buildDepends = [ From 8cc6a959d493aa3c1e306fd377427fc2a4c2126b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:24 +0200 Subject: [PATCH 379/424] haskell-hspec-meta: update to version 1.10.0 --- .../libraries/haskell/hspec-meta/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 612f49898489..dbc6369dc7ee 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -1,17 +1,17 @@ -{ cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit -, QuickCheck, quickcheckIo, random, setenv, tfRandom, time +{ cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations +, HUnit, QuickCheck, quickcheckIo, random, setenv, tfRandom, time , transformers }: cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.9.5"; - sha256 = "0y39z9r5icz62dd7hvr3lwdcqas526w4m5rcd1468fp7rlz3402j"; + version = "1.10.0"; + sha256 = "1x32wgrd1i6rs6790dbr51j9g6abjpcf951cx3nmm4zdcwblyi6a"; isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck - quickcheckIo random setenv tfRandom time transformers + ansiTerminal async deepseq filepath hspecExpectations HUnit + QuickCheck quickcheckIo random setenv tfRandom time transformers ]; doCheck = false; meta = { From c72d054ff462ec50d5ceef66ba2af86a7970f781 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:27 +0200 Subject: [PATCH 380/424] haskell-http-client: update to version 0.3.3.1 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index b447d9a1f11c..be261bf60272 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.3"; - sha256 = "001nmy6f57l2f7gc4mchz1gwam28qldkwmcxzs8jnqwczcirgk38"; + version = "0.3.3.1"; + sha256 = "0zzh4vr563f8rb51b64gcwmal7gswif8ndsf2x5kw6f7q55md0dw"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes From 54800cc222dec90976ff65f573b0117bb93a4ea5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:29 +0200 Subject: [PATCH 381/424] haskell-http-conduit: update to version 2.1.2.1 --- .../libraries/haskell/http-conduit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index fc6762c877e9..918993e6be8c 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -2,13 +2,13 @@ , connection, cookie, dataDefaultClass, hspec, httpClient , httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl , network, networkConduit, resourcet, streamingCommons, text, time -, transformers, utf8String, wai, warp, warpTls +, transformers, utf8String, wai, waiConduit, warp, warpTls }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.2"; - sha256 = "11g79yfgm2fzcy7gwk9f5np4p6fknsbjkm858v8khb4a1gmbrqvn"; + version = "2.1.2.1"; + sha256 = "17bq72qkgn7sh31ad5w7gqf15dlzl027nmx8k7kmm268mf9bz0b5"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { blazeBuilder caseInsensitive conduit conduitExtra connection cookie dataDefaultClass hspec httpClient httpTypes HUnit liftedBase network networkConduit streamingCommons text time transformers - utf8String wai warp warpTls + utf8String wai waiConduit warp warpTls ]; doCheck = false; meta = { From 229f3529532393eb2869e883a8a50480bdda4857 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:30 +0200 Subject: [PATCH 382/424] haskell-http-reverse-proxy: update to version 0.4.0.1 --- .../libraries/haskell/http-reverse-proxy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index ec34cc98d744..170d15aa7077 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -7,13 +7,13 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.1.7"; - sha256 = "0fhndk9zjv1kcqgrhj42brfg96p7flrcpy609asba1vc0i9213j4"; + version = "0.4.0.1"; + sha256 = "0gygmykxsy6rs3xmwb24s5c3brmabdgxb1w0ak82vyvfvsnqxz1h"; buildDepends = [ async blazeBuilder caseInsensitive conduit conduitExtra dataDefaultClass httpClient httpTypes liftedBase monadControl - network networkConduit resourcet streamingCommons text transformers - wai waiLogger word8 + network resourcet streamingCommons text transformers wai waiLogger + word8 ]; testDepends = [ blazeBuilder conduit conduitExtra hspec httpConduit httpTypes From faf9c7f1ddc8a7a533854a687fabdbc45a476f66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:32 +0200 Subject: [PATCH 383/424] haskell-non-negative: update to version 0.1.1 --- .../development/libraries/haskell/non-negative/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix index a50710791dbc..ae025f6cc64e 100644 --- a/pkgs/development/libraries/haskell/non-negative/default.nix +++ b/pkgs/development/libraries/haskell/non-negative/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "non-negative"; - version = "0.1"; - sha256 = "0aebb6f5518191a02b11230798444997a03b84d63d2aaa6c38cac6718f6c351c"; - isLibrary = true; - isExecutable = true; + version = "0.1.1"; + sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7"; buildDepends = [ QuickCheck utilityHt ]; + testDepends = [ QuickCheck utilityHt ]; meta = { homepage = "http://code.haskell.org/~thielema/non-negative/"; description = "Non-negative numbers"; From 978ae0e64f0ab0f29c206bba8d739e0b055a5a65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:33 +0200 Subject: [PATCH 384/424] haskell-scotty: update to version 0.8.0 --- .../libraries/haskell/scotty/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 601ecfb223d4..398d3a1dfb85 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,16 +1,17 @@ -{ cabal, aeson, blazeBuilder, caseInsensitive, conduit -, conduitExtra, dataDefault, httpTypes, mtl, regexCompat, text -, transformers, wai, waiExtra, warp +{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault +, hspec, httpTypes, mtl, regexCompat, text, transformers, wai +, waiExtra, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.7.3"; - sha256 = "1cksnsaghcliwpbigs7fjb2qcxsnrqmjcjwndmf3vbfkn43w2prb"; + version = "0.8.0"; + sha256 = "07198m8rsavdqr51abxsrmi8jail6h4ldzrr9s47il1djjba6lhh"; buildDepends = [ - aeson blazeBuilder caseInsensitive conduit conduitExtra dataDefault - httpTypes mtl regexCompat text transformers wai waiExtra warp + aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes + mtl regexCompat text transformers wai waiExtra warp ]; + testDepends = [ hspec httpTypes wai waiExtra ]; jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; From f9e09908b886ad01858693c50106f45204853c14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:35 +0200 Subject: [PATCH 385/424] haskell-wai-app-static: update to version 3.0.0 --- .../libraries/haskell/wai-app-static/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 45dd5562a28b..093fbb76f84d 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -3,13 +3,13 @@ , hspec, httpDate, httpTypes, mimeTypes, network , optparseApplicative, systemFileio, systemFilepath, text, time , transformers, unixCompat, unorderedContainers, wai, waiExtra -, waiTest, warp, zlib +, warp, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.1"; - sha256 = "1mygyp70rmhnkc0s8626cxrkvcbil92v4gnx70iz26gfb5q9lc7d"; + version = "3.0.0"; + sha256 = "117r2ps440i2i156k50b674fkny2ywwbbla6ry0km041604cl733"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -20,7 +20,7 @@ cabal.mkDerivation (self: { ]; testDepends = [ hspec httpDate httpTypes mimeTypes network text time transformers - unixCompat wai waiTest zlib + unixCompat wai waiExtra zlib ]; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; From 8b12a38910ab1af7c289d7c60c4e9127184525c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:37 +0200 Subject: [PATCH 386/424] haskell-wai-extra: update to version 3.0.0 --- .../libraries/haskell/wai-extra/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 66d45f059129..d54e8351d4fd 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,24 +1,23 @@ { cabal, ansiTerminal, base64Bytestring, blazeBuilder -, blazeBuilderConduit, caseInsensitive, conduit, conduitExtra -, dataDefault, fastLogger, hspec, httpTypes, HUnit, liftedBase -, network, resourcet, stringsearch, text, time, transformers, void -, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit +, caseInsensitive, dataDefault, dataDefaultClass, deepseq +, fastLogger, hspec, httpTypes, HUnit, liftedBase, network +, resourcet, streamingCommons, stringsearch, text, time +, transformers, void, wai, waiLogger, word8, zlib }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.1.1.2"; - sha256 = "000ksma1jmi7rfg2ib94baj31mcwqj2xfhkyv7lai89di0m0v6s4"; + version = "3.0.0"; + sha256 = "0spjyimqfj7hx8zgmal4laqy8p1inj8hl2402b5s6zqdn36lldfs"; buildDepends = [ - ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive conduit conduitExtra dataDefault fastLogger - httpTypes liftedBase network resourcet stringsearch text time - transformers void wai waiLogger word8 zlibConduit + ansiTerminal base64Bytestring blazeBuilder caseInsensitive + dataDefaultClass deepseq fastLogger httpTypes liftedBase network + resourcet streamingCommons stringsearch text time transformers void + wai waiLogger word8 ]; testDepends = [ - blazeBuilder conduit conduitExtra dataDefault fastLogger hspec - httpTypes HUnit resourcet text transformers wai waiTest zlib - zlibBindings + blazeBuilder dataDefault fastLogger hspec httpTypes HUnit resourcet + text transformers wai zlib ]; jailbreak = true; meta = { From edf412e9e51b33fcc0cf17d4b98e21b0085ec1e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:38 +0200 Subject: [PATCH 387/424] haskell-wai-handler-fastcgi: update to version 3.0.0 --- .../libraries/haskell/wai-handler-fastcgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix index 9767f2d7750d..7ecc3a347585 100644 --- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-fastcgi"; - version = "2.0.0.1"; - sha256 = "14jsibsqfj6z5yqgdrh43aiqps1yldxkgn6fkj4i80zxk099nbxp"; + version = "3.0.0"; + sha256 = "1cvy95qmbrhc1yjcral7f8y2929xp623abc9xasz7j28m4wwmynh"; buildDepends = [ wai waiExtra ]; extraLibraries = [ fcgi ]; meta = { From 0bcda04c139e3eb0b9996800d27ddfefb2f7e721 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:40 +0200 Subject: [PATCH 388/424] haskell-wai-handler-launch: update to version 3.0.0 --- .../libraries/haskell/wai-handler-launch/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index 9d59fd68ed61..d103b54ec6dc 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -1,14 +1,13 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, conduit, conduitExtra -, httpTypes, transformers, wai, warp, zlibConduit +{ cabal, blazeBuilder, httpTypes, streamingCommons, transformers +, wai, warp }: cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "2.0.1.3"; - sha256 = "06im28x26jbzbdk9xz33kqvzblglk3b3b60qwal836hima69alsd"; + version = "3.0.0"; + sha256 = "1dv7w151szjkg9968v870abz11a440pdzy50zwm0xl6blk392nmk"; buildDepends = [ - blazeBuilder blazeBuilderConduit conduit conduitExtra httpTypes - transformers wai warp zlibConduit + blazeBuilder httpTypes streamingCommons transformers wai warp ]; meta = { description = "Launch a web app in the default browser"; From 037ea00300e93c05f43c82d22c383301011bb725 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:41 +0200 Subject: [PATCH 389/424] haskell-wai-middleware-static: update to version 0.6.0 --- .../libraries/haskell/wai-middleware-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index 18b251a8aedb..9ca7992db686 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai-middleware-static"; - version = "0.5.0.1"; - sha256 = "1pwyy6lsvi7kaxf6x3ghy5013yq4ryjp01c4rrd4isx4jh1ynl31"; + version = "0.6.0"; + sha256 = "1rsy8qkxcjqdpzqkar0smyy49p8vqapi47k8d24101lz3rym6018"; buildDepends = [ filepath httpTypes mtl text wai ]; jailbreak = true; meta = { From 6f80ab07a5e2c398e20eb3a5e5c01646324a4e2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:43 +0200 Subject: [PATCH 390/424] haskell-wai-test: update to version 3.0.0 --- .../libraries/haskell/wai-test/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index b15aa1070ba5..c5bb750ff3ab 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,20 +1,13 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, conduitExtra, cookie, deepseq, hspec, httpTypes, network -, text, transformers, wai -}: +{ cabal, wai }: cabal.mkDerivation (self: { pname = "wai-test"; - version = "2.0.1.3"; - sha256 = "18j77l2n41941f95awj6fj0w712628v5lsc3bif00cqnaixjmz48"; - buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit - conduitExtra cookie deepseq httpTypes network text transformers wai - ]; - testDepends = [ hspec wai ]; + version = "3.0.0"; + sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx"; + buildDepends = [ wai ]; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; - description = "Unit test framework (built on HUnit) for WAI applications"; + description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; From b4dd791cea031c8da20897687f41390ff64a1ebc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:45 +0200 Subject: [PATCH 391/424] haskell-wai-websockets: update to version 3.0.0 --- .../libraries/haskell/wai-websockets/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index 5d909c7d773c..d0973881657f 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -1,17 +1,17 @@ -{ cabal, blazeBuilder, caseInsensitive, conduit, fileEmbed -, httpTypes, ioStreams, network, text, transformers, wai -, waiAppStatic, warp, websockets +{ cabal, blazeBuilder, caseInsensitive, fileEmbed, httpTypes +, ioStreams, network, text, transformers, wai, waiAppStatic, warp +, websockets }: cabal.mkDerivation (self: { pname = "wai-websockets"; - version = "2.1.0.2"; - sha256 = "16hff38x6fpmp4r1wkjd922s02v5na8zwy6mq5f5gsj7b70n2ww2"; + version = "3.0.0"; + sha256 = "0bpzkh9a5j0a282z4dj9dqnjsgd0g8gyvvp0xm0a53582zfhfi5s"; isLibrary = true; isExecutable = true; buildDepends = [ - blazeBuilder caseInsensitive conduit fileEmbed httpTypes ioStreams - network text transformers wai waiAppStatic warp websockets + blazeBuilder caseInsensitive fileEmbed httpTypes ioStreams network + text transformers wai waiAppStatic warp websockets ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 046c6369243308458aa625c3ae81882df18b8796 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:46 +0200 Subject: [PATCH 392/424] haskell-wai: update to version 3.0.0 --- pkgs/development/libraries/haskell/wai/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 540df207241d..6b777fbd11e9 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -1,15 +1,11 @@ -{ cabal, blazeBuilder, conduit, conduitExtra, httpTypes, network -, text, transformers, vault -}: +{ cabal, blazeBuilder, hspec, httpTypes, network, text, vault }: cabal.mkDerivation (self: { pname = "wai"; - version = "2.1.0.3"; - sha256 = "0qprvk63fvb4rddg9h385xbd5sr5bcgkpx6fqlw01pjzmmrig1m3"; - buildDepends = [ - blazeBuilder conduit conduitExtra httpTypes network text - transformers vault - ]; + version = "3.0.0"; + sha256 = "0zzcyrr0pkj439n28wmivmfavh9cdjc1mz3zrbi88zmrzg4wpssx"; + buildDepends = [ blazeBuilder httpTypes network text vault ]; + testDepends = [ blazeBuilder hspec ]; meta = { homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; From 78c13dfb4f8a15ed3d3a83e9cc4b1f11c5b4ba48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:48 +0200 Subject: [PATCH 393/424] haskell-warp-tls: update to version 3.0.0 --- .../development/libraries/haskell/warp-tls/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index e9e7ae393808..ca20fe2d6bfc 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -1,15 +1,13 @@ -{ cabal, conduit, conduitExtra, cprngAes, dataDefaultClass, network -, networkConduit, resourcet, streamingCommons, tls, transformers +{ cabal, cprngAes, dataDefaultClass, network, streamingCommons, tls , wai, warp }: cabal.mkDerivation (self: { pname = "warp-tls"; - version = "2.0.5"; - sha256 = "11nc5drys75mjfqww87rs2clhxpx485q008y42f2ymj7s5856db4"; + version = "3.0.0"; + sha256 = "14gm43a811v9h87ia2b9y9kynafrvq3yw89gswlj832469jx9sfw"; buildDepends = [ - conduit conduitExtra cprngAes dataDefaultClass network - networkConduit resourcet streamingCommons tls transformers wai warp + cprngAes dataDefaultClass network streamingCommons tls wai warp ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 567ba23b1ac5ca8594cf2eddbd483a6f141dc682 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:49 +0200 Subject: [PATCH 394/424] haskell-warp: update to version 3.0.0.1 --- .../libraries/haskell/warp/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index be5dd392d16f..d0940345a576 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,25 +1,22 @@ -{ cabal, async, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, conduitExtra, doctest, hashable, hspec, HTTP, httpDate -, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck -, simpleSendfile, streamingCommons, text, time, transformers -, unixCompat, void, wai +{ cabal, async, blazeBuilder, caseInsensitive, doctest, hashable +, hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase, network +, QuickCheck, simpleSendfile, streamingCommons, text, time +, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.5.2"; - sha256 = "0rv5fxw1d5dh6jzvs3bg2vjjr702xw59fx7mflygpqh8zivfh4ds"; + version = "3.0.0.1"; + sha256 = "05x216fj7s1i963xipi0p7vmkz5l0nma1fjqiq040fg3rngw4yqb"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit - conduitExtra hashable httpDate httpTypes liftedBase network - networkConduit simpleSendfile streamingCommons text transformers - unixCompat void wai + blazeBuilder caseInsensitive hashable httpDate httpTypes network + simpleSendfile streamingCommons text unixCompat void wai ]; testDepends = [ - async blazeBuilder blazeBuilderConduit caseInsensitive conduit - conduitExtra doctest hashable hspec HTTP httpDate httpTypes HUnit - liftedBase network networkConduit QuickCheck simpleSendfile - streamingCommons text time transformers unixCompat void wai + async blazeBuilder caseInsensitive doctest hashable hspec HTTP + httpDate httpTypes HUnit liftedBase network QuickCheck + simpleSendfile streamingCommons text time transformers unixCompat + void wai ]; doCheck = false; meta = { From d02baccd7b099e253ec2ba5f3e4b4e943b0730df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:51 +0200 Subject: [PATCH 395/424] haskell-websockets: update to version 0.8.2.4 --- pkgs/development/libraries/haskell/websockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 9e22d0cab185..e712a5b2b815 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.8.2.3"; - sha256 = "0j4lm5hkipd4q6kizrjy1cjdw2b0588m4k6fh50ss5qnqw9rkjkd"; + version = "0.8.2.4"; + sha256 = "09mq04vhi53isj8z5930ibyai7bv634lnmhl4xl2d3fzz2afvff0"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy ioStreams mtl network random SHA text From ffb0c2b5eb6edcef949eb0024649593149119d8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:53 +0200 Subject: [PATCH 396/424] haskell-yesod-bin: update to version 1.2.10.2 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 3bca09f4fb6b..145df1e625fe 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.9.4"; - sha256 = "0ir77hmg3avkm4x7pgmjx3fijisncpwklg4v1glqx4vqbjjrzk5g"; + version = "1.2.10.2"; + sha256 = "18faylxjrd790xv6zr77wikkcy99l7824bb1sq1y225kd7a3alsm"; isLibrary = false; isExecutable = true; buildDepends = [ From 7febd1952537a9756dc69e5749ff50e4cbbe1d41 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:54 +0200 Subject: [PATCH 397/424] haskell-yesod-core: update to version 1.2.16.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index ae63f4dbc16b..7ea674aa0d9d 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.15.2"; - sha256 = "1k5dqcfpwqac81p9w2i1kz5pcvr21ibia5kh441811bdzlpwsiwq"; + version = "1.2.16.1"; + sha256 = "1wr5labhp3wc23ki2wvaypanm54qw9vz3v77rxyj1za1y2n1cprw"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie @@ -26,7 +26,7 @@ cabal.mkDerivation (self: { async blazeBuilder conduit conduitExtra hamlet hspec httpTypes HUnit liftedBase network networkConduit QuickCheck random resourcet shakespeare shakespeareCss shakespeareJs streamingCommons text - transformers wai waiTest + transformers wai waiExtra waiTest ]; jailbreak = true; meta = { From 7e924a23c85e1a1dcd60f1fa93d97cb359f8e876 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:56 +0200 Subject: [PATCH 398/424] haskell-yesod-form: update to version 1.3.10 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index add7d94bac42..4309df0e4c4e 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.9.1"; - sha256 = "1iw2vcdvp77vz3az9g9y4nk29g098fa9lvqzc7hwypvdawgwpgwm"; + version = "1.3.10"; + sha256 = "1qq0r5phb6xygz4w5ysir3ky7bw0rmd1q4vz57dz1aza2pchb1ih"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet From fa6fd66288b9a686999f8e3c2cba4568869d5920 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:33:58 +0200 Subject: [PATCH 399/424] haskell-yesod-persistent: update to version 1.2.3 --- .../libraries/haskell/yesod-persistent/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 432adeee9af8..f5189caa46fb 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,19 +1,19 @@ { cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite , persistentTemplate, resourcePool, resourcet, text, transformers -, waiTest, yesodCore +, waiExtra, waiTest, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.2.3"; - sha256 = "1699grrxb1qwfiivh9ihnczkcbwl4gcqdk7m02lc09r9gjr920p8"; + version = "1.2.3"; + sha256 = "1kdspz6y32r8kl0qk89hgwi4n6dnxch7wriv829cnwqm0bzjfdpw"; buildDepends = [ blazeBuilder conduit persistent persistentTemplate resourcePool resourcet transformers yesodCore ]; testDepends = [ - blazeBuilder conduit hspec persistent persistentSqlite text waiTest - yesodCore + blazeBuilder conduit hspec persistent persistentSqlite text + waiExtra waiTest yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 5d54c131461ef55fcbfb72c79708081294e6caf4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:34:00 +0200 Subject: [PATCH 400/424] haskell-yesod-static: update to version 1.2.4 --- .../libraries/haskell/yesod-static/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index b6763871c40f..d5a0c1c4c7d4 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -3,14 +3,14 @@ , cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin , hspec, httpTypes, HUnit, mimeTypes, resourcet, shakespeareCss , systemFileio, systemFilepath, text, transformers, unixCompat -, unorderedContainers, wai, waiAppStatic, waiTest, yesodCore -, yesodTest +, unorderedContainers, wai, waiAppStatic, waiExtra, waiTest +, yesodCore, yesodTest }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.3"; - sha256 = "093lvg7pl71dfnr7qyfmp9r1m3bs64849k0dw4w2qb618y8wb9jh"; + version = "1.2.4"; + sha256 = "0r5bz1jmgjd7cmvhkp3ahgl610bssvgxxsvb626dvqz2vqc0061z"; buildDepends = [ async attoparsec base64Bytestring blazeBuilder byteable conduit conduitExtra cryptohash cryptohashConduit cssText dataDefault @@ -23,7 +23,7 @@ cabal.mkDerivation (self: { cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit mimeTypes resourcet shakespeareCss systemFileio systemFilepath text transformers unixCompat unorderedContainers wai - waiAppStatic waiTest yesodCore yesodTest + waiAppStatic waiExtra waiTest yesodCore yesodTest ]; doCheck = false; meta = { From ad65fa4c2bbb898b5c774cad1a089527e3c04a0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:34:01 +0200 Subject: [PATCH 401/424] haskell-yesod-test: update to version 1.2.3 --- .../libraries/haskell/yesod-test/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 292941c01717..44b147586236 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,18 +1,18 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit , monadControl, network, persistent, text, time, transformers, wai -, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm +, waiExtra, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.2"; - sha256 = "1vf5g83mj2a38f34llg6wa63whj13p0vgbzfvi3ic5j7qy5gb8g5"; + version = "1.2.3"; + sha256 = "082zi53q1pw9xv4l6ld1y3xxnvq3iwgbrdnxjknhwsxph7glkn3p"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network - persistent text time transformers wai waiTest xmlConduit xmlTypes - yesodCore + persistent text time transformers wai waiExtra waiTest xmlConduit + xmlTypes yesodCore ]; testDepends = [ hspec htmlConduit HUnit text wai xmlConduit yesodCore yesodForm From 6a17d46ba2a05a308101b10785e28ba2cc5101f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:34:03 +0200 Subject: [PATCH 402/424] haskell-yesod: update to version 1.2.6 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 630b04af26b9..8e3873df2ae6 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.5.3"; - sha256 = "1w9bbvinnbnhrajjqj6yhy9dgggdf6n98x04dys45anssiwrd2ss"; + version = "1.2.6"; + sha256 = "0rw46zznczdzg2wvbgp5kpq3yrl6w40vbbs7zyvqpcf6m82jsfz0"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger hamlet monadControl monadLogger networkConduit safe shakespeare From 129197ba5e04bbf97c6ab0d15e730cb34d1755c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:34:04 +0200 Subject: [PATCH 403/424] haskell-cabal-bounds: update to version 0.6 --- pkgs/development/tools/haskell/cabal-bounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index 5de7645a5e45..ee1fc152f803 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.5"; - sha256 = "0sx6vyf3p62khg7qv7nwgd8fns6dsfpw34gpl7zmb6n0c1kjj60b"; + version = "0.6"; + sha256 = "0dl8rf8y365a20yz5kk1c9y860k5mkg1jp5dipvbf451h7a7h9w5"; isLibrary = true; isExecutable = true; buildDepends = [ From bcd9e73947446f5f936bbfd5eaa805d1d8c54613 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jun 2014 20:34:06 +0200 Subject: [PATCH 404/424] haskell-keter: update to version 1.3.1 --- pkgs/development/tools/haskell/keter/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 1cffefd6da31..8a5bc8eb7c85 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,21 +1,21 @@ { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive , conduit, conduitExtra, dataDefault, filepath, fsnotify, hspec -, httpConduit, httpReverseProxy, httpTypes, liftedBase, mtl -, network, networkConduitTls, random, regexTdfa, stm, systemFileio -, systemFilepath, tar, text, time, transformers, unixCompat -, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp -, warpTls, yaml, zlib +, httpClient, httpConduit, httpReverseProxy, httpTypes, liftedBase +, mtl, network, networkConduitTls, random, regexTdfa, stm +, systemFileio, systemFilepath, tar, text, time, transformers +, unixCompat, unorderedContainers, vector, wai, waiAppStatic +, waiExtra, warp, warpTls, yaml, zlib }: cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.0"; - sha256 = "1fvb93iga4c0kfv29ksrmn9bjznl7wfspg1v9a5d3svwrszl4is3"; + version = "1.3.1"; + sha256 = "19isyslrxbp430ira7v2d3r5f1j1526rg7v6lzzyl3dsyfpvxjg6"; isLibrary = true; isExecutable = true; buildDepends = [ aeson async attoparsec blazeBuilder caseInsensitive conduit - conduitExtra dataDefault filepath fsnotify httpConduit + conduitExtra dataDefault filepath fsnotify httpClient httpConduit httpReverseProxy httpTypes liftedBase mtl network networkConduitTls random regexTdfa stm systemFileio systemFilepath tar text time transformers unixCompat unorderedContainers vector wai waiAppStatic From a2a94462db16f0c71f565d36744a86cd480de3e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 11:33:07 +0200 Subject: [PATCH 405/424] haskell-hourglass: update to version 0.2.2 --- pkgs/development/libraries/haskell/hourglass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix index 8615cefca28a..f7569ba3fa5c 100644 --- a/pkgs/development/libraries/haskell/hourglass/default.nix +++ b/pkgs/development/libraries/haskell/hourglass/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hourglass"; - version = "0.2.1"; - sha256 = "0xb5g10mm427yagv5hzg5wgxpjjr6s9my675ik8rh5k1is4zr500"; + version = "0.2.2"; + sha256 = "015ipy9adi67nfddjsw9c0ihn0banghgawjli0lgrmiyjz01610c"; buildDepends = [ deepseq ]; testDepends = [ deepseq mtl tasty tastyHunit tastyQuickcheck time From 21cba499b45e20837e3d5e19ada343d4d71ca4ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 11:33:09 +0200 Subject: [PATCH 406/424] haskell-mongoDB: update to version 1.5.0 --- pkgs/development/libraries/haskell/mongoDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 448fd3b2f5f7..259a8e2fc2d5 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.4.4"; - sha256 = "11v0k2i0ix67zwm19w1215dslnnqllkc4jlhbs5yva2ix4z7d4gh"; + version = "1.5.0"; + sha256 = "0dvy8pa79c26hcngds6nnwnayrhsyz1flj18m9bcyrcvwb5q3dd6"; buildDepends = [ binary bson cryptohash hashtables liftedBase monadControl mtl network parsec random randomShuffle text transformersBase From 30835fc7772625cf6920057baef528273f7dd005 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 11:33:11 +0200 Subject: [PATCH 407/424] haskell-wai: update to version 3.0.0.1 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 6b777fbd11e9..50ded58f44d8 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "3.0.0"; - sha256 = "0zzcyrr0pkj439n28wmivmfavh9cdjc1mz3zrbi88zmrzg4wpssx"; + version = "3.0.0.1"; + sha256 = "1f8alq4lygjdb4pzb7xm6jml3dviygk18siwfwb751va3j2fmi0v"; buildDepends = [ blazeBuilder httpTypes network text vault ]; testDepends = [ blazeBuilder hspec ]; meta = { From a059a4b16721597595e6aae4bdce79822790d38b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 11:58:27 +0200 Subject: [PATCH 408/424] haskell-wai-test: disable haddock phase for empty module --- pkgs/development/libraries/haskell/wai-test/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index c5bb750ff3ab..5d1cecc2e508 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "3.0.0"; sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx"; buildDepends = [ wai ]; + noHaddock = true; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)"; From 2795d46f95049b17cb9ea18d11d01c11ee45e70f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 12:08:27 +0200 Subject: [PATCH 409/424] haskell-wai-logger: disable test suite to fix build https://github.com/kazu-yamamoto/logger/issues/42 --- pkgs/development/libraries/haskell/wai-logger/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index dc00b9525eb8..35b044bdfb48 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { unixTime wai ]; testDepends = [ doctest waiTest ]; + doCheck = false; meta = { description = "A logging system for WAI"; license = self.stdenv.lib.licenses.bsd3; From 1380b62fdbe4c115e5384c5064b1f3913250b760 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jun 2014 12:10:39 +0200 Subject: [PATCH 410/424] haskell-sloane: update to version 1.8 --- pkgs/applications/science/math/sloane/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix index 2e7768e2d956..a2462e8eefee 100644 --- a/pkgs/applications/science/math/sloane/default.nix +++ b/pkgs/applications/science/math/sloane/default.nix @@ -1,15 +1,15 @@ -{ cabal, ansiTerminal, cmdargs, filepath, HTTP, network +{ cabal, ansiTerminal, filepath, HTTP, network, optparseApplicative , stringsearch, terminalSize, time, zlib }: cabal.mkDerivation (self: { pname = "sloane"; - version = "1.7.1"; - sha256 = "0d6k33rhp1ixrwdfwy31m39kbk8z81biwzwmkp01fvpgwm96p3va"; + version = "1.8"; + sha256 = "0c30slsswfqwzi39hk6jraxz1y1a2yn8g8nyjvlnggwajx2rlm6p"; isLibrary = false; isExecutable = true; buildDepends = [ - ansiTerminal cmdargs filepath HTTP network stringsearch + ansiTerminal filepath HTTP network optparseApplicative stringsearch terminalSize time zlib ]; postInstall = '' From cc326495c46b2510c536c0a01239fc91df1c6368 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 09:57:31 +0200 Subject: [PATCH 411/424] haskell-attoparsec: update to version 0.12.1.0 --- .../haskell/attoparsec/{0.12.0.0.nix => 0.12.1.0.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/attoparsec/{0.12.0.0.nix => 0.12.1.0.nix} (86%) diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix similarity index 86% rename from pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix rename to pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix index 6fd32736c4d8..72a58b1cce65 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.12.0.0"; - sha256 = "04wdb2i2yqybkfnjs3f25nf7xz1nq5sn8z23klbm4xnqaiajmkmr"; + version = "0.12.1.0"; + sha256 = "1y7sikk5hg9yj3mn21k026ni6lznsih0lx03rgdz4gmb6aqh54bn"; buildDepends = [ deepseq scientific text ]; testDepends = [ deepseq QuickCheck scientific testFramework diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index daea93d3aa7d..803dc897eb7f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -193,8 +193,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; - attoparsec_0_12_0_0 = callPackage ../development/libraries/haskell/attoparsec/0.12.0.0.nix {}; - attoparsec = self.attoparsec_0_12_0_0; + attoparsec_0_12_1_0 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.0.nix {}; + attoparsec = self.attoparsec_0_12_1_0; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; From f7db41dedaf61d0f5f268dcdb15edc807dec5388 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 09:57:47 +0200 Subject: [PATCH 412/424] haskell-entropy: update to version 0.3.2 --- pkgs/development/libraries/haskell/entropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index c92fc584aaf6..5c494f4a45df 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "entropy"; - version = "0.3"; - sha256 = "0b1yx7409xw8jz2rj8695xscjnw4p7y80niq9cbkqrmnqbqnwj2q"; + version = "0.3.2"; + sha256 = "1kk0vmfmfqcsw0pzbii9rvz32fvhvxqpn6p6jw6q2x33z6gm5f9x"; meta = { homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; From e4b5d2f7b7416d94124d99bac777e619a384a0d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 09:57:48 +0200 Subject: [PATCH 413/424] haskell-haskeline: update to version 0.7.1.3 --- pkgs/development/libraries/haskell/haskeline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index f813ddc25131..bff64a72f690 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.7.1.2"; - sha256 = "178hzal5gqw3rmgijv9ph9xa6d4sld279z4a8cjyx3hv4azciwr4"; + version = "0.7.1.3"; + sha256 = "1bwyfn7y9mi18g7zxz8wxjkld51azlfbxypxbiqdinpm2fdl63mi"; buildDepends = [ filepath terminfo transformers utf8String ]; configureFlags = "-fterminfo"; jailbreak = true; From 371f44dcbc2e1389f3e5b63dea4c4c96038ad5ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 09:57:50 +0200 Subject: [PATCH 414/424] haskell-pipes-text: update to version 0.0.0.11 --- pkgs/development/libraries/haskell/pipes-text/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index ac4a57348feb..7156b8897893 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -1,14 +1,14 @@ { cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe -, profunctors, text, textStreamDecode, transformers +, profunctors, streamingCommons, text, transformers }: cabal.mkDerivation (self: { pname = "pipes-text"; - version = "0.0.0.10"; - sha256 = "05lrxfy6cma7g5h41c74sc22p1y38kzbmiagr3grxk5a5110vhr1"; + version = "0.0.0.11"; + sha256 = "0c56gxm17bapdjgbp2f55z3f6vq8ryvsljqp3bcjjj18xv5pf1ls"; buildDepends = [ pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors - text textStreamDecode transformers + streamingCommons text transformers ]; meta = { homepage = "https://github.com/michaelt/text-pipes"; From a1336ca41c1e3a83d3dc103bafef072e627f8221 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 09:57:51 +0200 Subject: [PATCH 415/424] haskell-purescript: update to version 0.5.2.3 --- pkgs/development/libraries/haskell/purescript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 8e23a0cf8f28..4109fc89a2c8 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.2.2"; - sha256 = "07gkd897qcgn7yf81bii5njkiq1hlhfz5jx3spdlv64a492grmg2"; + version = "0.5.2.3"; + sha256 = "09z56gb3k1ya5c3yznm49sgd1g9i5wvn5ih4mycf5ys2wvy3v9sl"; isLibrary = true; isExecutable = true; buildDepends = [ From 84e0ecd664a1c77a7d86779eeff16bb895ac3953 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 09:59:08 +0200 Subject: [PATCH 416/424] haskell-MFlow: re-generate expression with cabal2nix --- pkgs/development/libraries/haskell/MFlow/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index def50e8e7dbd..fe96af2de9e5 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -1,7 +1,8 @@ { cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession -, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes, monadloc -, mtl, parsec, random, RefSerialize, stm, TCache, text, time -, transformers, utf8String, vector, wai, warp, warpTls, Workflow +, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes +, monadloc, mtl, parsec, random, RefSerialize, stm, TCache, text +, time, transformers, utf8String, vector, wai, warp, warpTls +, Workflow }: cabal.mkDerivation (self: { @@ -10,10 +11,11 @@ cabal.mkDerivation (self: { sha256 = "1ih9ni14xmqvcfvayjkggmpmw3s9yzp17gf4xzygldmjcs35j4n3"; buildDepends = [ blazeHtml blazeMarkup caseInsensitive clientsession conduit - conduitExtra cpphs extensibleExceptions httpTypes monadloc mtl parsec + conduitExtra extensibleExceptions httpTypes monadloc mtl parsec random RefSerialize stm TCache text time transformers utf8String vector wai warp warpTls Workflow ]; + buildTools = [ cpphs ]; meta = { description = "stateful, RESTful web framework"; license = self.stdenv.lib.licenses.bsd3; From 7abf0948be56e76c3ab97baf985281642d984b0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 10:22:57 +0200 Subject: [PATCH 417/424] hoogle: patch to fix build errors with WAI 3.0 https://github.com/ndmitchell/hoogle/issues/69 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 9c3ed9e778cd..624cc9319812 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -2,6 +2,7 @@ , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes , parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text , time, transformers, uniplate, vector, vectorAlgorithms, wai, warp +, fetchurl }: cabal.mkDerivation (self: { @@ -18,6 +19,9 @@ cabal.mkDerivation (self: { ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; + patches = [ (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff"; + sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; }) + ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; From 87d3a5b980f15ed73df72abbb4a82cdc9e959260 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 15:55:32 +0200 Subject: [PATCH 418/424] haskell-event-list: update to version 0.1.1.1 --- pkgs/development/libraries/haskell/event-list/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix index 4b36ef2c6be0..5305cd87d7df 100644 --- a/pkgs/development/libraries/haskell/event-list/default.nix +++ b/pkgs/development/libraries/haskell/event-list/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "event-list"; - version = "0.1.1"; - sha256 = "1qv7a4np8cr0chbvlz0kmcrvc95w1z7fqs2pq0mkwx22hnslsh5l"; + version = "0.1.1.1"; + sha256 = "16qrjvn8z2nlpfp3xlgwsg2abn7b33n3z673qs5k6ashfbkdy5ja"; buildDepends = [ nonNegative QuickCheck transformers utilityHt ]; testDepends = [ nonNegative QuickCheck random transformers utilityHt From 67a692a8304dc5941846010f50a05e49cba36b1f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 15:55:34 +0200 Subject: [PATCH 419/424] haskell-force-layout: update to version 0.3.0.5 --- pkgs/development/libraries/haskell/force-layout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 40a610f2b11d..55437747f8bf 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.4"; - sha256 = "1zgqcz9b86qax1hyl32a1giapvn2wpnb4gcfn8czkcr0m7c2iwdg"; + version = "0.3.0.5"; + sha256 = "01wk8zygw9d3r5dwbycyab82kfk8s05ynnajb6kfjv7i09s9sgcb"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; From 40ca1149c912325831b30b725af9ac775abe552e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jun 2014 15:55:37 +0200 Subject: [PATCH 420/424] haskell-io-memoize: update to version 1.1.0.0 --- pkgs/development/libraries/haskell/io-memoize/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix index bba2cd3b1e0f..3343ee9cbe9d 100644 --- a/pkgs/development/libraries/haskell/io-memoize/default.nix +++ b/pkgs/development/libraries/haskell/io-memoize/default.nix @@ -1,10 +1,10 @@ -{ cabal, spawn }: +{ cabal, async }: cabal.mkDerivation (self: { pname = "io-memoize"; - version = "1.0.0.0"; - sha256 = "1z6aimyg7wasaqmacpch7skfm9iyl7khd54lfmb8iwghyfvah5d0"; - buildDepends = [ spawn ]; + version = "1.1.0.0"; + sha256 = "1xnrzrvs5c3lrzdxm4hrqbh8chl8sxv2j98b28na73w8b7yv2agm"; + buildDepends = [ async ]; meta = { description = "Memoize IO actions"; license = self.stdenv.lib.licenses.bsd3; From a7d31fe4491fe18ddc1f80711bc32fb05a19486b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Jun 2014 16:46:59 +0200 Subject: [PATCH 421/424] Handle being a symlink Fixes #1898. --- nixos/doc/manual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 6d5039e81778..a79a77f40df1 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -12,11 +12,11 @@ let declarations = map (fn: stripPrefix fn) opt.declarations; }); - prefix = toString pkgs.path; + prefix = toString ../../..; stripPrefix = fn: if substring 0 (stringLength prefix) fn == prefix then - substring (add (stringLength prefix) 1) 1000 fn + substring (stringLength prefix + 1) 1000 fn else fn; From 27c72f337b2d5e247a513a553473b00f93eb7871 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Jun 2014 17:44:02 +0200 Subject: [PATCH 422/424] linux: Update to 3.12.22 Fixes CVE-2014-3153 (local privilege escalation via futex()). --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 82f31bf4f984..33bed4213b41 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.21"; + version = "3.12.22"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1pr4gr48bgxz28h790b2w41b1fc41xffz3drflsnz5736pisrhg7"; + sha256 = "0c9rw11iihjimqb6mdmwn4q67ds7jg4qibj5ijj5pdmkdqzj7g54"; }; features.iwlwifi = true; From f5055e2ef6cbb7e836ba80d8458647555aae6793 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Jun 2014 17:56:46 +0200 Subject: [PATCH 423/424] Rename environment.systemVariables -> environment.sessionVariables This makes it clearer that they're part of PAM sessions. --- nixos/modules/config/i18n.nix | 2 +- nixos/modules/config/system-environment.nix | 4 ++-- nixos/modules/config/timezone.nix | 2 +- nixos/modules/programs/environment.nix | 2 +- nixos/modules/security/ca.nix | 2 +- nixos/modules/services/misc/nix-daemon.nix | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 7a7d713ef687..d3f24e280c74 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -76,7 +76,7 @@ in environment.systemPackages = [ glibcLocales ]; - environment.systemVariables = + environment.sessionVariables = { LANG = config.i18n.defaultLocale; LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; }; diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index b30c4e064750..3ab32f00fd1d 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -14,7 +14,7 @@ in options = { - environment.systemVariables = mkOption { + environment.sessionVariables = mkOption { default = {}; description = '' A set of environment variables used in the global environment. @@ -48,7 +48,7 @@ in '' ${concatStringsSep "\n" ( (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'') - (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))} + (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.sessionVariables) ]))))} ''; }; diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index 4f7fc9ab262b..c85922840770 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -30,7 +30,7 @@ in config = { - environment.systemVariables.TZDIR = "/etc/zoneinfo"; + environment.sessionVariables.TZDIR = "/etc/zoneinfo"; systemd.globalEnvironment.TZDIR = tzdir; diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index c26c962b20a6..2ff1db48757d 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -23,7 +23,7 @@ in EDITOR = "nano"; }; - environment.systemVariables = + environment.sessionVariables = { NIX_PATH = [ "/nix/var/nix/profiles/per-user/root/channels/nixos" "nixpkgs=/etc/nixos/nixpkgs" diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 57764dc870f3..dd4b0c529e5d 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -12,7 +12,7 @@ with lib; } ]; - environment.systemVariables = + environment.sessionVariables = { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index f373657b7918..1ebd3c3643df 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -318,7 +318,7 @@ in }; # Set up the environment variables for running Nix. - environment.systemVariables = cfg.envVars; + environment.sessionVariables = cfg.envVars; environment.extraInit = '' From 13befa3979d6ac98a96880fba9a3239bc333e644 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Jun 2014 18:33:58 +0200 Subject: [PATCH 424/424] Set session variables in the shell as well --- nixos/modules/config/shells-environment.nix | 6 ++++++ nixos/tests/misc.nix | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index e3ddf9e3c5fa..cc079cdc5856 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -149,6 +149,12 @@ in system.build.binsh = pkgs.bashInteractive; + # Set session variables in the shell as well. This is usually + # unnecessary, but it allows changes to session variables to take + # effect without restarting the session (e.g. by opening a new + # terminal instead of logging out of X11). + environment.variables = config.environment.sessionVariables; + environment.etc."shells".text = '' ${concatStringsSep "\n" cfg.shells} diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index e33581b4d2d4..8caef146ec87 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -98,6 +98,10 @@ import ./make-test.nix { $machine->succeed("touch /tmp2/x"); $machine->succeed("grep '/tmp2 tmpfs' /proc/mounts"); }; + + subtest "shell-vars", sub { + $machine->succeed('[ -n "$NIX_PATH" ]'); + }; ''; }