diff options
Diffstat (limited to 'pkgs')
165 files changed, 4886 insertions, 1950 deletions
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 0b5bcccfb21a..bf2c34b9318e 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng -, fontconfig, freetype, pam, dbus_libs }: +, fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs }: stdenv.mkDerivation rec { name = "slim-1.3.6"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ./run-once.patch ]; - preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc --replace /lib $out/lib"; + preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib"; cmakeFlags = [ "-DUSE_PAM=1" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig libjpeg libpng fontconfig freetype pam dbus_libs - xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft + xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper ]; NIX_CFLAGS_LINK = "-lXmu"; diff --git a/pkgs/applications/display-managers/slim/runtime-paths.patch b/pkgs/applications/display-managers/slim/runtime-paths.patch index f6811dbe6682..5a8e07bfbf07 100644 --- a/pkgs/applications/display-managers/slim/runtime-paths.patch +++ b/pkgs/applications/display-managers/slim/runtime-paths.patch @@ -1,6 +1,6 @@ -diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp +diff -ru slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp --- slim-1.3.6-orig/app.cpp 2013-10-02 00:38:05.000000000 +0200 -+++ slim-1.3.6/app.cpp 2013-10-15 11:02:55.629263422 +0200 ++++ slim-1.3.6/app.cpp 2014-03-30 19:01:04.115414201 +0200 @@ -200,7 +200,9 @@ /* Read configuration and theme */ @@ -23,3 +23,48 @@ diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp themeName = cfg->getOption("current_theme"); string::size_type pos; if ((pos = themeName.find(",")) != string::npos) { +diff -ru slim-1.3.6-orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt +--- slim-1.3.6-orig/CMakeLists.txt 2013-10-02 00:38:05.000000000 +0200 ++++ slim-1.3.6/CMakeLists.txt 2014-03-30 19:16:48.445069729 +0200 +@@ -23,7 +23,7 @@ + + set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") + set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim") +-set(SYSCONFDIR "/etc") ++set(SYSCONFDIR "$ENV{out}/etc") + set(LIBDIR "/lib") + set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") + +@@ -40,7 +40,7 @@ + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPACKAGE=\"slim\"") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DVERSION=\"${SLIM_VERSION}\"") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"") +-set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"") ++set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"/etc\"") + + # Flags + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2") +Only in slim-1.3.6: CMakeLists.txt~ +diff -ru slim-1.3.6-orig/slimlock.cpp slim-1.3.6/slimlock.cpp +--- slim-1.3.6-orig/slimlock.cpp 2013-10-02 00:38:05.000000000 +0200 ++++ slim-1.3.6/slimlock.cpp 2014-03-30 19:01:04.115414201 +0200 +@@ -106,13 +106,17 @@ + unsigned int cfg_passwd_timeout; + // Read user's current theme + cfg = new Cfg; +- cfg->readConf(CFGFILE); ++ char *cfgfile = getenv("SLIM_CFGFILE"); ++ if (!cfgfile) cfgfile = CFGFILE; ++ cfg->readConf(cfgfile); + cfg->readConf(SLIMLOCKCFG); + string themebase = ""; + string themefile = ""; + string themedir = ""; + themeName = ""; +- themebase = string(THEMESDIR) + "/"; ++ char *themesdir = getenv("SLIM_THEMESDIR"); ++ if (!themesdir) themesdir = THEMESDIR; ++ themebase = string(themesdir) + "/"; + themeName = cfg->getOption("current_theme"); + string::size_type pos; + if ((pos = themeName.find(",")) != string::npos) { diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix index 25055df8ea35..a832c7d5942c 100644 --- a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix @@ -11,13 +11,12 @@ cabal.mkDerivation (self: { postInstall = '' emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el install -d $out/share/emacs/site-lisp - install "elisp/"*.elc $out/share/emacs/site-lisp + install "elisp/"*.el "elisp/"*.elc $out/share/emacs/site-lisp ''; meta = { homepage = "https://github.com/chrisdone/structured-haskell-mode"; description = "Structured editing Emacs mode for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.pSub ]; }; }) diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix index d595cb60da8c..1414310ebf33 100644 --- a/pkgs/applications/ike/default.nix +++ b/pkgs/applications/ike/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; platforms = platforms.unix; maintainers = [ maintainers.iElectric ]; - license = "sleepycat"; + license = licenses.sleepycat; }; } diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix new file mode 100644 index 000000000000..dc258d653280 --- /dev/null +++ b/pkgs/applications/misc/printrun/default.nix @@ -0,0 +1,36 @@ +{ stdenv, python27Packages, fetchgit }: +let + py = python27Packages; +in +py.buildPythonPackage rec { + name = "printrun"; + + src = fetchgit { + url = "https://github.com/kliment/Printrun"; + rev = "0a7f2335d0c02c3cc283200867b41f8b337b1387"; + sha256 = "1zvh5ih89isv51sraljm29z9k00srrdnklwkyp27ymxzlbcwq6gv"; + }; + + propagatedBuildInputs = [ py.wxPython py.pyserial py.dbus py.psutil ]; + + doCheck = false; + + postPatch = '' + sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py + sed -i "s|distutils.core|setuptools|" setup.py + sed -i "s|distutils.command.install |setuptools.command.install |" setup.py + ''; + + postInstall = '' + for f in $out/share/applications/*.desktop; do + sed -i -e "s|/usr/|$out/|g" "$f" + done + ''; + + meta = with stdenv.lib; { + description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; + homepage = https://github.com/kliment/Printrun; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 6d52f63ff6b4..e1f98fceace2 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -3,14 +3,14 @@ }: let - version = "0.9.2"; + version = "0.9.4"; in stdenv.mkDerivation rec { name = "spacefm-${version}"; src = fetchurl { url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; - sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; + sha256 = "0marwa031jk24q8hy90dr7yw6rv5hn1shar404zpb1k57v4nr23m"; }; buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index df5c2bff0d3f..c4040ec0356c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -8,7 +8,7 @@ , libusb1, libexif, pciutils , python, pythonPackages, perl, pkgconfig -, nspr, udev, krb5, file +, nspr, udev, krb5 , utillinux, alsaLib , gcc, bison, gperf , glib, gtk, dbus_glib @@ -54,6 +54,7 @@ let sed -i -r \ -e 's/-f(stack-protector)(-all)?/-fno-\1/' \ -e 's|/bin/echo|echo|' \ + -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi sed -i '/not RunGN/,+1d' build/gyp_chromium sed -i -e 's|/usr/bin/gcc|gcc|' \ @@ -165,8 +166,7 @@ in stdenv.mkDerivation rec { nspr udev (if useOpenSSL then openssl else nss) utillinux alsaLib - gcc bison gperf - krb5 file + gcc bison gperf krb5 glib gtk dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage @@ -223,8 +223,10 @@ in stdenv.mkDerivation rec { ffmpeg_branding = "Chrome"; } // optionalAttrs (stdenv.system == "x86_64-linux") { target_arch = "x64"; + python_arch = "x86-64"; } // optionalAttrs (stdenv.system == "i686-linux") { target_arch = "ia32"; + python_arch = "ia32"; }); configurePhase = '' diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index c638e2b1adb8..e14996d35f4a 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-03-01"; + name = "dwb-2014-03-27"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "e8d4b8d7937b70279d006da4938dfe52fb85f9e8"; - sha256 = "0m4730zqmnvb9k6xyydi221sh0wbanzbhg07xvwil3kn1d29340w"; + rev = "4566d58575fbf687ebe9e3414996c45697b62787"; + sha256 = "145sq2wv0s0n32cwpwgy59ff6ppcv80ialak7nnj1rpqicfqb72h"; }; buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4 ]; diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index bdbb53d1675f..752a7824e6f0 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, readline, libssh, intltool}: +{stdenv, fetchurl, readline, libssh, intltool, libbsd}: stdenv.mkDerivation rec { - name = "yafc-1.2.3"; + name = "yafc-1.3.2"; src = fetchurl { - url = "https://github.com/downloads/sebastinas/yafc/${name}.tar.xz"; - sha256 = "11h5r9ragfpil338kq981wxnifacflqfwgydhmy00b3fbdlnxzsi"; + url = "http://www.yafc-ftp.com/upload/${name}.tar.xz"; + sha256 = "0rrhik00xynxg5s3ffqlyynvy8ssv8zfaixkpb77baxa274gnbd7"; }; - buildInputs = [ readline libssh intltool ]; + buildInputs = [ readline libssh intltool libbsd ]; meta = { description = "ftp/sftp client with readline, autocompletion and bookmarks"; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix new file mode 100644 index 000000000000..4afd250a549f --- /dev/null +++ b/pkgs/applications/office/zotero/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, bash, xulrunner }: + +assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); + +let + version = "4.0.19"; + arch = if stdenv.system == "x86_64-linux" + then "linux-x86_64" + else "linux-i686"; +in +stdenv.mkDerivation { + name = "zotero-${version}"; + + src = fetchurl { + url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2"; + sha256 = if stdenv.system == "x86_64-linux" + then "0xihvk7ms1vvzmxvpw8hs15pl1vvmf3zd72nwyaqhg469kwcz9s1" + else "1z4q8nzl90snb03ywk0cp64nv3cgasj9fvbcw2d4bgl2zlgwzpy9"; + }; + + # Strip the bundled xulrunner + prePatch = ''rm -fr run-zotero.sh zotero xulrunner/''; + + inherit bash xulrunner; + installPhase = '' + ensureDir "$out/libexec/zotero" + cp -vR * "$out/libexec/zotero/" + + ensureDir "$out/bin" + substituteAll "${./zotero.sh}" "$out/bin/zotero" + chmod +x "$out/bin/zotero" + ''; + + meta = with stdenv.lib; { + homepage = "https://www.zotero.org"; + description = "Collect, organize, cite, and share your research sources"; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/applications/office/zotero/zotero.sh b/pkgs/applications/office/zotero/zotero.sh new file mode 100644 index 000000000000..c80d5e8189ea --- /dev/null +++ b/pkgs/applications/office/zotero/zotero.sh @@ -0,0 +1,3 @@ +#!@bash@/bin/bash + +exec "@xulrunner@/bin/xulrunner" "@out@/libexec/zotero/application.ini" "${@}" diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix new file mode 100644 index 000000000000..eeef03eb1619 --- /dev/null +++ b/pkgs/applications/science/logic/z3/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, python, unzip, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "z3-${version}"; + version = "4.3.1"; + src = fetchurl { + url = "http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx\?ProjectName\=z3\&changeSetId\=89c1785b73225a1b363c0e485f854613121b70a7"; + name = "${name}.zip"; + sha256 = "3b94465c52ec174350d8707dd6a1fb0cef42f0fa23f148cc1808c14f3c2c7f76"; + }; + + buildInputs = [ python unzip autoreconfHook ]; + enableParallelBuilding = true; + + # The zip file doesn't unpack a directory, just the code itself. + unpackPhase = "mkdir ${name} && cd ${name} && unzip $src"; + postConfigure = '' + python scripts/mk_make.py + cd build + ''; + + # z3's install phase is stupid because it tries to calculate the + # python package store location itself, meaning it'll attempt to + # write files into the nix store, and fail. + soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; + installPhase = '' + mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include + cp ../src/api/z3.h $out/include + cp ../src/api/z3_api.h $out/include + cp ../src/api/z3_v1.h $out/include + cp ../src/api/z3_macros.h $out/include + cp ../src/api/c++/z3++.h $out/include + cp z3 $out/bin + cp libz3${soext} $out/lib + cp libz3${soext} $out/lib/${python.libPrefix}/site-packages + cp z3*.pyc $out/lib/${python.libPrefix}/site-packages + ''; + + meta = { + description = "Z3 is a high-performance theorem prover and SMT solver"; + homepage = "http://z3.codeplex.com"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix new file mode 100644 index 000000000000..947d2517808a --- /dev/null +++ b/pkgs/applications/video/pitivi/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper +, pythonPackages, gst, clutter-gst, clutter-gtk +, gobjectIntrospection, clutter, gtk3, librsvg +, gnome_icon_theme, gnome_icon_theme_symbolic +}: + +let + version = "0.93"; +in stdenv.mkDerivation rec { + name = "pitivi-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz"; + sha256 = "0z89dwrd7akhkap270i372yszqib8yqcymv78lhdmn3a8bsa7jhp"; + }; + + meta = with stdenv.lib; { + description = "Non-Linear video editor utilizing the power of GStreamer"; + homepage = "http://pitivi.org/"; + longDescription = '' + Pitivi is a video editor built upon the GStreamer Editing Services. + It aims to be an intuitive and flexible application + that can appeal to newbies and professionals alike. + ''; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; + + buildInputs = [ + gobjectIntrospection clutter-gst clutter-gtk librsvg + ] ++ (with gst; [ + gst-python gst-editing-services + gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly gst-libav + ]) ++ (with pythonPackages; [ + python pygobject3 pyxdg numpy pycairo sqlite3 + ]); + + postInstall = with stdenv.lib; with gst; let + libraryPath = makeLibraryPath [ + gstreamer gst-editing-services + clutter-gst clutter-gtk clutter gtk3 + ]; + + xdgDataDirs = makeSearchPath "share" [ + gtk3 gnome_icon_theme gnome_icon_theme_symbolic + ]; + in '' + wrapProgram "$out/bin/pitivi" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix LD_LIBRARY_PATH : "${libraryPath}" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:${xdgDataDirs}:$out/share" + ''; +} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 79a208fa54c5..266ab11a39fb 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, which, alsaLib, curl, gawk +, which, alsaLib, curl, libvpx, gawk , xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "4.2.22"; # changes ./guest-additions as well + version = "4.3.10"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +31,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "91556"; + extpackRevision = "93012"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.22/SHA256SUMS - sha256 = "79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a"; + # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS + sha256 = "ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -56,12 +56,12 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1"; + sha256 = "739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b"; }; buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL - libcap glib lvm2 python alsaLib curl pam xorriso makeself perl + libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk ++ optional pythonBindings python; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 595698abcaa5..5fc755904170 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76"; + sha256 = "247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index 54ef0b274aa8..c80c8f1c9db0 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -10,8 +10,9 @@ cabal.mkDerivation (self: { extensibleExceptions filepath mtl utf8String X11 ]; postInstall = '' + shopt -s globstar mkdir -p $out/share/man/man1 - mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/ + mv "$out/"**"/man/"*.1 $out/share/man/man1/ ''; patches = [ diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 57d1bf74154e..ddf16bc2219e 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -2,12 +2,12 @@ , autoconf, automake, libtool, openjdk, perl }: stdenv.mkDerivation { - name = "aldor-1.1.0"; + name = "aldor-1.2.0"; src = fetchgit { url = "https://github.com/pippijn/aldor"; - sha256 = "14xv3jl15ib2knsdz0bd7jx64zg1qrr33q5zcr8gli860ps8gkg3"; - rev = "f7b95835cf709654744441ddb1c515bfc2bec998"; + sha256 = "1l9fc2cgwabifwbijcp293abc8hcv40nzx2w31jkxh8n0plbiczn"; + rev = "15471e75f3d65b93150f414ebcaf59a03054b68d"; }; buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 8cc283bc3f14..963c7e2cb5c5 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ mono pkgconfig autoconf automake which ]; configurePhase = '' - substituteInPlace ./autogen.sh "/usr/bin/env sh" "/bin/sh" + substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" ./autogen.sh --prefix $out ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix new file mode 100644 index 000000000000..62e08d1fa7c0 --- /dev/null +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -0,0 +1,46 @@ +{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256 }: +with stdenv.lib; +let + versionParts = splitString "-" version; # 4.7 2013q3 20130916 + majorVersion = elemAt versionParts 0; # 4.7 + yearQuarter = elemAt versionParts 1; # 2013q3 + underscoreVersion = replaceChars ["."] ["_"] version; # 4_7-2013q3-20130916 + yearQuarterParts = splitString "q" yearQuarter; # 2013 3 + year = elemAt yearQuarterParts 0; # 2013 + quarter = elemAt yearQuarterParts 1; # 3 + subdirName = "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update +in +stdenv.mkDerivation { + name = "gcc-arm-embedded-${version}"; + + src = fetchurl { + url = "https://launchpad.net/gcc-arm-embedded/${majorVersion}/${subdirName}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; + sha256 = sha256; + }; + + buildInputs = [ bzip2 patchelf ]; + + dontPatchELF = true; + + phases = "unpackPhase patchPhase installPhase"; + + installPhase = '' + mkdir -pv $out + cp -r ./* $out + + for f in $(find $out); do + if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then + patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \ + --set-rpath $out/lib:${gcc}/lib \ + "$f" || true + fi + done + ''; + + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)"; + homepage = "https://launchpad.net/gcc-arm-embedded"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix new file mode 100644 index 000000000000..9123aaa988cb --- /dev/null +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk }: + +stdenv.mkDerivation rec { + name = "icedtea-web-${version}"; + + version = "1.4.2"; + + src = fetchurl { + url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; + + sha256 = "0bfw4icxjfkdxqmiqgp9lfs1ca9rydl57g3yhlxrif0fpzyyb3fl"; + }; + + buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ]; + + preConfigure = '' + substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' + ''; + + configureFlags = [ + "--with-jdk-home=${jdk}" + ]; + + mozillaPlugin = "/lib"; + + meta = { + description = "Java web browser plugin and an implementation of Java Web Start"; + longDescription = '' + A Free Software web browser plugin running applets written in the Java + programming language and an implementation of Java Web Start, originally + based on the NetX project. + ''; + homepage = http://icedtea.classpath.org/wiki/IcedTea-Web; + maintainers = with stdenv.lib.maintainers; [ wizeman ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch new file mode 100644 index 000000000000..8931c122538f --- /dev/null +++ b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch @@ -0,0 +1,16 @@ +diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk +--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400 ++++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500 +@@ -234,12 +234,6 @@ + endif # !HEADLESS + endif # PLATFORM + +-ifeq ($(PLATFORM), linux) +- # Checking for the X11/extensions headers at the additional location +- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ +- $(wildcard /usr/include/X11/extensions)) +-endif +- + ifeq ($(PLATFORM), macosx)) + CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ + -I$(OPENWIN_HOME)/include diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix new file mode 100644 index 000000000000..a8f9617a6340 --- /dev/null +++ b/pkgs/development/compilers/icedtea/default.nix @@ -0,0 +1,179 @@ +{ stdenv, fetchurl, jdk, jdkPath, ant, wget, zip, unzip, cpio, file, libxslt +, xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, krb5, attr +, alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils +, cacert, setJavaClassPath +}: + +let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else if stdenv.system == "x86_64-linux" then + "amd64" + else + throw "icedtea requires i686-linux or x86_64 linux"; + + srcInfo = (import ./sources.nix).icedtea7; + + pkgName = "icedtea7-${srcInfo.version}"; + + defSrc = name: + with (builtins.getAttr name srcInfo.bundles); fetchurl { + inherit url sha256; + name = "${pkgName}-${name}-${baseNameOf url}"; + }; + + bundleNames = builtins.attrNames srcInfo.bundles; + + sources = stdenv.lib.genAttrs bundleNames (name: defSrc name); + + bundleFun = name: "--with-${name}-src-zip=" + builtins.getAttr name sources; + bundleFlags = map bundleFun bundleNames; + +in + +with srcInfo; stdenv.mkDerivation { + name = pkgName; + + src = fetchurl { + inherit url sha256; + }; + + outputs = [ "out" "jre" ]; + + # TODO: Probably some more dependencies should be on this list but are being + # propagated instead + buildInputs = [ + jdk ant wget zip unzip cpio file libxslt pkgconfig procps automake + autoconf which perl coreutils xorg.lndir + zlib libjpeg libpng giflib lcms2 krb5 attr alsaLib cups + xorg.libX11 xorg.libXtst gtk2 + ]; + + configureFlags = bundleFlags ++ [ + "--disable-bootstrap" + "--disable-downloading" + + "--without-rhino" + # Uncomment this when paxctl lands in stdenv: "--with-pax=paxctl" + "--with-jdk-home=${jdkPath}" + ]; + + preConfigure = '' + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS + + substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' + substituteInPlace javah.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' + + ./autogen.sh + ''; + + preBuild = '' + make stamps/extract.stamp + + substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo' + substituteInPlace openjdk/corba/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo' + + patch -p0 < ${./cppflags-include-fix.patch} + patch -p0 < ${./fix-java-home.patch} + ''; + + NIX_NO_SELF_RPATH = true; + + makeFlags = [ + "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" + "ALT_UNIXCOMMAND_PATH=" + "ALT_USRBIN_PATH=" + "ALT_DEVTOOLS_PATH=" + "ALT_COMPILER_PATH=" + "ALT_CUPS_HEADERS_PATH=${cups}/include" + "ALT_OBJCOPY=${binutils}/bin/objcopy" + "SORT=${coreutils}/bin/sort" + "UNLIMITED_CRYPTO=1" + ]; + + installPhase = '' + mkdir -p $out/lib/icedtea $out/share $jre/lib/icedtea + + cp -av openjdk.build/j2sdk-image/* $out/lib/icedtea + + # Move some stuff to top-level. + mv $out/lib/icedtea/include $out/include + mv $out/lib/icedtea/man $out/share/man + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove some broken manpages. + rm -rf $out/share/man/ja* + + # Remove crap from the installation. + rm -rf $out/lib/icedtea/demo $out/lib/icedtea/sample + + # Move the JRE to a separate output. + mv $out/lib/icedtea/jre $jre/lib/icedtea/ + mkdir $out/lib/icedtea/jre + lndir $jre/lib/icedtea/jre $out/lib/icedtea/jre + + # The following files cannot be symlinked, as it seems to violate Java security policies + rm $out/lib/icedtea/jre/lib/ext/* + cp $jre/lib/icedtea/jre/lib/ext/* $out/lib/icedtea/jre/lib/ext/ + + rm -rf $out/lib/icedtea/jre/bin + ln -s $out/lib/icedtea/bin $out/lib/icedtea/jre/bin + + # Remove duplicate binaries. + for i in $(cd $out/lib/icedtea/bin && echo *); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/icedtea/bin/$i $jre/lib/icedtea/jre/bin/$i; then + ln -sfn $jre/lib/icedtea/jre/bin/$i $out/lib/icedtea/bin/$i + fi + done + + # Generate certificates. + pushd $jre/lib/icedtea/jre/lib/security + rm cacerts + perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ca-bundle.crt + popd + + ln -s $out/lib/icedtea/bin $out/bin + ln -s $jre/lib/icedtea/jre/bin $jre/bin + ''; + + # FIXME: this is unnecessary once the multiple-outputs branch is merged. + preFixup = '' + prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + patchELF $jre + propagatedNativeBuildInputs+=" $jre" + + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $jre/nix-support + echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/icedtea; fi + EOF + ''; + + meta = { + description = "Free Java development kit based on OpenJDK 7.0 and the IcedTea project"; + longDescription = '' + Free Java environment based on OpenJDK 7.0 and the IcedTea project. + - Full Java runtime environment + - Needed for executing Java Webstart programs and the free Java web browser plugin. + ''; + homepage = http://icedtea.classpath.org; + maintainers = with stdenv.lib.maintainers; [ wizeman ]; + platforms = stdenv.lib.platforms.linux; + }; + + passthru = { inherit architecture; }; +} diff --git a/pkgs/development/compilers/icedtea/fix-java-home.patch b/pkgs/development/compilers/icedtea/fix-java-home.patch new file mode 100644 index 000000000000..5def344f1717 --- /dev/null +++ b/pkgs/development/compilers/icedtea/fix-java-home.patch @@ -0,0 +1,17 @@ +diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 20:22:03.000000000 +0200 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-24 22:44:08.223857012 +0100 +@@ -2358,12 +2358,10 @@ + CAST_FROM_FN_PTR(address, os::jvm_path), + dli_fname, sizeof(dli_fname), NULL); + assert(ret, "cannot locate libjvm"); + char *rp = NULL; + if (ret && dli_fname[0] != '\0') { +- rp = realpath(dli_fname, buf); ++ snprintf(buf, buflen, "%s", dli_fname); + } +- if (rp == NULL) +- return; + + if (Arguments::created_by_gamma_launcher()) { + // Support for the gamma launcher. Typical value for buf is diff --git a/pkgs/development/compilers/icedtea/generate-cacerts.pl b/pkgs/development/compilers/icedtea/generate-cacerts.pl new file mode 100644 index 000000000000..3bdd42f7274f --- /dev/null +++ b/pkgs/development/compilers/icedtea/generate-cacerts.pl @@ -0,0 +1,366 @@ +#!/usr/bin/perl + +# Copyright (C) 2007, 2008 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# generate-cacerts.pl generates a JKS keystore named 'cacerts' from +# OpenSSL's certificate bundle using OpenJDK's keytool. + +# First extract each of OpenSSL's bundled certificates into its own +# aliased filename. + +# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2 +# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org> + +$file = $ARGV[1]; +open(CERTS, $file); +@certs = <CERTS>; +close(CERTS); + +$pem_file_count = 0; +$in_cert_block = 0; +$write_current_cert = 1; +foreach $cert (@certs) +{ + if ($cert =~ /Issuer: /) + { + $_ = $cert; + if ($cert =~ /personal-freemail/) + { + $cert_alias = "thawtepersonalfreemailca"; + } + elsif ($cert =~ /personal-basic/) + { + $cert_alias = "thawtepersonalbasicca"; + } + elsif ($cert =~ /personal-premium/) + { + $cert_alias = "thawtepersonalpremiumca"; + } + elsif ($cert =~ /server-certs/) + { + $cert_alias = "thawteserverca"; + } + elsif ($cert =~ /premium-server/) + { + $cert_alias = "thawtepremiumserverca"; + } + elsif ($cert =~ /Class 1 Public Primary Certification Authority$/) + { + $cert_alias = "verisignclass1ca"; + } + elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/) + { + $cert_alias = "verisignclass1g2ca"; + } + elsif ($cert =~ + /VeriSign Class 1 Public Primary Certification Authority - G3/) + { + $cert_alias = "verisignclass1g3ca"; + } + elsif ($cert =~ /Class 2 Public Primary Certification Authority$/) + { + $cert_alias = "verisignclass2ca"; + } + elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/) + { + $cert_alias = "verisignclass2g2ca"; + } + elsif ($cert =~ + /VeriSign Class 2 Public Primary Certification Authority - G3/) + { + $cert_alias = "verisignclass2g3ca"; + } + elsif ($cert =~ /Class 3 Public Primary Certification Authority$/) + { + $cert_alias = "verisignclass3ca"; + } + # Version 1 of Class 3 Public Primary Certification Authority + # - G2 is added. Version 3 is excluded. See below. + elsif ($cert =~ + /VeriSign Class 3 Public Primary Certification Authority - G3/) + { + $cert_alias = "verisignclass3g3ca"; + } + elsif ($cert =~ + /RSA Data Security.*Secure Server Certification Authority/) + { + $cert_alias = "verisignserverca"; + } + elsif ($cert =~ /GTE CyberTrust Global Root/) + { + $cert_alias = "gtecybertrustglobalca"; + } + elsif ($cert =~ /Baltimore CyberTrust Root/) + { + $cert_alias = "baltimorecybertrustca"; + } + elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/) + { + $cert_alias = "entrustclientca"; + } + elsif ($cert =~ /www.entrust.net\/GCCA_CPS/) + { + $cert_alias = "entrustglobalclientca"; + } + elsif ($cert =~ /www.entrust.net\/CPS_2048/) + { + $cert_alias = "entrust2048ca"; + } + elsif ($cert =~ /www.entrust.net\/CPS /) + { + $cert_alias = "entrustsslca"; + } + elsif ($cert =~ /www.entrust.net\/SSL_CPS/) + { + $cert_alias = "entrustgsslca"; + } + elsif ($cert =~ /The Go Daddy Group/) + { + $cert_alias = "godaddyclass2ca"; + } + elsif ($cert =~ /Starfield Class 2 Certification Authority/) + { + $cert_alias = "starfieldclass2ca"; + } + elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/) + { + $cert_alias = "valicertclass2ca"; + } + elsif ($cert =~ /GeoTrust Global CA$/) + { + $cert_alias = "geotrustglobalca"; + } + elsif ($cert =~ /Equifax Secure Certificate Authority/) + { + $cert_alias = "equifaxsecureca"; + } + elsif ($cert =~ /Equifax Secure eBusiness CA-1/) + { + $cert_alias = "equifaxsecureebusinessca1"; + } + elsif ($cert =~ /Equifax Secure eBusiness CA-2/) + { + $cert_alias = "equifaxsecureebusinessca2"; + } + elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/) + { + $cert_alias = "equifaxsecureglobalebusinessca1"; + } + elsif ($cert =~ /Sonera Class1 CA/) + { + $cert_alias = "soneraclass1ca"; + } + elsif ($cert =~ /Sonera Class2 CA/) + { + $cert_alias = "soneraclass2ca"; + } + elsif ($cert =~ /AAA Certificate Services/) + { + $cert_alias = "comodoaaaca"; + } + elsif ($cert =~ /AddTrust Class 1 CA Root/) + { + $cert_alias = "addtrustclass1ca"; + } + elsif ($cert =~ /AddTrust External CA Root/) + { + $cert_alias = "addtrustexternalca"; + } + elsif ($cert =~ /AddTrust Qualified CA Root/) + { + $cert_alias = "addtrustqualifiedca"; + } + elsif ($cert =~ /UTN-USERFirst-Hardware/) + { + $cert_alias = "utnuserfirsthardwareca"; + } + elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/) + { + $cert_alias = "utnuserfirstclientauthemailca"; + } + elsif ($cert =~ /UTN - DATACorp SGC/) + { + $cert_alias = "utndatacorpsgcca"; + } + elsif ($cert =~ /UTN-USERFirst-Object/) + { + $cert_alias = "utnuserfirstobjectca"; + } + elsif ($cert =~ /America Online Root Certification Authority 1/) + { + $cert_alias = "aolrootca1"; + } + elsif ($cert =~ /DigiCert Assured ID Root CA/) + { + $cert_alias = "digicertassuredidrootca"; + } + elsif ($cert =~ /DigiCert Global Root CA/) + { + $cert_alias = "digicertglobalrootca"; + } + elsif ($cert =~ /DigiCert High Assurance EV Root CA/) + { + $cert_alias = "digicerthighassuranceevrootca"; + } + elsif ($cert =~ /GlobalSign Root CA$/) + { + $cert_alias = "globalsignca"; + } + elsif ($cert =~ /GlobalSign Root CA - R2/) + { + $cert_alias = "globalsignr2ca"; + } + elsif ($cert =~ /Elektronik.*Kas.*2005/) + { + $cert_alias = "extra-elektronikkas2005"; + } + elsif ($cert =~ /Elektronik/) + { + $cert_alias = "extra-elektronik2005"; + } + # Mozilla does not provide these certificates: + # baltimorecodesigningca + # gtecybertrust5ca + # trustcenterclass2caii + # trustcenterclass4caii + # trustcenteruniversalcai + else + { + # Generate an alias using the OU and CN attributes of the + # Issuer field if both are present, otherwise use only the + # CN attribute. The Issuer field must have either the OU + # or the CN attribute. + $_ = $cert; + if ($cert =~ /OU=/) + { + s/Issuer:.*?OU=//; + # Remove other occurrences of OU=. + s/OU=.*CN=//; + # Remove CN= if there were not other occurrences of OU=. + s/CN=//; + s/\/emailAddress.*//; + s/Certificate Authority/ca/g; + s/Certification Authority/ca/g; + } + elsif ($cert =~ /CN=/) + { + s/Issuer:.*CN=//; + s/\/emailAddress.*//; + s/Certificate Authority/ca/g; + s/Certification Authority/ca/g; + } + s/\W//g; + tr/A-Z/a-z/; + $cert_alias = "extra-$_"; + + } + while (-e "$cert_alias.pem") + { + $cert_alias = "$cert_alias" . "_"; + } + } + # When it attempts to parse: + # + # Class 3 Public Primary Certification Authority - G2, Version 3 + # + # keytool says: + # + # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false + # Unparseable AuthorityInfoAccess extension due to + # java.io.IOException: Invalid encoding of URI + # + # If we do not exclude this file + # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails + # on this cert, printing: + # + # Couldn't verify: java.security.SignatureException: Signature + # does not match. + # + elsif ($cert =~ + /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/) + { + $write_current_cert = 0; + $pem_file_count--; + } + elsif ($cert eq "-----BEGIN CERTIFICATE-----\n") + { + $_ = $cert; + s/\W//g; + tr/A-Z/a-z/; + $cert_alias = "extra-$_"; + while (-e "$cert_alias.pem") + { + $cert_alias = "$cert_alias" . "_"; + } + if ($in_cert_block != 0) + { + die "$file is malformed."; + } + $in_cert_block = 1; + if ($write_current_cert == 1) + { + $pem_file_count++; + if (-e "$cert_alias.pem") + { + print "$cert_alias"; + die "already exists" + } + open(PEM, ">$cert_alias.pem"); + print PEM $cert; + } + } + elsif ($cert eq "-----END CERTIFICATE-----\n") + { + $in_cert_block = 0; + if ($write_current_cert == 1) + { + print PEM $cert; + close(PEM); + } + $write_current_cert = 1 + } + else + { + if ($in_cert_block == 1 && $write_current_cert == 1) + { + print PEM $cert; + } + } +} + +# Check that the correct number of .pem files were produced. +@pem_files = <*.pem>; +if (@pem_files != $pem_file_count) +{ + print "$pem_file_count"; + die "Number of .pem files produced does not match". + " number of certs read from $file."; +} + +# Now store each cert in the 'cacerts' file using keytool. +$certs_written_count = 0; +foreach $pem_file (@pem_files) +{ + system "$ARGV[0] -noprompt -import". + " -alias `basename $pem_file .pem`". + " -keystore cacerts -storepass 'changeit' -file $pem_file"; + unlink($pem_file); + $certs_written_count++; +} + +# Check that the correct number of certs were added to the keystore. +if ($certs_written_count != $pem_file_count) +{ + die "Number of certs added to keystore does not match". + " number of certs read from $file."; +} diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix new file mode 100644 index 000000000000..95d6928b3ab4 --- /dev/null +++ b/pkgs/development/compilers/icedtea/sources.nix @@ -0,0 +1,56 @@ +# This file is autogenerated from update.py in the same directory. +{ + icedtea7 = rec { + branch = "2.4"; + version = "${branch}.5"; + + url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz"; + sha256 = "0nrhbn2q7cm21hpq1f5ds0v0rnsznmdyiifi8w4l1ykyqw9n9yfk"; + + hg_url = "http://icedtea.classpath.org/hg/release/icedtea7-forest-${branch}"; + + bundles = { + openjdk = rec { + changeset = "410eb7fef869"; + url = "${hg_url}/archive/${changeset}.tar.gz"; + sha256 = "2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707"; + }; + + corba = rec { + changeset = "3594dbde270d"; + url = "${hg_url}/corba/archive/${changeset}.tar.gz"; + sha256 = "d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d"; + }; + + jaxp = rec { + changeset = "8fe156ad49e2"; + url = "${hg_url}/jaxp/archive/${changeset}.tar.gz"; + sha256 = "0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3"; + }; + + jaxws = rec { + changeset = "32ea8b1ed91a"; + url = "${hg_url}/jaxws/archive/${changeset}.tar.gz"; + sha256 = "08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0"; + }; + + jdk = rec { + changeset = "9db88c18e114"; + url = "${hg_url}/jdk/archive/${changeset}.tar.gz"; + sha256 = "285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e"; + }; + + langtools = rec { + changeset = "dabd37b7e295"; + url = "${hg_url}/langtools/archive/${changeset}.tar.gz"; + sha256 = "86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f"; + }; + + hotspot = rec { + changeset = "2cb58882dac3"; + url = "${hg_url}/hotspot/archive/${changeset}.tar.gz"; + sha256 = "d8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9"; + }; + }; + }; +} diff --git a/pkgs/development/compilers/icedtea/update.py b/pkgs/development/compilers/icedtea/update.py new file mode 100755 index 000000000000..ba3c5fc51ad1 --- /dev/null +++ b/pkgs/development/compilers/icedtea/update.py @@ -0,0 +1,275 @@ +#!/usr/bin/env python3 + +import subprocess, urllib.request, re, os, tarfile +from html.parser import HTMLParser + +HG_URL = 'http://icedtea.classpath.org/hg/release/icedtea{}-forest-{}' +DOWNLOAD_URL = 'http://icedtea.wildebeest.org/download/source/' +DOWNLOAD_HTML = DOWNLOAD_URL + '?C=M;O=D' + +ICEDTEA_JDKS = [7] + +BUNDLES = ['openjdk', 'corba', 'jaxp', 'jaxws', 'jdk', 'langtools', 'hotspot'] + +SRC_PATH = './sources.nix' + +def get_output(cmd, env = None): + try: + proc = subprocess.Popen(cmd, env = env, stdout = subprocess.PIPE) + out = proc.communicate()[0] + except subprocess.CalledProcessError as e: + return None + + return out.decode('utf-8').strip() + +def nix_prefetch_url(url): + env = os.environ.copy() + env['PRINT_PATH'] = '1' + out = get_output(['nix-prefetch-url', url], env = env) + + return out.split('\n') + +def get_nix_attr(path, attr): + out = get_output(['nix-instantiate', '--eval-only', '-A', attr, path]) + + if len(out) < 2 or out[0] != '"' or out[-1] != '"': + raise Exception('Cannot find Nix attribute "{}" (parsing failure?)'.format(attr)) + + # Strip quotes + return out[1:-1] + +def get_jdk_attr(jdk, attr): + return get_nix_attr(SRC_PATH, 'icedtea{}.{}'.format(jdk, attr)) + +class Parser(HTMLParser): + def __init__(self, link_regex): + HTMLParser.__init__(self) + + self.regex = link_regex + self.href = None + self.version = None + + def handle_starttag(self, tag, attrs): + if self.href != None or tag != 'a': + return + + href = None + for attr in attrs: + if attr[0] == 'href': + href = attr[1] + if href == None: + return + + m = re.match(self.regex, href) + if m != None: + self.href = href + self.version = m.group(1) + +def get_latest_version_url(major): + f = urllib.request.urlopen(DOWNLOAD_HTML) + html = f.read().decode('utf-8') + f.close() + + parser = Parser(r'^icedtea\d?-({}\.\d[\d.]*)\.tar\.xz$'.format(major)) + parser.feed(html) + parser.close() + + if parser.href == None: + raise Exception('Error: could not find download url for major version "{}"'.format(major)) + + return parser.version, DOWNLOAD_URL + parser.href + +def get_old_bundle_attrs(jdk, bundle): + attrs = {} + for attr in ('changeset', 'url', 'sha256'): + attrs[attr] = get_jdk_attr(jdk, 'bundles.{}.{}'.format(bundle, attr)) + + return attrs + +def get_old_attrs(jdk): + attrs = {} + + for attr in ('branch', 'version', 'url', 'sha256'): + attrs[attr] = get_jdk_attr(jdk, attr) + + attrs['bundles'] = {} + + for bundle in BUNDLES: + attrs['bundles'][bundle] = get_old_bundle_attrs(jdk, bundle) + + return attrs + +def get_member_filename(tarball, name): + for fname in tarball.getnames(): + m = re.match(r'^icedtea\d?-\d[\d.]*/{}$'.format(name), fname) + if m != None: + return m.group(0) + + return None + +def get_member_file(tarball, name): + path = get_member_filename(tarball, name) + if path == None: + raise Exception('Could not find "{}" inside tarball'.format(name)) + + f = tarball.extractfile(path) + data = f.read().decode('utf-8') + f.close() + + return data + +def get_new_bundle_attr(makefile, bundle, attr): + var = '{}_{}'.format(bundle.upper(), attr.upper()) + regex = r'^{} = (.*?)$'.format(var) + + m = re.search(regex, makefile, re.MULTILINE) + if m == None: + raise Exception('Could not find variable "{}" in Makefile.am'.format(var)) + + return m.group(1) + +def get_new_bundle_attrs(jdk, branch, path): + hg_url = HG_URL.format(jdk, branch) + + attrs = {} + + print('Opening file: "{}"'.format(path)) + tar = tarfile.open(name = path, mode = 'r:xz') + + makefile = get_member_file(tar, 'Makefile.am') + hotspot_map = get_member_file(tar, 'hotspot.map') + + for bundle in BUNDLES: + battrs = {} + + if bundle == 'hotspot': + m = re.search(r'^default (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE) + if m == None: + raise Exception('Could not find info for hotspot bundle in hotspot.map') + + battrs['url'] = '{}/archive/{}.tar.gz'.format(m.group(1), m.group(2)) + battrs['changeset'] = m.group(2) + battrs['sha256'] = m.group(3) + + attrs[bundle] = battrs + continue + + changeset = get_new_bundle_attr(makefile, bundle, 'changeset') + battrs['changeset'] = changeset + battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum') + + if bundle == 'openjdk': + battrs['url'] = '{}/archive/{}.tar.gz'.format(hg_url, changeset) + else: + battrs['url'] = '{}/{}/archive/{}.tar.gz'.format(hg_url, bundle, changeset) + + attrs[bundle] = battrs + + tar.close() + + return attrs + +def get_new_attrs(jdk): + print('Getting old attributes for JDK {}...'.format(jdk)) + old_attrs = get_old_attrs(jdk) + attrs = {} + + # The major version corresponds to a specific JDK (1 = OpenJDK6, 2 = OpenJDK7, 3 = OpenJDK8) + major = jdk - 5 + + print('Getting latest version for JDK {}...'.format(jdk)) + version, url = get_latest_version_url(major) + + print() + print('Old version: {}'.format(old_attrs['version'])) + print('New version: {}'.format(version)) + print() + + if version == old_attrs['version']: + print('No update available, skipping...') + print() + return old_attrs + + print('Update available, generating new attributes for JDK {}...'.format(jdk)) + + attrs['version'] = version + attrs['branch'] = '.'.join(version.split('.')[:2]) + attrs['url'] = url + + print('Downloading tarball from url "{}"...'.format(url)) + print() + attrs['sha256'], path = nix_prefetch_url(url) + print() + + print('Inspecting tarball for bundle information...') + + attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['branch'], path) + + print('Done!') + + return attrs + +def generate_jdk(jdk): + attrs = get_new_attrs(jdk) + + branch = attrs['branch'] + src_version = attrs['version'].replace(branch, '${branch}') + src_url = attrs['url'].replace(attrs['version'], '${version}') + + hg_url = HG_URL.format(jdk, branch) + src_hg_url = HG_URL.format(jdk, '${branch}') + + src = ' icedtea{} = rec {{\n'.format(jdk) + src += ' branch = "{}";\n'.format(branch) + src += ' version = "{}";\n'.format(src_version) + src += '\n' + src += ' url = "{}";\n'.format(src_url) + src += ' sha256 = "{}";\n'.format(attrs['sha256']) + src += '\n' + src += ' hg_url = "{}";\n'.format(src_hg_url) + src += '\n' + src += ' bundles = {\n' + + for bundle in BUNDLES: + battrs = attrs['bundles'][bundle] + + b_url = battrs['url'] + b_url = b_url.replace(hg_url, '${hg_url}') + b_url = b_url.replace(battrs['changeset'], '${changeset}') + + src += ' {} = rec {{\n'.format(bundle) + src += ' changeset = "{}";\n'.format(battrs['changeset']) + src += ' url = "{}";\n'.format(b_url) + src += ' sha256 = "{}";\n'.format(battrs['sha256']) + src += ' };\n' + + if bundle != BUNDLES[-1]: + src += '\n' + + src += ' };\n' + src += ' };\n' + + return src + +def generate_sources(jdks): + src = '# This file is autogenerated from update.py in the same directory.\n' + src += '{\n' + + for jdk in jdks: + print() + print('Generating sources for JDK {}...'.format(jdk)) + src += generate_jdk(jdk) + + src += '}\n' + return src + +if __name__ == '__main__': + print('Generating {}...'.format(SRC_PATH)) + src = generate_sources(ICEDTEA_JDKS) + + f = open(SRC_PATH, 'w', encoding = 'utf-8') + f.write(src) + f.close() + + print() + print('Update complete!') diff --git a/pkgs/development/compilers/julia/0.2.1.nix b/pkgs/development/compilers/julia/0.2.1.nix new file mode 100644 index 000000000000..f7d20a1e01f0 --- /dev/null +++ b/pkgs/development/compilers/julia/0.2.1.nix @@ -0,0 +1,140 @@ +{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib + , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl + , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack + , tcl, tk, xproto, libX11, git, mpfr + } : +let + realGcc = stdenv.gcc.gcc; +in +stdenv.mkDerivation rec { + pname = "julia"; + version = "0.2.1"; + name = "${pname}-${version}"; + + grisu_ver = "1.1.1"; + dsfmt_ver = "2.2"; + openblas_ver = "v0.2.2"; + lapack_ver = "3.4.1"; + arpack_ver = "3.1.3"; + clp_ver = "1.14.5"; + lighttpd_ver = "1.4.29"; + patchelf_ver = "0.6"; + pcre_ver = "8.31"; + + grisu_src = fetchurl { + url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; + sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d"; + }; + dsfmt_src = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; + name = "dsfmt-${dsfmt_ver}.tar.gz"; + sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899"; + }; + openblas_src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; + name = "openblas-${openblas_ver}.tar.gz"; + sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e"; + }; + arpack_src = fetchurl { + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/607/get/"; + name = "arpack-ng-${arpack_ver}.tar.gz"; + sha256 = "039w7j3dr1xy35a3hp92zg2g92gmjq6xsv0g4awlb4cffy09nr2d"; + }; + lapack_src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; + name = "lapack-${lapack_ver}.tgz"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + }; + clp_src = fetchurl { + url = "http://www.coin-or.org/download/source/Clp/Clp-${clp_ver}.tgz"; + name = "clp-${clp_ver}.tar.gz"; + sha256 = "e6cabe8b4319c17a9bbe6fe172194ab6cd1fe6e376f5e9969d3040636ea3a817"; + }; + lighttpd_src = fetchurl { + url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz"; + sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85"; + }; + patchelf_src = fetchurl { + url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; + sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw"; + }; + pcre_src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2"; + sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p"; + }; + + src = fetchgit { + url = "git://github.com/JuliaLang/julia.git"; + rev = "e44b5939057d87c1e854077108a1a6d66203f4fa"; + sha256 = "7ee0f267bc1ae286764ced3c0c695c335a6f8d67bd7b3ca7e4de259333c9426a"; + }; + + buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib + fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf + openblas liblapack tcl tk xproto libX11 git mpfr + ]; + + configurePhase = '' + for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; + do + makeFlags="$makeFlags USE_SYSTEM_$i=1 " + done + + copy_kill_hash(){ + cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" + } + + for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" "${pcre_src}" ; do + copy_kill_hash "$i" deps + done + copy_kill_hash "${dsfmt_src}" deps/random + + ${if realGcc ==null then "" else + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " + + export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" + + export GLPK_PREFIX="${glpk}/include" + + mkdir -p "$out/lib" + sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile + sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile + + export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell}" + + export dontPatchELF=1 + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" + ''; + + preBuild = '' + mkdir -p usr/lib + + echo "$out" + mkdir -p "$out/lib" + ( + cd "$(mktemp -d)" + for i in "${suitesparse}"/lib/lib*.a; do + ar -x $i + done + gcc *.o --shared -o "$out/lib/libsuitesparse.so" + ) + cp "$out/lib/libsuitesparse.so" usr/lib + for i in umfpack cholmod amd camd colamd spqr; do + ln -s libsuitesparse.so "$out"/lib/lib$i.so; + ln -s libsuitesparse.so "usr"/lib/lib$i.so; + done + ''; + + preInstall = '' + ''; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "http://julialang.org/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/git-20131013.nix index ae550f5692d8..ae550f5692d8 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/git-20131013.nix diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 6bb5622d0cf5..7032056f7e47 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -28,7 +28,11 @@ stdenv.mkDerivation { (stdenv.lib.optional (stdenv.gcc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}"); # Clang expects to find LLVMgold in its own prefix - postInstall = "ln -sv ${llvm}/lib/LLVMgold.so $out/lib"; + # Clang expects to find sanitizer libraries in its own prefix + postInstall = '' + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + ln -sv ${llvm}/lib/clang/3.4/lib $out/lib/clang/3.4/ + ''; passthru.gcc = stdenv.gcc.gcc; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index a3b80c02545b..37acb4f6d1f2 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -6,7 +6,7 @@ let fsrc = fetchurl { url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; - sha256 = "006bq6cmycq2f4xb3zmnmxyngj64hppk3a083hy0qzj7gl77zvfw"; + sha256 = "165f29zgb7ldl51zfwgc31fk6a67w0gznp5lhvb6i5m013g2ddi8"; }; in diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 6964d8ac8040..b122248bb231 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -22,11 +22,11 @@ let ''; in stdenv.mkDerivation rec { - name = "SDL2-2.0.2"; + name = "SDL2-2.0.3"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0l78h3wlirnxxrdw3kkm9amhgjn6xrs9l5j871r552wabbw5f0ar"; + sha256 = "0369ngvb46x6c26h8zva4x22ywgy6mvn0wx87xqwxg40pxm9m9m5"; }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 040123d42766..3614d149489d 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3 }: +{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: stdenv.mkDerivation rec { name = "clutter-gtk-1.4.4"; @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix new file mode 100644 index 000000000000..59de923ad43d --- /dev/null +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "concurrencykit-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; + sha256 = "1gi5gpkxvbb6vkhjm9kab7dz1av2i11f1pggxp001rqq2mi3i6aq"; + }; + + meta = { + description = "A library of safe, high-performance concurrent data structures"; + homepage = "http://concurrencykit.org"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index de9fb27b4ec2..6217bc461249 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -5,7 +5,7 @@ # Options from inherited versions , version, sha256 , extraPatches ? [ ] -, license ? "Berkeley Database License" +, license ? stdenv.lib.licenses.sleepycat }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; sha256 = sha256; }; - + patches = extraPatches; configureFlags = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 94d3688eb1ce..90233abe31c1 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python +{ stdenv, fetchurl, pkgconfig, python, gobjectIntrospection , gnonlin, libxml2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1n7nw8rqvwna9af55lggah44gdvfgld1igvgaya8glc37wpq89b0"; }; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkgconfig python gobjectIntrospection ]; propagatedBuildInputs = [ gnonlin libxml2 ]; } diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 843822b0748d..9a526de05b1c 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "09c6yls8ipbmwimdjr7xi3hvf2xa1xn1pv07855r7wfyzas1xbl1"; }; + patches = [ ./different-path-with-pygobject.patch ]; + buildInputs = [ pkgconfig gst-plugins-base pygtk pygobject3 ] ; diff --git a/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch b/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch new file mode 100644 index 000000000000..7326b3630f70 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch @@ -0,0 +1,20 @@ +diff -Nru gst-python-1.2.0-orig/gi/overrides/Makefile.in gst-python-1.2.0/gi/overrides/Makefile.in +--- gst-python-1.2.0-orig/gi/overrides/Makefile.in 2014-03-22 21:47:56.235364405 +0800 ++++ gst-python-1.2.0/gi/overrides/Makefile.in 2014-03-22 21:48:28.737958066 +0800 +@@ -356,7 +356,7 @@ + + # We install everything in the gi/overrides folder + pygioverridesdir = $(PYGI_OVERRIDES_DIR) +-pygioverrides_PYTHON = Gst.py GstPbutils.py ++pygioverrides_PYTHON = Gst.py GstPbutils.py __init__.py + pygioverridesexecdir = $(PYGI_OVERRIDES_DIR) + EXTRA_DIST = Gst.py + INCLUDES = $(PYTHON_INCLUDES) +diff -Nru gst-python-1.2.0-orig/gi/overrides/__init__.py gst-python-1.2.0/gi/overrides/__init__.py +--- gst-python-1.2.0-orig/gi/overrides/__init__.py 1970-01-01 08:00:00.000000000 +0800 ++++ gst-python-1.2.0/gi/overrides/__init__.py 2014-03-22 21:48:15.442124287 +0800 +@@ -0,0 +1,4 @@ ++from pkgutil import extend_path ++ ++__path__ = extend_path(__path__, __name__) ++print(__path__, __name__) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 083d0a10cdf8..73b74a12c66b 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , glib, dbus, udev, udisks2, libgcrypt , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl -, lightWeight ? true, gnome, samba, makeWrapper }: +, lightWeight ? true, gnome, samba, libgnome_keyring, gconf, makeWrapper }: let ver_maj = "1.18"; diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index 84ef157613e9..1fc28b4e50b0 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { lens liftedBase monadControl mtl network optparseApplicative transformers transformersBase xmlConduit xmlHamlet ]; + jailbreak = true; meta = { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index fda43c09baf1..15a7741d3351 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HList"; - version = "0.3.4.0"; - sha256 = "0jx0bfsc17c6bx621n7k0wfa5s59kcpi45p6wr8g4gyw846hjw9q"; + version = "0.3.4.1"; + sha256 = "02hw496qv2p0nnbz7lq7jfqnis19qqjsylyvdksqbwmjprk32rh2"; buildDepends = [ mtl tagged ]; testDepends = [ cmdargs doctest filepath hspec lens mtl syb ]; buildTools = [ diffutils ]; diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix index c000002d4998..2546748ee1ed 100644 --- a/pkgs/development/libraries/haskell/attempt/default.nix +++ b/pkgs/development/libraries/haskell/attempt/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "attempt"; - version = "0.4.0"; - sha256 = "0n7srd1gy1fa0q1qzizvdgmrc078jyx47115aw85vvl74vh9qyjy"; + version = "0.4.0.1"; + sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh"; buildDepends = [ failure ]; meta = { homepage = "http://github.com/snoyberg/attempt/tree/master"; - description = "Concrete data type for handling extensible exceptions as failures"; + description = "Concrete data type for handling extensible exceptions as failures. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index f0a1969ffbab..884f4175ba5b 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,16 +1,17 @@ { cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit -, httpConduit, httpTypes, network, tagsoup, text, transformers -, unorderedContainers, xmlConduit +, httpConduit, httpTypes, monadControl, network, resourcet +, tagstreamConduit, text, transformers, unorderedContainers +, xmlConduit }: cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2.6"; - sha256 = "12sgi6q6kajjhh8mns9nklxj0kwn32xs5kzi7wmw50shx0smnjrz"; + version = "1.3.2.8"; + sha256 = "1ylijkj32li9nm4x16d66h6a74q07m4v3n2dqm67by548wfyh1j9"; buildDepends = [ aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit - httpTypes network tagsoup text transformers unorderedContainers - xmlConduit + httpTypes monadControl network resourcet tagstreamConduit text + transformers unorderedContainers xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index 8d31acb399f8..807b80b81228 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "basic-prelude"; - version = "0.3.6.0"; - sha256 = "1sm89mva8vkhqp230g965b0k4n3g0c8w4sfsad8m1wh434g3k732"; + version = "0.3.7"; + sha256 = "1lk4f41f226v7na1cw0c8y62lm3pgwmn4560g1wmhvyxcj7185q5"; buildDepends = [ hashable liftedBase ReadArgs safe systemFilepath text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index 8c4f2af654e1..9a013c9f2453 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bytestring-lexing"; - version = "0.4.3.1"; - sha256 = "1n0sk1xqwkj4whp0gav7hwr33xqmwl3ylqfnqix8wbwz6xpg9ygn"; + version = "0.4.3.2"; + sha256 = "09ymg1n21668wn4harxg0cqlz98fz990bangpy99w2z7d6cwbc05"; buildTools = [ alex ]; meta = { homepage = "http://code.haskell.org/~wren/"; diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix new file mode 100644 index 000000000000..aa8996b0fc3f --- /dev/null +++ b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq, hashable, HUnit, testFramework +, testFrameworkHunit, text +}: + +cabal.mkDerivation (self: { + pname = "case-insensitive"; + version = "1.2.0.0"; + sha256 = "0ybdmqaqh9hdl3dl5kx8qhs4b67g78fhnkqnd3y2lpgqjvhnbzp4"; + buildDepends = [ deepseq hashable text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; + meta = { + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 99fa5a138b8a..6768e6cfda33 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.8.1.1"; - sha256 = "14iq0zdmw4f2i3c282hs89c4a763wcm7vn5n0f6kcvcpjgjyahgi"; + version = "0.8.2"; + sha256 = "1kvab1vns1mp0i0nyn0flg2m6f2sl8w1yr2c0x54172f20rdm5lv"; buildDepends = [ basicPrelude chunkedData enclosedExceptions hashable liftedBase monoTraversable semigroups systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 4799a0f63f5c..5431f3dbe3a1 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,21 +1,21 @@ -{ cabal, base16Bytestring, base64Bytestring, basicPrelude -, chunkedData, conduit, hspec, monoTraversable, mwcRandom -, primitive, silently, systemFileio, systemFilepath, text -, transformers, transformersBase, unixCompat, vector, void +{ cabal, base16Bytestring, base64Bytestring, chunkedData, conduit +, hspec, monoTraversable, mwcRandom, primitive, silently +, systemFileio, systemFilepath, text, transformers +, transformersBase, unixCompat, vector, void }: cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.3"; - sha256 = "05sb1v6rciaj7cj6lxv6pf9ai0k3q6cvvflcb4a7q6ql9xr3j7pr"; + version = "0.2.3.1"; + sha256 = "078i0727nhy75y6bxav6sxr1gz9cq04nvskdnzwabljppd34dqg4"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit monoTraversable mwcRandom primitive systemFileio systemFilepath text transformers transformersBase unixCompat vector void ]; testDepends = [ - base16Bytestring base64Bytestring basicPrelude chunkedData hspec - monoTraversable mwcRandom silently text transformers vector + base16Bytestring base64Bytestring chunkedData hspec monoTraversable + mwcRandom silently systemFilepath text transformers vector ]; meta = { homepage = "https://github.com/fpco/conduit-combinators"; diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix new file mode 100644 index 000000000000..82ab990947d9 --- /dev/null +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "conduit-extra"; + version = "1.0.0"; + sha256 = "120c3zay8svdw3b9nqgxlrj45a1d4xf0sijkg367m7hp22szvz8a"; + noHaddock = true; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Temporary placeholder package"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix index 501edf03ae09..78c0c1016592 100644 --- a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix @@ -1,10 +1,13 @@ -{ cabal, conduit, cryptohash, transformers }: +{ cabal, conduit, conduitExtra, cryptohash, resourcet, transformers +}: cabal.mkDerivation (self: { pname = "cryptohash-conduit"; - version = "0.1.0"; - sha256 = "08x45dy5crxc63gd4psryrzprz7lc5hbzjl23q56c3iqbvrx2r7w"; - buildDepends = [ conduit cryptohash transformers ]; + version = "0.1.1"; + sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga"; + buildDepends = [ + conduit conduitExtra cryptohash resourcet transformers + ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptohash-conduit"; description = "cryptohash conduit"; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index b888ce6153ab..cefa8fbbdf8e 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.11.2"; - sha256 = "0az2p7lql1lchl85ca26b5sbvhqsv47daavyfqy84qmr3w3wyr28"; + version = "0.11.4"; + sha256 = "1laakkc1xzp2bmai0sfi86784wharqbyanlp1d1f1q6nj318by3y"; buildDepends = [ byteable ]; testDepends = [ byteable HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 4abea9429a5b..d0bd50e584b8 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.7.0.0"; - sha256 = "1zn8vn6xcmp4w39b0k33bp7zsxvnn8g8p26mch4r8ng9ldcb2y8h"; + version = "0.7.1.0"; + sha256 = "0ry0ircxs6ml4wdz6hrn3jnyhniwdnn1dn21imq3kv68jlhfn3by"; buildDepends = [ mtl text time ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix index bc2821e3e8c5..9c0edece3029 100644 --- a/pkgs/development/libraries/haskell/failure/default.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "failure"; - version = "0.2.0.1"; - sha256 = "05k62sb2xj4ddjwsbfldxkap7v5kmv04qzic4sszx5i3ykbf20fd"; + version = "0.2.0.2"; + sha256 = "0hvcsn7qx00613f23vvb3vjpjlcy0nfavsai9f6s3yvmyssk5kfv"; buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Failure"; - description = "A simple type class for success/failure computations"; + description = "A simple type class for success/failure computations. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/git-date/default.nix b/pkgs/development/libraries/haskell/git-date/default.nix new file mode 100644 index 000000000000..9124da6c7a6f --- /dev/null +++ b/pkgs/development/libraries/haskell/git-date/default.nix @@ -0,0 +1,19 @@ +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2, time +, utf8String +}: + +cabal.mkDerivation (self: { + pname = "git-date"; + version = "0.2.1"; + sha256 = "17xiim439igg1gfcfwpzxjkgpmfqqh9v79jm4bg0f9h5dijij79l"; + buildDepends = [ time utf8String ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 time utf8String + ]; + meta = { + homepage = "https://github.com/singpolyma/git-date-haskell"; + description = "Bindings to the date parsing from Git"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index e027111c6b6b..cd051bd938c9 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.3.2"; - sha256 = "1n597q4pbdka7g06524j0zvjcjpv7fgf6mga1a0kfr012sf9cqz9"; + version = "4.5.0.0"; + sha256 = "19rmib508zcaada7xj0p84dbkjwzfiaxaszpmc763wlpx15azw8z"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26,12 +26,6 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 text time ]; doCheck = false; - patchPhase = '' - sed -i -e 's|blaze-markup.*,|blaze-markup,|' \ - -e 's|blaze-html.*,|blaze-html,|' \ - -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' \ - -e 's|regex-tdfa.*,|regex-tdfa,|' hakyll.cabal - ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index c864c7e0a5ff..20fc429fc63e 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hastache"; - version = "0.5.1"; - sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3"; + version = "0.6.0"; + sha256 = "1z609mhsc875ba3k6mlmlqpmqlwgxpav2asnf83yzq1q7bfs0cxh"; buildDepends = [ blazeBuilder filepath ieee754 mtl syb text transformers utf8String ]; diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index bff7c352175d..244b1c2dcce2 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -1,14 +1,15 @@ -{ cabal, conduit, hspec, HUnit, resourcet, systemFilepath -, tagstreamConduit, text, transformers, xmlConduit, xmlTypes +{ cabal, conduit, conduitExtra, hspec, HUnit, resourcet +, systemFilepath, tagstreamConduit, text, transformers, xmlConduit +, xmlTypes }: cabal.mkDerivation (self: { pname = "html-conduit"; - version = "1.1.0.2"; - sha256 = "12a5hb9sf4sd11sjhwwp84k8whkxs7hqfyni2hi247fii2ldkfax"; + version = "1.1.0.4"; + sha256 = "1bl6h38fvhiidzxly49l7jickcg0s4fy59m4cizfjarxll9cspwb"; buildDepends = [ - conduit resourcet systemFilepath tagstreamConduit text transformers - xmlConduit xmlTypes + conduit conduitExtra resourcet systemFilepath tagstreamConduit text + transformers xmlConduit xmlTypes ]; testDepends = [ hspec HUnit xmlConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 87a48bbdd398..7ebdd3cee6aa 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.2.2.3"; - sha256 = "0li4mfw5lm0y0m3l3r7cbmhbch7ap9n2067jqw1l0qjm8s74nqkh"; + version = "0.2.2.4"; + sha256 = "19dymsi39m2m7i99xsmcl9gigqm6jhynnv0w8w230mq8vraq1mcw"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq failure httpTypes network publicsuffixlist diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 1e1b0117a2f9..957dbe020069 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,17 +1,19 @@ -{ cabal, async, basicPrelude, blazeBuilder, caseInsensitive -, conduit, dataDefaultClass, hspec, httpClient, httpConduit +{ cabal, async, blazeBuilder, caseInsensitive, conduit +, conduitExtra, dataDefaultClass, hspec, httpClient, httpConduit , httpTypes, liftedBase, monadControl, network, networkConduit -, resourcet, text, transformers, wai, waiLogger, warp, word8 +, resourcet, streamingCommons, text, transformers, wai, waiLogger +, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.1.1"; - sha256 = "02aksdkwhdxzc4kk7j3npbiqpm9px3yva0375mk1b1f2g552g5jj"; + version = "0.3.1.4"; + sha256 = "0j7k6njyp3qss08gja5p62zvqxdh7bpqfbzvkm23gdv8v1bgh5h6"; buildDepends = [ - async basicPrelude blazeBuilder caseInsensitive conduit + async blazeBuilder caseInsensitive conduit conduitExtra dataDefaultClass httpClient httpTypes liftedBase monadControl - network networkConduit resourcet text wai waiLogger word8 + network networkConduit resourcet streamingCommons text transformers + wai waiLogger word8 ]; testDepends = [ blazeBuilder conduit hspec httpConduit httpTypes liftedBase network diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index ed24e1ede749..ab523e07cf25 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "02l1lhl2ajbm5f7zq363nlb21dpdg1m0qsy330arccmds7z9g7a2"; buildDepends = [ blazeBuilder caseInsensitive text ]; testDepends = [ blazeBuilder hspec QuickCheck text ]; + jailbreak = true; meta = { homepage = "https://github.com/aristidb/http-types"; description = "Generic HTTP types for Haskell (for both client and server code)"; diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 94eb72633de3..3f4ec1e54d82 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.6"; - sha256 = "15sfasbrr9wzqkwv9xg9nvb3gnn4drkll3b3cappiyzkmawp2hkr"; + version = "0.7.7"; + sha256 = "0rj508hfv9xf30rfjhalz3yfb15vp4r4acdj8aahwfnbls2qb37v"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix index 5b638ea9dab4..c415e3a2b930 100644 --- a/pkgs/development/libraries/haskell/language-c/default.nix +++ b/pkgs/development/libraries/haskell/language-c/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "language-c"; - version = "0.4.2"; - sha256 = "07pf4v4n7kvr5inkhs24b7g55pmkk4k5ihi6s5dbc200l01wz133"; + version = "0.4.3"; + sha256 = "0y5yn0jaairqixxqx7c80z5y5mc6czshps7wghjci1s39mn9cjf6"; buildDepends = [ filepath syb ]; buildTools = [ alex happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index d2cc342c4774..94d693aa7c86 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,5 +1,5 @@ { cabal, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck -, testFramework, testFrameworkHunit, utf8Light, utf8String +, testFramework, testFrameworkHunit, utf8Light, utf8String, alex }: cabal.mkDerivation (self: { @@ -11,7 +11,8 @@ cabal.mkDerivation (self: { blazeBuilder Cabal HUnit mtl QuickCheck testFramework testFrameworkHunit utf8Light utf8String ]; - buildTools = [ happy ]; + buildTools = [ happy alex ]; + preConfigure = "rm -rv dist; $SHELL runalex.sh"; meta = { homepage = "http://github.com/alanz/language-javascript"; description = "Parser for JavaScript"; diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index f0dac623a987..1abc63c8c4b7 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.9.1"; - sha256 = "17jvqy2nbcra36fzkwbjkfwg6mjw804zd1i50mhbqwg9j7z4s5sb"; + version = "1.10"; + sha256 = "1wl0hb58znc3n5f5jv0wm6g21p080zldlq954n0lm8sjwmv39cdx"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index fe8a9a35176f..7ba509761687 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -1,15 +1,16 @@ { cabal, base64Bytestring, blazeBuilder, filepath, hspec, random -, text +, text, sendmail ? "sendmail" }: cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.4.1"; - sha256 = "0jzbkrd62alvgyx9bkrzicz88hjjnnavpv6hl22cxnirz41h8hw0"; + version = "0.4.4.2"; + sha256 = "0s38xgv6kycnfahqi5dnrjn3wkaq35w87cv8p12pq0qq2x7dvawd"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; testDepends = [ blazeBuilder hspec text ]; + configureFlags = [ "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\"" ]; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index a66ad0faf01f..4aa394aff408 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.4.0"; - sha256 = "16nrzms87klbs26rbaw4j8xal5k7glpbhg7r2x1m3gxbdhsp696n"; + version = "0.3.4.1"; + sha256 = "1i5192060svqhc1iv215b98hah6p29bzdqin6ng5qpq8d44hdnpm"; buildDepends = [ blazeBuilder conduit fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text transformers transformersBase diff --git a/pkgs/development/libraries/haskell/monadloc/default.nix b/pkgs/development/libraries/haskell/monadloc/default.nix new file mode 100644 index 000000000000..9ff7383565e1 --- /dev/null +++ b/pkgs/development/libraries/haskell/monadloc/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "monadloc"; + version = "0.7.1"; + sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/pepeiborra/monadloc"; + description = "A class for monads which can keep a monadic call trace"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index a1de3e9ad16b..113a4b67b414 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.4.0.3"; - sha256 = "04g2ihk4n71zrz09si2k8j46y53i5vllps9xizgs0bmikmrgh29f"; + version = "0.4.0.4"; + sha256 = "1ikrdhr4f3755xim6j9db60a9y0mpdnljmck84qh47yk2axfp0n9"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix new file mode 100644 index 000000000000..e9fa49510c18 --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix @@ -0,0 +1,15 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "mtl"; + version = "2.1.3.1"; + sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/mtl"; + description = "Monad classes, using functional dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix new file mode 100644 index 000000000000..7ff8a9de430e --- /dev/null +++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix @@ -0,0 +1,19 @@ +{ cabal, aeson, blazeBuilder, conduit, monadControl, mysql +, mysqlSimple, persistent, resourcet, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "persistent-mysql"; + version = "1.3.0.2"; + sha256 = "0yv2f8zqypbp5swdpxmgnfmmfsr6lwhb27k0hl9bh7ya76anhvqy"; + buildDepends = [ + aeson blazeBuilder conduit monadControl mysql mysqlSimple + persistent resourcet text transformers + ]; + meta = { + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using MySQL database server"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index e529747e7a75..85b1a10b5ba0 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -1,14 +1,15 @@ { cabal, aeson, blazeBuilder, conduit, monadControl, persistent -, postgresqlLibpq, postgresqlSimple, text, time, transformers +, postgresqlLibpq, postgresqlSimple, resourcet, text, time +, transformers }: cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.3.0.3"; - sha256 = "00frqpv7wbksbjl714nhrian45p61kggxhpin9hawbwn2siwsg2m"; + version = "1.3.0.5"; + sha256 = "0abk38jzc7k93wrzn3pq90xj0mqln4nqrgzmmy0d3p4gmbzmnnia"; buildDepends = [ aeson blazeBuilder conduit monadControl persistent postgresqlLibpq - postgresqlSimple text time transformers + postgresqlSimple resourcet text time transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 009aa3b62995..cb12d9cbe843 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -1,15 +1,16 @@ { cabal, aeson, conduit, monadControl, monadLogger, persistent -, text, transformers +, resourcet, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.3.0.3"; - sha256 = "0b7dp2hiza02rnnph44rd2vls06jipmixi32icbijmcqk83hfglq"; + version = "1.3.0.5"; + sha256 = "05b7byc4z7mhni90cj2aan63f599wv0511zqbsm6kbylk1zpyizb"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson conduit monadControl monadLogger persistent text transformers + aeson conduit monadControl monadLogger persistent resourcet text + transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 1340ceaaf957..994632c40e20 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.2"; - sha256 = "1gdwwx55ihnqxgyw0wsx0pr4dcs2hdbp5xbnx6l1j03rn5x1sglq"; + version = "1.3.1.3"; + sha256 = "0q5ysv1r6p4mg79waq2g6ql11rap6znawkplddblpaa8lq9qalj6"; buildDepends = [ aeson monadControl monadLogger persistent text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index a3faace8d490..b16c89dac709 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.3.0.4"; - sha256 = "09p7nf6dnjz83qp7invkmzcr55zglm0y54p8pb1y6acjpnw3glkl"; + version = "1.3.0.6"; + sha256 = "0rj5yi8nziym9cb9c9vw6vdjflf2yfz02i39p6dsdy084f1ivpk8"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces resourcePool diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index e97fbb983a71..e7c1489d5cb3 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.1.2.1"; - sha256 = "1mcx66xv1irxd66cfv23h4n7fplg5a0hyldlgk8km0k395mjw8k8"; + version = "0.1.2.2"; + sha256 = "1jg7kymr1v82xl9122q9fly385jhm1hr2406g35ydl9wnh4aaiw8"; buildDepends = [ monadControl resourcePool resourcet transformers ]; diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 56c4a5965e15..20222609cffa 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.0"; - sha256 = "0g31a7s2h9d6f3igvrddbr357sk4vabvg88mmvb194pps66y8zzn"; + version = "0.4.2.1"; + sha256 = "1547n7rh0gsrjaa8f9lc4diljpps09kdf0gkm0cjf1gk2kr7lh94"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix index 45ac44951667..6148b9b508b3 100644 --- a/pkgs/development/libraries/haskell/process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/process-conduit/default.nix @@ -1,13 +1,13 @@ -{ cabal, conduit, controlMonadLoop, hspec, mtl, shakespeareText -, text +{ cabal, conduit, controlMonadLoop, hspec, mtl, shakespeare +, shakespeareText, text }: cabal.mkDerivation (self: { pname = "process-conduit"; - version = "1.0.0.1"; - sha256 = "1b1bya316gxj3rgn7qpjmmcllgy9aac69rqw664sw1rnypnic780"; + version = "1.0.0.2"; + sha256 = "0rz18x7gy8w1h2xq0il49k515n0y3gpxnl7mfgkczc86965w7fzj"; buildDepends = [ - conduit controlMonadLoop mtl shakespeareText text + conduit controlMonadLoop mtl shakespeare shakespeareText text ]; testDepends = [ conduit hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index 41e4fc6eeb05..300d2e66f89c 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "profunctors"; - version = "4.0.2"; - sha256 = "1p98pczrxvhk1imwics25b5ac59qzixblns83a1k9zszvz42kmix"; + version = "4.0.3"; + sha256 = "0rdr75nqzxaly47vnpbmska608k457dgpzi5wfcqhmw996kh5inh"; buildDepends = [ comonad semigroupoids tagged transformers ]; meta = { homepage = "http://github.com/ekmett/profunctors/"; diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index f4c9214b0b63..58dc06e6aa58 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,19 +1,19 @@ -{ cabal, base64Bytestring, base64Conduit, basicPrelude, conduit -, hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath -, text, transformers +{ cabal, base64Bytestring, conduit, conduitExtra, hspec, mtl +, QuickCheck, resourcet, systemFileio, systemFilepath, text +, transformers }: cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.3.2"; - sha256 = "076xq5hwi7bfn3cmx8zd19vnj6lj2p7qm2waam94qqw2m466xq50"; + version = "0.1.4.1"; + sha256 = "1vsx8a4kzdcwbdy47hb2wz32najsa6bqq6jkyal9nbc5ydwb65lb"; buildDepends = [ - base64Bytestring base64Conduit basicPrelude conduit mtl resourcet - systemFileio systemFilepath text transformers + base64Bytestring conduit conduitExtra mtl resourcet systemFileio + systemFilepath text transformers ]; testDepends = [ - base64Bytestring basicPrelude conduit hspec QuickCheck - systemFilepath text transformers + base64Bytestring conduit hspec QuickCheck resourcet systemFilepath + text transformers ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index 0d7b9d709c6c..2d3fb430fe27 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "recaptcha"; - version = "0.1.0.1"; - sha256 = "0mk2vdvm5jz8jh8xc4alsly8c9msfis0drbgg89rck1y387z2njz"; + version = "0.1.0.2"; + sha256 = "04sdfp6bmcd3qkz1iqxijfiqa4qf78m5d16r9gjv90ckqf68kbih"; buildDepends = [ HTTP network xhtml ]; meta = { homepage = "http://github.com/jgm/recaptcha/tree/master"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index cb5543147524..8413802faa19 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.10.1"; - sha256 = "05skxqxhbmsyjn72w1c9n924d865wxadfsxlavk0nmbd7ygmnazb"; + version = "0.4.10.2"; + sha256 = "0k0l4909b30hc2apxgzjz1rxbqqkhqnqchz53wi6zyhvbh46ffh6"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix index d41a37d1e5be..a61daf6de255 100644 --- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix +++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix @@ -1,18 +1,18 @@ -{ cabal, base64String, cprngAes, network, tlsExtra, utf8String +{ cabal, base64Bytestring, cprngAes, dataDefault, filepath +, mimeMail, network, stringsearch, text, tls }: cabal.mkDerivation (self: { pname = "smtps-gmail"; - version = "1.0.0"; - sha256 = "0kv5m8rg5z1iic10av3bscdygnph1iab4b22sq3hmx6a93abqkc2"; - isLibrary = true; - isExecutable = true; + version = "1.1.0"; + sha256 = "0zr2ndpwfnb9pkv69vx94p0vpghl0khd0wbmccjpk6hlrp6fsj66"; buildDepends = [ - base64String cprngAes network tlsExtra utf8String + base64Bytestring cprngAes dataDefault filepath mimeMail network + stringsearch text tls ]; meta = { homepage = "https://github.com/enzoh/smtps-gmail"; - description = "Gmail API"; + description = "Gmail SMTP Client"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 351e8d943235..0a1d1b7c5cf4 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.1"; - sha256 = "1wfjkbck2dc4a1nxz62yprf68g66m9vhvxihn9c5xypxjpgj2r9k"; + version = "0.9.6.2"; + sha256 = "1s77p2q4zrpw2fksklqc9sgcb214fijsk88lqqasdiw9kb9xmwij"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath hashable diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 80cffd6b4321..4634ec554ebe 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.0"; - sha256 = "0jcg99byygdxx42p1w0a8nvyh2w2hrqj2j9n76hf7sa65f67j828"; + version = "0.9.4.1"; + sha256 = "07k7gndzmh4d2mghi8qv25frvdlgmn7497hh6j22ki0al0zrs0l9"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator MonadCatchIOTransformers mtl network diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix index e8bd79a9a80a..2b8c9d1080ae 100644 --- a/pkgs/development/libraries/haskell/stm-chans/default.nix +++ b/pkgs/development/libraries/haskell/stm-chans/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "stm-chans"; - version = "3.0.0"; - sha256 = "1nnl5h88dshcmk0ydhkf84kkf6989igxry9r0z7lwlxfgf7q9nim"; + version = "3.0.0.2"; + sha256 = "1zsa092yjxsdq8nm2yqagdfpip3i3ff3xdwvys99ns7ridxbyynh"; buildDepends = [ stm ]; meta = { homepage = "http://code.haskell.org/~wren/"; diff --git a/pkgs/development/libraries/haskell/stm/2.4.3.nix b/pkgs/development/libraries/haskell/stm/2.4.3.nix new file mode 100644 index 000000000000..28c3da5cba23 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm/2.4.3.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "stm"; + version = "2.4.3"; + sha256 = "0vzw4s06d5scfy4ircl81ym8ylkw9ckzsp8rq950dvipmaj1xhis"; + meta = { + description = "Software Transactional Memory"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix new file mode 100644 index 000000000000..fec0ddf79cd3 --- /dev/null +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq, hspec, network, QuickCheck, text, transformers +, zlib +}: + +cabal.mkDerivation (self: { + pname = "streaming-commons"; + version = "0.1.0.2"; + sha256 = "1idlhvlv5pg20xq8h4rmphyflvpc9q88krwm498mh3s4983ik28c"; + buildDepends = [ network text transformers zlib ]; + testDepends = [ deepseq hspec QuickCheck text zlib ]; + meta = { + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 2e060e252dd9..fba75d7b847d 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.9"; - sha256 = "0qxbibq6lj7gyw62crp774pv2a8cm83rllw5yjjsg372nk4m1is0"; + version = "0.4.10"; + sha256 = "176g5jm1gd6lrkmhfz9qh5aqwfbpwyr30yknfcc49wl7jkfhisiq"; buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix index eb55d68666c5..0530804d84b1 100644 --- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix +++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "text-stream-decode"; - version = "0.1.0.4"; - sha256 = "041winxbqkz1y6vx6sgbhl925n5qxii2q7ijcwa85sj4dkrqpafr"; + version = "0.1.0.5"; + sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy"; buildDepends = [ text ]; testDepends = [ deepseq hspec text ]; meta = { homepage = "http://github.com/fpco/text-stream-decode"; - description = "Streaming decoding functions for UTF encodings"; + description = "Streaming decoding functions for UTF encodings. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix index 42ff1d78198a..827828d64741 100644 --- a/pkgs/development/libraries/haskell/th-desugar/default.nix +++ b/pkgs/development/libraries/haskell/th-desugar/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-desugar"; - version = "1.3.0"; - sha256 = "1wfypk1hcxr2918qp63df5xlx00rqwnaa59mivnlqs558g4kjx6j"; + version = "1.3.1"; + sha256 = "1wi0c5d1w6vjjk580zhypgqnnkndcsx4cmx5qy01w97h6kyj8913"; buildDepends = [ mtl syb ]; testDepends = [ hspec HUnit mtl syb ]; meta = { diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix index 8dff0ffd58fc..62690186ee8f 100644 --- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix +++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "type-level-natural-number"; - version = "1.1.1"; - sha256 = "1zc26nckpcixxp1m818jhzi3dj1ysnjfc2xliq4rpmf5583k6mjw"; + version = "2.0"; + sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk"; meta = { - description = "Simple, Haskell 2010-compatible type level natural numbers"; + description = "Simple type level natural numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix index 69f6ac60ac36..78484a2a75ab 100644 --- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix +++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unbounded-delays"; - version = "0.1.0.6"; - sha256 = "0yykb9jqxhvbngvp2gbzb0ch2cmzdxx8km62dclyvr3xbv6hk1h7"; + version = "0.1.0.7"; + sha256 = "1nv50i90hgvcl51w7s8x1c1ylpzyrbvs2mz5zfn68lr1ix2lk879"; meta = { homepage = "https://github.com/basvandijk/unbounded-delays"; description = "Unbounded thread delays and timeouts"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index fec4d410c22e..45dd5562a28b 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,21 +1,21 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup -, byteable, cmdargs, cryptohash, cryptohashConduit, fileEmbed -, filepath, hspec, httpDate, httpTypes, mimeTypes, network -, systemFileio, systemFilepath, text, time, transformers -, unixCompat, unorderedContainers, wai, waiExtra, waiTest, warp -, zlib +, byteable, cryptohash, cryptohashConduit, fileEmbed, filepath +, hspec, httpDate, httpTypes, mimeTypes, network +, optparseApplicative, systemFileio, systemFilepath, text, time +, transformers, unixCompat, unorderedContainers, wai, waiExtra +, waiTest, warp, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0.5"; - sha256 = "0f18wwk0xrzbn9d6krjdcm71cyxl1pzzi5xqwzzc9xnq595m75wa"; + version = "2.0.1"; + sha256 = "1mygyp70rmhnkc0s8626cxrkvcbil92v4gnx70iz26gfb5q9lc7d"; isLibrary = true; isExecutable = true; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable - cmdargs cryptohash cryptohashConduit fileEmbed filepath httpDate - httpTypes mimeTypes systemFileio systemFilepath text time + cryptohash cryptohashConduit fileEmbed filepath httpDate httpTypes + mimeTypes optparseApplicative systemFileio systemFilepath text time transformers unixCompat unorderedContainers wai waiExtra warp zlib ]; testDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index df13922601c2..ef91a8726874 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,23 +1,24 @@ { cabal, ansiTerminal, base64Bytestring, blazeBuilder -, blazeBuilderConduit, caseInsensitive, conduit, dataDefault -, fastLogger, hspec, httpTypes, HUnit, liftedBase, network -, resourcet, stringsearch, text, time, transformers, void, wai -, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit +, blazeBuilderConduit, caseInsensitive, conduit, conduitExtra +, dataDefault, fastLogger, hspec, httpTypes, HUnit, liftedBase +, network, resourcet, stringsearch, text, time, transformers, void +, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.1.1"; - sha256 = "1bsc9sjmp9hspdif4f81iqjkcaflv6b7rd42g62qj790a4b70igf"; + version = "2.1.1.1"; + sha256 = "1mqpy1klr4b5dvgk89hqyd8c2vg7rl0vypy3m9hxr2r4bzifkqc1"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase - network resourcet stringsearch text time transformers void wai - waiLogger word8 zlibConduit + caseInsensitive conduit conduitExtra dataDefault fastLogger + httpTypes liftedBase network resourcet stringsearch text time + transformers void wai waiLogger word8 zlibConduit ]; testDepends = [ - blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit - resourcet text transformers wai waiTest zlib zlibBindings + blazeBuilder conduit conduitExtra dataDefault fastLogger hspec + httpTypes HUnit resourcet text transformers wai waiTest zlib + zlibBindings ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index f25206e69acf..9be534725825 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, conduit, httpTypes -, transformers, wai, warp, zlibConduit +{ cabal, blazeBuilder, blazeBuilderConduit, conduit, conduitExtra +, httpTypes, transformers, wai, warp, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "2.0.1.1"; - sha256 = "10izbri1a8mjb2q4r1badw63qbp3vxnw5v2hzskq6911bckqkskc"; + version = "2.0.1.2"; + sha256 = "1mcjxv4dkcc5rx1bj8zc5m2q2ifcdwhsl4x4fnrv1ir9kclzsm7q"; buildDepends = [ - blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai - warp zlibConduit + blazeBuilder blazeBuilderConduit conduit conduitExtra httpTypes + transformers wai warp zlibConduit ]; meta = { description = "Launch a web app in the default browser"; diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 5e3a666726a8..e55bf8805e35 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,15 +1,15 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, cookie, deepseq, hspec, httpTypes, network, text -, transformers, wai +, conduit, conduitExtra, cookie, deepseq, hspec, httpTypes, network +, text, transformers, wai }: cabal.mkDerivation (self: { pname = "wai-test"; - version = "2.0.1"; - sha256 = "0c803l3cz5bjf60l97sy1isxhnmbpzr5x39yhnck28r0vykycnrj"; + version = "2.0.1.1"; + sha256 = "08mkn6v8kxlcn2qb5rz9m5mqzl9wy43mxs2jzl1gavkf9bhwc93s"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie - deepseq httpTypes network text transformers wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit + conduitExtra cookie deepseq httpTypes network text transformers wai ]; testDepends = [ hspec wai ]; meta = { diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index 4b4038fd4111..5558f2e32ce1 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-websockets"; - version = "2.1.0"; - sha256 = "094imqhkn4ghifgp2qhs4hnby3zzdd84fhmyvvy7igcpz1rmll7a"; + version = "2.1.0.1"; + sha256 = "1ic1wgfp16j6lhypn1psmicafjavbhq5rvm32xqwkb65abhpg571"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index f17b999f1497..a0164a3950c9 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -1,13 +1,14 @@ -{ cabal, blazeBuilder, conduit, httpTypes, network, text -, transformers, vault +{ cabal, blazeBuilder, conduit, conduitExtra, httpTypes, network +, text, transformers, vault }: cabal.mkDerivation (self: { pname = "wai"; - version = "2.1.0"; - sha256 = "0n3dgm1pwv9baxrx0qh0iq1mh9i7ihhki3h4ks5k74d37w7bwcjy"; + version = "2.1.0.1"; + sha256 = "03gp3ijdpyyh7zic89laj0y4wsi8f49lbqlqq8w9msfgizjhvdv6"; buildDepends = [ - blazeBuilder conduit httpTypes network text transformers vault + blazeBuilder conduit conduitExtra httpTypes network text + transformers vault ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index c21e3b0d4328..b04d9439d2df 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -1,14 +1,15 @@ -{ cabal, conduit, cprngAes, dataDefaultClass, network -, networkConduit, tls, transformers, wai, warp +{ cabal, conduit, conduitExtra, cprngAes, dataDefaultClass, network +, networkConduit, resourcet, streamingCommons, tls, transformers +, wai, warp }: cabal.mkDerivation (self: { pname = "warp-tls"; - version = "2.0.3.1"; - sha256 = "1cyf4syblisi5hana7h2g72yyrjln40v3b6jq2253nglqip79l5w"; + version = "2.0.3.2"; + sha256 = "1dqaq1z4gb3sya41hiwsxgl4f0v7sqza7aazf2vc7dd5x5izp02w"; buildDepends = [ - conduit cprngAes dataDefaultClass network networkConduit tls - transformers wai warp + conduit conduitExtra cprngAes dataDefaultClass network + networkConduit resourcet streamingCommons tls transformers wai warp ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index abd301dcc789..c67ea5c25e07 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,23 +1,25 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, doctest, hashable, hspec, HTTP, httpDate, httpTypes -, HUnit, liftedBase, network, networkConduit, QuickCheck -, simpleSendfile, text, time, transformers, unixCompat, void, wai +, conduit, conduitExtra, doctest, hashable, hspec, HTTP, httpDate +, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck +, simpleSendfile, streamingCommons, text, time, transformers +, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.3"; - sha256 = "00861dimzvbbqx3pbpihfml8k2fkvsw8kda7mkkix59xqsjwc1nz"; + version = "2.1.3.3"; + sha256 = "1dbarrjb6y4cbc1dc265b008b6d5qziqnikdbnbdlrwfzr97cz23"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - httpDate httpTypes liftedBase network networkConduit simpleSendfile - text transformers unixCompat void wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit + conduitExtra hashable httpDate httpTypes liftedBase network + networkConduit simpleSendfile streamingCommons text transformers + unixCompat void wai ]; testDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest - hashable hspec HTTP httpDate httpTypes HUnit liftedBase network - networkConduit QuickCheck simpleSendfile text time transformers - unixCompat void wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit + conduitExtra doctest hashable hspec HTTP httpDate httpTypes HUnit + liftedBase network networkConduit QuickCheck simpleSendfile + streamingCommons text time transformers unixCompat void wai ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 28a5beb966f8..d31f1d0e70d7 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,20 +1,21 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault -, deepseq, failure, hspec, HUnit, monadControl, resourcet -, systemFilepath, text, transformers, xmlTypes +, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit +, conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl +, resourcet, systemFilepath, text, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.1.0.9"; - sha256 = "01sx8yblknv0dyi7z6k6icfvwjvl4dyhrka1d6y1793xcp1mkxs6"; + version = "1.2.0.1"; + sha256 = "0ry3h1csblssv2x8b63hvl2gqc0wyzyqbvp6iyisrk77wkz72jw9"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - blazeHtml blazeMarkup conduit dataDefault deepseq failure + blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq monadControl resourcet systemFilepath text transformers xmlTypes ]; testDepends = [ - blazeMarkup conduit hspec HUnit text transformers xmlTypes + blazeMarkup conduit hspec HUnit resourcet text transformers + xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 885620f0648a..346891cc68d5 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.6"; - sha256 = "05izdqpxw0gq2wgs4ckr55xvzfk5ay7xpbcvihj66myiah5azqwy"; + version = "0.4.0.7"; + sha256 = "05rygs3ja3zc87az151mkbm4llrnshzrqf1mfpbwx4ysfgjkvq7b"; buildDepends = [ parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index e92d761edcbc..31f7a06c1fe2 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xss-sanitize"; - version = "0.3.5"; - sha256 = "13iggcivpvzlzlx0n1pb6lyw55lc7d7hzihf1llphq6lmdy6l49s"; + version = "0.3.5.2"; + sha256 = "1lkawsing0x776078qi1565aj1nr4smxhql1xzfw0bjihbgs1d6b"; buildDepends = [ attoparsec cssText network tagsoup text utf8String ]; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index e9a9c075c328..5b0d4ad3f470 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.8"; - sha256 = "0fv56x40ici6hx2dfy85fg7zy213mn82h84czhj4xbvjszg8wycw"; + version = "0.8.8.1"; + sha256 = "1lkw05rx88jckzlkslb945zswn6g7i3vxsgxpj9pkcxvh3y9zagv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { unorderedContainers vector ]; testDepends = [ - aeson conduit hspec HUnit text transformers unorderedContainers - vector + aeson conduit hspec HUnit resourcet text transformers + unorderedContainers vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 6857b6f02d76..93e1bb9cadd2 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,21 +1,23 @@ -{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, dataDefault -, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes -, liftedBase, mimeMail, network, persistent, persistentTemplate -, pureMD5, pwstoreFast, random, resourcet, safe, SHA -, shakespeareCss, shakespeareJs, text, time, transformers -, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent +{ cabal, aeson, authenticate, base16Bytestring, blazeHtml +, blazeMarkup, cryptohash, dataDefault, emailValidate, fileEmbed +, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network +, persistent, persistentTemplate, pwstoreFast, random, resourcet +, safe, shakespeare, shakespeareCss, shakespeareJs, text, time +, transformers, unorderedContainers, wai, yesodCore, yesodForm +, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.7"; - sha256 = "0arszd7nk7rwm0xnjb2vqk2zf7lcwyw1ncxyxdmdxxvmh28lymwk"; + version = "1.3.0.2"; + sha256 = "1lx9xz5jrr63256w64isndwr323khsyyn8ah1iv1vy7n54y9afpk"; buildDepends = [ - aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate - fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network - persistent persistentTemplate pureMD5 pwstoreFast random resourcet - safe SHA shakespeareCss shakespeareJs text time transformers - unorderedContainers wai yesodCore yesodForm yesodPersistent + aeson authenticate base16Bytestring blazeHtml blazeMarkup + cryptohash dataDefault emailValidate fileEmbed hamlet httpConduit + httpTypes liftedBase mimeMail network persistent persistentTemplate + pwstoreFast random resourcet safe shakespeare shakespeareCss + shakespeareJs text time transformers unorderedContainers wai + yesodCore yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index e939b1e4ee72..baf4a9dd4d50 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,26 +1,26 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths -, httpConduit, httpReverseProxy, httpTypes, liftedBase, network -, networkConduit, optparseApplicative, parsec, projectTemplate -, resourcet, shakespeare, shakespeareCss, shakespeareJs -, shakespeareText, split, systemFileio, systemFilepath, tar, text -, time, transformers, unixCompat, unorderedContainers, wai, warp -, yaml, zlib +, conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify +, ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase +, network, networkConduit, optparseApplicative, parsec +, projectTemplate, resourcet, shakespeare, shakespeareCss +, shakespeareJs, shakespeareText, split, streamingCommons +, systemFileio, systemFilepath, tar, text, time, transformers +, unixCompat, unorderedContainers, wai, warp, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.7.3"; - sha256 = "05kbfnkigk4p1vjw0h1pkp7jfczjq99vgrsaz45faajadnhffnpz"; + version = "1.2.7.4"; + sha256 = "1nhpn8855jhvjmh5fdvjic20lyx6k054kfp8j0lwvdcd79c7bl77"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base64Bytestring blazeBuilder Cabal conduit + attoparsec base64Bytestring blazeBuilder Cabal conduit conduitExtra dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy httpTypes liftedBase network networkConduit optparseApplicative parsec projectTemplate resourcet shakespeare - shakespeareCss shakespeareJs shakespeareText split systemFileio - systemFilepath tar text time transformers unixCompat + shakespeareCss shakespeareJs shakespeareText split streamingCommons + systemFileio systemFilepath tar text time transformers unixCompat unorderedContainers wai warp yaml zlib ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 2c3d378257f5..3083eb0c9298 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,30 +1,32 @@ { cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml , blazeMarkup, caseInsensitive, cereal, clientsession, conduit -, cookie, dataDefault, failure, fastLogger, hamlet, hspec +, conduitExtra, cookie, dataDefault, fastLogger, hamlet, hspec , httpTypes, HUnit, liftedBase, monadControl, monadLogger, network , networkConduit, parsec, pathPieces, QuickCheck, random, resourcet , safe, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs -, text, time, transformers, transformersBase, unixCompat, vector -, wai, waiExtra, waiLogger, waiTest, warp, yesodRoutes +, streamingCommons, text, time, transformers, transformersBase +, unixCompat, vector, wai, waiExtra, waiLogger, waiTest, warp +, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.9"; - sha256 = "0qd9x2pca2nx7yqz9whlvb0rjgf1zf9vw19j6z0p149yddgrrcyq"; + version = "1.2.9.2"; + sha256 = "1ip5rra426agqv5v2hmxcp1g3xjvi9wnixrpdnxvifflhr7gchfl"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup - caseInsensitive cereal clientsession conduit cookie dataDefault - failure fastLogger hamlet httpTypes liftedBase monadControl + caseInsensitive cereal clientsession conduit conduitExtra cookie + dataDefault fastLogger hamlet httpTypes liftedBase monadControl monadLogger parsec pathPieces random resourcet safe shakespeare shakespeareCss shakespeareI18n shakespeareJs text time transformers transformersBase unixCompat vector wai waiExtra waiLogger warp yesodRoutes ]; testDepends = [ - async blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase - network networkConduit QuickCheck random resourcet shakespeareCss - shakespeareJs text transformers wai waiTest + async blazeBuilder conduit conduitExtra hamlet hspec httpTypes + HUnit liftedBase network networkConduit QuickCheck random resourcet + shakespeare shakespeareCss shakespeareJs streamingCommons text + transformers wai waiTest ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 2f58cbb64087..a67eccb00c2a 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,18 +1,19 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , byteable, dataDefault, emailValidate, hamlet, hspec, network -, persistent, resourcet, shakespeareCss, shakespeareJs, text, time -, transformers, wai, xssSanitize, yesodCore, yesodPersistent +, persistent, resourcet, shakespeare, shakespeareCss, shakespeareJs +, text, time, transformers, wai, xssSanitize, yesodCore +, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.8"; - sha256 = "0cdpdgclhasdmynp9fhf9yhl33nwh71bmg344x51xkp5347w614b"; + version = "1.3.8.1"; + sha256 = "0cyvyr3whrbswawv5rcfmq9nhk3kf4d3vgfm8z01prcqdsc4yh21"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet - shakespeareCss shakespeareJs text time transformers wai xssSanitize - yesodCore yesodPersistent + shakespeare shakespeareCss shakespeareJs text time transformers wai + xssSanitize yesodCore yesodPersistent ]; testDepends = [ hspec text time ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 7059e178bb61..78d941b371b6 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,6 +1,6 @@ -{ cabal, base64Bytestring, byteable, conduit, cryptohash -, cryptohashConduit, dataDefault, fileEmbed, filepath, hjsmin -, hspec, httpTypes, HUnit, mimeTypes, processConduit, resourcet +{ cabal, async, base64Bytestring, byteable, conduit, conduitExtra +, cryptohash, cryptohashConduit, dataDefault, fileEmbed, filepath +, hjsmin, hspec, httpTypes, HUnit, mimeTypes, resourcet , shakespeareCss, systemFileio, systemFilepath, text, transformers , unixCompat, unorderedContainers, wai, waiAppStatic, waiTest , yesodCore, yesodTest @@ -8,19 +8,19 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.2.2"; - sha256 = "156qqd2v3z7wv75jsfscs9cvbg1cl1riqcrhycrqcmapjprr2r12"; + version = "1.2.2.4"; + sha256 = "1dpd175kd1yda2fs8zzs00j8nhdvzsgqywkkh934qz7zr7p1rawl"; buildDepends = [ - base64Bytestring byteable conduit cryptohash cryptohashConduit - dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes - processConduit resourcet shakespeareCss systemFileio systemFilepath - text transformers unixCompat unorderedContainers wai waiAppStatic + async base64Bytestring byteable conduit conduitExtra cryptohash + cryptohashConduit dataDefault fileEmbed filepath hjsmin httpTypes + mimeTypes resourcet shakespeareCss systemFileio systemFilepath text + transformers unixCompat unorderedContainers wai waiAppStatic yesodCore ]; testDepends = [ - base64Bytestring byteable conduit cryptohash cryptohashConduit - dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit - mimeTypes processConduit resourcet shakespeareCss systemFileio + async base64Bytestring byteable conduit conduitExtra cryptohash + cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec + httpTypes HUnit mimeTypes resourcet shakespeareCss systemFileio systemFilepath text transformers unixCompat unorderedContainers wai waiAppStatic waiTest yesodCore yesodTest ]; diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 38a319a87456..9a9cdc4e295c 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.1"; - sha256 = "0rbavw67cfqyav6xakacag0sd0gixbz3sls06px6q6pnpzk9q9d4"; + version = "1.2.1.2"; + sha256 = "12b747sd5rrypv1i2b5rpa3qgpnzibwjw7rlv02hyz8g7kf6wvbm"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 130e6eb9c334..a3416cf59c6d 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,19 +1,20 @@ -{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, fastLogger -, hamlet, monadControl, monadLogger, networkConduit, safe -, shakespeareCss, shakespeareJs, text, transformers -, unorderedContainers, wai, waiExtra, warp, yaml, yesodAuth -, yesodCore, yesodForm, yesodPersistent +{ cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault +, fastLogger, hamlet, monadControl, monadLogger, networkConduit +, safe, shakespeare, shakespeareCss, shakespeareJs, text +, transformers, unorderedContainers, wai, waiExtra, warp, yaml +, yesodAuth, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.5"; - sha256 = "0vcszhd8vasfpm754bz1vyarhlkffj3kbrfcq9q5gqmm389jfpk2"; + version = "1.2.5.2"; + sha256 = "0vvpzyfwzgnnd8h60pqz5z1474isp487p43vx7cyzhj423c50p6r"; buildDepends = [ - aeson blazeHtml blazeMarkup dataDefault fastLogger hamlet - monadControl monadLogger networkConduit safe shakespeareCss - shakespeareJs text transformers unorderedContainers wai waiExtra - warp yaml yesodAuth yesodCore yesodForm yesodPersistent + aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger + hamlet monadControl monadLogger networkConduit safe shakespeare + shakespeareCss shakespeareJs text transformers unorderedContainers + wai waiExtra warp yaml yesodAuth yesodCore yesodForm + yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 231e3ac40f07..ba4751af2fe3 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.1.1.4"; - sha256 = "02ln0gv9kkq68s3n195q2mpqimxb6k4wqs731b1gg8wrbbkaxb6w"; + version = "0.1.1.5"; + sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8"; buildDepends = [ zlib ]; testDepends = [ hspec QuickCheck zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; - description = "Low-level bindings to the zlib package"; + description = "Low-level bindings to the zlib package. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix new file mode 100644 index 000000000000..26dc6be8382c --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, ruby }: + +stdenv.mkDerivation rec { + version = "0.5.8"; + name = "libmsgpack-${version}"; + + src = fetchurl { + url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"; + sha256 = "1h6k9kdbfavmw3by5kk3raszwa64hn9k8yw9rdhvl5m8g2lks89k"; + }; + + buildInputs = [ autoconf automake libtool ruby ]; + + outputs = [ "out" "lib" ]; + + preConfigure = "./bootstrap"; + + postInstall = '' + mkdir -p $lib/lib + mv $out/lib/*.so.* $lib/lib/ + ''; + + meta = with stdenv.lib; { + description = "MessagePack implementation for C and C++"; + homepage = http://msgpack.org; + maintainers = [ maintainers.redbaron ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 42fa2578062d..d90e1c225641 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-2.14"; + name = "libtasn1-3.4"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0m1x2p04xpacl18dzv1hmsm2fk97gi167ra5h4kmjy16436kcadw"; + sha256 = "1j5cwsjk9wai700ljsr5qyzywijrr5ba05hhg4mkgqlg8mx50lzk"; }; + buildInputs = [ perl texinfo ]; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix new file mode 100644 index 000000000000..6e1e8c8e1138 --- /dev/null +++ b/pkgs/development/libraries/mps/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoreconfHook, sqlite }: + +stdenv.mkDerivation rec { + name = "mps-${version}"; + version = "1.113.0"; + + src = fetchurl { + url = "http://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; + sha256 = "0v4difh3yl2mvpvnwlavhaags945l1452g07fllhdbpzgbjay79i"; + }; + + buildInputs = [ autoreconfHook sqlite ]; + + # Fix a slightly annoying build failure in 'make install' + patchPhase = "substituteInPlace ./Makefile.in --replace /hot/Release /hot"; + + meta = { + description = "A flexible memory management and garbage collection library"; + homepage = "http://www.ravenbrook.com/project/mps"; + license = stdenv.lib.licenses.sleepycat; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix new file mode 100644 index 000000000000..255468e78103 --- /dev/null +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "npapi-sdk-${version}"; + + version = "0.27.2"; + + src = fetchurl { + url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${name}.tar.bz2"; + + sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1"; + }; + + meta = with stdenv.lib; { + description = "NPAPI-SDK is a bundle of NPAPI headers by Mozilla"; + + homepage = https://code.google.com/p/npapi-sdk/; + license = licenses.bsd3; + maintainers = with maintainers; [ wizeman ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 8f8551ac9b63..8497ea9ae942 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -3,10 +3,12 @@ , gtk2, gtk3, wayland, libwebp, enchant , libxml2, libsoup, libsecret, libxslt, harfbuzz , gst-plugins-base +, withGtk2 ? false +, enableIntrospection ? true }: stdenv.mkDerivation rec { - name = "webkitgtk-2.2.4"; + name = "webkitgtk-2.4.0"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -18,22 +20,23 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0x2d9hds5yazwdakkhrh3dk5qxscb169imi056q2qq53zhdyw6jy"; + sha256 = "1fyz6ysw7npy5wa7m1zg05zrj0gi0wdlpjbqix03iq4ym36pflnw"; }; patches = [ ./webcore-svg-libxml-cflags.patch ]; + CC = "cc"; + prePatch = '' patchShebangs Tools/gtk - - for i in $(find . -name '*.p[l|m]'); do - sed -e 's@/usr/bin/gcc@gcc@' -i $i - done ''; - configureFlags = [ + configureFlags = with stdenv.lib; [ "--disable-geolocation" - "--enable-introspection" + (optionalString enableIntrospection "--enable-introspection") + ] ++ stdenv.lib.optional withGtk2 [ + "--with-gtk=2.0" + "--disable-webkit2" ]; dontAddDisableDepTrack = true; @@ -49,7 +52,10 @@ stdenv.mkDerivation rec { gst-plugins-base ]; - propagatedBuildInputs = [ gtk3 libsoup ]; + propagatedBuildInputs = [ + libsoup + (if withGtk2 then gtk2 else gtk3) + ]; #enableParallelBuilding = true; # build problems on Hydra } diff --git a/pkgs/development/tools/documentation/haddock/2.14.1.nix b/pkgs/development/tools/documentation/haddock/2.14.1.nix new file mode 100644 index 000000000000..c63503c85baa --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.14.1.nix @@ -0,0 +1,22 @@ +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, hspec +, QuickCheck, xhtml +}: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.14.1"; + sha256 = "1mxkphzdfd5c8dklfl09ajqwhw8ibvzl0cqrfr2j8rn0j03w46x6"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; + buildTools = [ alex happy ]; + doCheck = false; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/haskell/cake3/default.nix b/pkgs/development/tools/haskell/cake3/default.nix new file mode 100644 index 000000000000..c5c35ac571cb --- /dev/null +++ b/pkgs/development/tools/haskell/cake3/default.nix @@ -0,0 +1,23 @@ +{ cabal, attoparsec, deepseq, filepath, haskellSrcMeta +, languageJavascript, mimeTypes, monadloc, mtl, optparseApplicative +, syb, systemFilepath, text, textFormat +}: + +cabal.mkDerivation (self: { + pname = "cake3"; + version = "0.4.0.0"; + sha256 = "15v50m60fr2mgfm2irxfaw4pi2s3bx187p0y0ns20rqfy0dasxyx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec deepseq filepath haskellSrcMeta languageJavascript + mimeTypes monadloc mtl optparseApplicative syb systemFilepath text + textFormat + ]; + meta = { + homepage = "https://github.com/grwlf/cake3"; + description = "Third cake the Makefile EDSL"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index b8cf2466b10a..a56e64953c0d 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,17 +1,16 @@ { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive -, conduit, dataDefault, filepath, fsnotify, httpClient +, conduit, dataDefault, filepath, fsnotify, hspec, httpClient , httpClientConduit, httpConduit, httpReverseProxy, httpTypes , liftedBase, mtl, network, networkConduit, networkConduitTls , random, regexTdfa, stm, systemFileio, systemFilepath, tar, text -, time, transformers, unixCompat, unixProcessConduit -, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp -, warpTls, yaml, zlib +, time, transformers, unixCompat, unorderedContainers, vector, wai +, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib }: cabal.mkDerivation (self: { pname = "keter"; - version = "1.2.0"; - sha256 = "06iz01ci1mcxjqs7dknxgjlkl783sdf680b54schxxirg268cxh3"; + version = "1.2.1"; + sha256 = "160kw3c2h9i1rwhicm860ahanx9p9qskrnfxsa68484j0cmw1ga9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -20,9 +19,10 @@ cabal.mkDerivation (self: { httpConduit httpReverseProxy httpTypes liftedBase mtl network networkConduit networkConduitTls random regexTdfa stm systemFileio systemFilepath tar text time transformers unixCompat - unixProcessConduit unorderedContainers vector wai waiAppStatic - waiExtra warp warpTls yaml zlib + unorderedContainers vector wai waiAppStatic waiExtra warp warpTls + yaml zlib ]; + testDepends = [ conduit hspec transformers ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Web application deployment manager, focusing on Haskell web frameworks"; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix new file mode 100644 index 000000000000..bfa5a69dfc32 --- /dev/null +++ b/pkgs/games/minecraft-server/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, jre }: + +with import <nixpkgs> {}; + +stdenv.mkDerivation rec { + name = "minecraft-server-${version}"; + version = "1.7.5"; + + src = fetchurl { + url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; + sha256 = "0f3sh3fws02yl4xqa8qrvn0cchfp0hymqrf30c5syzzcz9w4l8pq"; + }; + + installPhase = '' + mkdir -p $out/bin $out/lib/minecraft + cp -v $src $out/lib/minecraft/server.jar + + cat > $out/bin/minecraft-server << EOF + #!/bin/sh + exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui + EOF + + chmod +x $out/bin/minecraft-server + ''; + + phases = "installPhase"; + + meta = { + description = "Minecraft Server"; + homepage = "https://minecraft.net"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 6a3d528bde08..b4ec7eb311ff 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -2,11 +2,11 @@ , mesa, openal, alsaOss }: stdenv.mkDerivation { - name = "minecraft-1.4.7"; + name = "minecraft-2013.07.01"; src = fetchurl { - url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar"; - sha256 = "92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49"; + url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"; + sha256 = "04pj4l5q0a64jncm2kk45r7nxnxa2z9n110dcxbbahdi6wk0png8"; }; phases = "installPhase"; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix new file mode 100644 index 000000000000..1d23640ce8b1 --- /dev/null +++ b/pkgs/games/mnemosyne/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, pyqt4 +, matplotlib +, cherrypy +, sqlite3 +}: +let + version = "2.2.1"; +in buildPythonPackage rec { + name = "mnemosyne-${version}"; + src = fetchurl { + url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; + sha256 = "7f5dd06a879b9ab059592355412182ee286e78e124aa25d588cacf9e4ab7c423"; + }; + pythonPath = [ + pyqt4 + matplotlib + cherrypy + sqlite3 + ]; + preConfigure = '' + substituteInPlace setup.py --replace /usr $out + find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\", + ''; + installCommand = "python setup.py install --prefix=$out"; + meta = { + homepage = "http://mnemosyne-proj.org/"; + description = "Spaced-repetition software."; + longDescription = '' + The Mnemosyne Project has two aspects: + + * It's a free flash-card tool which optimizes your learning process. + * It's a research project into the nature of long-term memory. + + We strive to provide a clear, uncluttered piece of software, easy to use + and to understand for newbies, but still infinitely customisable through + plugins and scripts for power users. + + ## Efficient learning + + Mnemosyne uses a sophisticated algorithm to schedule the best time for + a card to come up for review. Difficult cards that you tend to forget + quickly will be scheduled more often, while Mnemosyne won't waste your + time on things you remember well. + + ## Memory research + + If you want, anonymous statistics on your learning process can be + uploaded to a central server for analysis. This data will be valuable to + study the behaviour of our memory over a very long time period. The + results will be used to improve the scheduling algorithms behind the + software even further. + ''; + }; +} diff --git a/pkgs/games/widelands/boost_and_cmake_die_die_die.patch b/pkgs/games/widelands/boost_and_cmake_die_die_die.patch deleted file mode 100644 index f008be35e378..000000000000 --- a/pkgs/games/widelands/boost_and_cmake_die_die_die.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- widelands-build17-src.old/CMakeLists.txt 2012-04-23 02:46:49.000000000 -0700 -+++ widelands-build17-src/CMakeLists.txt 2012-07-14 19:49:14.000000000 -0700 -@@ -140,8 +140,6 @@ - else (WL_UNIT_TESTS) - message(STATUS "Disabled Unit Tests") - set (Boost_FIND_COMPONENTS signals) -- set (Boost_USE_STATIC_LIBS ON) -- set (Boost_USE_MULTITHREADED ON) - set (Boost_DETAILED_FAILURE_MSG ON) - find_package(Boost 1.35.0 COMPONENTS signals REQUIRED) - endif (WL_UNIT_TESTS) diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 65c991340728..b6008bd7e76a 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -1,77 +1,46 @@ -x@{builderDefsPackage - , libjpeg, boost, SDL, SDL_gfx, SDL_image, SDL_net, SDL_ttf, SDL_sound - , gettext, zlib, libiconv, libpng, python, expat, lua5, glew, doxygen - , cmake, ggz_base_libs, mesa, SDL_mixer - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, cmake, python, gettext +, boost, libpng, zlib, glew, lua +, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, SDL_gfx +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="widelands"; - version="build17"; - name="${baseName}-${version}"; - project="${baseName}"; - url="https://launchpadlibrarian.net/102893896/widelands-build17-src.tar.bz2"; - hash="be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["killBuildDir" "doPatch" "doCmake" "doMakeInstall" "createScript"]; - - patches = [ ./boost_and_cmake_die_die_die.patch ]; - - killBuildDir = a.fullDepEntry '' - rm -r build - '' ["minInit" "doUnpack"]; - - cmakeFlags = [ - "-DLUA_LIBRARIES=-llua" - "-DWL_PORTABLE=true" - ]; - - createScript = a.fullDepEntry '' - mkdir -p "$out/bin" - echo '#! ${a.stdenv.shell}' >> "$out/bin/widelands" - echo "cd \"$out/share/games/widelands\"" >> "$out/bin/widelands" - echo "\"$out/games/widelands\" \"\$@\"" >> "$out/bin/widelands" - chmod a+x "$out/bin/widelands" - '' ["minInit"]; +stdenv.mkDerivation { + name = "widelands-18"; - meta = { - description = "Widelands RTS with multiple-goods economy"; + meta = with stdenv.lib; { + description = "RTS with multiple-goods economy"; + homepage = "http://widelands.org/"; longDescription = '' Widelands is a real time strategy game based on "The Settlers" and "The Settlers II". It has a single player campaign mode, as well as a networked - multiplayer mode. + multiplayer mode. ''; - - maintainers = with a.lib.maintainers; - [ - raskin - jcumming - ]; - platforms = a.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ raskin jcumming ]; hydraPlatforms = []; - license = a.lib.licenses.gpl2Plus; }; - passthru = { - updateInfo = { - downloadPage = "https://launchpad.net/widelands/+download"; - }; + + + src = fetchurl { + url = "https://launchpad.net/widelands/build18/build-18/+download/" + + "widelands-build18-src.tar.bz2"; + sha256 = "1qvx1cwkf61iwq0qkngvg460dsxqsfvk36qc7jf7mzwkiwbxkzvd"; }; -}) x + preConfigure = '' + cmakeFlags=" + -DWL_INSTALL_PREFIX=$out + -DWL_INSTALL_BINDIR=bin + -DWL_INSTALL_DATADIR=share/widelands + " + ''; + + nativeBuildInputs = [ cmake python gettext ]; + + buildInputs = [ + boost libpng zlib glew lua + SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 8b96a321634d..a2b139dc6fc9 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -167,7 +167,9 @@ with stdenv.lib; STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default DEVKMEM n # Disable /dev/kmem - CC_STACKPROTECTOR y # Detect buffer overflows on the stack + ${optionalString (versionOlder version "3.14") '' + CC_STACKPROTECTOR y # Detect buffer overflows on the stack + ''} ${optionalString (versionAtLeast version "3.12") '' USER_NS y # Support for user namespaces ''} diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix new file mode 100644 index 000000000000..31e6226a3de5 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.14"; + extraMeta.branch = "3.14"; + modDirVersion = "3.14.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa"; + }; + + 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/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 1632f4f4ecbf..7391a6fdf4c3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "331.38"; + versionNumber = "331.49"; in @@ -21,18 +21,16 @@ stdenv.mkDerivation { builder = ./builder.sh; - patches = optional (kernel ? version && versionAtLeast kernel.version "3.13") ./kernel-3.13.patch ; - src = if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1x1b70lnw2ipwlyff7czxqrgz8yyq87djzgmgs9p3lmczy7lsvir"; + sha256 = "00d7bq8cfxk52qd4y226fz8m9m3mjq45fbgr3q7k08jyy9qmswmn"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1ljafiqnyhj355mjp3r8wmb806xm6mbrn0x1dfgqh5pv9imhszhp"; + sha256 = "0q3lvl1lypi33i847nqz4k3161ackh2n9kgyjn6v2c480f405hfk"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch b/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch deleted file mode 100644 index 477ac1369e0a..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c ---- NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c 2014-01-25 09:39:47.126966926 +0100 -+++ NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c 2014-01-26 09:59:45.853427603 +0100 -@@ -303,7 +303,10 @@ static int nv_acpi_remove(struct acpi_de - - if (pNvAcpiObject->notify_handler_installed) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) -+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */ - NV_ACPI_OS_WAIT_EVENTS_COMPLETE(); -+#endif - - // remove event notifier - status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); -@@ -1076,10 +1079,17 @@ RM_STATUS NV_API_CALL nv_acpi_dsm_method - NvU8 argument3[4]; /* For all DSM sub functions, input size is 4 */ - NvU32 data_size; - acpi_handle dev_handle = NULL; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - #ifdef DEVICE_ACPI_HANDLE - nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); - dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev); - #endif -+#else -+#ifdef ACPI_HANDLE -+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -+ dev_handle = ACPI_HANDLE(&nvl->dev->dev); -+#endif -+#endif - - if (!dev_handle) - return RM_ERR_NOT_SUPPORTED; -@@ -1179,12 +1189,21 @@ RM_STATUS NV_API_CALL nv_acpi_ddc_method - NvU32 i; - acpi_handle dev_handle = NULL; - acpi_handle lcd_dev_handle = NULL; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - #ifdef DEVICE_ACPI_HANDLE - nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); - dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev); - #else - return RM_ERR_NOT_SUPPORTED; - #endif -+#else -+#ifdef ACPI_HANDLE -+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -+ dev_handle = ACPI_HANDLE(&nvl->dev->dev); -+#else -+ return RM_ERR_NOT_SUPPORTED; -+#endif -+#endif - if (!dev_handle) - return RM_ERR_INVALID_ARGUMENT; - -@@ -1294,12 +1313,21 @@ RM_STATUS NV_API_CALL nv_acpi_rom_method - struct acpi_object_list input = { 2, rom_arg }; - acpi_handle dev_handle = NULL; - uint32_t offset, length; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - #ifdef DEVICE_ACPI_HANDLE - nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -- dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev); -+ dev_handle = ACPI_DEVICE_HANDLE(&nvl->dev->dev); - #else - return RM_ERR_NOT_SUPPORTED; - #endif -+#else -+#ifdef ACPI_HANDLE -+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -+ dev_handle = ACPI_HANDLE(&nvl->dev->dev); -+#else -+ return RM_ERR_NOT_SUPPORTED; -+#endif -+#endif - - if (!dev_handle) - return RM_ERR_INVALID_ARGUMENT; -@@ -1364,12 +1392,21 @@ RM_STATUS NV_API_CALL nv_acpi_dod_method - union acpi_object *dod; - acpi_handle dev_handle = NULL; - NvU32 i, count = (*pSize / sizeof(NvU32)); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - #ifdef DEVICE_ACPI_HANDLE - nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); - dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev); - #else - return RM_ERR_NOT_SUPPORTED; - #endif -+#else -+#ifdef ACPI_HANDLE -+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); -+ dev_handle = ACPI_HANDLE(&nvl->dev->dev); -+#else -+ return RM_ERR_NOT_SUPPORTED; -+#endif -+#endif - - if (!dev_handle) - return RM_ERR_INVALID_ARGUMENT; -diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h ---- NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h 2014-01-25 09:39:47.172966925 +0100 -+++ NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h 2014-01-25 09:46:40.572999245 +0100 -@@ -405,11 +405,17 @@ typedef void irqreturn_t; - // not require the RCU's read lock on current->cred. - // - // -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+#define NV_KUID_TO_UID(value) (__kuid_val(value)) -+#else -+#define NV_KUID_TO_UID(value) (value) -+#endif -+ - #if defined(NV_TASK_STRUCT_HAS_CRED) - #define NV_CURRENT_EUID() \ -- (((typeof(*current->cred) __force __kernel *)current->cred)->euid) -+ NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid) - #else --#define NV_CURRENT_EUID() (current->euid) -+#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid) - #endif - - #define NV_ATOMIC_SET(data,val) atomic_set(&(data), (val)) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index caa69a9e3a8a..0afaf7b03703 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { [ # These are all changes between upstream and # https://github.com/edolstra/systemd/tree/nixos-v203. ./fixes.patch + ./fix_console_in_containers.patch ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; diff --git a/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch b/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch new file mode 100644 index 000000000000..005c00282020 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch @@ -0,0 +1,14 @@ +diff -ruN systemd-203/units/getty@.service.m4 systemd-203-patched/units/getty@.service.m4 +--- systemd-203/units/getty@.service.m4 2013-01-07 22:50:49.083315575 +0100 ++++ systemd-203-patched/units/getty@.service.m4 2014-03-18 09:54:40.002476232 +0100 +@@ -23,7 +23,9 @@ + # On systems without virtual consoles, don't start any getty. (Note + # that serial gettys are covered by serial-getty@.service, not this + # unit +-ConditionPathExists=/dev/tty0 ++ConditionPathExists=|/dev/tty0 ++ConditionVirtualization=|lxc ++ConditionVirtualization=|lxc-libvirt + + [Service] + # the VT is cleared by TTYVTDisallocate diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix new file mode 100644 index 000000000000..af1cf6d320c8 --- /dev/null +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, kernel, kmod }: + +stdenv.mkDerivation rec { + name = "v4l2loopback-${version}-${kernel.version}"; + version = "0.8.0"; + + src = fetchurl { + url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz"; + sha256 = "1rhsgc4prrj8s6njixic7fs5m3gs94v9hhf3am6lnfh5yv6yab9h"; + }; + + preBuild = '' + substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" + sed -i '/depmod/d' Makefile + export PATH=${kmod}/sbin:$PATH + ''; + + buildInputs = [ kmod ]; + + makeFlags = [ + "KERNELRELEASE=${kernel.modDirVersion}" + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + meta = with stdenv.lib; { + description = "a kernel module to create V4L2 loopback devices"; + homepage = https://github.com/umlaeute/v4l2loopback; + license = licenses.gpl2; + maintainers = [ maintainers.iElectric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 9fc3520002c9..69c0a3dff41c 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, cmake, python, boost, libuuid }: +{ stdenv, fetchurl, cmake, python, boost, libuuid, ruby }: stdenv.mkDerivation rec { name = "${project}-cpp-${version}"; project = "qpid"; - version = "0.24"; + version = "0.26"; src = fetchurl { url = "mirror://apache/${project}/${version}/${name}.tar.gz"; - sha256 = "08nfks5jjipy5i4b6mz62ijrz5ryq32c478ix7l3fzmaim3cy8b8"; + sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk"; }; - buildInputs = [ cmake python boost libuuid ]; - - # workaround this - #/nix/store/n38ns73bm4iv62fihd9ih5b39w54yyaf-boost-1.54.0/include/boost/ptr_container/detail/map_iterator.hpp:52:48: - #error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers] - cmakeFlags = "-DENABLE_WARNINGS=OFF"; + buildInputs = [ cmake python boost libuuid ruby ]; # the subdir managementgen wants to install python stuff in ${python} and # the installation tries to create some folders in /var diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index a52ca2b6871b..62fbd3337f7a 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { systemd=yes udevdir="$out/lib/udev" chrpath=no ''; - doCheck = true; + doCheck = false; checkPhase = '' export LD_LIBRARY_PATH="$PWD" diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 49d7810a3c20..acff3a84a31e 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, openssl, openssh }: +{ stdenv, fetchurl, pam, openssl, openssh, shadow }: stdenv.mkDerivation { name = "shellinabox-2.14"; @@ -7,12 +7,17 @@ stdenv.mkDerivation { url = "https://shellinabox.googlecode.com/files/shellinabox-2.14.tar.gz"; sha1 = "9e01f58c68cb53211b83d0f02e676e0d50deb781"; }; + buildInputs = [pam openssl openssh]; + patches = [ ./shellinabox-minus.patch ]; + # Disable GSSAPIAuthentication errors as well as correct hardcoded path. Take /usr/games's place. preConfigure = '' substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" "" substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin" + substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login" + substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login" ''; meta = { homepage = https://code.google.com/p/shellinabox; diff --git a/pkgs/servers/shellinabox/shellinabox-minus.patch b/pkgs/servers/shellinabox/shellinabox-minus.patch new file mode 100644 index 000000000000..2e30bd9c8aa1 --- /dev/null +++ b/pkgs/servers/shellinabox/shellinabox-minus.patch @@ -0,0 +1,28 @@ +diff -ru shellinabox-2.14/shellinabox/vt100.js shellinabox-2.14.new/shellinabox/vt100.js +--- shellinabox-2.14/shellinabox/vt100.js 2012-04-21 21:30:44.000000000 +0400 ++++ shellinabox-2.14.new/shellinabox/vt100.js 2014-03-27 16:33:31.012344164 +0400 +@@ -2676,6 +2676,7 @@ + switch (key) { + case 33: /* Page Up */ this.scrollBack(); return; + case 34: /* Page Down */ this.scrollFore(); return; ++ case 173: /* _ */ ch = this.applyModifiers(95, event); break; + default: break; + } + } +@@ -2738,6 +2739,7 @@ + case 123: /* F12 */ ch = '\u001B[24~'; break; + case 144: /* Num Lock */ return; + case 145: /* Scroll Lock */ return; ++ case 173: /* - */ ch = this.applyModifiers(45, event); break; + case 186: /* ; */ ch = this.applyModifiers(59, event); break; + case 187: /* = */ ch = this.applyModifiers(61, event); break; + case 188: /* , */ ch = this.applyModifiers(44, event); break; +@@ -2882,6 +2884,7 @@ + case 109: /* - -> _ */ u = 45; s = 95; break; + case 111: /* / -> ? */ u = 47; s = 63; break; + ++ case 173: /* - -> _ */ u = 45; s = 95; break; + case 186: /* ; -> : */ u = 59; s = 58; break; + case 187: /* = -> + */ u = 61; s = 43; break; + case 188: /* , -> < */ u = 44; s = 60; break; + diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index a5d31ca354d0..2e0a4e84f6c7 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,15 +1,13 @@ { fetchurl, stdenv, libtasn1, libgcrypt, gnutls }: stdenv.mkDerivation rec { - name = "shishi-1.0.1"; + name = "shishi-1.0.2"; src = fetchurl { url = "mirror://gnu/shishi/${name}.tar.gz"; - sha256 = "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx"; + sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"; }; - patches = [ ./no-gets.patch ]; - buildInputs = [ libtasn1 libgcrypt gnutls ] ; NIX_CFLAGS_COMPILE diff --git a/pkgs/servers/shishi/no-gets.patch b/pkgs/servers/shishi/no-gets.patch deleted file mode 100644 index 12137204f455..000000000000 --- a/pkgs/servers/shishi/no-gets.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/gl/stdio.in.h b/gl/stdio.in.h -index 06d9780..fa04a10 100644 ---- a/gl/stdio.in.h -+++ b/gl/stdio.in.h -@@ -713,10 +713,13 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # endif - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides C11 -+ removed it. */ -+#ifdef gets -+#undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif -+#endif - - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index e8da8a48d65f..782019f8ee06 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.34"; + version = "5.5.37"; src = fetchurl { url = "http://cdn.mysql.com/Downloads/MySQL-5.5/${name}.tar.gz"; - md5 = "930970a42d51e48599deb7fe01778a4a"; + md5 = "bf1d80c66d4822ec6036300399a33c03"; }; buildInputs = [ cmake bison ncurses openssl readline zlib ] diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix new file mode 100644 index 000000000000..b1cc248e1a52 --- /dev/null +++ b/pkgs/tools/backup/wal-e/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }: + +pythonPackages.buildPythonPackage rec { + name = "wal-e-${version}"; + version = "0.6.9"; + + namePrefix = ""; + + src = fetchurl { + url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz"; + sha256 = "1yzz9hic8amq7mp0kh04hsmwisk5r374ddja5g8345bl8y3bzbgk"; + }; + + # needs tox + doCheck = false; + + propagatedBuildInputs = [ + pythonPackages.boto + pythonPackages.gevent + postgresql + lzop + pv + ]; + + meta = { + description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; + homepage = https://github.com/wal-e/wal-e; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + licenses = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/compression/bsdiff/builder.sh b/pkgs/tools/compression/bsdiff/builder.sh deleted file mode 100644 index f2792a40a60c..000000000000 --- a/pkgs/tools/compression/bsdiff/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -installFlags="PREFIX=$out INSTALL=install" - -mkdir -p "$out/bin" -mkdir -p "$out/man/man1" - -genericBuild diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 81210490883f..1d693f781e6c 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -1,14 +1,37 @@ -{stdenv, fetchurl, bzip2}: +{ stdenv, fetchurl, bzip2 }: + +stdenv.mkDerivation rec { + name = "bsdiff-${version}"; + version = "4.3"; -stdenv.mkDerivation { - name = "bsdiff-4.3"; - builder = ./builder.sh; src = fetchurl { - url = http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz; + url = "http://www.daemonology.net/bsdiff/${name}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; + buildInputs = [ bzip2 ]; - patchPhase = '' - sed 's/^\.//g' -i Makefile + patches = [ ./include-systypes.patch ]; + + buildPhase = '' + cc -O3 -lbz2 bspatch.c -o bspatch + cc -O3 -lbz2 bsdiff.c -o bsdiff + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + + cp bsdiff $out/bin + cp bspatch $out/bin + cp bsdiff.1 $out/share/man/man1 + cp bspatch.1 $out/share/man/man1 ''; + + meta = { + description = "An efficient binary diff/patch tool"; + homepage = "http://www.daemonology.net/bsdiff"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; } diff --git a/pkgs/tools/compression/bsdiff/include-systypes.patch b/pkgs/tools/compression/bsdiff/include-systypes.patch new file mode 100644 index 000000000000..d070a8bb0f85 --- /dev/null +++ b/pkgs/tools/compression/bsdiff/include-systypes.patch @@ -0,0 +1,12 @@ +diff --git a/bspatch.c b/bspatch.c +index 643c60b..543379c 100644 +--- a/bspatch.c ++++ b/bspatch.c +@@ -28,6 +28,7 @@ + __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:06 cperciva Exp $"); + #endif + ++#include <sys/types.h> + #include <bzlib.h> + #include <stdlib.h> + #include <stdio.h> diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a70678c50343..6e2f92e9c1c8 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.03.25.1"; + version = "2014.03.30.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "09jayir0n10pgp6h3swzlx4d2x82by6f3dgbvnlvby73h5lpf668"; + sha256 = "07xdhgc2sgr7bqkaxwcihvx6l0m6alp3i8d0ij7cxrk6b6rvwrgx"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index fe683c382853..758e3fd79805 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc"; # Check that the udev plugin got built. - postInstall = "[ -e $out/lib/dhcpcd/dev/udev.so ]"; + postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]"; meta = { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix new file mode 100644 index 000000000000..e2dc1fd1eafd --- /dev/null +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, systemd, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.05.9"; + name = "ndjbdns-${version}"; + src = fetchurl { + url = "http://pjp.dgplug.org/ndjbdns/${name}.tar.gz"; + sha256 = "0gf3hlmr6grcn6dzflf83lqqfp6hk3ldhbc7z0a1rrh059m93ap5"; + }; + + buildInputs = [ pkgconfig systemd ]; + + meta = with stdenv.lib; { + description = "N-DJBDNS is a brand new release of the Djbdns. Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein."; + homepage = http://pjp.dgplug.org/ndjbdns/; + license = licenses.gpl2; + maintainers = [ maintainers.msackman ]; + platforms = platforms.linux; + }; + +} \ No newline at end of file diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index b0d1dba891b6..6926b9aa82aa 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -31,7 +31,17 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = [ ./locale_archive.patch ]; + patches = [ + ./locale_archive.patch + (fetchurl { + name = "CVE-2014-2653.patch"; + url = "http://anonscm.debian.org/gitweb/?p=pkg-ssh/openssh.git;a=blobdiff_plain;" + + "f=sshconnect.c;h=324f5e0a396a4da9885d121bbbef87f6ccf2b149;" + + "hp=87c3770c0fd5c7ff41227c45b4528985eaea54a6;hb=63d5fa28e16d96db6bac2dbe3fcecb65328f8966;" + + "hpb=9cbb60f5e4932634db04c330c88abc49cc5567bd"; + sha256 = "160c434igl2r8q4cavhdlwvnbqizx444sjrhg98f997pyhz524h9"; + }) + ]; buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ stdenv.lib.optional withKerberos [ kerberos ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 5c9120cf33ed..ff29316edbf2 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea"; src = fetchurl { - url = http://hydra.nixos.org/build/6763179/download/4/disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea.tar.gz; - sha256 = "0zmsaz1kvc7dl1igh6z74jxy3w5p2zbfm9jsczdjdh3947fkni4p"; + url = http://hydra.nixos.org/build/9876935/download/4/disnix-0.3pre15e93a364ad9439d8336e659921600d48252045d.tar.gz; + sha256 = "1kgc6cacpp3ly7c62ah6pdprdl1bab08b4ir4dcrrm44x6fa1k63"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 4c811dd3f71f..7420353499f5 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, disnix, socat, pkgconfig }: +{ stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { name = "disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99"; src = fetchurl { - url = http://hydra.nixos.org/build/6769017/download/3/disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99.tar.gz; - sha256 = "0jw05qjn0fbf4xb2g8a8i0padmsw17ayr4acw7z784bljrm1z055"; + url = http://hydra.nixos.org/build/9877039/download/3/disnixos-0.2preb10c56eeb1be3046645eea90c779e2d64045581f.tar.gz; + sha256 = "1pkpf6vp9q3jjp212lghbs1km8iqh4rm9xa5jm0dqb5ya25f0jf2"; }; - buildInputs = [ socat pkgconfig disnix ]; + buildInputs = [ socat pkgconfig disnix getopt ]; dontStrip = true; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 2a5852863f96..5c937bc8aef4 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -9,6 +9,7 @@ , enableTomcatWebApplication ? false , enableMongoDatabase ? false , catalinaBaseDir ? "/var/tomcat" +, getopt }: assert enableMySQLDatabase -> mysql != null; @@ -20,8 +21,8 @@ assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484"; src = fetchurl { - url = http://hydra.nixos.org/build/6763096/download/1/dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484.tar.gz; - sha256 = "0k7qpqa9inzxjdryd7zfzxid8k1icsxxw995chzw4wrlgxns16xy"; + url = http://hydra.nixos.org/build/9146265/download/1/dysnomia-0.3pre313a5f99a166fee2e0245dfd25f41ec9ed958075.tar.gz; + sha256 = "0fgbqybr9rfr95fkmv1hpq7al0p1kxa385k6sjc7iwwcxs4cmxf5"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -37,7 +38,7 @@ stdenv.mkDerivation { ${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"} ''; - buildInputs = [] + buildInputs = [ getopt ] ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 7f52950aa366..28497647f86d 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.7pre3522_f7e077a"; + name = "nix-1.7pre3538_4900957"; src = fetchurl { - url = "http://hydra.nixos.org/build/9342392/download/4/${name}.tar.xz"; - sha256 = "f1fce2cc7bde1a7bd5d8d491153ed805542970768211ebb7b121d9630033afc2"; + url = "http://hydra.nixos.org/build/9862372/download/5/${name}.tar.xz"; + sha256 = "05l9j892cscf0ig6s0kxkfigzqwrsza4g38a40s87yvd2cr14pxq"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix deleted file mode 100644 index 0f84cfa6ebc7..000000000000 --- a/pkgs/tools/security/cb0cat/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "cb0cat-${version}"; - version = "20131216153906"; - - src = fetchurl { - url = "https://www.cblnk.com/cb0cat/dist/${name}.tgz"; - sha256 = "182767nxfyiis7ac8bn5v8rxb9vlly8n5w42pz1dd0751xwdlp82"; - }; - - installPhase = '' - mkdir -p $out/bin - mv cb0cat $out/bin - ''; - - meta = { - description = "cryptographic tool based on the CBEAMr0 sponge function"; - homepage = "https://www.cblnk.com"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/tools/security/cb1cat/default.nix b/pkgs/tools/security/cb1cat/default.nix new file mode 100644 index 000000000000..7c3d9a1661e2 --- /dev/null +++ b/pkgs/tools/security/cb1cat/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "cb1cat-${version}"; + version = "20140328100000"; + + src = fetchurl { + url = "https://www.cblnk.com/cb1cat/dist/${name}.tgz"; + sha256 = "0fbly4fg2qsb4kx9wgv357bsa3mmmy8xmy0yszw80k50ixphjswv"; + }; + + installPhase = '' + mkdir -p $out/bin + mv cb1cat $out/bin + ''; + + meta = { + description = "cryptographic tool based on the CBEAMr1 sponge function"; + homepage = "https://www.cblnk.com/cb1cat/"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index fdcd15a4b825..458111be4006 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.15"; + version = "1.4.16"; name = "ccid-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2"; - sha256 = "02lrdmqlw2ilbmgcpi2h7w741p025c10frxdn5w3wnzi8qi1hdjl"; + sha256 = "0a0e6aa38863c79e38673c085254fa94fd0aa040b9622304a8d6d4222b7e7ea0"; }; patchPhase = '' diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix new file mode 100644 index 000000000000..5e1737241904 --- /dev/null +++ b/pkgs/tools/security/hashcat/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, p7zip, patchelf }: + +let + bits = if stdenv.system == "x86_64-linux" then "64" else "32"; + libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; + + fixBin = x: '' + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath} ${x} + ''; +in +stdenv.mkDerivation rec { + name = "hashcat-${version}"; + version = "0.47"; + + src = fetchurl { + url = "http://hashcat.net/files/${name}.7z"; + sha256 = "0mc4lv4qfxabp794xfzgr63fhwk7lvbg12pry8a96lldp0jwp6i3"; + }; + + buildInputs = [ p7zip patchelf ]; + + unpackPhase = "7z x $src > /dev/null && cd ${name}"; + + installPhase = '' + mkdir -p $out/bin $out/libexec + cp -R * $out/libexec + + echo -n "/" > $out/bin/eula.accepted + ln -s $out/libexec/hashcat-cli${bits}.bin $out/bin/hashcat + ln -s $out/libexec/hashcat-cliXOP.bin $out/bin/hashcat-xop + ln -s $out/libexec/hashcat-cliAVX.bin $out/bin/hashcat-avx + ''; + + fixupPhase = '' + ${fixBin "$out/libexec/hashcat-cli${bits}.bin"} + ${fixBin "$out/libexec/hashcat-cliXOP.bin"} + ${fixBin "$out/libexec/hashcat-cliAVX.bin"} + ''; + + meta = { + description = "Fast password cracker"; + homepage = "http://hashcat.net/hashcat/"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix new file mode 100644 index 000000000000..2c54e0b3cb8f --- /dev/null +++ b/pkgs/tools/security/p0f/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, libpcap }: + +stdenv.mkDerivation rec { + name = "p0f-${version}"; + version = "3.06b"; + + src = fetchurl { + url = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz"; + sha256 = "1rydqvr78a3rjp9iwfbw4bs7jfb4p22962makdgw8yjmw8dr6lfi"; + }; + + buildInputs = [ libpcap ]; + + buildPhase = '' + substituteInPlace config.h --replace "p0f.fp" "$out/etc/p0f.fp" + ./build.sh + cd tools && make && cd .. + ''; + + installPhase = '' + mkdir -p $out/sbin $out/etc + + cp ./p0f $out/sbin + cp ./p0f.fp $out/etc + + cp ./tools/p0f-client $out/sbin + cp ./tools/p0f-sendsyn $out/sbin + cp ./tools/p0f-sendsyn6 $out/sbin + ''; + + meta = { + description = "Passive network reconnaissance and fingerprinting tool"; + homepage = "http://lcamtuf.coredump.cx/p0f3/"; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 7f13ffc8db5f..2737cc435752 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }: stdenv.mkDerivation rec { - version = "1.8.10"; + version = "1.8.11"; name = "pcsclite-${version}"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/3963/pcsc-lite-${version}.tar.bz2"; - sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30"; + url = "https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-${version}.tar.bz2"; + sha256 = "945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6"; }; # The OS should care on preparing the drivers into this location @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = http://pcsclite.alioth.debian.org/; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.bsd3; + maintainers = with maintainers; [viric]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index c59e50f4ae4c..c5c474417046 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p7dgchq8hgadnxz5qh95ay17k5j74l4qyd15wspc54lb603p2av"; }; - postFixup = '' + postFixup = stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/ssdeep):$out/lib" $out/bin/ssdeep ''; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A program for calculating fuzzy hashes"; homepage = "http://www.ssdeep.sf.net"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 98a8a0fd810f..85de3dc08cfd 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,16 +5,16 @@ rec { sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd"; }; - texmfVersion = "2013.20140215"; + texmfVersion = "2013.20140314"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "0f1xqa1a1yklsiqz12rgihdc6viw8ghdbx2s2pw2k3h0dfsd6ss3"; + sha256 = "0f2dxm0ac4j04w1rgjpdranpprjghw8slvijknykpvph1jn0lmzm"; }; - langTexmfVersion = "2013.20140215"; + langTexmfVersion = "2013.20140314"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "0igz9kpd1rfbq7smb1wyd75cz396rinbh25rk19lxqh25dix0xzj"; + sha256 = "154g300nbg4fhxprvi9fwr7wmpws4cg89m9nwsfpyf0m2k8n9ibx"; }; passthru = { inherit texmfSrc langTexmfSrc; }; diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 056c7e0bf4e0..10b9962936dd 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.20140215"; + version = "2013.20140314"; src = fetchurl { url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "04a67pns6q8kw1nl2v6x5p443kvhk8fr26qkcj7z098n68fpwls8"; + sha256 = "6b4216fe87c354a0c3c8ec456272cc096a7ec112a68031797ae23f18e1e5b74c"; }; buildInputs = [texLive xz]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b2af0be384a..a00ca1a1fb16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -426,7 +426,7 @@ let aescrypt = callPackage ../tools/misc/aescrypt { }; - cb0cat = callPackage ../tools/security/cb0cat { }; + cb1cat = callPackage ../tools/security/cb1cat { }; ahcpd = callPackage ../tools/networking/ahcpd { }; @@ -711,6 +711,8 @@ let colordiff = callPackage ../tools/text/colordiff { }; + concurrencykit = callPackage ../development/libraries/concurrencykit { }; + connect = callPackage ../tools/networking/connect { }; conspy = callPackage ../os-specific/linux/conspy {}; @@ -823,6 +825,8 @@ let dhcpcd = callPackage ../tools/networking/dhcpcd { }; + dhcpcd_without_udev = callPackage ../tools/networking/dhcpcd { udev = null; }; + diffstat = callPackage ../tools/text/diffstat { }; diffutils = callPackage ../tools/text/diffutils { }; @@ -1170,6 +1174,8 @@ let hardlink = callPackage ../tools/system/hardlink { }; + hashcat = callPackage ../tools/security/hashcat { }; + halibut = callPackage ../tools/typesetting/halibut { }; hddtemp = callPackage ../tools/misc/hddtemp { }; @@ -1392,6 +1398,8 @@ let minecraft = callPackage ../games/minecraft { }; + minecraft-server = callPackage ../games/minecraft-server { }; + minetest = callPackage ../games/minetest { libpng = libpng12; }; @@ -1467,6 +1475,8 @@ let nbd = callPackage ../tools/networking/nbd { }; + ndjbdns = callPackage ../tools/networking/ndjbdns { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; netcdf = callPackage ../development/libraries/netcdf { }; @@ -1525,6 +1535,8 @@ let nlopt = callPackage ../development/libraries/nlopt {}; + npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; + npth = callPackage ../development/libraries/npth {}; nmap = callPackage ../tools/security/nmap { @@ -1634,6 +1646,14 @@ let parted = callPackage ../tools/misc/parted { hurd = null; }; + pitivi = callPackage ../applications/video/pitivi { + gst = gst_all_1; + clutter-gtk = clutter_gtk; + inherit (gnome3) gnome_icon_theme gnome_icon_theme_symbolic; + }; + + p0f = callPackage ../tools/security/p0f { }; + hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (makeOverridable @@ -2106,6 +2126,8 @@ let vtun = callPackage ../tools/networking/vtun { }; + wal_e = callPackage ../tools/backup/wal-e { }; + wbox = callPackage ../tools/networking/wbox {}; welkin = callPackage ../tools/graphics/welkin {}; @@ -2710,6 +2732,18 @@ let regexCompat HsSyck random; }; + gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + version = "4.7-2013q3-20130916"; + releaseType = "update"; + sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; + }; + gcc-arm-embedded-4_8 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + version = "4.8-2014q1-20140314"; + releaseType = "update"; + sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; + }; + gcc-arm-embedded = gcc-arm-embedded-4_8; + # Haskell and GHC # Import Haskell infrastructure. @@ -2792,6 +2826,19 @@ let gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; + icedtea7_jdk = callPackage ../development/compilers/icedtea rec { + jdk = openjdk; + jdkPath = "${openjdk}/lib/openjdk"; + } // { outputs = [ "out" ]; }; + + icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs + { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; } + pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; }; + + icedtea7_web = callPackage ../development/compilers/icedtea-web { + jdk = "${icedtea7_jdk}/lib/icedtea"; + }; + ikarus = callPackage ../development/compilers/ikarus { }; hugs = callPackage ../development/compilers/hugs { }; @@ -2846,10 +2893,15 @@ let jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { + juliaGit = callPackage ../development/compilers/julia/git-20131013.nix { liblapack = liblapack.override {shared = true;}; llvm = llvm_33; }; + julia021 = callPackage ../development/compilers/julia/0.2.1.nix { + liblapack = liblapack.override {shared = true;}; + llvm = llvm_33; + }; + julia = julia021; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit makeWrapper gtk glib pango atk gdk_pixbuf; @@ -4540,7 +4592,7 @@ let gts = callPackage ../development/libraries/gts { }; - gvfs = callPackage ../development/libraries/gvfs { }; + gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; @@ -4885,6 +4937,8 @@ let libmtp = callPackage ../development/libraries/libmtp { }; + libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libnatspec = callPackage ../development/libraries/libnatspec { }; libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; @@ -5313,6 +5367,8 @@ let mlt = callPackage ../development/libraries/mlt { }; + mps = callPackage ../development/libraries/mps { }; + libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; mpeg2dec = libmpeg2; @@ -5909,6 +5965,11 @@ let gst-plugins-base = gst_all_1.gst-plugins-base; }; + webkitgtk2 = webkitgtk.override { + withGtk2 = true; + enableIntrospection = false; + }; + wildmidi = callPackage ../development/libraries/wildmidi { }; wvstreams = callPackage ../development/libraries/wvstreams { }; @@ -6909,6 +6970,15 @@ let ]; }; + linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.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 kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -6932,6 +7002,8 @@ let cryptodev = callPackage ../os-specific/linux/cryptodev { }; e1000e = callPackage ../os-specific/linux/e1000e {}; + + v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; frandom = callPackage ../os-specific/linux/frandom { }; @@ -7003,8 +7075,9 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity; linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); + linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); # Update this when adding a new version! - linuxPackages_latest = pkgs.linuxPackages_3_13; + linuxPackages_latest = pkgs.linuxPackages_3_14; # The current default kernel / kernel modules. linux = linuxPackages.kernel; @@ -8973,6 +9046,8 @@ let cura = callPackage ../applications/misc/cura { }; + printrun = callPackage ../applications/misc/printrun { }; + slim = callPackage ../applications/display-managers/slim { libpng = libpng12; }; @@ -9455,6 +9530,8 @@ let zgrviewer = callPackage ../applications/graphics/zgrviewer {}; + zotero = callPackage ../applications/office/zotero { }; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; @@ -9599,6 +9676,10 @@ let mars = callPackage ../games/mars { }; micropolis = callPackage ../games/micropolis { }; + + mnemosyne = callPackage ../games/mnemosyne { + inherit (pythonPackages) matplotlib cherrypy sqlite3; + }; naev = callPackage ../games/naev { }; @@ -9754,7 +9835,7 @@ let warzone2100 = callPackage ../games/warzone2100 { }; widelands = callPackage ../games/widelands { - libpng = libpng12; + lua = lua5_1; }; worldofgoo_demo = callPackage ../games/worldofgoo { @@ -10168,6 +10249,7 @@ let tptp = callPackage ../applications/science/logic/tptp {}; + z3 = callPackage ../applications/science/logic/z3 {}; ### SCIENCE / ELECTRONICS diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b8f4076c89a5..d9f00fb3f0bb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x inherit (self) cabal ghc; async = self.async_2_0_1_5; attoparsec = self.attoparsec_0_11_2_1; - caseInsensitive = self.caseInsensitive_1_1_0_3; + caseInsensitive = self.caseInsensitive_1_2_0_0; cgi = self.cgi_3001_1_8_5; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_5_1_0; @@ -153,7 +153,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x html = self.html_1_0_1_2; HTTP = self.HTTP_4000_2_11; HUnit = self.HUnit_1_2_5_2; - mtl = self.mtl_2_1_2; + mtl = self.mtl_2_1_3_1; network = self.network_2_4_2_2; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw = self.OpenGLRaw_1_4_0_0; @@ -165,7 +165,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x regexCompat = self.regexCompat_0_95_1; regexPosix = self.regexPosix_0_95_2; split = self.split_0_2_2; - stm = self.stm_2_4_2; + stm = self.stm_2_4_3; syb = self.syb_0_4_1; text = self.text_1_1_0_1; transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 @@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x zlib = self.zlib_0_5_4_1; cabalInstall = self.cabalInstall_1_18_0_3; alex = self.alex_3_1_3; - haddock = self.haddock_2_13_2_1; + haddock = self.haddock_2_14_1; happy = self.happy_1_19_3; primitive = self.primitive_0_5_2_1; # semi-official, but specified }; @@ -729,7 +729,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {}; - caseInsensitive = self.caseInsensitive_1_1_0_3; + caseInsensitive_1_2_0_0 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.0.nix {}; + caseInsensitive = self.caseInsensitive_1_2_0_0; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; @@ -816,6 +817,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {}; + conduitExtra = callPackage ../development/libraries/haskell/conduit-extra {}; + ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; configurator = callPackage ../development/libraries/haskell/configurator {}; @@ -1177,6 +1180,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x gio = callPackage ../development/libraries/haskell/gio {}; + gitDate = callPackage ../development/libraries/haskell/git-date {}; + github = callPackage ../development/libraries/haskell/github {}; gitit = callPackage ../development/libraries/haskell/gitit {}; @@ -1718,6 +1723,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {}; + monadloc = callPackage ../development/libraries/haskell/monadloc {}; + monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; @@ -1757,7 +1764,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix { transformers = self.transformers_0_3_0_0; }; - mtl = self.mtl_2_1_2; + mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix { + transformers = self.transformers_0_3_0_0; + }; + mtl = self.mtl_2_1_3_1; mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; @@ -1939,6 +1949,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x persistent = callPackage ../development/libraries/haskell/persistent {}; + persistentMysql = callPackage ../development/libraries/haskell/persistent-mysql {}; + persistentPostgresql = callPackage ../development/libraries/haskell/persistent-postgresql {}; persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {}; @@ -2249,6 +2261,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x StrafunskiStrategyLib = callPackage ../development/libraries/haskell/Strafunski-StrategyLib {}; + streamingCommons = callPackage ../development/libraries/haskell/streaming-commons {}; + streamproc = callPackage ../development/libraries/haskell/streamproc {}; strict = callPackage ../development/libraries/haskell/strict {}; @@ -2336,7 +2350,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {}; stm_2_4 = callPackage ../development/libraries/haskell/stm/2.4.nix {}; stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {}; - stm = self.stm_2_4_2; + stm_2_4_3 = callPackage ../development/libraries/haskell/stm/2.4.3.nix {}; + stm = self.stm_2_4_3; stmChans = callPackage ../development/libraries/haskell/stm-chans {}; @@ -2810,6 +2825,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x BNFCMeta = callPackage ../development/tools/haskell/BNFC-meta {}; + cake3 = callPackage ../development/tools/haskell/cake3 {}; + cpphs = callPackage ../development/tools/misc/cpphs {}; Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {}; @@ -2822,8 +2839,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; - haddock_2_13_2_1 = callPackage ../development/tools/documentation/haddock/2.13.2.1.nix {}; - haddock = self.haddock_2_13_2_1; + haddock_2_14_1 = callPackage ../development/tools/documentation/haddock/2.14.1.nix {}; + haddock = self.haddock_2_14_1; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; @@ -2899,21 +2916,21 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # Build a cabal package given a local .cabal file buildLocalCabal = src: name: let - cabalExpr = pkgs.stdenv.mkDerivation { + cabalExpr = pkgs.stdenv.mkDerivation ({ name = "${name}.nix"; - LANG = "en_US.UTF-8"; - - LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; - buildCommand = '' ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ | grep -v FILTERME | sed \ -e 's/licenses.proprietary/licenses.unfree/' \ -e 's/{ cabal/{ cabal, src/' \ - -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;/' > $out + -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n jailbreak = true;/' > $out ''; - }; + + } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { + LANG = "en_US.UTF-8"; + LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; + }); in callPackage cabalExpr { inherit src; }; cabalDev = callPackage ../development/tools/haskell/cabal-dev {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 93e965235fcc..d8f4f2078c7e 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -21,21 +21,21 @@ passthru.names = [ "Base64" ]; }; by-spec."CSSselect"."0.x" = - self.by-version."CSSselect"."0.5.0"; - by-version."CSSselect"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSselect-0.5.0"; + self.by-version."CSSselect"."0.7.0"; + by-version."CSSselect"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-CSSselect-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.5.0.tgz"; - name = "CSSselect-0.5.0.tgz"; - sha1 = "cd12727a4e3a85d1e862611b349c9e3c6b7e0452"; + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.7.0.tgz"; + name = "CSSselect-0.7.0.tgz"; + sha1 = "e4054c67b467465f3c9500c0da0aa7878c4babd2"; }) ]; buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ self.by-version."CSSwhat"."0.4.5" - self.by-version."domutils"."1.4.0" + self.by-version."domutils"."1.4.1" self.by-version."boolbase"."1.0.0" self.by-version."nth-check"."1.0.0" ]; @@ -58,7 +58,7 @@ (self.nativeDeps."CSSselect" or []); deps = [ self.by-version."CSSwhat"."0.4.5" - self.by-version."domutils"."1.4.0" + self.by-version."domutils"."1.4.1" ]; peerDependencies = [ ]; @@ -246,7 +246,7 @@ ]; passthru.names = [ "adm-zip" ]; }; - by-spec."adm-zip"."~0.4.3" = + by-spec."adm-zip"."^0.4.3" = self.by-version."adm-zip"."0.4.4"; by-version."adm-zip"."0.4.4" = lib.makeOverridable self.buildNodePackage { name = "node-adm-zip-0.4.4"; @@ -265,6 +265,8 @@ ]; passthru.names = [ "adm-zip" ]; }; + by-spec."adm-zip"."~0.4.3" = + self.by-version."adm-zip"."0.4.4"; by-spec."almond"."*" = self.by-version."almond"."0.2.9"; by-version."almond"."0.2.9" = lib.makeOverridable self.buildNodePackage { @@ -548,6 +550,82 @@ }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.15"; + by-spec."array-filter"."~0.0.0" = + self.by-version."array-filter"."0.0.1"; + by-version."array-filter"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-array-filter-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; + name = "array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + }) + ]; + buildInputs = + (self.nativeDeps."array-filter" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "array-filter" ]; + }; + by-spec."array-map"."~0.0.0" = + self.by-version."array-map"."0.0.0"; + by-version."array-map"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-array-map-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; + name = "array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + }) + ]; + buildInputs = + (self.nativeDeps."array-map" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "array-map" ]; + }; + by-spec."array-reduce"."~0.0.0" = + self.by-version."array-reduce"."0.0.0"; + by-version."array-reduce"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-array-reduce-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + name = "array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + }) + ]; + buildInputs = + (self.nativeDeps."array-reduce" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "array-reduce" ]; + }; + by-spec."asap"."^1.0.0" = + self.by-version."asap"."1.0.0"; + by-version."asap"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-asap-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; + name = "asap-1.0.0.tgz"; + sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"; + }) + ]; + buildInputs = + (self.nativeDeps."asap" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "asap" ]; + }; by-spec."ascii-json"."~0.2" = self.by-version."ascii-json"."0.2.0"; by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -689,14 +767,14 @@ passthru.names = [ "astw" ]; }; by-spec."async"."*" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.2.10"; + 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.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz"; + name = "async-0.6.2.tgz"; + sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef"; }) ]; buildInputs = @@ -707,7 +785,7 @@ ]; passthru.names = [ "async" ]; }; - "async" = self.by-version."async"."0.2.10"; + "async" = self.by-version."async"."0.6.2"; by-spec."async"."0.1.15" = self.by-version."async"."0.1.15"; by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -769,6 +847,25 @@ }; by-spec."async"."0.2.x" = self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.2.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }) + ]; + 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.1.22" = self.by-version."async"."0.1.22"; by-spec."async"."~0.2.10" = @@ -959,6 +1056,25 @@ ]; passthru.names = [ "base64id" ]; }; + by-spec."basic-auth-connect"."1.0.0" = + self.by-version."basic-auth-connect"."1.0.0"; + by-version."basic-auth-connect"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-basic-auth-connect-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + name = "basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + }) + ]; + buildInputs = + (self.nativeDeps."basic-auth-connect" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "basic-auth-connect" ]; + }; by-spec."batch"."0.5.0" = self.by-version."batch"."0.5.0"; by-version."batch"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -1159,6 +1275,70 @@ passthru.names = [ "boom" ]; }; by-spec."bower"."*" = + self.by-version."bower"."1.3.1"; + by-version."bower"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "bower-1.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bower/-/bower-1.3.1.tgz"; + name = "bower-1.3.1.tgz"; + sha1 = "60d564e774be4e60631a159566830fce260e469a"; + }) + ]; + buildInputs = + (self.nativeDeps."bower" or []); + deps = [ + self.by-version."abbrev"."1.0.4" + self.by-version."archy"."0.0.2" + 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.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.5" + 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."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.0" + self.by-version."nopt"."2.1.2" + self.by-version."lru-cache"."2.5.0" + self.by-version."open"."0.0.4" + 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" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bower" ]; + }; + "bower" = self.by-version."bower"."1.3.1"; + by-spec."bower".">=0.9.0" = + self.by-version."bower"."1.3.1"; + by-spec."bower".">=1.2.8 <2" = + self.by-version."bower"."1.3.1"; + by-spec."bower"."~1.2.0" = self.by-version."bower"."1.2.8"; by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage { name = "bower-1.2.8"; @@ -1182,11 +1362,11 @@ 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.4" + self.by-version."decompress-zip"."0.0.5" 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."graceful-fs"."2.0.2" + self.by-version."graceful-fs"."2.0.3" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" self.by-version."junk"."0.2.2" @@ -1207,7 +1387,7 @@ 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.7" + self.by-version."update-notifier"."0.1.8" self.by-version."which"."1.0.5" self.by-version."p-throttler"."0.0.1" ]; @@ -1215,13 +1395,6 @@ ]; passthru.names = [ "bower" ]; }; - "bower" = self.by-version."bower"."1.2.8"; - by-spec."bower".">=0.9.0" = - self.by-version."bower"."1.2.8"; - by-spec."bower".">=1.2.8 <2" = - self.by-version."bower"."1.2.8"; - by-spec."bower"."~1.2.0" = - self.by-version."bower"."1.2.8"; 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 { @@ -1236,7 +1409,7 @@ buildInputs = (self.nativeDeps."bower-config" or []); deps = [ - self.by-version."graceful-fs"."2.0.2" + 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" @@ -1259,7 +1432,7 @@ buildInputs = (self.nativeDeps."bower-config" or []); deps = [ - self.by-version."graceful-fs"."2.0.2" + 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" @@ -1304,7 +1477,7 @@ (self.nativeDeps."bower-json" or []); deps = [ self.by-version."deep-extend"."0.2.8" - self.by-version."graceful-fs"."2.0.2" + self.by-version."graceful-fs"."2.0.3" self.by-version."intersect"."0.0.3" ]; peerDependencies = [ @@ -1351,6 +1524,8 @@ ]; passthru.names = [ "bower-logger" ]; }; + by-spec."bower-logger"."~0.2.2" = + self.by-version."bower-logger"."0.2.2"; by-spec."bower-registry-client"."~0.1.4" = self.by-version."bower-registry-client"."0.1.6"; by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -1367,7 +1542,7 @@ deps = [ self.by-version."async"."0.2.10" self.by-version."bower-config"."0.4.5" - self.by-version."graceful-fs"."2.0.2" + 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" @@ -1397,7 +1572,7 @@ 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.2.8" + self.by-version."bower"."1.3.1" self.by-version."argparse"."0.1.15" self.by-version."clone"."0.1.11" self.by-version."semver"."2.2.1" @@ -1479,21 +1654,21 @@ by-spec."browser-resolve"."~1.2.2" = self.by-version."browser-resolve"."1.2.2"; by-spec."browserchannel"."*" = - self.by-version."browserchannel"."1.1.1"; - by-version."browserchannel"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-browserchannel-1.1.1"; + self.by-version."browserchannel"."1.2.0"; + by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-browserchannel-1.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.1.1.tgz"; - name = "browserchannel-1.1.1.tgz"; - sha1 = "223aeddf06892314e11f15fd2d4e2ade64a1bba5"; + url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.2.0.tgz"; + name = "browserchannel-1.2.0.tgz"; + sha1 = "207ce6eb844e00febfdf32084f10d4757cbcf97c"; }) ]; buildInputs = (self.nativeDeps."browserchannel" or []); deps = [ self.by-version."hat"."0.0.3" - self.by-version."connect"."2.13.0" + self.by-version."connect"."2.14.3" self.by-version."request"."2.34.0" self.by-version."ascii-json"."0.2.0" ]; @@ -1501,16 +1676,16 @@ ]; passthru.names = [ "browserchannel" ]; }; - "browserchannel" = self.by-version."browserchannel"."1.1.1"; - by-spec."browserify"."~3.31.2" = - self.by-version."browserify"."3.31.2"; - by-version."browserify"."3.31.2" = lib.makeOverridable self.buildNodePackage { - name = "browserify-3.31.2"; + "browserchannel" = self.by-version."browserchannel"."1.2.0"; + by-spec."browserify"."~3.32.0" = + self.by-version."browserify"."3.32.1"; + by-version."browserify"."3.32.1" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.32.1"; src = [ - (self.patchSource fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-3.31.2.tgz"; - name = "browserify-3.31.2.tgz"; - sha1 = "ec5bbd7fff284645db59280c340d972868e0ab1b"; + (fetchurl { + url = "http://registry.npmjs.org/browserify/-/browserify-3.32.1.tgz"; + name = "browserify-3.32.1.tgz"; + sha1 = "5d4ad85d5cafee3fc1062e76e56143d0c298bfcb"; }) ]; buildInputs = @@ -1523,7 +1698,7 @@ self.by-version."through"."2.3.4" self.by-version."duplexer"."0.1.1" self.by-version."stream-combiner"."0.0.4" - self.by-version."concat-stream"."1.4.1" + self.by-version."concat-stream"."1.4.4" self.by-version."insert-module-globals"."3.2.0" self.by-version."syntax-error"."0.1.0" self.by-version."browser-resolve"."1.2.2" @@ -1533,7 +1708,7 @@ self.by-version."parents"."0.0.2" self.by-version."deep-equal"."0.1.2" self.by-version."constants-browserify"."0.0.1" - self.by-version."os-browserify"."0.1.1" + self.by-version."os-browserify"."0.1.2" self.by-version."console-browserify"."1.0.3" self.by-version."vm-browserify"."0.0.4" self.by-version."zlib-browserify"."0.0.3" @@ -1542,11 +1717,11 @@ self.by-version."crypto-browserify"."1.0.9" self.by-version."util"."0.10.3" self.by-version."events"."1.0.0" - self.by-version."buffer"."2.1.4" + self.by-version."buffer"."2.1.5" self.by-version."url"."0.7.9" self.by-version."https-browserify"."0.0.0" self.by-version."path-browserify"."0.0.0" - self.by-version."querystring"."0.2.0" + self.by-version."querystring-es3"."0.2.0" self.by-version."stream-browserify"."0.1.3" self.by-version."string_decoder"."0.0.1" self.by-version."tty-browserify"."0.0.0" @@ -1558,7 +1733,7 @@ self.by-version."commondir"."0.0.1" self.by-version."shallow-copy"."0.0.1" self.by-version."subarg"."0.0.1" - self.by-version."resolve"."0.6.1" + self.by-version."resolve"."0.6.2" self.by-version."glob"."3.2.9" self.by-version."builtins"."0.0.2" ]; @@ -1644,14 +1819,14 @@ passthru.names = [ "bson" ]; }; by-spec."buffer"."~2.1.4" = - self.by-version."buffer"."2.1.4"; - by-version."buffer"."2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-buffer-2.1.4"; + self.by-version."buffer"."2.1.5"; + by-version."buffer"."2.1.5" = lib.makeOverridable self.buildNodePackage { + name = "node-buffer-2.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-2.1.4.tgz"; - name = "buffer-2.1.4.tgz"; - sha1 = "0283e62870b4f450b636e00eb9fd527cd9ae1341"; + url = "http://registry.npmjs.org/buffer/-/buffer-2.1.5.tgz"; + name = "buffer-2.1.5.tgz"; + sha1 = "15373190bc584061de5cbc155db82a0dc1a462de"; }) ]; buildInputs = @@ -1724,14 +1899,14 @@ passthru.names = [ "buffers" ]; }; by-spec."buffertools"."*" = - self.by-version."buffertools"."2.0.1"; - by-version."buffertools"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-buffertools-2.0.1"; + self.by-version."buffertools"."2.1.2"; + by-version."buffertools"."2.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-buffertools-2.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.1.tgz"; - name = "buffertools-2.0.1.tgz"; - sha1 = "4611e6430687e7876330285dd1ae7e7e47b47288"; + url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.2.tgz"; + name = "buffertools-2.1.2.tgz"; + sha1 = "d667afc1ef8b9932e90a25f2e3a66a929d42daab"; }) ]; buildInputs = @@ -1742,7 +1917,7 @@ ]; passthru.names = [ "buffertools" ]; }; - "buffertools" = self.by-version."buffertools"."2.0.1"; + "buffertools" = self.by-version."buffertools"."2.1.2"; by-spec."buffertools".">=1.1.1 <2.0.0" = self.by-version."buffertools"."1.1.1"; by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1879,6 +2054,8 @@ ]; passthru.names = [ "bytes" ]; }; + 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."callsite"."~1.0.0" = @@ -1922,14 +2099,14 @@ passthru.names = [ "cardinal" ]; }; by-spec."chai"."*" = - self.by-version."chai"."1.9.0"; - by-version."chai"."1.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-chai-1.9.0"; + self.by-version."chai"."1.9.1"; + by-version."chai"."1.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-chai-1.9.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/chai/-/chai-1.9.0.tgz"; - name = "chai-1.9.0.tgz"; - sha1 = "3ebe99f3bab9241ed3fcd576f8fe96cad9ed7413"; + url = "http://registry.npmjs.org/chai/-/chai-1.9.1.tgz"; + name = "chai-1.9.1.tgz"; + sha1 = "3711bb6706e1568f34c0b36098bf8f19455c81ae"; }) ]; buildInputs = @@ -1942,7 +2119,7 @@ ]; passthru.names = [ "chai" ]; }; - "chai" = self.by-version."chai"."1.9.0"; + "chai" = self.by-version."chai"."1.9.1"; by-spec."chainsaw"."~0.1.0" = self.by-version."chainsaw"."0.1.0"; by-version."chainsaw"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -2027,8 +2204,6 @@ ]; passthru.names = [ "chalk" ]; }; - by-spec."chalk"."~0.2.1" = - self.by-version."chalk"."0.2.1"; by-spec."chalk"."~0.3.0" = self.by-version."chalk"."0.3.0"; by-version."chalk"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -2131,7 +2306,7 @@ buildInputs = (self.nativeDeps."cheerio-select" or []); deps = [ - self.by-version."CSSselect"."0.5.0" + self.by-version."CSSselect"."0.7.0" ]; peerDependencies = [ ]; @@ -2176,19 +2351,21 @@ passthru.names = [ "chmodr" ]; }; by-spec."chokidar"."~0.8.0" = - self.by-version."chokidar"."0.8.1"; - by-version."chokidar"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "node-chokidar-0.8.1"; + self.by-version."chokidar"."0.8.2"; + by-version."chokidar"."0.8.2" = lib.makeOverridable self.buildNodePackage { + name = "node-chokidar-0.8.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz"; - name = "chokidar-0.8.1.tgz"; - sha1 = "8ee0c99ef48420902fded73b862eac2dd75da4a6"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.2.tgz"; + name = "chokidar-0.8.2.tgz"; + sha1 = "767e2509aaa040fd8a23cc46225a783dc1bfc899"; }) ]; buildInputs = (self.nativeDeps."chokidar" or []); deps = [ + self.by-version."fsevents"."0.2.0" + self.by-version."recursive-readdir"."0.0.2" ]; peerDependencies = [ ]; @@ -2234,14 +2411,14 @@ passthru.names = [ "class-extend" ]; }; by-spec."clean-css"."2.1.x" = - self.by-version."clean-css"."2.1.4"; - by-version."clean-css"."2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.1.4"; + self.by-version."clean-css"."2.1.8"; + by-version."clean-css"."2.1.8" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.1.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.4.tgz"; - name = "clean-css-2.1.4.tgz"; - sha1 = "82b59182c8aa02d7050329b0b977f7651bf9875e"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.8.tgz"; + name = "clean-css-2.1.8.tgz"; + sha1 = "2b4b2fd60f32441096216ae25a21faa74580dc83"; }) ]; buildInputs = @@ -2254,7 +2431,7 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.1.0" = - self.by-version."clean-css"."2.1.4"; + 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 { @@ -2414,7 +2591,7 @@ (self.nativeDeps."cmd-shim" or []); deps = [ self.by-version."mkdirp"."0.3.5" - self.by-version."graceful-fs"."2.0.2" + self.by-version."graceful-fs"."2.0.3" ]; peerDependencies = [ ]; @@ -2483,29 +2660,51 @@ ]; passthru.names = [ "coffee-script" ]; }; - by-spec."coffee-script"."~1.6" = - self.by-version."coffee-script"."1.6.3"; - by-spec."coffee-script-redux"."git+https://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" = - self.by-version."coffee-script-redux"."2.0.0-beta4"; - by-version."coffee-script-redux"."2.0.0-beta4" = lib.makeOverridable self.buildNodePackage { - name = "coffee-script-redux-2.0.0-beta4"; + by-spec."coffee-script-redux"."=2.0.0-beta8" = + self.by-version."coffee-script-redux"."2.0.0-beta8"; + by-version."coffee-script-redux"."2.0.0-beta8" = lib.makeOverridable self.buildNodePackage { + name = "coffee-script-redux-2.0.0-beta8"; src = [ - (fetchgit { - url = "https://github.com/michaelficarra/CoffeeScriptRedux.git"; - rev = "9895cd1641fdf3a2424e662ab7583726bb0e35b3"; - sha256 = "d70e659aa7cdb50a98959dec0e2a8c916200e31cb770f04faa2ae92a55d1e66d"; + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/coffee-script-redux/-/coffee-script-redux-2.0.0-beta8.tgz"; + name = "coffee-script-redux-2.0.0-beta8.tgz"; + sha1 = "0fd7b8417340dd0d339e8f6fd8b4b8716956e8d5"; }) ]; buildInputs = (self.nativeDeps."coffee-script-redux" or []); deps = [ self.by-version."StringScanner"."0.0.3" - self.by-version."jedediah"."0.1.1" + self.by-version."nopt"."2.1.2" + self.by-version."esmangle"."0.0.17" + self.by-version."source-map"."0.1.11" + self.by-version."escodegen"."0.0.28" + self.by-version."cscodegen"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "coffee-script-redux" ]; }; + 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/collections/-/collections-2.0.1.tgz"; + name = "collections-2.0.1.tgz"; + sha1 = "ee201b142bd1ee5b37a95d62fe13062d87d83db0"; + }) + ]; + buildInputs = + (self.nativeDeps."collections" or []); + deps = [ + self.by-version."weak-map"."1.0.4" + ]; + 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 { @@ -2521,7 +2720,7 @@ (self.nativeDeps."color" or []); deps = [ self.by-version."color-convert"."0.2.1" - self.by-version."color-string"."0.1.2" + self.by-version."color-string"."0.1.3" ]; peerDependencies = [ ]; @@ -2547,14 +2746,14 @@ passthru.names = [ "color-convert" ]; }; by-spec."color-string"."0.1.x" = - self.by-version."color-string"."0.1.2"; - by-version."color-string"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-color-string-0.1.2"; + self.by-version."color-string"."0.1.3"; + by-version."color-string"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-color-string-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/color-string/-/color-string-0.1.2.tgz"; - name = "color-string-0.1.2.tgz"; - sha1 = "a413fb7dd137162d5d4ea784cbeb36d931ad9b4a"; + url = "http://registry.npmjs.org/color-string/-/color-string-0.1.3.tgz"; + name = "color-string-0.1.3.tgz"; + sha1 = "e865d2e3e59f665c3af0de14383f6bf0705685f3"; }) ]; buildInputs = @@ -2791,6 +2990,8 @@ self.by-version."commander"."2.1.0"; by-spec."commander"."~0.6.1" = self.by-version."commander"."0.6.1"; + by-spec."commander"."~2.1.0" = + self.by-version."commander"."2.1.0"; by-spec."commondir"."0.0.1" = self.by-version."commondir"."0.0.1"; by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -2829,15 +3030,37 @@ ]; 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz"; + name = "compression-1.0.0.tgz"; + sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020"; + }) + ]; + buildInputs = + (self.nativeDeps."compression" or []); + deps = [ + 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.1"; - by-version."concat-stream"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-concat-stream-1.4.1"; + self.by-version."concat-stream"."1.4.4"; + by-version."concat-stream"."1.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-concat-stream-1.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.1.tgz"; - name = "concat-stream-1.4.1.tgz"; - sha1 = "20358b86fe36e5ac3de29cec76f4d04ad8ff1423"; + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.4.tgz"; + name = "concat-stream-1.4.4.tgz"; + sha1 = "88cf474555dfbbdbeb34453e7f1e417dae97ce21"; }) ]; buildInputs = @@ -2845,14 +3068,14 @@ deps = [ self.by-version."inherits"."2.0.1" self.by-version."typedarray"."0.0.5" - self.by-version."readable-stream"."1.1.11" + self.by-version."readable-stream"."1.1.12" ]; peerDependencies = [ ]; passthru.names = [ "concat-stream" ]; }; by-spec."concat-stream"."~1.4.1" = - self.by-version."concat-stream"."1.4.1"; + self.by-version."concat-stream"."1.4.4"; by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { @@ -2898,39 +3121,15 @@ }; by-spec."config-chain"."~1.1.8" = self.by-version."config-chain"."1.1.8"; - by-spec."configstore"."~0.1.0" = - self.by-version."configstore"."0.1.7"; - by-version."configstore"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "node-configstore-0.1.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/configstore/-/configstore-0.1.7.tgz"; - name = "configstore-0.1.7.tgz"; - sha1 = "57dc701bc2a51eb804d6e1733c8abb9d82a5cede"; - }) - ]; - buildInputs = - (self.nativeDeps."configstore" or []); - deps = [ - self.by-version."lodash"."2.4.1" - self.by-version."mkdirp"."0.3.5" - self.by-version."js-yaml"."2.1.3" - self.by-version."osenv"."0.0.3" - self.by-version."graceful-fs"."2.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "configstore" ]; - }; by-spec."configstore"."~0.2.1" = - self.by-version."configstore"."0.2.2"; - by-version."configstore"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-configstore-0.2.2"; + self.by-version."configstore"."0.2.3"; + by-version."configstore"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-configstore-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/configstore/-/configstore-0.2.2.tgz"; - name = "configstore-0.2.2.tgz"; - sha1 = "ae0eb4f75833a4436f33456a4d2db11d69cc61ed"; + url = "http://registry.npmjs.org/configstore/-/configstore-0.2.3.tgz"; + name = "configstore-0.2.3.tgz"; + sha1 = "b1bdc4ad823a25423dc15d220fcc1ae1d7efab02"; }) ]; buildInputs = @@ -2939,7 +3138,7 @@ self.by-version."mkdirp"."0.3.5" self.by-version."js-yaml"."3.0.2" self.by-version."osenv"."0.0.3" - self.by-version."graceful-fs"."2.0.2" + self.by-version."graceful-fs"."2.0.3" self.by-version."uuid"."1.4.1" self.by-version."object-assign"."0.1.2" ]; @@ -2947,6 +3146,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 { @@ -2992,7 +3193,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.7.4" + self.by-version."debug"."0.8.0" self.by-version."methods"."0.0.1" self.by-version."raw-body"."0.0.3" self.by-version."negotiator"."0.3.0" @@ -3026,7 +3227,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.7.4" + self.by-version."debug"."0.8.0" self.by-version."methods"."0.1.0" self.by-version."raw-body"."1.1.2" self.by-version."negotiator"."0.3.0" @@ -3036,6 +3237,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"; + src = [ + (fetchurl { + 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."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.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"."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."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.0" + self.by-version."raw-body"."1.1.3" + self.by-version."multiparty"."2.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "connect" ]; + }; by-spec."connect"."2.3.x" = self.by-version."connect"."2.3.9"; by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage { @@ -3057,7 +3299,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.7.4" + self.by-version."debug"."0.8.0" ]; peerDependencies = [ ]; @@ -3086,7 +3328,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.7.4" + self.by-version."debug"."0.8.0" ]; peerDependencies = [ ]; @@ -3115,41 +3357,47 @@ 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.7.4" + self.by-version."debug"."0.8.0" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.13.0"; - by-version."connect"."2.13.0" = lib.makeOverridable self.buildNodePackage { - name = "node-connect-2.13.0"; + self.by-version."connect"."2.14.3"; + by-version."connect"."2.14.3" = lib.makeOverridable self.buildNodePackage { + name = "node-connect-2.14.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.13.0.tgz"; - name = "connect-2.13.0.tgz"; - sha1 = "a1974986381b4ea52ded726c2b4598e88ed527d3"; + url = "http://registry.npmjs.org/connect/-/connect-2.14.3.tgz"; + name = "connect-2.14.3.tgz"; + sha1 = "be8267f116cc905b53b29e0e7c9ea278d71d597b"; }) ]; buildInputs = (self.nativeDeps."connect" or []); deps = [ - self.by-version."compressible"."1.0.0" - self.by-version."batch"."0.5.0" + 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.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"."1.0.0" + self.by-version."morgan"."1.0.0" self.by-version."qs"."0.6.6" - self.by-version."cookie-signature"."1.0.1" - self.by-version."buffer-crc32"."0.2.1" - self.by-version."cookie"."0.1.0" - self.by-version."send"."0.1.4" + 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.2" + self.by-version."vhost"."1.0.0" self.by-version."bytes"."0.2.1" - 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.7.4" - self.by-version."methods"."0.1.0" - self.by-version."raw-body"."1.1.2" - self.by-version."negotiator"."0.3.0" + self.by-version."debug"."0.8.0" + self.by-version."raw-body"."1.1.3" self.by-version."multiparty"."2.2.0" ]; peerDependencies = [ @@ -3239,6 +3487,26 @@ 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz"; + name = "connect-timeout-1.0.0.tgz"; + sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb"; + }) + ]; + buildInputs = + (self.nativeDeps."connect-timeout" or []); + deps = [ + self.by-version."debug"."0.8.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "connect-timeout" ]; + }; by-spec."connection-parse"."0.0.x" = self.by-version."connection-parse"."0.0.7"; by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -3310,7 +3578,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.12" + self.by-version."uglify-js"."2.4.13" ]; peerDependencies = [ ]; @@ -3332,7 +3600,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.12" + self.by-version."uglify-js"."2.4.13" ]; peerDependencies = [ ]; @@ -3433,6 +3701,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-jar"."~0.2.0" = self.by-version."cookie-jar"."0.2.0"; by-version."cookie-jar"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -3471,6 +3758,27 @@ ]; 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz"; + name = "cookie-parser-1.0.1.tgz"; + sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie-parser" or []); + deps = [ + self.by-version."cookie"."0.1.0" + self.by-version."cookie-signature"."1.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie-parser" ]; + }; 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 { @@ -3567,15 +3875,15 @@ ]; passthru.names = [ "cookies" ]; }; - by-spec."copy-paste"."~0.1.0" = - self.by-version."copy-paste"."0.1.0"; - by-version."copy-paste"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-copy-paste-0.1.0"; + 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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.1.0.tgz"; - name = "copy-paste-0.1.0.tgz"; - sha1 = "d748638a4eccfa83af064eeb4bfc625cb300d28c"; + url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.0.tgz"; + name = "copy-paste-0.2.0.tgz"; + sha1 = "6a83a3a073fc144adfa83cd03adb8db35953c424"; }) ]; buildInputs = @@ -3627,14 +3935,14 @@ passthru.names = [ "couch-login" ]; }; by-spec."coveralls"."*" = - self.by-version."coveralls"."2.8.0"; - by-version."coveralls"."2.8.0" = lib.makeOverridable self.buildNodePackage { - name = "coveralls-2.8.0"; + self.by-version."coveralls"."2.10.0"; + by-version."coveralls"."2.10.0" = lib.makeOverridable self.buildNodePackage { + name = "coveralls-2.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.8.0.tgz"; - name = "coveralls-2.8.0.tgz"; - sha1 = "959b1b3cb9b5ce2ca502b025fd69eb1700756e63"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.10.0.tgz"; + name = "coveralls-2.10.0.tgz"; + sha1 = "03f0c54070f30e0d336c79ef2b16a5c53728a7e5"; }) ]; buildInputs = @@ -3649,7 +3957,7 @@ ]; passthru.names = [ "coveralls" ]; }; - "coveralls" = self.by-version."coveralls"."2.8.0"; + "coveralls" = self.by-version."coveralls"."2.10.0"; by-spec."crc"."0.2.0" = self.by-version."crc"."0.2.0"; by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -3767,6 +4075,25 @@ ]; passthru.names = [ "crypto-browserify" ]; }; + by-spec."cscodegen"."git://github.com/michaelficarra/cscodegen.git#73fd7202ac086c26f18c9d56f025b18b3c6f5383" = + self.by-version."cscodegen"."0.1.0"; + by-version."cscodegen"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "cscodegen-0.1.0"; + src = [ + (fetchgit { + url = "git://github.com/michaelficarra/cscodegen.git"; + rev = "73fd7202ac086c26f18c9d56f025b18b3c6f5383"; + sha256 = "cb527b00ac305ebc6ab3f59ff4e99def7646b417fdd9e35f0186c8ee41cd0829"; + }) + ]; + buildInputs = + (self.nativeDeps."cscodegen" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cscodegen" ]; + }; by-spec."css"."~1.0.8" = self.by-version."css"."1.0.8"; by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage { @@ -3845,6 +4172,26 @@ ]; 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"; + 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."ctype"."0.5.0" = self.by-version."ctype"."0.5.0"; by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -3960,14 +4307,14 @@ passthru.names = [ "dateformat" ]; }; by-spec."debug"."*" = - self.by-version."debug"."0.7.4"; - by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-0.7.4"; + 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.7.4.tgz"; - name = "debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz"; + name = "debug-0.8.0.tgz"; + sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; }) ]; buildInputs = @@ -3999,42 +4346,40 @@ }; by-spec."debug"."0.7.4" = self.by-version."debug"."0.7.4"; - by-spec."debug".">= 0.7.3 < 1" = - self.by-version."debug"."0.7.4"; - by-spec."debug"."~0.7.0" = - self.by-version."debug"."0.7.4"; - by-spec."debug"."~0.7.2" = - self.by-version."debug"."0.7.4"; - by-spec."debug"."~0.7.3" = - self.by-version."debug"."0.7.4"; - by-spec."debuglog"."0.0.2" = - self.by-version."debuglog"."0.0.2"; - by-version."debuglog"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-debuglog-0.0.2"; + by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage { + name = "node-debug-0.7.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz"; - name = "debuglog-0.0.2.tgz"; - sha1 = "6c0dcf07e2c3f74524629b741668bd46c7b362eb"; + url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + name = "debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }) ]; buildInputs = - (self.nativeDeps."debuglog" or []); + (self.nativeDeps."debug" or []); deps = [ ]; peerDependencies = [ ]; - passthru.names = [ "debuglog" ]; + passthru.names = [ "debug" ]; }; - by-spec."decompress"."~0.1.5" = - self.by-version."decompress"."0.1.6"; - by-version."decompress"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "node-decompress-0.1.6"; + by-spec."debug".">= 0.7.3 < 1" = + self.by-version."debug"."0.8.0"; + 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.7.3" = + self.by-version."debug"."0.7.4"; + by-spec."decompress"."~0.2.0" = + self.by-version."decompress"."0.2.0"; + by-version."decompress"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-decompress-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress/-/decompress-0.1.6.tgz"; - name = "decompress-0.1.6.tgz"; - sha1 = "4db64844d80b615b888ca129d12f8accd1e27286"; + url = "http://registry.npmjs.org/decompress/-/decompress-0.2.0.tgz"; + name = "decompress-0.2.0.tgz"; + sha1 = "548f7d789181afe2378ddff1db18784ffa181410"; }) ]; buildInputs = @@ -4042,36 +4387,36 @@ deps = [ self.by-version."adm-zip"."0.4.4" self.by-version."mkdirp"."0.3.5" - self.by-version."mout"."0.6.0" self.by-version."rimraf"."2.2.6" - self.by-version."stream-combiner"."0.0.4" + self.by-version."stream-combiner"."0.0.2" self.by-version."tar"."0.1.19" - self.by-version."tempfile"."0.1.2" + self.by-version."tempfile"."0.1.3" + self.by-version."map-key"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "decompress" ]; }; by-spec."decompress-zip"."~0.0.3" = - self.by-version."decompress-zip"."0.0.4"; - by-version."decompress-zip"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "decompress-zip-0.0.4"; + self.by-version."decompress-zip"."0.0.5"; + by-version."decompress-zip"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "decompress-zip-0.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.4.tgz"; - name = "decompress-zip-0.0.4.tgz"; - sha1 = "c562431f76af8970afaf50226e42e1c47a57b086"; + url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.5.tgz"; + name = "decompress-zip-0.0.5.tgz"; + sha1 = "ab145d0dfe4f1c4249af7efcdff1df669eca0c8c"; }) ]; buildInputs = (self.nativeDeps."decompress-zip" or []); deps = [ - self.by-version."q"."0.9.7" + self.by-version."q"."1.0.1" self.by-version."mkpath"."0.1.0" self.by-version."binary"."0.3.0" self.by-version."touch"."0.0.2" - self.by-version."readable-stream"."1.1.11" - self.by-version."nopt"."2.1.2" + self.by-version."readable-stream"."1.1.12" + self.by-version."nopt"."2.2.0" ]; peerDependencies = [ ]; @@ -4177,6 +4522,26 @@ }; by-spec."deep-extend"."~0.2.8" = 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 { + name = "node-deepmerge-0.2.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz"; + name = "deepmerge-0.2.7.tgz"; + sha1 = "3a5ab8d37311c4d1aefb22209693afe0a91a0563"; + }) + ]; + buildInputs = + (self.nativeDeps."deepmerge" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "deepmerge" ]; + }; + "deepmerge" = self.by-version."deepmerge"."0.2.7"; by-spec."defined"."~0.0.0" = self.by-version."defined"."0.0.0"; by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { @@ -4520,14 +4885,14 @@ passthru.names = [ "domutils" ]; }; by-spec."domutils"."1.4" = - self.by-version."domutils"."1.4.0"; - by-version."domutils"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-domutils-1.4.0"; + self.by-version."domutils"."1.4.1"; + by-version."domutils"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-domutils-1.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.4.0.tgz"; - name = "domutils-1.4.0.tgz"; - sha1 = "330b95212944e340c6e0227e9ec3d35242d4dd05"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.4.1.tgz"; + name = "domutils-1.4.1.tgz"; + sha1 = "e716621c245561dd03c1ecd5667f70e8ddeb2f59"; }) ]; buildInputs = @@ -4540,23 +4905,23 @@ passthru.names = [ "domutils" ]; }; by-spec."download"."~0.1.6" = - self.by-version."download"."0.1.10"; - by-version."download"."0.1.10" = lib.makeOverridable self.buildNodePackage { - name = "node-download-0.1.10"; + self.by-version."download"."0.1.12"; + by-version."download"."0.1.12" = lib.makeOverridable self.buildNodePackage { + name = "node-download-0.1.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/download/-/download-0.1.10.tgz"; - name = "download-0.1.10.tgz"; - sha1 = "732065fc96259abd47543c2711467bcf7ed66af5"; + url = "http://registry.npmjs.org/download/-/download-0.1.12.tgz"; + name = "download-0.1.12.tgz"; + sha1 = "ff596658f301c340a292ac0ac1972790084568ad"; }) ]; buildInputs = (self.nativeDeps."download" or []); deps = [ - self.by-version."decompress"."0.1.6" + self.by-version."decompress"."0.2.0" self.by-version."each-async"."0.1.2" self.by-version."mkdirp"."0.3.5" - self.by-version."request"."2.31.0" + self.by-version."request"."2.34.0" self.by-version."through2"."0.4.1" ]; peerDependencies = [ @@ -4603,6 +4968,25 @@ ]; passthru.names = [ "dtrace-provider" ]; }; + by-spec."duplexer"."~0.0.3" = + self.by-version."duplexer"."0.0.4"; + by-version."duplexer"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-duplexer-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/duplexer/-/duplexer-0.0.4.tgz"; + name = "duplexer-0.0.4.tgz"; + sha1 = "afcb7f1f8b8d74f820726171d5d64ac9e4a8ff20"; + }) + ]; + buildInputs = + (self.nativeDeps."duplexer" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "duplexer" ]; + }; by-spec."duplexer"."~0.1.1" = self.by-version."duplexer"."0.1.1"; by-version."duplexer"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -4756,6 +5140,25 @@ ]; passthru.names = [ "entities" ]; }; + 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.0.tgz"; + name = "errorhandler-1.0.0.tgz"; + sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a"; + }) + ]; + buildInputs = + (self.nativeDeps."errorhandler" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "errorhandler" ]; + }; 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 { @@ -4797,15 +5200,15 @@ "escape-html" = self.by-version."escape-html"."1.0.1"; by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; - by-spec."escodegen"."*" = - self.by-version."escodegen"."1.2.0"; - by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.2.0"; + by-spec."escodegen"."1.3.x" = + self.by-version."escodegen"."1.3.0"; + by-version."escodegen"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz"; - name = "escodegen-1.2.0.tgz"; - sha1 = "09de7967791cc958b7f89a2ddb6d23451af327e1"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.0.tgz"; + name = "escodegen-1.3.0.tgz"; + sha1 = "9d7b4aa74aa32f300474381c098f930eb1e9973a"; }) ]; buildInputs = @@ -4820,37 +5223,39 @@ ]; passthru.names = [ "escodegen" ]; }; - by-spec."escodegen"."0.0.23" = - self.by-version."escodegen"."0.0.23"; - by-version."escodegen"."0.0.23" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-0.0.23"; + by-spec."escodegen"."~ 0.0.28" = + self.by-version."escodegen"."0.0.28"; + by-version."escodegen"."0.0.28" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-0.0.28"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.23.tgz"; - name = "escodegen-0.0.23.tgz"; - sha1 = "9acf978164368e42276571f18839c823b3a844df"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz"; + name = "escodegen-0.0.28.tgz"; + sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3"; }) ]; buildInputs = (self.nativeDeps."escodegen" or []); deps = [ self.by-version."esprima"."1.0.4" - self.by-version."estraverse"."0.0.4" + self.by-version."estraverse"."1.3.2" self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; - by-spec."escodegen"."1.0.x" = - self.by-version."escodegen"."1.0.1"; - by-version."escodegen"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.0.1"; + by-spec."escodegen"."~0.0.24" = + self.by-version."escodegen"."0.0.28"; + by-spec."escodegen"."~1.1.0" = + self.by-version."escodegen"."1.1.0"; + by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.1.tgz"; - name = "escodegen-1.0.1.tgz"; - sha1 = "84c92c4a07440271b90e6b78e620973bf721226e"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz"; + name = "escodegen-1.1.0.tgz"; + sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf"; }) ]; buildInputs = @@ -4865,28 +5270,25 @@ ]; passthru.names = [ "escodegen" ]; }; - by-spec."escodegen"."~1.1.0" = - self.by-version."escodegen"."1.1.0"; - by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.1.0"; + by-spec."escope"."~ 1.0.0" = + self.by-version."escope"."1.0.1"; + by-version."escope"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-escope-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz"; - name = "escodegen-1.1.0.tgz"; - sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf"; + url = "http://registry.npmjs.org/escope/-/escope-1.0.1.tgz"; + name = "escope-1.0.1.tgz"; + sha1 = "59b04cdccb76555608499ed13502b9028fe73dd8"; }) ]; buildInputs = - (self.nativeDeps."escodegen" or []); + (self.nativeDeps."escope" or []); deps = [ - self.by-version."esprima"."1.0.4" self.by-version."estraverse"."1.5.0" - self.by-version."esutils"."1.0.0" - self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; - passthru.names = [ "escodegen" ]; + passthru.names = [ "escope" ]; }; by-spec."escope"."~0.0.13" = self.by-version."escope"."0.0.16"; @@ -4908,7 +5310,52 @@ ]; passthru.names = [ "escope" ]; }; - by-spec."esprima"."1.0.x" = + by-spec."esmangle"."~0.0.8" = + self.by-version."esmangle"."0.0.17"; + by-version."esmangle"."0.0.17" = lib.makeOverridable self.buildNodePackage { + name = "esmangle-0.0.17"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esmangle/-/esmangle-0.0.17.tgz"; + name = "esmangle-0.0.17.tgz"; + sha1 = "4c5c93607cde5d1276bad396e836229dba68d90c"; + }) + ]; + buildInputs = + (self.nativeDeps."esmangle" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."escope"."1.0.1" + self.by-version."escodegen"."0.0.28" + self.by-version."estraverse"."1.3.2" + self.by-version."source-map"."0.1.33" + self.by-version."esshorten"."0.0.2" + self.by-version."optimist"."0.6.1" + ]; + peerDependencies = [ + ]; + 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"; + 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"."~ 1.0.2" = self.by-version."esprima"."1.0.4"; by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "esprima-1.0.4"; @@ -4927,8 +5374,6 @@ ]; passthru.names = [ "esprima" ]; }; - by-spec."esprima"."~ 1.0.2" = - self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.2" = self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.4" = @@ -4976,7 +5421,28 @@ ]; passthru.names = [ "esrefactor" ]; }; - by-spec."estraverse"."*" = + by-spec."esshorten"."~ 0.0.2" = + self.by-version."esshorten"."0.0.2"; + by-version."esshorten"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-esshorten-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esshorten/-/esshorten-0.0.2.tgz"; + name = "esshorten-0.0.2.tgz"; + sha1 = "28a652f1efd40c8e227f8c6de7dbe6b560ee8129"; + }) + ]; + buildInputs = + (self.nativeDeps."esshorten" or []); + deps = [ + self.by-version."escope"."1.0.1" + self.by-version."estraverse"."1.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "esshorten" ]; + }; + by-spec."estraverse".">= 0.0.2" = self.by-version."estraverse"."1.5.0"; by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage { name = "node-estraverse-1.5.0"; @@ -4995,8 +5461,44 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse".">= 0.0.2" = - self.by-version."estraverse"."1.5.0"; + by-spec."estraverse"."~ 1.2.0" = + self.by-version."estraverse"."1.2.0"; + by-version."estraverse"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-estraverse-1.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.2.0.tgz"; + name = "estraverse-1.2.0.tgz"; + sha1 = "6a3dc8a46a5d6766e5668639fc782976ce5660fd"; + }) + ]; + buildInputs = + (self.nativeDeps."estraverse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "estraverse" ]; + }; + by-spec."estraverse"."~ 1.3.2" = + self.by-version."estraverse"."1.3.2"; + by-version."estraverse"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-estraverse-1.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz"; + name = "estraverse-1.3.2.tgz"; + sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42"; + }) + ]; + buildInputs = + (self.nativeDeps."estraverse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "estraverse" ]; + }; by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -5016,6 +5518,8 @@ ]; passthru.names = [ "estraverse" ]; }; + by-spec."estraverse"."~1.3.0" = + self.by-version."estraverse"."1.3.2"; by-spec."estraverse"."~1.5.0" = self.by-version."estraverse"."1.5.0"; by-spec."esutils"."~1.0.0" = @@ -5173,11 +5677,11 @@ self.by-version."request"."2.9.203" self.by-version."connect"."2.3.9" self.by-version."openid"."0.5.5" - self.by-version."xml2js"."0.4.1" + 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.4.8" + self.by-version."express"."3.5.1" ]; peerDependencies = [ ]; @@ -5225,19 +5729,20 @@ by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."4.0.0-rc2"; - by-version."express"."4.0.0-rc2" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.0.0-rc2"; + self.by-version."express"."4.0.0-rc4"; + by-version."express"."4.0.0-rc4" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.0.0-rc4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.0.0-rc2.tgz"; - name = "express-4.0.0-rc2.tgz"; - sha1 = "0b3fc3b853b393cdb5042dc9960498015ed06b96"; + url = "http://registry.npmjs.org/express/-/express-4.0.0-rc4.tgz"; + name = "express-4.0.0-rc4.tgz"; + sha1 = "1cedc8790f47b776b9d100f5388e5fb652ea4388"; }) ]; 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" @@ -5251,13 +5756,15 @@ 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."debug"."0.7.4" + self.by-version."serve-static"."1.0.1" + self.by-version."path-to-regexp"."0.1.2" + self.by-version."debug"."0.8.0" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.0.0-rc2"; + "express" = self.by-version."express"."4.0.0-rc4"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -5305,7 +5812,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.7.4" + self.by-version."debug"."0.8.0" ]; peerDependencies = [ ]; @@ -5335,38 +5842,38 @@ 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.7.4" + self.by-version."debug"."0.8.0" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.4.8"; - by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.8"; + 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.4.8.tgz"; - name = "express-3.4.8.tgz"; - sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; + 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."connect"."2.12.0" + self.by-version."connect"."2.14.1" self.by-version."commander"."1.3.2" - self.by-version."range-parser"."0.0.4" + self.by-version."range-parser"."1.0.0" self.by-version."mkdirp"."0.3.5" - self.by-version."cookie"."0.1.0" + self.by-version."cookie"."0.1.1" self.by-version."buffer-crc32"."0.2.1" - self.by-version."fresh"."0.2.0" + self.by-version."fresh"."0.2.2" 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."merge-descriptors"."0.0.1" - self.by-version."debug"."0.7.4" + 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.0" ]; peerDependencies = [ ]; @@ -5396,7 +5903,7 @@ 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"."0.7.4" + self.by-version."debug"."0.8.0" ]; peerDependencies = [ ]; @@ -5404,6 +5911,35 @@ }; by-spec."express"."~3.4" = self.by-version."express"."3.4.8"; + by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz"; + name = "express-3.4.8.tgz"; + sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = [ + self.by-version."connect"."2.12.0" + self.by-version."commander"."1.3.2" + self.by-version."range-parser"."0.0.4" + self.by-version."mkdirp"."0.3.5" + self.by-version."cookie"."0.1.0" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.2.0" + 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."merge-descriptors"."0.0.1" + self.by-version."debug"."0.8.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; by-spec."express"."~3.4.8" = self.by-version."express"."3.4.8"; by-spec."express-form"."*" = @@ -5425,7 +5961,7 @@ self.by-version."async"."0.2.10" ]; peerDependencies = [ - self.by-version."express"."3.4.8" + self.by-version."express"."3.5.1" ]; passthru.names = [ "express-form" ]; }; @@ -5449,6 +5985,31 @@ ]; 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz"; + name = "express-session-1.0.2.tgz"; + sha1 = "004478c742561774411ceb79733155a56b6d49eb"; + }) + ]; + buildInputs = + (self.nativeDeps."express-session" or []); + deps = [ + self.by-version."utils-merge"."1.0.0" + self.by-version."cookie"."0.1.0" + 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" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express-session" ]; + }; by-spec."extend"."*" = self.by-version."extend"."1.2.1"; by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -5469,6 +6030,8 @@ passthru.names = [ "extend" ]; }; "extend" = self.by-version."extend"."1.2.1"; + by-spec."extend"."~1.2.1" = + self.by-version."extend"."1.2.1"; by-spec."extract-opts"."~2.2.0" = self.by-version."extract-opts"."2.2.0"; by-version."extract-opts"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -5605,7 +6168,7 @@ deps = [ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" - self.by-version."bower"."1.2.8" + self.by-version."bower"."1.3.1" self.by-version."glob"."3.2.9" ]; peerDependencies = [ @@ -5656,7 +6219,7 @@ 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.2" + self.by-version."findup-sync"."0.1.3" self.by-version."isbinaryfile"."0.1.9" ]; peerDependencies = [ @@ -5706,49 +6269,49 @@ passthru.names = [ "findit" ]; }; by-spec."findup"."~0.1.3" = - self.by-version."findup"."0.1.3"; - by-version."findup"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "findup-0.1.3"; + self.by-version."findup"."0.1.4"; + by-version."findup"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "findup-0.1.4"; src = [ - (self.patchSource fetchurl { - url = "http://registry.npmjs.org/findup/-/findup-0.1.3.tgz"; - name = "findup-0.1.3.tgz"; - sha1 = "df2b8ecf06fdaa9cc13dc4ba58bf950e3a176941"; + (fetchurl { + url = "http://registry.npmjs.org/findup/-/findup-0.1.4.tgz"; + name = "findup-0.1.4.tgz"; + sha1 = "28cd82e13eb629b40688f08f613f5cae5a29a0f5"; }) ]; buildInputs = (self.nativeDeps."findup" or []); deps = [ - self.by-version."nopt"."1.0.10" self.by-version."colors"."0.6.2" + self.by-version."commander"."2.1.0" ]; peerDependencies = [ ]; passthru.names = [ "findup" ]; }; by-spec."findup-sync"."~0.1.0" = - self.by-version."findup-sync"."0.1.2"; - by-version."findup-sync"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz"; - name = "findup-sync-0.1.2.tgz"; - sha1 = "da2b96ca9f800e5a13d0a11110f490b65f62e96d"; + url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz"; + name = "findup-sync-0.1.3.tgz"; + sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683"; }) ]; buildInputs = (self.nativeDeps."findup-sync" or []); deps = [ - self.by-version."glob"."3.1.21" - self.by-version."lodash"."1.0.1" + 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.2" = - self.by-version."findup-sync"."0.1.2"; + self.by-version."findup-sync"."0.1.3"; by-spec."flatiron"."*" = self.by-version."flatiron"."0.3.11"; by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage { @@ -5840,7 +6403,7 @@ self.by-version."timespan"."2.3.0" self.by-version."watch"."0.8.0" self.by-version."utile"."0.2.1" - self.by-version."winston"."0.7.2" + self.by-version."winston"."0.7.3" ]; peerDependencies = [ ]; @@ -6156,7 +6719,7 @@ buildInputs = (self.nativeDeps."fs-walk" or []); deps = [ - self.by-version."async"."0.2.10" + self.by-version."async"."0.6.2" ]; peerDependencies = [ ]; @@ -6187,6 +6750,26 @@ }; by-spec."fs.extra".">=1.2.1 <2" = self.by-version."fs.extra"."1.2.1"; + by-spec."fsevents"."0.2.0" = + self.by-version."fsevents"."0.2.0"; + by-version."fsevents"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-fsevents-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fsevents/-/fsevents-0.2.0.tgz"; + name = "fsevents-0.2.0.tgz"; + sha1 = "1de161da042818f45bfbe11a853da8e5c6ca5d83"; + }) + ]; + buildInputs = + (self.nativeDeps."fsevents" or []); + deps = [ + self.by-version."nan"."0.8.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "fsevents" ]; + }; by-spec."fstream"."0" = self.by-version."fstream"."0.1.25"; by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage { @@ -6203,7 +6786,7 @@ deps = [ self.by-version."rimraf"."2.2.6" self.by-version."mkdirp"."0.3.5" - self.by-version."graceful-fs"."2.0.2" + self.by-version."graceful-fs"."2.0.3" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ @@ -6264,45 +6847,45 @@ passthru.names = [ "fstream-npm" ]; }; by-spec."generator-angular"."*" = - self.by-version."generator-angular"."0.7.1"; - by-version."generator-angular"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "node-generator-angular-0.7.1"; + 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.7.1.tgz"; - name = "generator-angular-0.7.1.tgz"; - sha1 = "51f9faed8d7c0e9d972004101cc1c16ecd1ebf65"; + 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."yeoman-generator"."0.13.4" - self.by-version."chalk"."0.3.0" - self.by-version."wiredep"."0.4.2" + 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.6.0" + 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.7.1"; - by-spec."generator-karma"."~0.6.0" = - self.by-version."generator-karma"."0.6.0"; - by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "node-generator-karma-0.6.0"; + "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.6.0.tgz"; - name = "generator-karma-0.6.0.tgz"; - sha1 = "e89b6195c186771e8bdddde37441abb6ce07e1a0"; + 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."yeoman-generator"."0.13.4" + self.by-version."yeoman-generator"."0.16.0" ]; peerDependencies = [ self.by-version."yo"."1.1.2" @@ -6331,14 +6914,14 @@ passthru.names = [ "generator-mocha" ]; }; by-spec."generator-webapp"."*" = - self.by-version."generator-webapp"."0.4.7"; - by-version."generator-webapp"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "node-generator-webapp-0.4.7"; + self.by-version."generator-webapp"."0.4.8"; + by-version."generator-webapp"."0.4.8" = lib.makeOverridable self.buildNodePackage { + name = "node-generator-webapp-0.4.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.7.tgz"; - name = "generator-webapp-0.4.7.tgz"; - sha1 = "a42b663cbe289358046038229603e8557b6881e5"; + url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.8.tgz"; + name = "generator-webapp-0.4.8.tgz"; + sha1 = "d0dc7e8040ec41fe6cf42ec43291157a3bd515be"; }) ]; buildInputs = @@ -6354,7 +6937,7 @@ ]; passthru.names = [ "generator-webapp" ]; }; - "generator-webapp" = self.by-version."generator-webapp"."0.4.7"; + "generator-webapp" = self.by-version."generator-webapp"."0.4.8"; by-spec."getmac"."~1.0.6" = self.by-version."getmac"."1.0.6"; by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage { @@ -6395,14 +6978,14 @@ passthru.names = [ "getobject" ]; }; by-spec."gh"."*" = - self.by-version."gh"."1.8.2"; - by-version."gh"."1.8.2" = lib.makeOverridable self.buildNodePackage { - name = "gh-1.8.2"; + self.by-version."gh"."1.9.1"; + by-version."gh"."1.9.1" = lib.makeOverridable self.buildNodePackage { + name = "gh-1.9.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/gh/-/gh-1.8.2.tgz"; - name = "gh-1.8.2.tgz"; - sha1 = "01ae9e23a617a9c08e8196078dd7b5a8b79b0156"; + url = "http://registry.npmjs.org/gh/-/gh-1.9.1.tgz"; + name = "gh-1.9.1.tgz"; + sha1 = "1862071cddc13cfd31545c64256ab731bb334194"; }) ]; buildInputs = @@ -6411,33 +6994,33 @@ self.by-version."async"."0.2.10" self.by-version."cli-color"."0.2.3" self.by-version."cli-log"."0.0.8" - self.by-version."copy-paste"."0.1.0" - self.by-version."moment"."2.4.0" - self.by-version."handlebars"."1.0.11" - self.by-version."github"."0.1.14" - self.by-version."inquirer"."0.3.5" - self.by-version."wordwrap"."0.0.2" - self.by-version."nopt"."2.1.2" + self.by-version."github"."0.1.15" + 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.0" self.by-version."open"."0.0.4" self.by-version."truncate"."1.0.2" - self.by-version."update-notifier"."0.1.7" + 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" ]; peerDependencies = [ ]; passthru.names = [ "gh" ]; }; - "gh" = self.by-version."gh"."1.8.2"; - by-spec."github"."~0.1.12" = - self.by-version."github"."0.1.14"; - by-version."github"."0.1.14" = lib.makeOverridable self.buildNodePackage { - name = "node-github-0.1.14"; + "gh" = self.by-version."gh"."1.9.1"; + by-spec."github"."~0.1.15" = + self.by-version."github"."0.1.15"; + by-version."github"."0.1.15" = lib.makeOverridable self.buildNodePackage { + name = "node-github-0.1.15"; src = [ (fetchurl { - url = "http://registry.npmjs.org/github/-/github-0.1.14.tgz"; - name = "github-0.1.14.tgz"; - sha1 = "2a4fc150c9aee8c7a7702fa1e620d29599246322"; + url = "http://registry.npmjs.org/github/-/github-0.1.15.tgz"; + name = "github-0.1.15.tgz"; + sha1 = "3df037442518fe800c75b1a243a13154d334069c"; }) ]; buildInputs = @@ -6543,28 +7126,7 @@ (self.nativeDeps."glob" or []); deps = [ self.by-version."minimatch"."0.2.14" - self.by-version."graceful-fs"."2.0.2" - self.by-version."inherits"."2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - by-spec."glob"."3.2.7" = - self.by-version."glob"."3.2.7"; - by-version."glob"."3.2.7" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-3.2.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.7.tgz"; - name = "glob-3.2.7.tgz"; - sha1 = "275f39a0eee805694790924f36eac38e1db6d802"; - }) - ]; - buildInputs = - (self.nativeDeps."glob" or []); - deps = [ - self.by-version."minimatch"."0.2.14" + self.by-version."graceful-fs"."2.0.3" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ @@ -6611,15 +7173,17 @@ self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.8" = self.by-version."glob"."3.2.9"; + by-spec."glob"."~3.2.9" = + self.by-version."glob"."3.2.9"; by-spec."graceful-fs"."2" = - self.by-version."graceful-fs"."2.0.2"; - by-version."graceful-fs"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-graceful-fs-2.0.2"; + self.by-version."graceful-fs"."2.0.3"; + by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-graceful-fs-2.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.2.tgz"; - name = "graceful-fs-2.0.2.tgz"; - sha1 = "26806eaca4bff8fc5dbc935e696135792175c46f"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; + name = "graceful-fs-2.0.3.tgz"; + sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; }) ]; buildInputs = @@ -6630,8 +7194,6 @@ ]; passthru.names = [ "graceful-fs" ]; }; - by-spec."graceful-fs"."^2.0.2" = - self.by-version."graceful-fs"."2.0.2"; by-spec."graceful-fs"."~1" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -6673,11 +7235,13 @@ 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.2"; + self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.0" = - self.by-version."graceful-fs"."2.0.2"; + self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~2.0.1" = - self.by-version."graceful-fs"."2.0.2"; + 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."gridfs-stream"."*" = self.by-version."gridfs-stream"."0.4.1"; by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage { @@ -6718,14 +7282,14 @@ passthru.names = [ "growl" ]; }; by-spec."grunt"."0.4.x" = - self.by-version."grunt"."0.4.2"; - by-version."grunt"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-0.4.2"; + 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.2.tgz"; - name = "grunt-0.4.2.tgz"; - sha1 = "895b4f28a6102bffd41d365a65e8be2d6a293d93"; + url = "http://registry.npmjs.org/grunt/-/grunt-0.4.4.tgz"; + name = "grunt-0.4.4.tgz"; + sha1 = "f37fa46e2e52e37f9a0370542a74281c09c73f53"; }) ]; buildInputs = @@ -6736,32 +7300,33 @@ self.by-version."colors"."0.6.2" self.by-version."dateformat"."1.0.2-1.2.3" self.by-version."eventemitter2"."0.4.13" - self.by-version."findup-sync"."0.1.2" + self.by-version."findup-sync"."0.1.3" self.by-version."glob"."3.1.21" self.by-version."hooker"."0.2.3" 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.0.3" + 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.1.2" ]; peerDependencies = [ ]; passthru.names = [ "grunt" ]; }; by-spec."grunt"."^0.4.0" = - self.by-version."grunt"."0.4.2"; + self.by-version."grunt"."0.4.4"; by-spec."grunt"."~0.4" = - self.by-version."grunt"."0.4.2"; + self.by-version."grunt"."0.4.4"; by-spec."grunt"."~0.4.0" = - self.by-version."grunt"."0.4.2"; + self.by-version."grunt"."0.4.4"; by-spec."grunt"."~0.4.1" = - self.by-version."grunt"."0.4.2"; + 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 { @@ -6803,7 +7368,7 @@ (self.nativeDeps."grunt-cli" or []); deps = [ self.by-version."nopt"."1.0.10" - self.by-version."findup-sync"."0.1.2" + self.by-version."findup-sync"."0.1.3" self.by-version."resolve"."0.3.1" ]; peerDependencies = [ @@ -6828,61 +7393,64 @@ (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ self.by-version."chalk"."0.4.0" - self.by-version."clean-css"."2.1.4" + self.by-version."clean-css"."2.1.8" self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ - self.by-version."grunt"."0.4.2" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-cssmin" ]; }; "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0"; by-spec."grunt-contrib-jshint"."*" = - self.by-version."grunt-contrib-jshint"."0.8.0"; - by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-jshint-0.8.0"; + self.by-version."grunt-contrib-jshint"."0.9.2"; + by-version."grunt-contrib-jshint"."0.9.2" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-jshint-0.9.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.8.0.tgz"; - name = "grunt-contrib-jshint-0.8.0.tgz"; - sha1 = "6bd52325dcce1d995dbbf648030c59e1a606acda"; + url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.9.2.tgz"; + name = "grunt-contrib-jshint-0.9.2.tgz"; + sha1 = "d6301597bcc3611e95f5f35ff582a7b3d73d20fb"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ self.by-version."jshint"."2.4.4" + self.by-version."hooker"."0.2.3" ]; peerDependencies = [ - self.by-version."grunt"."0.4.2" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-jshint" ]; }; - "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.8.0"; + "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.9.2"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.10.0"; - by-version."grunt-contrib-less"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-less-0.10.0"; + 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.10.0.tgz"; - name = "grunt-contrib-less-0.10.0.tgz"; - sha1 = "542bf636ffb35f6e14c2e931855c1151b4a291b3"; + 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.0" - self.by-version."grunt-lib-contrib"."0.6.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.2" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.10.0"; + "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.3"; by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage { @@ -6900,7 +7468,7 @@ self.by-version."requirejs"."2.1.11" ]; peerDependencies = [ - self.by-version."grunt"."0.4.2" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-contrib-requirejs" ]; }; @@ -6919,58 +7487,64 @@ buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.by-version."uglify-js"."2.4.12" + self.by-version."uglify-js"."2.4.13" self.by-version."chalk"."0.4.0" self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ - self.by-version."grunt"."0.4.2" + 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.7.2"; - by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-karma-0.7.2"; + 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.7.2.tgz"; - name = "grunt-karma-0.7.2.tgz"; - sha1 = "1d041d9833671c2bca671cd66bd874c96b2a631e"; + url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.2.tgz"; + name = "grunt-karma-0.8.2.tgz"; + sha1 = "0f422d357e4556fb96ab68c6d9a2be46908f1c84"; }) ]; buildInputs = (self.nativeDeps."grunt-karma" or []); deps = [ - self.by-version."optimist"."0.6.1" + self.by-version."lodash"."2.4.1" ]; peerDependencies = [ - self.by-version."grunt"."0.4.2" - self.by-version."karma"."0.11.14" + self.by-version."grunt"."0.4.4" + self.by-version."karma"."0.12.2" ]; passthru.names = [ "grunt-karma" ]; }; - "grunt-karma" = self.by-version."grunt-karma"."0.7.2"; - by-spec."grunt-lib-contrib"."~0.6.1" = - self.by-version."grunt-lib-contrib"."0.6.1"; - by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-lib-contrib-0.6.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-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz"; - name = "grunt-lib-contrib-0.6.1.tgz"; - sha1 = "3f56adb7da06e814795ee2415b0ebe5fb8903ebb"; + 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 = - (self.nativeDeps."grunt-lib-contrib" or []); + (self.nativeDeps."grunt-legacy-util" or []); deps = [ - self.by-version."zlib-browserify"."0.0.1" + self.by-version."hooker"."0.2.3" + self.by-version."async"."0.1.22" + self.by-version."lodash"."0.9.2" + self.by-version."exit"."0.1.2" + self.by-version."underscore.string"."2.2.1" + self.by-version."getobject"."0.1.0" + self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; - passthru.names = [ "grunt-lib-contrib" ]; + passthru.names = [ "grunt-legacy-util" ]; }; by-spec."grunt-sed"."*" = self.by-version."grunt-sed"."0.1.1"; @@ -6989,7 +7563,7 @@ self.by-version."replace"."0.2.9" ]; peerDependencies = [ - self.by-version."grunt"."0.4.2" + self.by-version."grunt"."0.4.4" ]; passthru.names = [ "grunt-sed" ]; }; @@ -7010,8 +7584,8 @@ deps = [ self.by-version."coffee-script"."1.7.1" self.by-version."jade"."1.3.0" - self.by-version."q"."1.0.0" - self.by-version."xml2js"."0.4.1" + self.by-version."q"."2.0.1" + self.by-version."xml2js"."0.4.2" self.by-version."msgpack"."0.2.2" ]; peerDependencies = [ @@ -7033,7 +7607,7 @@ buildInputs = (self.nativeDeps."gzip-size" or []); deps = [ - self.by-version."concat-stream"."1.4.1" + self.by-version."concat-stream"."1.4.4" self.by-version."zlib-browserify"."0.0.3" ]; peerDependencies = [ @@ -7061,28 +7635,30 @@ passthru.names = [ "gzippo" ]; }; "gzippo" = self.by-version."gzippo"."0.2.0"; - by-spec."handlebars"."1.0.11" = - self.by-version."handlebars"."1.0.11"; - by-version."handlebars"."1.0.11" = lib.makeOverridable self.buildNodePackage { - name = "handlebars-1.0.11"; + by-spec."handlebars"."1.3.0" = + self.by-version."handlebars"."1.3.0"; + by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "handlebars-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.11.tgz"; - name = "handlebars-1.0.11.tgz"; - sha1 = "28b8af8b1f3658ef377e621e0d6b07078fc450a9"; + url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz"; + name = "handlebars-1.3.0.tgz"; + sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34"; }) ]; buildInputs = (self.nativeDeps."handlebars" or []); deps = [ self.by-version."optimist"."0.3.7" - self.by-version."uglify-js"."1.2.6" + self.by-version."uglify-js"."2.3.6" ]; peerDependencies = [ ]; passthru.names = [ "handlebars" ]; }; - by-spec."handlebars"."1.0.x" = + by-spec."handlebars"."1.3.x" = + self.by-version."handlebars"."1.3.0"; + by-spec."handlebars"."~1.0.11" = self.by-version."handlebars"."1.0.12"; by-version."handlebars"."1.0.12" = lib.makeOverridable self.buildNodePackage { name = "handlebars-1.0.12"; @@ -7103,29 +7679,8 @@ ]; passthru.names = [ "handlebars" ]; }; - by-spec."handlebars"."1.3.x" = + by-spec."handlebars"."~1.3.0" = self.by-version."handlebars"."1.3.0"; - by-version."handlebars"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "handlebars-1.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz"; - name = "handlebars-1.3.0.tgz"; - sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34"; - }) - ]; - buildInputs = - (self.nativeDeps."handlebars" or []); - deps = [ - self.by-version."optimist"."0.3.7" - self.by-version."uglify-js"."2.3.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "handlebars" ]; - }; - by-spec."handlebars"."~1.0.11" = - self.by-version."handlebars"."1.0.12"; by-spec."has-color"."~0.1.0" = self.by-version."has-color"."0.1.4"; by-version."has-color"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -7456,7 +8011,7 @@ self.by-version."domhandler"."2.2.0" self.by-version."domutils"."1.3.0" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.1.11" + self.by-version."readable-stream"."1.1.12" ]; peerDependencies = [ ]; @@ -7672,27 +8227,28 @@ passthru.names = [ "i18next" ]; }; "i18next" = self.by-version."i18next"."1.7.1"; - by-spec."ibrik"."~1.0.1" = - self.by-version."ibrik"."1.0.1"; - by-version."ibrik"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "ibrik-1.0.1"; + by-spec."ibrik"."~1.1.1" = + self.by-version."ibrik"."1.1.1"; + by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "ibrik-1.1.1"; src = [ - (self.patchSource fetchurl { - url = "http://registry.npmjs.org/ibrik/-/ibrik-1.0.1.tgz"; - name = "ibrik-1.0.1.tgz"; - sha1 = "ba9c0cf9302c51a812dc4a92038b3de579c0aefb"; + (fetchurl { + url = "http://registry.npmjs.org/ibrik/-/ibrik-1.1.1.tgz"; + name = "ibrik-1.1.1.tgz"; + sha1 = "c9bd04c5137e967a2f0dbc9e4eb31dbfa04801b5"; }) ]; buildInputs = (self.nativeDeps."ibrik" or []); deps = [ - self.by-version."coffee-script-redux"."2.0.0-beta4" - self.by-version."istanbul"."0.2.4" - self.by-version."optimist"."0.6.1" - self.by-version."escodegen"."1.2.0" - self.by-version."mkdirp"."0.3.5" - self.by-version."which"."1.0.5" + 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."estraverse"."1.5.0" + self.by-version."escodegen"."1.1.0" + self.by-version."which"."1.0.5" + self.by-version."mkdirp"."0.3.5" + self.by-version."optimist"."0.6.1" ]; peerDependencies = [ ]; @@ -7799,6 +8355,8 @@ }; by-spec."inherits"."2.0.1" = self.by-version."inherits"."2.0.1"; + by-spec."inherits"."^2.0.1" = + self.by-version."inherits"."2.0.1"; by-spec."inherits"."~1.0.0" = self.by-version."inherits"."1.0.0"; by-spec."inherits"."~2.0.0" = @@ -7828,15 +8386,15 @@ 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.14" = - self.by-version."init-package-json"."0.0.14"; - by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage { - name = "node-init-package-json-0.0.14"; + 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.14.tgz"; - name = "init-package-json-0.0.14.tgz"; - sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7"; + 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 = @@ -7844,7 +8402,7 @@ deps = [ self.by-version."promzard"."0.2.1" self.by-version."read"."1.0.5" - self.by-version."read-package-json"."1.1.7" + self.by-version."read-package-json"."1.1.8" self.by-version."semver"."2.2.1" self.by-version."glob"."3.2.9" ]; @@ -7897,8 +8455,6 @@ }; by-spec."inquirer"."~0.3.1" = self.by-version."inquirer"."0.3.5"; - by-spec."inquirer"."~0.3.4" = - self.by-version."inquirer"."0.3.5"; by-spec."inquirer"."~0.4.0" = self.by-version."inquirer"."0.4.1"; by-version."inquirer"."0.4.1" = lib.makeOverridable self.buildNodePackage { @@ -7924,6 +8480,8 @@ ]; passthru.names = [ "inquirer" ]; }; + by-spec."inquirer"."~0.4.1" = + self.by-version."inquirer"."0.4.1"; by-spec."insert-module-globals"."~3.2.0" = self.by-version."insert-module-globals"."3.2.0"; by-version."insert-module-globals"."3.2.0" = lib.makeOverridable self.buildNodePackage { @@ -7942,7 +8500,7 @@ self.by-version."process"."0.5.2" self.by-version."through"."2.3.4" self.by-version."JSONStream"."0.7.1" - self.by-version."concat-stream"."1.4.1" + self.by-version."concat-stream"."1.4.4" ]; peerDependencies = [ ]; @@ -7964,7 +8522,7 @@ deps = [ self.by-version."chalk"."0.4.0" self.by-version."request"."2.27.0" - self.by-version."configstore"."0.2.2" + self.by-version."configstore"."0.2.3" self.by-version."async"."0.2.10" self.by-version."inquirer"."0.4.1" self.by-version."object-assign"."0.1.2" @@ -8008,11 +8566,11 @@ (self.nativeDeps."ironhorse" or []); deps = [ self.by-version."underscore"."1.5.2" - self.by-version."winston"."0.7.2" + 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.2.10" - self.by-version."express"."4.0.0-rc2" + self.by-version."async"."0.6.2" + self.by-version."express"."4.0.0-rc4" self.by-version."jade"."1.3.0" self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" @@ -8048,6 +8606,44 @@ ]; passthru.names = [ "is-promise" ]; }; + by-spec."is-root"."~0.1.0" = + self.by-version."is-root"."0.1.0"; + by-version."is-root"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-is-root-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-root/-/is-root-0.1.0.tgz"; + name = "is-root-0.1.0.tgz"; + sha1 = "825e394ab593df2d73c5d0092fce507270b53dcb"; + }) + ]; + buildInputs = + (self.nativeDeps."is-root" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "is-root" ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-isarray-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }) + ]; + buildInputs = + (self.nativeDeps."isarray" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "isarray" ]; + }; by-spec."isbinaryfile"."~0.1.8" = self.by-version."isbinaryfile"."0.1.9"; by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage { @@ -8089,67 +8685,41 @@ passthru.names = [ "isbinaryfile" ]; }; by-spec."istanbul"."*" = - self.by-version."istanbul"."0.2.4"; - by-version."istanbul"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.2.4"; + 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.4.tgz"; - name = "istanbul-0.2.4.tgz"; - sha1 = "faaaa400f2cf652c3dc8b3d9484b44a5528e3a04"; + 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.0.4" - self.by-version."escodegen"."1.0.1" + self.by-version."esprima"."1.1.1" + self.by-version."escodegen"."1.3.0" self.by-version."handlebars"."1.3.0" self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.1.2" + 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.2.10" self.by-version."abbrev"."1.0.4" self.by-version."wordwrap"."0.0.2" - self.by-version."resolve"."0.6.1" + self.by-version."resolve"."0.6.2" self.by-version."js-yaml"."3.0.2" ]; peerDependencies = [ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.2.4"; - by-spec."istanbul"."~0.1.45" = - self.by-version."istanbul"."0.1.46"; - by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.1.46"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.46.tgz"; - name = "istanbul-0.1.46.tgz"; - sha1 = "cefeb1c787d125a6db23bd0f63b0eb9390b0b40d"; - }) - ]; - buildInputs = - (self.nativeDeps."istanbul" or []); - deps = [ - self.by-version."esprima"."1.0.4" - self.by-version."escodegen"."0.0.23" - self.by-version."handlebars"."1.0.12" - self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.1.2" - self.by-version."fileset"."0.1.5" - self.by-version."which"."1.0.5" - self.by-version."async"."0.2.10" - self.by-version."abbrev"."1.0.4" - self.by-version."wordwrap"."0.0.2" - self.by-version."resolve"."0.5.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "istanbul" ]; - }; + "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.7"; by-spec."jade"."*" = self.by-version."jade"."1.3.0"; by-version."jade"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -8274,14 +8844,14 @@ passthru.names = [ "jade" ]; }; by-spec."jayschema"."*" = - self.by-version."jayschema"."0.2.5"; - by-version."jayschema"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "jayschema-0.2.5"; + self.by-version."jayschema"."0.2.6"; + by-version."jayschema"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "jayschema-0.2.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.5.tgz"; - name = "jayschema-0.2.5.tgz"; - sha1 = "314e87687eac703a0a2557d77dbb3f175a0e7ada"; + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.6.tgz"; + name = "jayschema-0.2.6.tgz"; + sha1 = "c160e767cef66babda76b0fc34a06d4adc44965d"; }) ]; buildInputs = @@ -8293,26 +8863,7 @@ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.by-version."jayschema"."0.2.5"; - by-spec."jedediah"."~0.1.0" = - self.by-version."jedediah"."0.1.1"; - by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-jedediah-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/jedediah/-/jedediah-0.1.1.tgz"; - name = "jedediah-0.1.1.tgz"; - sha1 = "51f33021ebec6847d844cb53bbc086ee38877f84"; - }) - ]; - buildInputs = - (self.nativeDeps."jedediah" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "jedediah" ]; - }; + "jayschema" = self.by-version."jayschema"."0.2.6"; by-spec."js-yaml"."*" = self.by-version."js-yaml"."3.0.2"; by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage { @@ -8419,27 +8970,6 @@ ]; passthru.names = [ "js-yaml" ]; }; - by-spec."js-yaml"."~2.1.0" = - self.by-version."js-yaml"."2.1.3"; - by-version."js-yaml"."2.1.3" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-2.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; - name = "js-yaml-2.1.3.tgz"; - sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; - }) - ]; - buildInputs = - (self.nativeDeps."js-yaml" or []); - deps = [ - self.by-version."argparse"."0.1.15" - self.by-version."esprima"."1.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "js-yaml" ]; - }; by-spec."js-yaml"."~3.0.1" = self.by-version."js-yaml"."3.0.2"; by-spec."jsesc"."0.4.3" = @@ -8668,14 +9198,14 @@ passthru.names = [ "junk" ]; }; by-spec."karma"."*" = - self.by-version."karma"."0.11.14"; - by-version."karma"."0.11.14" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.11.14"; + self.by-version."karma"."0.12.2"; + by-version."karma"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.12.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.14.tgz"; - name = "karma-0.11.14.tgz"; - sha1 = "2f6f81611bfe62e588d4e1d63c14f3928971a77c"; + url = "http://registry.npmjs.org/karma/-/karma-0.12.2.tgz"; + name = "karma-0.12.2.tgz"; + sha1 = "9c145720fb088807b3af8de4c68a4c530e45c4de"; }) ]; buildInputs = @@ -8683,20 +9213,19 @@ deps = [ self.by-version."di"."0.0.1" self.by-version."socket.io"."0.9.16" - self.by-version."chokidar"."0.8.1" + self.by-version."chokidar"."0.8.2" 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."coffee-script"."1.6.3" 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" self.by-version."mime"."1.2.11" self.by-version."log4js"."0.6.12" - self.by-version."useragent"."2.0.7" - self.by-version."graceful-fs"."2.0.2" + self.by-version."useragent"."2.0.8" + self.by-version."graceful-fs"."2.0.3" self.by-version."connect"."2.12.0" self.by-version."source-map"."0.1.33" ]; @@ -8704,15 +9233,15 @@ ]; passthru.names = [ "karma" ]; }; - "karma" = self.by-version."karma"."0.11.14"; + "karma" = self.by-version."karma"."0.12.2"; by-spec."karma".">=0.11.11" = - self.by-version."karma"."0.11.14"; + self.by-version."karma"."0.12.2"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.11.14"; + self.by-version."karma"."0.12.2"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.11.14"; - by-spec."karma"."~0.11.0" = - self.by-version."karma"."0.11.14"; + self.by-version."karma"."0.12.2"; + by-spec."karma"."~0.12.0" = + self.by-version."karma"."0.12.2"; by-spec."karma-chrome-launcher"."*" = self.by-version."karma-chrome-launcher"."0.1.2"; by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -8729,35 +9258,35 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.14" + self.by-version."karma"."0.12.2" ]; passthru.names = [ "karma-chrome-launcher" ]; }; "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2"; by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.2.0"; - by-version."karma-coverage"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-coverage-0.2.0"; + 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.0.tgz"; - name = "karma-coverage-0.2.0.tgz"; - sha1 = "d8edc429c35ab7c68fa90a5cd2f2ecb3aa31fde8"; + 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.1.46" - self.by-version."ibrik"."1.0.1" + self.by-version."istanbul"."0.2.7" + self.by-version."ibrik"."1.1.1" self.by-version."dateformat"."1.0.7-1.2.3" ]; peerDependencies = [ - self.by-version."karma"."0.11.14" + self.by-version."karma"."0.12.2" ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.2.0"; + "karma-coverage" = self.by-version."karma-coverage"."0.2.1"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.1"; by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -8775,20 +9304,20 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.11.14" + self.by-version."karma"."0.12.2" ]; passthru.names = [ "karma-junit-reporter" ]; }; "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.1"; by-spec."karma-mocha"."*" = - self.by-version."karma-mocha"."0.1.1"; - by-version."karma-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-mocha-0.1.1"; + self.by-version."karma-mocha"."0.1.3"; + by-version."karma-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-mocha-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.1.tgz"; - name = "karma-mocha-0.1.1.tgz"; - sha1 = "5edddb3e2d2c6fd47e9ad26f0af1595fe852c756"; + url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.3.tgz"; + name = "karma-mocha-0.1.3.tgz"; + sha1 = "396e44be8ddb4abf28bfca0387924c3aeddbce1a"; }) ]; buildInputs = @@ -8796,12 +9325,12 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.14" - self.by-version."mocha"."1.17.1" + self.by-version."karma"."0.12.2" + self.by-version."mocha"."1.18.2" ]; passthru.names = [ "karma-mocha" ]; }; - "karma-mocha" = self.by-version."karma-mocha"."0.1.1"; + "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 { @@ -8818,37 +9347,37 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.14" + self.by-version."karma"."0.12.2" self.by-version."requirejs"."2.1.11" ]; passthru.names = [ "karma-requirejs" ]; }; "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1"; by-spec."karma-sauce-launcher"."*" = - self.by-version."karma-sauce-launcher"."0.2.0"; - by-version."karma-sauce-launcher"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-sauce-launcher-0.2.0"; + self.by-version."karma-sauce-launcher"."0.2.4"; + by-version."karma-sauce-launcher"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-sauce-launcher-0.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.0.tgz"; - name = "karma-sauce-launcher-0.2.0.tgz"; - sha1 = "0994da49a1774be876ff1b107fd47e8768e3ead0"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.4.tgz"; + name = "karma-sauce-launcher-0.2.4.tgz"; + sha1 = "9d33b23d44c7580ea0d9d1651fd56d96276d8cd7"; }) ]; buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.2.11" - self.by-version."sauce-connect-launcher"."0.2.2" + self.by-version."wd"."0.2.14" + self.by-version."sauce-connect-launcher"."0.3.3" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" ]; peerDependencies = [ - self.by-version."karma"."0.11.14" + self.by-version."karma"."0.12.2" ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.0"; + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.4"; 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 { @@ -9115,7 +9644,7 @@ passthru.names = [ "lcov-result-merger" ]; }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; - by-spec."less"."~1.7.0" = + by-spec."less"."^1.7.0" = self.by-version."less"."1.7.0"; by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage { name = "less-1.7.0"; @@ -9132,13 +9661,15 @@ self.by-version."mime"."1.2.11" self.by-version."request"."2.34.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."2.1.4" + self.by-version."clean-css"."2.1.8" self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; passthru.names = [ "less" ]; }; + by-spec."less"."~1.7.0" = + self.by-version."less"."1.7.0"; by-spec."lexical-scope"."~0.1.0" = self.by-version."lexical-scope"."0.1.0"; by-version."lexical-scope"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -9218,6 +9749,25 @@ ]; passthru.names = [ "lockfile" ]; }; + by-spec."lodash"."^2.4.1" = + self.by-version."lodash"."2.4.1"; + by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"; + name = "lodash-2.4.1.tgz"; + sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash" ]; + }; by-spec."lodash"."~0.10.0" = self.by-version."lodash"."0.10.0"; by-version."lodash"."0.10.0" = lib.makeOverridable self.buildNodePackage { @@ -9256,25 +9806,6 @@ ]; passthru.names = [ "lodash" ]; }; - by-spec."lodash"."~1.0.1" = - self.by-version."lodash"."1.0.1"; - by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-lodash-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"; - name = "lodash-1.0.1.tgz"; - sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash" ]; - }; by-spec."lodash"."~1.2.1" = self.by-version."lodash"."1.2.1"; by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -9355,23 +9886,6 @@ }; by-spec."lodash"."~2.4.1" = self.by-version."lodash"."2.4.1"; - by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-lodash-2.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"; - name = "lodash-2.4.1.tgz"; - sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash" ]; - }; by-spec."lodash._isnative"."~2.4.1" = self.by-version."lodash._isnative"."2.4.1"; by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -9615,14 +10129,14 @@ passthru.names = [ "long" ]; }; by-spec."longjohn"."~0.2.2" = - self.by-version."longjohn"."0.2.2"; - by-version."longjohn"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-longjohn-0.2.2"; + self.by-version."longjohn"."0.2.4"; + by-version."longjohn"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-longjohn-0.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.2.tgz"; - name = "longjohn-0.2.2.tgz"; - sha1 = "f1110be9407b2dfc13713cb5b57cb69ef843c4d9"; + url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.4.tgz"; + name = "longjohn-0.2.4.tgz"; + sha1 = "48436a1f359e7666f678e2170ee1f43bba8f8b4c"; }) ]; buildInputs = @@ -9793,6 +10307,26 @@ ]; passthru.names = [ "mailcomposer" ]; }; + by-spec."map-key"."^0.1.0" = + self.by-version."map-key"."0.1.0"; + by-version."map-key"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-map-key-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/map-key/-/map-key-0.1.0.tgz"; + name = "map-key-0.1.0.tgz"; + sha1 = "7ce8f677ba4051e23ddab5ce0d19c256cbf701fc"; + }) + ]; + buildInputs = + (self.nativeDeps."map-key" or []); + deps = [ + self.by-version."mout"."0.9.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "map-key" ]; + }; by-spec."maxmin"."^0.1.0" = self.by-version."maxmin"."0.1.0"; by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -9903,26 +10437,27 @@ ]; passthru.names = [ "merge-descriptors" ]; }; - by-spec."methods"."0.0.1" = - self.by-version."methods"."0.0.1"; - by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-methods-0.0.1"; + 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/methods/-/methods-0.0.1.tgz"; - name = "methods-0.0.1.tgz"; - sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; + 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."methods" or []); + (self.nativeDeps."method-override" or []); deps = [ + self.by-version."methods"."0.1.0" ]; peerDependencies = [ ]; - passthru.names = [ "methods" ]; + passthru.names = [ "method-override" ]; }; - by-spec."methods"."0.1.0" = + 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"; @@ -9941,6 +10476,27 @@ ]; 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 { + name = "node-methods-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + name = "methods-0.0.1.tgz"; + sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; + }) + ]; + buildInputs = + (self.nativeDeps."methods" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "methods" ]; + }; + by-spec."methods"."0.1.0" = + self.by-version."methods"."0.1.0"; by-spec."mime"."*" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { @@ -10241,6 +10797,8 @@ self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."0.x.x" = self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."^0.3.5" = + self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.3.3" = self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.3.4" = @@ -10267,14 +10825,14 @@ passthru.names = [ "mkpath" ]; }; by-spec."mocha"."*" = - self.by-version."mocha"."1.17.1"; - by-version."mocha"."1.17.1" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.17.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.17.1.tgz"; - name = "mocha-1.17.1.tgz"; - sha1 = "7f7671d68526d074b7bae660c9099f87e0ea1ccb"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.18.2.tgz"; + name = "mocha-1.18.2.tgz"; + sha1 = "800848f8f7884c61eefcfa2a27304ba9e5446d0b"; }) ]; buildInputs = @@ -10284,7 +10842,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.7.4" + self.by-version."debug"."0.8.0" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.3" ]; @@ -10292,7 +10850,7 @@ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.17.1"; + "mocha" = self.by-version."mocha"."1.18.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 { @@ -10334,8 +10892,8 @@ self.by-version."through"."2.3.4" self.by-version."JSONStream"."0.7.1" self.by-version."browser-resolve"."1.2.2" - self.by-version."resolve"."0.6.1" - self.by-version."concat-stream"."1.4.1" + self.by-version."resolve"."0.6.2" + self.by-version."concat-stream"."1.4.4" self.by-version."minimist"."0.0.8" self.by-version."parents"."0.0.2" self.by-version."detective"."2.4.1" @@ -10402,14 +10960,14 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.0-rc8"; - by-version."mongodb"."1.4.0-rc8" = lib.makeOverridable self.buildNodePackage { - name = "node-mongodb-1.4.0-rc8"; + self.by-version."mongodb"."1.4.0-rc9"; + by-version."mongodb"."1.4.0-rc9" = lib.makeOverridable self.buildNodePackage { + name = "node-mongodb-1.4.0-rc9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc8.tgz"; - name = "mongodb-1.4.0-rc8.tgz"; - sha1 = "3c6048070935d2b1c7e997dd77be70119e33cced"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc9.tgz"; + name = "mongodb-1.4.0-rc9.tgz"; + sha1 = "1b3887e9b2846de7557a009e1702f7dbc70d4c12"; }) ]; buildInputs = @@ -10422,7 +10980,7 @@ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.0-rc8"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc9"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -10649,6 +11207,45 @@ ]; 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz"; + name = "morgan-1.0.0.tgz"; + sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d"; + }) + ]; + buildInputs = + (self.nativeDeps."morgan" or []); + deps = [ + self.by-version."bytes"."0.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "morgan" ]; + }; + by-spec."mout"."^0.9.0" = + self.by-version."mout"."0.9.0"; + by-version."mout"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-mout-0.9.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mout/-/mout-0.9.0.tgz"; + name = "mout-0.9.0.tgz"; + sha1 = "4b6ef8cae5099151d9a7ddb6ebb9a56f9de6aaeb"; + }) + ]; + 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 { @@ -10687,6 +11284,8 @@ ]; passthru.names = [ "mout" ]; }; + by-spec."mout"."~0.9.0" = + self.by-version."mout"."0.9.0"; by-spec."mpath"."0.1.1" = self.by-version."mpath"."0.1.1"; by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -10819,7 +11418,7 @@ buildInputs = (self.nativeDeps."multiparty" or []); deps = [ - self.by-version."readable-stream"."1.1.11" + self.by-version."readable-stream"."1.1.12" self.by-version."stream-counter"."0.2.0" ]; peerDependencies = [ @@ -11090,6 +11689,25 @@ ]; 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz"; + name = "negotiator-0.4.2.tgz"; + sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37"; + }) + ]; + buildInputs = + (self.nativeDeps."negotiator" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "negotiator" ]; + }; by-spec."negotiator"."~0.3.0" = self.by-version."negotiator"."0.3.0"; by-spec."net-ping"."1.1.7" = @@ -11151,26 +11769,27 @@ passthru.names = [ "nib" ]; }; by-spec."nijs"."*" = - self.by-version."nijs"."0.0.13"; - by-version."nijs"."0.0.13" = lib.makeOverridable self.buildNodePackage { - name = "nijs-0.0.13"; + self.by-version."nijs"."0.0.14"; + by-version."nijs"."0.0.14" = lib.makeOverridable self.buildNodePackage { + name = "nijs-0.0.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nijs/-/nijs-0.0.13.tgz"; - name = "nijs-0.0.13.tgz"; - sha1 = "eba11ace22e3ff73a9dc526b2b955c2e04472572"; + url = "http://registry.npmjs.org/nijs/-/nijs-0.0.14.tgz"; + name = "nijs-0.0.14.tgz"; + sha1 = "e4851865ee94567e33c7c7e6d7d92c031e8f1eab"; }) ]; buildInputs = (self.nativeDeps."nijs" or []); deps = [ self.by-version."optparse"."1.0.5" + self.by-version."slasp"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "nijs" ]; }; - "nijs" = self.by-version."nijs"."0.0.13"; + "nijs" = self.by-version."nijs"."0.0.14"; by-spec."node-appc"."0.2.0" = self.by-version."node-appc"."0.2.0"; by-version."node-appc"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -11241,7 +11860,7 @@ (self.nativeDeps."node-gyp" or []); deps = [ self.by-version."glob"."3.2.9" - self.by-version."graceful-fs"."2.0.2" + 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" @@ -11259,47 +11878,17 @@ passthru.names = [ "node-gyp" ]; }; "node-gyp" = self.by-version."node-gyp"."0.13.0"; - by-spec."node-gyp"."~0.12.2" = - self.by-version."node-gyp"."0.12.2"; - by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.12.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; - name = "node-gyp-0.12.2.tgz"; - sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; - }) - ]; - buildInputs = - (self.nativeDeps."node-gyp" or []); - deps = [ - self.by-version."glob"."3.2.9" - self.by-version."graceful-fs"."2.0.2" - 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."semver"."2.2.1" - self.by-version."tar"."0.1.19" - self.by-version."which"."1.0.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "node-gyp" ]; - }; + by-spec."node-gyp"."~0.13.0" = + self.by-version."node-gyp"."0.13.0"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.0"; - by-version."node-inspector"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.0"; + self.by-version."node-inspector"."0.7.2"; + by-version."node-inspector"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0.tgz"; - name = "node-inspector-0.7.0.tgz"; - sha1 = "b035e94e4bca3279ebabbb4df871ad8931919d9c"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.2.tgz"; + name = "node-inspector-0.7.2.tgz"; + sha1 = "b9f1a1bbec7960d504edbfbc4bf191841794aab8"; }) ]; buildInputs = @@ -11320,7 +11909,7 @@ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.0"; + "node-inspector" = self.by-version."node-inspector"."0.7.2"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.0.10"; by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage { @@ -11491,7 +12080,7 @@ buildInputs = (self.nativeDeps."node-wsfederation" or []); deps = [ - self.by-version."xml2js"."0.4.1" + self.by-version."xml2js"."0.4.2" ]; peerDependencies = [ ]; @@ -11531,7 +12120,7 @@ (self.nativeDeps."nodemailer" or []); deps = [ self.by-version."mailcomposer"."0.2.8" - self.by-version."simplesmtp"."0.3.22" + self.by-version."simplesmtp"."0.3.24" self.by-version."optimist"."0.6.1" ]; peerDependencies = [ @@ -11539,27 +12128,27 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.0.15"; - by-version."nodemon"."1.0.15" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.0.15"; + 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.0.15.tgz"; - name = "nodemon-1.0.15.tgz"; - sha1 = "32efa6b8134d579dca8894cd9e8a27d381387f11"; + 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.7" + 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.0.15"; + "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 { @@ -11621,15 +12210,17 @@ ]; passthru.names = [ "nopt" ]; }; - by-spec."nopt"."2.1.x" = - self.by-version."nopt"."2.1.2"; - by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.1.2"; + by-spec."nopt"."2.2.x" = + 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 { + name = "nopt-1.0.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; - name = "nopt-2.1.2.tgz"; - sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; + url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + name = "nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }) ]; buildInputs = @@ -11641,17 +12232,15 @@ ]; passthru.names = [ "nopt" ]; }; - by-spec."nopt"."^2.2.0" = - self.by-version."nopt"."2.2.0"; - by-spec."nopt"."https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress" = - self.by-version."nopt"."1.0.10"; - by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage { - name = "nopt-1.0.10"; + by-spec."nopt"."~2.1.1" = + self.by-version."nopt"."2.1.2"; + by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage { + name = "nopt-2.1.2"; src = [ (fetchurl { - url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress"; - name = "nopt-1.0.10.tgz"; - sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad"; + url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; + name = "nopt-2.1.2.tgz"; + sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; }) ]; buildInputs = @@ -11663,12 +12252,10 @@ ]; passthru.names = [ "nopt" ]; }; - by-spec."nopt"."~1.0.10" = - self.by-version."nopt"."1.0.10"; - by-spec."nopt"."~2.1.1" = - self.by-version."nopt"."2.1.2"; 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 { @@ -11692,73 +12279,74 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.4.4"; - by-version."npm"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.4.4"; + self.by-version."npm"."1.4.6"; + by-version."npm"."1.4.6" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.4.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.4.4.tgz"; - name = "npm-1.4.4.tgz"; - sha1 = "076616f7af95bcd08a4c5ad5cce18c5f370e0935"; + url = "http://registry.npmjs.org/npm/-/npm-1.4.6.tgz"; + name = "npm-1.4.6.tgz"; + sha1 = "0e151bce38e72cf2206a6299fa5164123f04256e"; }) ]; buildInputs = (self.nativeDeps."npm" or []); deps = [ - self.by-version."semver"."2.2.1" - self.by-version."ini"."1.1.0" - self.by-version."slide"."1.1.5" self.by-version."abbrev"."1.0.4" - self.by-version."graceful-fs"."2.0.2" - self.by-version."minimatch"."0.2.14" - self.by-version."nopt"."2.2.0" - self.by-version."rimraf"."2.2.6" - self.by-version."request"."2.30.0" - self.by-version."which"."1.0.5" - self.by-version."tar"."0.1.19" - self.by-version."fstream"."0.1.25" - self.by-version."block-stream"."0.0.7" - self.by-version."mkdirp"."0.3.5" - self.by-version."read"."1.0.5" - self.by-version."lru-cache"."2.5.0" - self.by-version."node-gyp"."0.12.2" - self.by-version."fstream-npm"."0.1.6" - self.by-version."uid-number"."0.0.5" - self.by-version."archy"."0.0.2" - self.by-version."chownr"."0.0.1" - self.by-version."npmlog"."0.0.6" self.by-version."ansi"."0.2.1" - self.by-version."npm-registry-client"."0.4.4" - self.by-version."read-package-json"."1.1.7" - self.by-version."read-installed"."1.0.0" - self.by-version."glob"."3.2.7" - self.by-version."init-package-json"."0.0.14" - self.by-version."osenv"."0.0.3" - self.by-version."lockfile"."0.4.2" - self.by-version."retry"."0.6.0" - self.by-version."once"."1.3.0" - self.by-version."npmconf"."0.1.13" - self.by-version."opener"."1.3.0" + self.by-version."ansicolors"."0.3.2" + 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."child-process-close"."0.1.1" self.by-version."chmodr"."0.1.0" + self.by-version."chownr"."0.0.1" self.by-version."cmd-shim"."1.1.1" - self.by-version."sha"."1.2.3" + self.by-version."columnify"."0.1.2" self.by-version."editor"."0.0.5" - self.by-version."child-process-close"."0.1.1" - self.by-version."npm-user-validate"."0.0.3" + self.by-version."fstream"."0.1.25" + 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.0.2" - self.by-version."text-table"."0.2.0" - self.by-version."ansicolors"."0.3.2" - self.by-version."ansistyles"."0.1.3" - self.by-version."path-is-inside"."1.0.1" - self.by-version."columnify"."0.1.2" + self.by-version."glob"."3.2.9" + 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."lockfile"."0.4.2" + self.by-version."lru-cache"."2.5.0" + self.by-version."minimatch"."0.2.14" + 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.6" + self.by-version."npm-user-validate"."0.0.3" + self.by-version."npmconf"."0.1.13" + 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."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."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."slide"."1.1.5" + self.by-version."sorted-object"."1.0.0" + self.by-version."tar"."0.1.19" + self.by-version."text-table"."0.2.0" + self.by-version."uid-number"."0.0.5" + self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.4.4"; + "npm" = self.by-version."npm"."1.4.6"; 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 { @@ -11795,7 +12383,7 @@ (self.nativeDeps."npm-registry-client" or []); deps = [ self.by-version."request"."2.34.0" - self.by-version."graceful-fs"."2.0.2" + 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" @@ -11809,22 +12397,22 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."^0.4.4" = - self.by-version."npm-registry-client"."0.4.4"; - by-version."npm-registry-client"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-registry-client-0.4.4"; + by-spec."npm-registry-client"."~0.4.4" = + self.by-version."npm-registry-client"."0.4.6"; + by-version."npm-registry-client"."0.4.6" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-registry-client-0.4.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.4.tgz"; - name = "npm-registry-client-0.4.4.tgz"; - sha1 = "f9dbc383a49069d8c7f67755a3ff6e424aff584f"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.6.tgz"; + name = "npm-registry-client-0.4.6.tgz"; + sha1 = "657f69a79543fc4cc264c3b2de958bd15f7140fe"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ self.by-version."request"."2.34.0" - self.by-version."graceful-fs"."2.0.2" + 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" @@ -11837,8 +12425,8 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.4.4" = - self.by-version."npm-registry-client"."0.4.4"; + by-spec."npm-registry-client"."~0.4.5" = + self.by-version."npm-registry-client"."0.4.6"; 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 { @@ -11940,7 +12528,7 @@ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."~0.1.12" = + by-spec."npmconf"."~0.1.13" = self.by-version."npmconf"."0.1.13"; by-version."npmconf"."0.1.13" = lib.makeOverridable self.buildNodePackage { name = "node-npmconf-0.1.13"; @@ -11967,8 +12555,6 @@ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."~0.1.13" = - self.by-version."npmconf"."0.1.13"; by-spec."npmconf"."~0.1.2" = self.by-version."npmconf"."0.1.13"; by-spec."npmlog"."*" = @@ -12044,7 +12630,7 @@ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; name = "oauth-0.9.11.tgz"; - sha256 = "ea86c233c1a77e52a97107b40978a909a99dd59c4751e7f4d342274c1d6a55a4"; + sha256 = "8716e78676584860379f3ccc0f510beea508152d1728f3f17e8e760e12b0ef8f"; }) ]; buildInputs = @@ -12426,14 +13012,14 @@ by-spec."optparse".">= 1.0.3" = self.by-version."optparse"."1.0.5"; by-spec."os-browserify"."~0.1.1" = - self.by-version."os-browserify"."0.1.1"; - by-version."os-browserify"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-os-browserify-0.1.1"; + self.by-version."os-browserify"."0.1.2"; + by-version."os-browserify"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-os-browserify-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.1.tgz"; - name = "os-browserify-0.1.1.tgz"; - sha1 = "c1c6b8b27be18cb09da7fa87476e0bcf3b465cbe"; + url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; + name = "os-browserify-0.1.2.tgz"; + sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; }) ]; buildInputs = @@ -12465,6 +13051,8 @@ }; 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"."*" = self.by-version."owl-deepcopy"."0.0.2"; by-version."owl-deepcopy"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -12528,6 +13116,25 @@ }; by-spec."parents"."~0.0.1" = self.by-version."parents"."0.0.2"; + by-spec."parseurl"."1.0.1" = + self.by-version."parseurl"."1.0.1"; + by-version."parseurl"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-parseurl-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz"; + name = "parseurl-1.0.1.tgz"; + sha1 = "2e57dce6efdd37c3518701030944c22bf388b7b4"; + }) + ]; + buildInputs = + (self.nativeDeps."parseurl" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "parseurl" ]; + }; by-spec."passport"."*" = self.by-version."passport"."0.2.0"; by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -12598,6 +13205,27 @@ }; "passport-http" = self.by-version."passport-http"."0.2.2"; by-spec."passport-local"."*" = + self.by-version."passport-local"."1.0.0"; + by-version."passport-local"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-passport-local-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz"; + name = "passport-local-1.0.0.tgz"; + sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; + }) + ]; + buildInputs = + (self.nativeDeps."passport-local" or []); + deps = [ + self.by-version."passport-strategy"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "passport-local" ]; + }; + "passport-local" = self.by-version."passport-local"."1.0.0"; + by-spec."passport-local"."0.1.6" = self.by-version."passport-local"."0.1.6"; by-version."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage { name = "node-passport-local-0.1.6"; @@ -12618,9 +13246,6 @@ ]; passthru.names = [ "passport-local" ]; }; - "passport-local" = self.by-version."passport-local"."0.1.6"; - by-spec."passport-local"."0.1.6" = - self.by-version."passport-local"."0.1.6"; by-spec."passport-strategy"."1.x.x" = self.by-version."passport-strategy"."1.0.0"; by-version."passport-strategy"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -12678,6 +13303,25 @@ ]; passthru.names = [ "path-is-inside" ]; }; + by-spec."path-to-regexp"."0.1.2" = + self.by-version."path-to-regexp"."0.1.2"; + by-version."path-to-regexp"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-path-to-regexp-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.2.tgz"; + name = "path-to-regexp-0.1.2.tgz"; + sha1 = "9b2b151f9cc3018c9eea50ca95729e05781712b4"; + }) + ]; + buildInputs = + (self.nativeDeps."path-to-regexp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "path-to-regexp" ]; + }; by-spec."pause"."0.0.1" = self.by-version."pause"."0.0.1"; by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13067,19 +13711,21 @@ by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.4"; by-spec."q".">= 0.0.1" = - self.by-version."q"."1.0.0"; - by-version."q"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-q-1.0.0"; + 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-1.0.0.tgz"; - name = "q-1.0.0.tgz"; - sha1 = "dc1f92c4587be54f7853b29dc28e6d243a88498d"; + url = "http://registry.npmjs.org/q/-/q-2.0.1.tgz"; + name = "q-2.0.1.tgz"; + sha1 = "ae9dc1edd970e72820a1ca716ecc1b0fc96c1c5a"; }) ]; buildInputs = (self.nativeDeps."q" or []); deps = [ + self.by-version."asap"."1.0.0" + self.by-version."collections"."2.0.1" ]; peerDependencies = [ ]; @@ -13109,7 +13755,24 @@ by-spec."q"."~0.9.7" = self.by-version."q"."0.9.7"; by-spec."q"."~1.0.0" = - self.by-version."q"."1.0.0"; + self.by-version."q"."1.0.1"; + by-version."q"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-q-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz"; + name = "q-1.0.1.tgz"; + sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + }) + ]; + buildInputs = + (self.nativeDeps."q" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "q" ]; + }; by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -13270,24 +13933,24 @@ ]; passthru.names = [ "querystring" ]; }; - by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" = - self.by-version."querystring"."0.2.0"; - by-version."querystring"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-querystring-0.2.0"; + by-spec."querystring-es3"."0.2.0" = + self.by-version."querystring-es3"."0.2.0"; + by-version."querystring-es3"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-querystring-es3-0.2.0"; src = [ (fetchurl { - url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz"; - name = "querystring-0.2.0.tgz"; - sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5"; + url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.0.tgz"; + name = "querystring-es3-0.2.0.tgz"; + sha1 = "c365a08a69c443accfeb3a9deab35e3f0abaa476"; }) ]; buildInputs = - (self.nativeDeps."querystring" or []); + (self.nativeDeps."querystring-es3" or []); deps = [ ]; peerDependencies = [ ]; - passthru.names = [ "querystring" ]; + passthru.names = [ "querystring-es3" ]; }; by-spec."rai"."~0.1" = self.by-version."rai"."0.1.9"; @@ -13410,6 +14073,26 @@ ]; 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"; + src = [ + (fetchurl { + 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"."0.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "raw-body" ]; + }; by-spec."raw-socket"."*" = self.by-version."raw-socket"."1.2.2"; by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage { @@ -13515,45 +14198,46 @@ deps = [ self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" - self.by-version."read-package-json"."1.1.7" + self.by-version."read-package-json"."1.1.8" self.by-version."graceful-fs"."1.2.3" ]; peerDependencies = [ ]; passthru.names = [ "read-installed" ]; }; - by-spec."read-installed"."~1.0.0" = - self.by-version."read-installed"."1.0.0"; - by-version."read-installed"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-read-installed-1.0.0"; + 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-1.0.0.tgz"; - name = "read-installed-1.0.0.tgz"; - sha1 = "4db88d5a363f9c68eaa07e1626974bc2e0a1b3a5"; + 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.1.8" self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" - self.by-version."read-package-json"."1.1.7" - self.by-version."graceful-fs"."2.0.2" + self.by-version."util-extend"."1.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.1.7"; - by-version."read-package-json"."1.1.7" = lib.makeOverridable self.buildNodePackage { - name = "node-read-package-json-1.1.7"; + 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.1.7.tgz"; - name = "read-package-json-1.1.7.tgz"; - sha1 = "a28da23cb4330106a0d45e86065e0fc3b79d263e"; + 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 = @@ -13562,14 +14246,14 @@ self.by-version."glob"."3.2.9" self.by-version."lru-cache"."2.5.0" self.by-version."normalize-package-data"."0.2.12" - self.by-version."graceful-fs"."2.0.2" + self.by-version."graceful-fs"."2.0.3" ]; peerDependencies = [ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."~1.1.7" = - self.by-version."read-package-json"."1.1.7"; + 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.26"; by-version."readable-stream"."1.0.26" = lib.makeOverridable self.buildNodePackage { @@ -13591,22 +14275,23 @@ passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."1.1" = - self.by-version."readable-stream"."1.1.11"; - by-version."readable-stream"."1.1.11" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.1.11"; + self.by-version."readable-stream"."1.1.12"; + by-version."readable-stream"."1.1.12" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.1.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.11.tgz"; - name = "readable-stream-1.1.11.tgz"; - sha1 = "76ae0d88df2ac36c59e7c205e0cafc81c57bc07d"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.12.tgz"; + name = "readable-stream-1.1.12.tgz"; + sha1 = "960d442bbf5f6690b6b20550413931021af8e506"; }) ]; 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."debuglog"."0.0.2" + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; @@ -13619,9 +14304,9 @@ by-spec."readable-stream"."~1.0.24" = self.by-version."readable-stream"."1.0.26"; by-spec."readable-stream"."~1.1.8" = - self.by-version."readable-stream"."1.1.11"; + self.by-version."readable-stream"."1.1.12"; by-spec."readable-stream"."~1.1.9" = - self.by-version."readable-stream"."1.1.11"; + self.by-version."readable-stream"."1.1.12"; by-spec."readdirp"."~0.2.3" = self.by-version."readdirp"."0.2.5"; by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -13664,6 +14349,25 @@ ]; passthru.names = [ "readline2" ]; }; + by-spec."recursive-readdir"."0.0.2" = + self.by-version."recursive-readdir"."0.0.2"; + by-version."recursive-readdir"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-recursive-readdir-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/recursive-readdir/-/recursive-readdir-0.0.2.tgz"; + name = "recursive-readdir-0.0.2.tgz"; + sha1 = "0bc47dc4838e646dccfba0507b5e57ffbff35f7c"; + }) + ]; + buildInputs = + (self.nativeDeps."recursive-readdir" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "recursive-readdir" ]; + }; by-spec."redeyed"."~0.4.0" = self.by-version."redeyed"."0.4.4"; by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -13963,37 +14667,6 @@ self.by-version."request"."2.34.0"; by-spec."request"."~2" = self.by-version."request"."2.34.0"; - by-spec."request"."~2.25.0" = - self.by-version."request"."2.25.0"; - by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.25.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; - name = "request-2.25.0.tgz"; - sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."5.0.0" - self.by-version."forever-agent"."0.5.2" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign"."0.3.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."cookie-jar"."0.3.0" - self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" - self.by-version."form-data"."0.1.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; by-spec."request"."~2.27.0" = self.by-version."request"."2.27.0"; by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { @@ -14056,37 +14729,6 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.31.0" = - self.by-version."request"."2.31.0"; - by-version."request"."2.31.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.31.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.31.0.tgz"; - name = "request-2.31.0.tgz"; - sha1 = "4c8ac967c9a4b9410cb4ba1a61fdb644267eeeff"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."5.0.0" - 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.9.15" - 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" - self.by-version."aws-sign2"."0.5.0" - ]; - peerDependencies = [ - ]; - 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 { @@ -14118,6 +14760,8 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."~2.34.0" = + self.by-version."request"."2.34.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 { @@ -14179,15 +14823,15 @@ }; by-spec."requirejs"."~2.1.0" = self.by-version."requirejs"."2.1.11"; - by-spec."resolve"."0.5.x" = - self.by-version."resolve"."0.5.1"; - by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "node-resolve-0.5.1"; + by-spec."resolve"."0.6.1" = + self.by-version."resolve"."0.6.1"; + by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "node-resolve-0.6.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-0.5.1.tgz"; - name = "resolve-0.5.1.tgz"; - sha1 = "15e4a222c4236bcd4cf85454412c2d0fb6524576"; + url = "http://registry.npmjs.org/resolve/-/resolve-0.6.1.tgz"; + name = "resolve-0.6.1.tgz"; + sha1 = "b7fc874a8fe240b44de2c92b7f885a2e8598b652"; }) ]; buildInputs = @@ -14198,15 +14842,15 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.6.1" = - self.by-version."resolve"."0.6.1"; - by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-resolve-0.6.1"; + by-spec."resolve"."0.6.x" = + self.by-version."resolve"."0.6.2"; + by-version."resolve"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "node-resolve-0.6.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-0.6.1.tgz"; - name = "resolve-0.6.1.tgz"; - sha1 = "b7fc874a8fe240b44de2c92b7f885a2e8598b652"; + url = "http://registry.npmjs.org/resolve/-/resolve-0.6.2.tgz"; + name = "resolve-0.6.2.tgz"; + sha1 = "7404e59e3c02980aa172272186521db3cf0a15f5"; }) ]; buildInputs = @@ -14217,8 +14861,6 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.6.x" = - self.by-version."resolve"."0.6.1"; by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -14241,9 +14883,28 @@ by-spec."resolve"."~0.3.1" = self.by-version."resolve"."0.3.1"; by-spec."resolve"."~0.6.0" = - self.by-version."resolve"."0.6.1"; + self.by-version."resolve"."0.6.2"; by-spec."resolve"."~0.6.1" = - self.by-version."resolve"."0.6.1"; + self.by-version."resolve"."0.6.2"; + 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-1.0.0.tgz"; + name = "response-time-1.0.0.tgz"; + sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9"; + }) + ]; + buildInputs = + (self.nativeDeps."response-time" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "response-time" ]; + }; by-spec."restify"."2.4.1" = self.by-version."restify"."2.4.1"; by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -14281,14 +14942,14 @@ passthru.names = [ "restify" ]; }; by-spec."rethinkdb"."*" = - self.by-version."rethinkdb"."1.11.0-4"; - by-version."rethinkdb"."1.11.0-4" = lib.makeOverridable self.buildNodePackage { - name = "node-rethinkdb-1.11.0-4"; + 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.11.0-4.tgz"; - name = "rethinkdb-1.11.0-4.tgz"; - sha1 = "11a4f32cf7cd98d895016448641b9af6a1b575e9"; + url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-0.tgz"; + name = "rethinkdb-1.12.0-0.tgz"; + sha1 = "cad01e869bd12dcd09f235c5ec8f5ccf26cc6f81"; }) ]; buildInputs = @@ -14300,7 +14961,7 @@ ]; passthru.names = [ "rethinkdb" ]; }; - "rethinkdb" = self.by-version."rethinkdb"."1.11.0-4"; + "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 { @@ -14404,6 +15065,8 @@ }; by-spec."rimraf"."2.x.x" = self.by-version."rimraf"."2.2.6"; + by-spec."rimraf"."^2.2.2" = + self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2" = self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2.0.2" = @@ -14426,8 +15089,6 @@ ]; passthru.names = [ "rimraf" ]; }; - by-spec."rimraf"."~2.0.3" = - self.by-version."rimraf"."2.0.3"; by-spec."rimraf"."~2.1.4" = self.by-version."rimraf"."2.1.4"; by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage { @@ -14505,15 +15166,15 @@ passthru.names = [ "s3http" ]; }; "s3http" = self.by-version."s3http"."0.0.5"; - by-spec."sauce-connect-launcher"."~0.2.2" = - self.by-version."sauce-connect-launcher"."0.2.2"; - by-version."sauce-connect-launcher"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-sauce-connect-launcher-0.2.2"; + by-spec."sauce-connect-launcher"."~0.3.0" = + self.by-version."sauce-connect-launcher"."0.3.3"; + by-version."sauce-connect-launcher"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-sauce-connect-launcher-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.2.2.tgz"; - name = "sauce-connect-launcher-0.2.2.tgz"; - sha1 = "cfd951c8b488af38d384aef14920261482e2e05a"; + url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.3.3.tgz"; + name = "sauce-connect-launcher-0.3.3.tgz"; + sha1 = "6c8b59d16b795ffc9439f162d5abd24387cdc23d"; }) ]; buildInputs = @@ -14522,6 +15183,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" ]; peerDependencies = [ ]; @@ -14585,14 +15247,14 @@ passthru.names = [ "sax" ]; }; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.40.0"; - by-version."selenium-webdriver"."2.40.0" = lib.makeOverridable self.buildNodePackage { - name = "node-selenium-webdriver-2.40.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.40.0.tgz"; - name = "selenium-webdriver-2.40.0.tgz"; - sha1 = "ca4603c08311ec3688d67e1c8e8263cb9c1c1450"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.41.0.tgz"; + name = "selenium-webdriver-2.41.0.tgz"; + sha1 = "d084dfbc73bdf33aedc7d731eaab028affad7f16"; }) ]; buildInputs = @@ -14603,7 +15265,7 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.40.0"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.41.0"; by-spec."semver"."*" = self.by-version."semver"."2.2.1"; by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -14730,7 +15392,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.0" self.by-version."mime"."1.2.11" self.by-version."fresh"."0.2.2" self.by-version."range-parser"."1.0.0" @@ -14753,7 +15415,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.0" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -14776,7 +15438,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.0" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -14799,7 +15461,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.0" self.by-version."mime"."1.2.11" self.by-version."fresh"."0.2.0" self.by-version."range-parser"."0.0.4" @@ -14831,6 +15493,67 @@ }; 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz"; + name = "serve-index-1.0.1.tgz"; + sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-index" or []); + deps = [ + self.by-version."batch"."0.5.0" + self.by-version."negotiator"."0.4.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "serve-index" ]; + }; + by-spec."serve-static"."1.0.1" = + self.by-version."serve-static"."1.0.1"; + by-version."serve-static"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.1.tgz"; + name = "serve-static-1.0.1.tgz"; + sha1 = "10dcbfd44b3e0291a131fc9ab4ab25a9f5a78a42"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-static" or []); + deps = [ + self.by-version."send"."0.1.4" + ]; + peerDependencies = [ + ]; + 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"; + 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."sha"."~1.2.1" = self.by-version."sha"."1.2.3"; by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -14845,7 +15568,7 @@ buildInputs = (self.nativeDeps."sha" or []); deps = [ - self.by-version."graceful-fs"."2.0.2" + self.by-version."graceful-fs"."2.0.3" self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ @@ -14890,6 +15613,29 @@ ]; passthru.names = [ "shell-quote" ]; }; + by-spec."shell-quote"."~1.4.1" = + self.by-version."shell-quote"."1.4.1"; + by-version."shell-quote"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-shell-quote-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.1.tgz"; + name = "shell-quote-1.4.1.tgz"; + sha1 = "ae18442b536a08c720239b079d2f228acbedee40"; + }) + ]; + buildInputs = + (self.nativeDeps."shell-quote" or []); + deps = [ + self.by-version."jsonify"."0.0.0" + self.by-version."array-filter"."0.0.1" + self.by-version."array-reduce"."0.0.0" + self.by-version."array-map"."0.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "shell-quote" ]; + }; by-spec."shelljs"."0.1.x" = self.by-version."shelljs"."0.1.4"; by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -14909,8 +15655,6 @@ ]; passthru.names = [ "shelljs" ]; }; - by-spec."shelljs"."~0.1.4" = - self.by-version."shelljs"."0.1.4"; by-spec."shelljs"."~0.2.6" = self.by-version."shelljs"."0.2.6"; by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage { @@ -14931,14 +15675,14 @@ passthru.names = [ "shelljs" ]; }; by-spec."should"."*" = - self.by-version."should"."3.1.3"; - by-version."should"."3.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-should-3.1.3"; + self.by-version."should"."3.2.0"; + by-version."should"."3.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-should-3.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-3.1.3.tgz"; - name = "should-3.1.3.tgz"; - sha1 = "900ff485c1497f873de0aa3bfcf9d8b913fdda24"; + url = "http://registry.npmjs.org/should/-/should-3.2.0.tgz"; + name = "should-3.2.0.tgz"; + sha1 = "0dbbaec439c37eac010d4c0c2304815598be659f"; }) ]; buildInputs = @@ -14949,7 +15693,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."3.1.3"; + "should" = self.by-version."should"."3.2.0"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -15012,14 +15756,14 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.22"; - by-version."simplesmtp"."0.3.22" = lib.makeOverridable self.buildNodePackage { - name = "node-simplesmtp-0.3.22"; + self.by-version."simplesmtp"."0.3.24"; + by-version."simplesmtp"."0.3.24" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.24"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.22.tgz"; - name = "simplesmtp-0.3.22.tgz"; - sha1 = "5bef8fef60e7e3c4ff57117e3502190447de11e5"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.24.tgz"; + name = "simplesmtp-0.3.24.tgz"; + sha1 = "7423226b0735a8dbf87c07c3888f33ba2135a0e7"; }) ]; buildInputs = @@ -15032,6 +15776,28 @@ ]; passthru.names = [ "simplesmtp" ]; }; + by-spec."slasp"."*" = + self.by-version."slasp"."0.0.3"; + by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-slasp-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/slasp/-/slasp-0.0.3.tgz"; + name = "slasp-0.0.3.tgz"; + sha1 = "fb9aba74f30fc2f012d0ff2d34d4b5c678c11f9f"; + }) + ]; + buildInputs = + (self.nativeDeps."slasp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "slasp" ]; + }; + "slasp" = self.by-version."slasp"."0.0.3"; + by-spec."slasp"."0.0.3" = + self.by-version."slasp"."0.0.3"; by-spec."sliced"."0.0.3" = self.by-version."sliced"."0.0.3"; by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -15317,6 +16083,25 @@ passthru.names = [ "sockjs" ]; }; "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 { + name = "node-sorted-object-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"; + name = "sorted-object-1.0.0.tgz"; + sha1 = "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05"; + }) + ]; + buildInputs = + (self.nativeDeps."sorted-object" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "sorted-object" ]; + }; by-spec."source-map"."*" = self.by-version."source-map"."0.1.33"; by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage { @@ -15338,14 +16123,38 @@ passthru.names = [ "source-map" ]; }; "source-map" = self.by-version."source-map"."0.1.33"; + by-spec."source-map"."0.1.11" = + self.by-version."source-map"."0.1.11"; + by-version."source-map"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "node-source-map-0.1.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.11.tgz"; + name = "source-map-0.1.11.tgz"; + sha1 = "2eef2fd65a74c179880ae5ee6975d99ce21eb7b4"; + }) + ]; + buildInputs = + (self.nativeDeps."source-map" or []); + deps = [ + self.by-version."amdefine"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "source-map" ]; + }; by-spec."source-map"."0.1.x" = self.by-version."source-map"."0.1.33"; by-spec."source-map".">= 0.1.2" = self.by-version."source-map"."0.1.33"; + by-spec."source-map"."~ 0.1.8" = + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.30" = self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.31" = self.by-version."source-map"."0.1.33"; + by-spec."source-map"."~0.1.33" = + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.7" = self.by-version."source-map"."0.1.33"; by-spec."spdy"."1.7.1" = @@ -15467,6 +16276,44 @@ passthru.names = [ "stackdriver-statsd-backend" ]; }; "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.1.5"; + 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 { @@ -15531,6 +16378,26 @@ ]; passthru.names = [ "stream-browserify" ]; }; + by-spec."stream-combiner"."^0.0.2" = + self.by-version."stream-combiner"."0.0.2"; + by-version."stream-combiner"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-stream-combiner-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.2.tgz"; + name = "stream-combiner-0.0.2.tgz"; + sha1 = "dfe0e74675742565e76c6056788ea5c23bd97db4"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-combiner" or []); + deps = [ + self.by-version."duplexer"."0.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-combiner" ]; + }; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -15585,7 +16452,7 @@ buildInputs = (self.nativeDeps."stream-counter" or []); deps = [ - self.by-version."readable-stream"."1.1.11" + self.by-version."readable-stream"."1.1.12" ]; peerDependencies = [ ]; @@ -15688,6 +16555,25 @@ ]; 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.0.tgz"; + name = "stringify-object-0.2.0.tgz"; + sha1 = "832996ea55ab2aaa7570cc9bc0d5774adfc2c585"; + }) + ]; + buildInputs = + (self.nativeDeps."stringify-object" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "stringify-object" ]; + }; by-spec."strip-ansi"."~0.1.0" = self.by-version."strip-ansi"."0.1.1"; by-version."strip-ansi"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -15743,7 +16629,7 @@ deps = [ self.by-version."css-parse"."1.7.0" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.0" self.by-version."sax"."0.5.8" self.by-version."glob"."3.2.9" ]; @@ -15768,7 +16654,7 @@ deps = [ self.by-version."css-parse"."1.7.0" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.7.4" + self.by-version."debug"."0.8.0" self.by-version."sax"."0.5.8" self.by-version."glob"."3.2.9" ]; @@ -15836,15 +16722,15 @@ ]; passthru.names = [ "sudo-block" ]; }; - by-spec."superagent"."0.16.0" = - self.by-version."superagent"."0.16.0"; - by-version."superagent"."0.16.0" = lib.makeOverridable self.buildNodePackage { - name = "node-superagent-0.16.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.16.0.tgz"; - name = "superagent-0.16.0.tgz"; - sha1 = "f38df4a476565dffdbaa07764b81a19f0ab38a4e"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz"; + name = "superagent-0.17.0.tgz"; + sha1 = "aadcd50fbe5a93e71991118d79bf0714d625bba8"; }) ]; buildInputs = @@ -15858,6 +16744,7 @@ 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" ]; peerDependencies = [ ]; @@ -15890,28 +16777,53 @@ }; by-spec."superagent"."~0.16.0" = self.by-version."superagent"."0.16.0"; + by-version."superagent"."0.16.0" = lib.makeOverridable self.buildNodePackage { + name = "node-superagent-0.16.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/superagent/-/superagent-0.16.0.tgz"; + name = "superagent-0.16.0.tgz"; + sha1 = "f38df4a476565dffdbaa07764b81a19f0ab38a4e"; + }) + ]; + buildInputs = + (self.nativeDeps."superagent" or []); + deps = [ + self.by-version."qs"."0.6.5" + self.by-version."formidable"."1.0.14" + self.by-version."mime"."1.2.5" + self.by-version."emitter-component"."1.0.0" + self.by-version."methods"."0.0.1" + self.by-version."cookiejar"."1.3.0" + self.by-version."debug"."0.7.4" + self.by-version."reduce-component"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "superagent" ]; + }; by-spec."supertest"."*" = - self.by-version."supertest"."0.9.0"; - by-version."supertest"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-supertest-0.9.0"; + self.by-version."supertest"."0.10.0"; + by-version."supertest"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-supertest-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.9.0.tgz"; - name = "supertest-0.9.0.tgz"; - sha1 = "955efa32ad01fb9eecfc6f7c3122699a5843bba4"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.10.0.tgz"; + name = "supertest-0.10.0.tgz"; + sha1 = "5ba821b5f4e9e643292fcf87268dfd2688bdbb58"; }) ]; buildInputs = (self.nativeDeps."supertest" or []); deps = [ - self.by-version."superagent"."0.16.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.9.0"; + "supertest" = self.by-version."supertest"."0.10.0"; by-spec."swig"."0.14.x" = self.by-version."swig"."0.14.0"; by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage { @@ -16043,9 +16955,9 @@ ]; passthru.names = [ "tar" ]; }; - by-spec."tar"."~0.1.17" = + by-spec."tar"."^0.1.18" = self.by-version."tar"."0.1.19"; - by-spec."tar"."~0.1.18" = + by-spec."tar"."~0.1.17" = self.by-version."tar"."0.1.19"; by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.19"; @@ -16115,15 +17027,15 @@ self.by-version."temp"."0.6.0"; by-spec."temp"."~0.7.0" = self.by-version."temp"."0.7.0"; - by-spec."tempfile"."~0.1.2" = - self.by-version."tempfile"."0.1.2"; - by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-tempfile-0.1.2"; + by-spec."tempfile"."^0.1.2" = + self.by-version."tempfile"."0.1.3"; + by-version."tempfile"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-tempfile-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/tempfile/-/tempfile-0.1.2.tgz"; - name = "tempfile-0.1.2.tgz"; - sha1 = "81d4e51f35856592f3b51d568135791af3b038e0"; + url = "http://registry.npmjs.org/tempfile/-/tempfile-0.1.3.tgz"; + name = "tempfile-0.1.3.tgz"; + sha1 = "7d6b710047339d39f847327a056dadf183103010"; }) ]; buildInputs = @@ -16135,25 +17047,6 @@ ]; passthru.names = [ "tempfile" ]; }; - by-spec."text-table"."~0.1.1" = - self.by-version."text-table"."0.1.1"; - by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-text-table-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/text-table/-/text-table-0.1.1.tgz"; - name = "text-table-0.1.1.tgz"; - sha1 = "9aa4347a39b6950cd24190264576f62db6e52d93"; - }) - ]; - buildInputs = - (self.nativeDeps."text-table" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "text-table" ]; - }; 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 { @@ -16291,14 +17184,14 @@ passthru.names = [ "timespan" ]; }; by-spec."timezone"."*" = - self.by-version."timezone"."0.0.28"; - by-version."timezone"."0.0.28" = lib.makeOverridable self.buildNodePackage { - name = "node-timezone-0.0.28"; + 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.28.tgz"; - name = "timezone-0.0.28.tgz"; - sha1 = "a3fb234b48093c8edd36de5662e92ece6477a88c"; + url = "http://registry.npmjs.org/timezone/-/timezone-0.0.30.tgz"; + name = "timezone-0.0.30.tgz"; + sha1 = "f83e46d35c017a33a684a4d8bb8fac3debed49bf"; }) ]; buildInputs = @@ -16309,7 +17202,7 @@ ]; passthru.names = [ "timezone" ]; }; - "timezone" = self.by-version."timezone"."0.0.28"; + "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 { @@ -16348,7 +17241,7 @@ self.by-version."fields"."0.1.12" self.by-version."humanize"."0.0.9" self.by-version."jade"."0.35.0" - self.by-version."longjohn"."0.2.2" + self.by-version."longjohn"."0.2.4" self.by-version."moment"."2.4.0" self.by-version."node-appc"."0.2.0" self.by-version."optimist"."0.6.1" @@ -16680,14 +17573,14 @@ passthru.names = [ "uglify-js" ]; }; by-spec."uglify-js"."^2.4.0" = - self.by-version."uglify-js"."2.4.12"; - by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.12"; + self.by-version."uglify-js"."2.4.13"; + by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz"; - name = "uglify-js-2.4.12.tgz"; - sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz"; + name = "uglify-js-2.4.13.tgz"; + sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba"; }) ]; buildInputs = @@ -16702,25 +17595,6 @@ ]; passthru.names = [ "uglify-js" ]; }; - by-spec."uglify-js"."~1.2" = - self.by-version."uglify-js"."1.2.6"; - by-version."uglify-js"."1.2.6" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-1.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.6.tgz"; - name = "uglify-js-1.2.6.tgz"; - sha1 = "d354b2d3c1cf10ebc18fa78c11a28bdd9ce1580d"; - }) - ]; - buildInputs = - (self.nativeDeps."uglify-js" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "uglify-js" ]; - }; by-spec."uglify-js"."~2.2" = self.by-version."uglify-js"."2.2.5"; by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage { @@ -16769,9 +17643,9 @@ by-spec."uglify-js"."~2.3.6" = self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.12"; + self.by-version."uglify-js"."2.4.13"; by-spec."uglify-js"."~2.4.12" = - self.by-version."uglify-js"."2.4.12"; + self.by-version."uglify-js"."2.4.13"; by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.2"; by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -16829,6 +17703,8 @@ ]; passthru.names = [ "uid2" ]; }; + by-spec."uid2"."~0.0.2" = + self.by-version."uid2"."0.0.3"; by-spec."umd"."~2.0.0" = self.by-version."umd"."2.0.0"; by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -16846,7 +17722,7 @@ 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.12" + self.by-version."uglify-js"."2.4.13" ]; peerDependencies = [ ]; @@ -16989,14 +17865,14 @@ passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.7.1"; - by-version."ungit"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.7.1"; + self.by-version."ungit"."0.7.2"; + by-version."ungit"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.7.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.7.1.tgz"; - name = "ungit-0.7.1.tgz"; - sha1 = "9b1b768ecd97a66f7b97b5d7a1b36f29682e2bf7"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.7.2.tgz"; + name = "ungit-0.7.2.tgz"; + sha1 = "fc4d6943c407ca4ed08b7c48841419050e3ce52a"; }) ]; buildInputs = @@ -17011,7 +17887,7 @@ self.by-version."async"."0.2.10" self.by-version."rc"."0.3.4" self.by-version."uuid"."1.4.1" - self.by-version."winston"."0.7.2" + self.by-version."winston"."0.7.3" self.by-version."passport"."0.2.0" self.by-version."passport-local"."0.1.6" self.by-version."semver"."2.2.1" @@ -17028,42 +17904,42 @@ self.by-version."deep-extend"."0.2.8" self.by-version."raven"."0.6.2" self.by-version."knockout"."3.0.0" - self.by-version."npm-registry-client"."0.4.4" + self.by-version."npm-registry-client"."0.4.6" self.by-version."npmconf"."0.1.13" self.by-version."mkdirp"."0.3.5" self.by-version."less"."1.7.0" - self.by-version."browserify"."3.31.2" + self.by-version."browserify"."3.32.1" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.7.1"; + "ungit" = self.by-version."ungit"."0.7.2"; by-spec."update-notifier"."~0.1.3" = - self.by-version."update-notifier"."0.1.7"; - by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "node-update-notifier-0.1.7"; + 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.7.tgz"; - name = "update-notifier-0.1.7.tgz"; - sha1 = "b37fb55004835240fd2e7e360c52ccffde5219c9"; + 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.1.7" + self.by-version."configstore"."0.2.3" self.by-version."semver"."2.1.0" - self.by-version."chalk"."0.2.1" + self.by-version."chalk"."0.4.0" ]; peerDependencies = [ ]; passthru.names = [ "update-notifier" ]; }; by-spec."update-notifier"."~0.1.7" = - self.by-version."update-notifier"."0.1.7"; + self.by-version."update-notifier"."0.1.8"; by-spec."url"."~0.7.9" = self.by-version."url"."0.7.9"; by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage { @@ -17086,14 +17962,14 @@ passthru.names = [ "url" ]; }; by-spec."useragent"."~2.0.4" = - self.by-version."useragent"."2.0.7"; - by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-useragent-2.0.7"; + self.by-version."useragent"."2.0.8"; + by-version."useragent"."2.0.8" = lib.makeOverridable self.buildNodePackage { + name = "node-useragent-2.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz"; - name = "useragent-2.0.7.tgz"; - sha1 = "a44c07d157a15e13d73d4af4ece6aab70f298224"; + url = "http://registry.npmjs.org/useragent/-/useragent-2.0.8.tgz"; + name = "useragent-2.0.8.tgz"; + sha1 = "32caa86d3f404e92d7d4183831dd103ebc1a3125"; }) ]; buildInputs = @@ -17184,6 +18060,25 @@ ]; passthru.names = [ "util" ]; }; + by-spec."util-extend"."^1.0.1" = + self.by-version."util-extend"."1.0.1"; + by-version."util-extend"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-util-extend-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"; + name = "util-extend-1.0.1.tgz"; + sha1 = "bb703b79480293ddcdcfb3c6a9fea20f483415bc"; + }) + ]; + buildInputs = + (self.nativeDeps."util-extend" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "util-extend" ]; + }; by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -17401,6 +18296,25 @@ ]; passthru.names = [ "verror" ]; }; + by-spec."vhost"."1.0.0" = + self.by-version."vhost"."1.0.0"; + by-version."vhost"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-vhost-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz"; + name = "vhost-1.0.0.tgz"; + sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0"; + }) + ]; + buildInputs = + (self.nativeDeps."vhost" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "vhost" ]; + }; by-spec."view-helpers"."*" = self.by-version."view-helpers"."0.1.4"; by-version."view-helpers"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -17541,15 +18455,15 @@ ]; passthru.names = [ "watch" ]; }; - by-spec."wd"."~0.2.8" = - self.by-version."wd"."0.2.11"; - by-version."wd"."0.2.11" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.2.11"; + by-spec."wd"."~0.2.12" = + self.by-version."wd"."0.2.14"; + by-version."wd"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.2.11.tgz"; - name = "wd-0.2.11.tgz"; - sha1 = "27889d290facf3d19e050b3c789f2e852ca03f10"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.14.tgz"; + name = "wd-0.2.14.tgz"; + sha1 = "834dfc756e03a68013ff3a3f62aea0cb1302f879"; }) ]; buildInputs = @@ -17557,7 +18471,7 @@ deps = [ self.by-version."async"."0.2.10" self.by-version."vargs"."0.1.0" - self.by-version."q"."1.0.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" @@ -17567,6 +18481,25 @@ ]; 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"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.4.tgz"; + name = "weak-map-1.0.4.tgz"; + sha1 = "1acddee2cc90eb30950860b7415c79cefc5f07c9"; + }) + ]; + buildInputs = + (self.nativeDeps."weak-map" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "weak-map" ]; + }; by-spec."webdrvr"."*" = self.by-version."webdrvr"."2.40.0"; by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage { @@ -17634,7 +18567,7 @@ ]; passthru.names = [ "when" ]; }; - by-spec."which"."*" = + by-spec."which"."1" = self.by-version."which"."1.0.5"; by-version."which"."1.0.5" = lib.makeOverridable self.buildNodePackage { name = "which-1.0.5"; @@ -17653,8 +18586,6 @@ ]; passthru.names = [ "which" ]; }; - by-spec."which"."1" = - self.by-version."which"."1.0.5"; by-spec."which"."1.0.x" = self.by-version."which"."1.0.5"; by-spec."which"."~1.0.5" = @@ -17681,14 +18612,14 @@ passthru.names = [ "winser" ]; }; by-spec."winston"."*" = - self.by-version."winston"."0.7.2"; - by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "node-winston-0.7.2"; + self.by-version."winston"."0.7.3"; + by-version."winston"."0.7.3" = lib.makeOverridable self.buildNodePackage { + name = "node-winston-0.7.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; - name = "winston-0.7.2.tgz"; - sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb"; + url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz"; + name = "winston-0.7.3.tgz"; + sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266"; }) ]; buildInputs = @@ -17706,7 +18637,7 @@ ]; passthru.names = [ "winston" ]; }; - "winston" = self.by-version."winston"."0.7.2"; + "winston" = self.by-version."winston"."0.7.3"; by-spec."winston"."0.6.2" = self.by-version."winston"."0.6.2"; by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage { @@ -17737,17 +18668,41 @@ self.by-version."winston"."0.6.2"; by-spec."winston"."0.7.2" = self.by-version."winston"."0.7.2"; + by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "node-winston-0.7.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; + name = "winston-0.7.2.tgz"; + sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb"; + }) + ]; + buildInputs = + (self.nativeDeps."winston" or []); + deps = [ + self.by-version."async"."0.2.10" + self.by-version."colors"."0.6.2" + self.by-version."cycle"."1.0.3" + self.by-version."eyes"."0.1.8" + self.by-version."pkginfo"."0.3.0" + self.by-version."request"."2.16.6" + self.by-version."stack-trace"."0.0.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "winston" ]; + }; by-spec."winston"."~0.7.2" = - self.by-version."winston"."0.7.2"; - by-spec."wiredep"."~0.4.2" = - self.by-version."wiredep"."0.4.2"; - by-version."wiredep"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-wiredep-0.4.2"; + 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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wiredep/-/wiredep-0.4.2.tgz"; - name = "wiredep-0.4.2.tgz"; - sha1 = "42d4cf07422576f26e3a04045edc163da101a66f"; + url = "http://registry.npmjs.org/wiredep/-/wiredep-1.0.0.tgz"; + name = "wiredep-1.0.0.tgz"; + sha1 = "2e570465657b97e7494abf62978a3e52fc37ac52"; }) ]; buildInputs = @@ -17755,6 +18710,7 @@ deps = [ self.by-version."lodash"."1.3.1" self.by-version."chalk"."0.1.1" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -17814,7 +18770,7 @@ buildInputs = (self.nativeDeps."with" or []); deps = [ - self.by-version."uglify-js"."2.4.12" + self.by-version."uglify-js"."2.4.13" ]; peerDependencies = [ ]; @@ -17989,14 +18945,14 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">= 0.0.1" = - self.by-version."xml2js"."0.4.1"; - by-version."xml2js"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-xml2js-0.4.1"; + 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.1.tgz"; - name = "xml2js-0.4.1.tgz"; - sha1 = "dee0630173a5c6ea62797f848615fd55c6bc6992"; + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.2.tgz"; + name = "xml2js-0.4.2.tgz"; + sha1 = "93911c393c4a332a2dce1222801eb571453b2f90"; }) ]; buildInputs = @@ -18010,7 +18966,7 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">=0.1.7" = - self.by-version."xml2js"."0.4.1"; + 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 { @@ -18147,45 +19103,6 @@ ]; passthru.names = [ "yargs" ]; }; - by-spec."yeoman-generator"."~0.13.0" = - self.by-version."yeoman-generator"."0.13.4"; - by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage { - name = "node-yeoman-generator-0.13.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; - name = "yeoman-generator-0.13.4.tgz"; - sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34"; - }) - ]; - buildInputs = - (self.nativeDeps."yeoman-generator" or []); - deps = [ - self.by-version."cheerio"."0.12.4" - self.by-version."request"."2.25.0" - self.by-version."rimraf"."2.2.6" - self.by-version."tar"."0.1.19" - 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"."1.3.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"."0.1.9" - self.by-version."dargs"."0.1.0" - self.by-version."async"."0.2.10" - self.by-version."inquirer"."0.3.5" - self.by-version."iconv-lite"."0.2.11" - self.by-version."shelljs"."0.1.4" - self.by-version."findup-sync"."0.1.2" - self.by-version."chalk"."0.2.1" - self.by-version."text-table"."0.1.1" - ]; - 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 { @@ -18215,10 +19132,10 @@ self.by-version."inquirer"."0.3.5" self.by-version."iconv-lite"."0.2.11" self.by-version."shelljs"."0.2.6" - self.by-version."findup-sync"."0.1.2" + 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.10" + self.by-version."download"."0.1.12" self.by-version."request"."2.27.0" self.by-version."file-utils"."0.1.5" ]; @@ -18255,10 +19172,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.2" + 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.10" + self.by-version."download"."0.1.12" self.by-version."request"."2.30.0" self.by-version."file-utils"."0.1.5" self.by-version."class-extend"."0.1.1" @@ -18284,18 +19201,18 @@ 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.7" + 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" self.by-version."open"."0.0.4" self.by-version."chalk"."0.4.0" - self.by-version."findup"."0.1.3" + self.by-version."findup"."0.1.4" self.by-version."shelljs"."0.2.6" ]; peerDependencies = [ self.by-version."grunt-cli"."0.1.13" - self.by-version."bower"."1.2.8" + self.by-version."bower"."1.3.1" ]; passthru.names = [ "yo" ]; }; @@ -18344,25 +19261,6 @@ ]; passthru.names = [ "zip-stream" ]; }; - by-spec."zlib-browserify"."0.0.1" = - self.by-version."zlib-browserify"."0.0.1"; - by-version."zlib-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-zlib-browserify-0.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.1.tgz"; - name = "zlib-browserify-0.0.1.tgz"; - sha1 = "4fa6a45d00dbc15f318a4afa1d9afc0258e176cc"; - }) - ]; - buildInputs = - (self.nativeDeps."zlib-browserify" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "zlib-browserify" ]; - }; by-spec."zlib-browserify"."^0.0.3" = self.by-version."zlib-browserify"."0.0.3"; by-version."zlib-browserify"."0.0.3" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 6539fc3e6dda..07adedb9a709 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -118,4 +118,6 @@ , "fetch-bower" , { "titanium": "3.2.1" } , "gh" +, "deepmerge" +, "slasp" ] diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d5cd011bbaea..f36630833846 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4069,10 +4069,10 @@ let self = _self // overrides; _self = with self; { }; HTMLTiny = buildPerlPackage rec { - name = "HTML-Tiny-1.03"; + name = "HTML-Tiny-1.05"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; - sha256 = "1nc9vr0z699jwv8jaxxpkfhspiv7glhdp500hqyzdm2jxfw8azrg"; + sha256 = "18zxg7z51f5daidnwl9vxsrs3lz0y6n5ddqhpb748bjyk3awkkfp"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a4be8d1704b..d87eb45dc697 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -460,6 +460,20 @@ rec { }; }); + backports_ssl_match_hostname_3_4_0_2 = pythonPackages.buildPythonPackage rec { + name = "backports.ssl_match_hostname-3.4.0.2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz"; + md5 = "788214f20214c64631f0859dc79f23c6"; + }; + + meta = { + description = "The Secure Sockets layer is only actually *secure*"; + homepage = http://bitbucket.org/brandon/backports.ssl_match_hostname; + }; + }; + bcdoc = buildPythonPackage rec { name = "bcdoc-0.12.1"; @@ -1484,6 +1498,22 @@ rec { }; }; + derpconf = pythonPackages.buildPythonPackage rec { + name = "derpconf-0.4.9"; + + propagatedBuildInputs = [ six ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/derpconf/${name}.tar.gz"; + md5 = "a164807d7bf0c4adf1de781305f29b82"; + }; + + meta = { + description = "derpconf abstracts loading configuration files for your app"; + homepage = https://github.com/globocom/derpconf; + license = licenses.mit; + }; + }; dpkt = buildPythonPackage rec { name = "dpkt-1.8"; @@ -8258,11 +8288,13 @@ rec { tornado = buildPythonPackage rec { - name = "tornado-3.1.1"; + name = "tornado-3.2"; + + propagatedBuildInputs = [ backports_ssl_match_hostname_3_4_0_2 ]; src = fetchurl { - url = "http://pypi.python.org/packages/source/t/tornado/${name}.tar.gz"; - sha256 = "1ipx23ix8hyd88rywmwr7bfdgkvkdac87xq3f9l5vkm0wjzh8n9l"; + url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz"; + md5 = "bd83cee5f1a5c5e139e87996d00b251b"; }; doCheck = false; @@ -8834,4 +8866,51 @@ rec { }; }; + + thumbor = pythonPackages.buildPythonPackage rec { + name = "thumbor-4.0.4"; + + propagatedBuildInputs = [ + tornado + pycrypto + pycurl + pillow + derpconf + python_magic + thumborPexif + (pkgs.opencv.override { + gtk = null; + glib = null; + xineLib = null; + gstreamer = null; + ffmpeg = null; + }) ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz"; + md5 = "cf639a1cc57ee287b299ace450444408"; + }; + + meta = { + description = "Thumbor is a smart imaging service. It enables on-demand crop, resizing and flipping of images."; + homepage = https://github.com/globocom/thumbor/wiki; + license = licenses.mit; + }; + }; + + thumborPexif = pythonPackages.buildPythonPackage rec { + name = "thumbor-pexif-0.14"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/thumbor-pexif/${name}.tar.gz"; + md5 = "fb4cdb60f4a0bead5193fb483ccd3430"; + }; + + meta = { + description = "Module to parse and edit the EXIF data tags in a JPEG image"; + homepage = http://www.benno.id.au/code/pexif/; + license = licenses.mit; + }; + }; + }); in pythonPackages |